[savara-commits] savara SVN: r584 - in branches/experimental/2.0.x/bundles: org.savara.activity/src/main/java/org/savara/activity and 4 other directories.

do-not-reply at jboss.org do-not-reply at jboss.org
Sun Jan 16 09:41:55 EST 2011 

Author: objectiser
Date: 2011-01-16 09:41:55 -0500 (Sun, 16 Jan 2011)
New Revision: 584

Added:
   branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/
   branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/Analysis.java
   branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/EndpointActivity.java
   branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/Error.java
   branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/InstanceFinished.java
   branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/InstanceStarted.java
   branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/LifecycleActivity.java
   branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/MessageActivity.java
   branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/MessageReceived.java
   branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/MessageSent.java
   branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/ObjectFactory.java
   branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/ProtocolAnalysis.java
   branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/package-info.java
   branches/experimental/2.0.x/bundles/org.savara.monitor/src/main/java/org/savara/monitor/ConversationInstanceId.java
   branches/experimental/2.0.x/bundles/org.savara.monitor/src/main/java/org/savara/monitor/ProtocolId.java
Removed:
   branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/EndpointActivity.java
   branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/Error.java
   branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/InstanceFinished.java
   branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/InstanceStarted.java
   branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/LifecycleActivity.java
   branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/MessageActivity.java
   branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/MessageReceived.java
   branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/MessageSent.java
   branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/ObjectFactory.java
   branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/package-info.java
   branches/experimental/2.0.x/bundles/org.savara.monitor/src/main/java/org/savara/monitor/ConversationId.java
Modified:
   branches/experimental/2.0.x/bundles/org.savara.activity/schema/Activity.xsd
   branches/experimental/2.0.x/bundles/org.savara.monitor/src/main/java/org/savara/monitor/ConversationStore.java
   branches/experimental/2.0.x/bundles/org.savara.monitor/src/main/java/org/savara/monitor/impl/DefaultMonitor.java
   branches/experimental/2.0.x/bundles/org.savara.monitor/src/main/java/org/savara/monitor/impl/InMemoryConversationStore.java
   branches/experimental/2.0.x/bundles/org.savara.monitor/src/test/java/org/savara/monitor/impl/InMemoryConversationStoreTest.java
Log:
Updated activity schema to move the 'expected' attribute from the message activity to a specific analysis sub-type - so each event could have zero or more analysis elements to record information about their processing.

Modified: branches/experimental/2.0.x/bundles/org.savara.activity/schema/Activity.xsd
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.activity/schema/Activity.xsd	2011-01-15 00:09:17 UTC (rev 583)
+++ branches/experimental/2.0.x/bundles/org.savara.activity/schema/Activity.xsd	2011-01-16 14:41:55 UTC (rev 584)
@@ -2,6 +2,9 @@
 <schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.savara.org/activity" xmlns:tns="http://www.savara.org/activity" elementFormDefault="qualified">
 
     <complexType name="EndpointActivity" abstract="true">
+    	<sequence>
+    		<element name="analysis" type="tns:Analysis" minOccurs="0" maxOccurs="unbounded"></element>
+    	</sequence>
     	<attribute name="endpointName" type="string"></attribute>
     	<attribute name="instanceId" type="string"></attribute>
     	<attribute name="timestamp" type="dateTime"></attribute>
@@ -19,10 +22,12 @@
     <complexType name="MessageActivity" abstract="true">
     	<complexContent>
     		<extension base="tns:EndpointActivity">
+    			<sequence>
+    				<element name="value" type="anyURI"></element>
+    			</sequence>
     			<attribute name="operationName" type="string"></attribute>
     			<attribute name="faultName" type="string"></attribute>
     			<attribute name="type" type="string"></attribute>
-    			<attribute name="expected" type="boolean" default="true"></attribute>
     		</extension>
     	</complexContent>
     </complexType>
@@ -64,5 +69,16 @@
     	</complexContent>
     </complexType>
 
+    <complexType name="Analysis" abstract="true"></complexType>
 
+    <complexType name="ProtocolAnalysis">
+    	<complexContent>
+    		<extension base="tns:Analysis">
+    			<attribute name="protocol" type="string"></attribute>
+    			<attribute name="role" type="string"></attribute>
+    			<attribute name="expected" type="boolean" default="true"></attribute>
+    		</extension>
+    	</complexContent>
+    </complexType>
+    
 </schema>
\ No newline at end of file

Deleted: branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/EndpointActivity.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/EndpointActivity.java	2011-01-15 00:09:17 UTC (rev 583)
+++ branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/EndpointActivity.java	2011-01-16 14:41:55 UTC (rev 584)
@@ -1,128 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.2-146 
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2011.01.15 at 12:05:04 AM GMT 
-//
-
-
-package org.savara.activity;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlSeeAlso;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.datatype.XMLGregorianCalendar;
-
-
-/**
- * <p>Java class for EndpointActivity complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="EndpointActivity">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;attribute name="endpointName" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       &lt;attribute name="instanceId" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       &lt;attribute name="timestamp" type="{http://www.w3.org/2001/XMLSchema}dateTime" />
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
- at XmlAccessorType(XmlAccessType.FIELD)
- at XmlType(name = "EndpointActivity")
- at XmlSeeAlso({
-    LifecycleActivity.class,
-    MessageActivity.class,
-    Error.class
-})
-public abstract class EndpointActivity {
-
-    @XmlAttribute(name = "endpointName")
-    protected String endpointName;
-    @XmlAttribute(name = "instanceId")
-    protected String instanceId;
-    @XmlAttribute(name = "timestamp")
-    @XmlSchemaType(name = "dateTime")
-    protected XMLGregorianCalendar timestamp;
-
-    /**
-     * Gets the value of the endpointName property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getEndpointName() {
-        return endpointName;
-    }
-
-    /**
-     * Sets the value of the endpointName property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setEndpointName(String value) {
-        this.endpointName = value;
-    }
-
-    /**
-     * Gets the value of the instanceId property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getInstanceId() {
-        return instanceId;
-    }
-
-    /**
-     * Sets the value of the instanceId property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setInstanceId(String value) {
-        this.instanceId = value;
-    }
-
-    /**
-     * Gets the value of the timestamp property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link XMLGregorianCalendar }
-     *     
-     */
-    public XMLGregorianCalendar getTimestamp() {
-        return timestamp;
-    }
-
-    /**
-     * Sets the value of the timestamp property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link XMLGregorianCalendar }
-     *     
-     */
-    public void setTimestamp(XMLGregorianCalendar value) {
-        this.timestamp = value;
-    }
-
-}

Deleted: branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/Error.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/Error.java	2011-01-15 00:09:17 UTC (rev 583)
+++ branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/Error.java	2011-01-16 14:41:55 UTC (rev 584)
@@ -1,94 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.2-146 
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2011.01.15 at 12:05:04 AM GMT 
-//
-
-
-package org.savara.activity;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for Error complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="Error">
- *   &lt;complexContent>
- *     &lt;extension base="{http://www.savara.org/activity}EndpointActivity">
- *       &lt;attribute name="description" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       &lt;attribute name="type" type="{http://www.w3.org/2001/XMLSchema}string" />
- *     &lt;/extension>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
- at XmlAccessorType(XmlAccessType.FIELD)
- at XmlType(name = "Error")
-public class Error
-    extends EndpointActivity
-{
-
-    @XmlAttribute(name = "description")
-    protected String description;
-    @XmlAttribute(name = "type")
-    protected String type;
-
-    /**
-     * Gets the value of the description property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getDescription() {
-        return description;
-    }
-
-    /**
-     * Sets the value of the description property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setDescription(String value) {
-        this.description = value;
-    }
-
-    /**
-     * Gets the value of the type property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getType() {
-        return type;
-    }
-
-    /**
-     * Sets the value of the type property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setType(String value) {
-        this.type = value;
-    }
-
-}

Deleted: branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/InstanceFinished.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/InstanceFinished.java	2011-01-15 00:09:17 UTC (rev 583)
+++ branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/InstanceFinished.java	2011-01-16 14:41:55 UTC (rev 584)
@@ -1,39 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.2-146 
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2011.01.15 at 12:05:04 AM GMT 
-//
-
-
-package org.savara.activity;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for InstanceFinished complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="InstanceFinished">
- *   &lt;complexContent>
- *     &lt;extension base="{http://www.savara.org/activity}LifecycleActivity">
- *     &lt;/extension>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
- at XmlAccessorType(XmlAccessType.FIELD)
- at XmlType(name = "InstanceFinished")
-public class InstanceFinished
-    extends LifecycleActivity
-{
-
-
-}

Deleted: branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/InstanceStarted.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/InstanceStarted.java	2011-01-15 00:09:17 UTC (rev 583)
+++ branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/InstanceStarted.java	2011-01-16 14:41:55 UTC (rev 584)
@@ -1,39 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.2-146 
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2011.01.15 at 12:05:04 AM GMT 
-//
-
-
-package org.savara.activity;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for InstanceStarted complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="InstanceStarted">
- *   &lt;complexContent>
- *     &lt;extension base="{http://www.savara.org/activity}LifecycleActivity">
- *     &lt;/extension>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
- at XmlAccessorType(XmlAccessType.FIELD)
- at XmlType(name = "InstanceStarted")
-public class InstanceStarted
-    extends LifecycleActivity
-{
-
-
-}

Deleted: branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/LifecycleActivity.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/LifecycleActivity.java	2011-01-15 00:09:17 UTC (rev 583)
+++ branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/LifecycleActivity.java	2011-01-16 14:41:55 UTC (rev 584)
@@ -1,44 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.2-146 
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2011.01.15 at 12:05:04 AM GMT 
-//
-
-
-package org.savara.activity;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlSeeAlso;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for LifecycleActivity complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="LifecycleActivity">
- *   &lt;complexContent>
- *     &lt;extension base="{http://www.savara.org/activity}EndpointActivity">
- *     &lt;/extension>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
- at XmlAccessorType(XmlAccessType.FIELD)
- at XmlType(name = "LifecycleActivity")
- at XmlSeeAlso({
-    InstanceStarted.class,
-    InstanceFinished.class
-})
-public abstract class LifecycleActivity
-    extends EndpointActivity
-{
-
-
-}

Deleted: branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/MessageActivity.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/MessageActivity.java	2011-01-15 00:09:17 UTC (rev 583)
+++ branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/MessageActivity.java	2011-01-16 14:41:55 UTC (rev 584)
@@ -1,157 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.2-146 
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2011.01.15 at 12:05:04 AM GMT 
-//
-
-
-package org.savara.activity;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlSeeAlso;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for MessageActivity complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="MessageActivity">
- *   &lt;complexContent>
- *     &lt;extension base="{http://www.savara.org/activity}EndpointActivity">
- *       &lt;attribute name="operationName" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       &lt;attribute name="faultName" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       &lt;attribute name="type" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       &lt;attribute name="expected" type="{http://www.w3.org/2001/XMLSchema}boolean" default="true" />
- *     &lt;/extension>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
- at XmlAccessorType(XmlAccessType.FIELD)
- at XmlType(name = "MessageActivity")
- at XmlSeeAlso({
-    MessageReceived.class,
-    MessageSent.class
-})
-public abstract class MessageActivity
-    extends EndpointActivity
-{
-
-    @XmlAttribute(name = "operationName")
-    protected String operationName;
-    @XmlAttribute(name = "faultName")
-    protected String faultName;
-    @XmlAttribute(name = "type")
-    protected String type;
-    @XmlAttribute(name = "expected")
-    protected Boolean expected;
-
-    /**
-     * Gets the value of the operationName property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getOperationName() {
-        return operationName;
-    }
-
-    /**
-     * Sets the value of the operationName property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setOperationName(String value) {
-        this.operationName = value;
-    }
-
-    /**
-     * Gets the value of the faultName property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getFaultName() {
-        return faultName;
-    }
-
-    /**
-     * Sets the value of the faultName property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setFaultName(String value) {
-        this.faultName = value;
-    }
-
-    /**
-     * Gets the value of the type property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getType() {
-        return type;
-    }
-
-    /**
-     * Sets the value of the type property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setType(String value) {
-        this.type = value;
-    }
-
-    /**
-     * Gets the value of the expected property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Boolean }
-     *     
-     */
-    public boolean isExpected() {
-        if (expected == null) {
-            return true;
-        } else {
-            return expected;
-        }
-    }
-
-    /**
-     * Sets the value of the expected property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Boolean }
-     *     
-     */
-    public void setExpected(Boolean value) {
-        this.expected = value;
-    }
-
-}

Deleted: branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/MessageReceived.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/MessageReceived.java	2011-01-15 00:09:17 UTC (rev 583)
+++ branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/MessageReceived.java	2011-01-16 14:41:55 UTC (rev 584)
@@ -1,67 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.2-146 
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2011.01.15 at 12:05:04 AM GMT 
-//
-
-
-package org.savara.activity;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for MessageReceived complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="MessageReceived">
- *   &lt;complexContent>
- *     &lt;extension base="{http://www.savara.org/activity}MessageActivity">
- *       &lt;attribute name="source" type="{http://www.w3.org/2001/XMLSchema}string" />
- *     &lt;/extension>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
- at XmlAccessorType(XmlAccessType.FIELD)
- at XmlType(name = "MessageReceived")
-public class MessageReceived
-    extends MessageActivity
-{
-
-    @XmlAttribute(name = "source")
-    protected String source;
-
-    /**
-     * Gets the value of the source property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getSource() {
-        return source;
-    }
-
-    /**
-     * Sets the value of the source property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setSource(String value) {
-        this.source = value;
-    }
-
-}

Deleted: branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/MessageSent.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/MessageSent.java	2011-01-15 00:09:17 UTC (rev 583)
+++ branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/MessageSent.java	2011-01-16 14:41:55 UTC (rev 584)
@@ -1,67 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.2-146 
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2011.01.15 at 12:05:04 AM GMT 
-//
-
-
-package org.savara.activity;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for MessageSent complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="MessageSent">
- *   &lt;complexContent>
- *     &lt;extension base="{http://www.savara.org/activity}MessageActivity">
- *       &lt;attribute name="destination" type="{http://www.w3.org/2001/XMLSchema}string" />
- *     &lt;/extension>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
- at XmlAccessorType(XmlAccessType.FIELD)
- at XmlType(name = "MessageSent")
-public class MessageSent
-    extends MessageActivity
-{
-
-    @XmlAttribute(name = "destination")
-    protected String destination;
-
-    /**
-     * Gets the value of the destination property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getDestination() {
-        return destination;
-    }
-
-    /**
-     * Sets the value of the destination property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setDestination(String value) {
-        this.destination = value;
-    }
-
-}

Deleted: branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/ObjectFactory.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/ObjectFactory.java	2011-01-15 00:09:17 UTC (rev 583)
+++ branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/ObjectFactory.java	2011-01-16 14:41:55 UTC (rev 584)
@@ -1,79 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.2-146 
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2011.01.15 at 12:05:04 AM GMT 
-//
-
-
-package org.savara.activity;
-
-import javax.xml.bind.annotation.XmlRegistry;
-
-
-/**
- * This object contains factory methods for each 
- * Java content interface and Java element interface 
- * generated in the org.savara.activity.model package. 
- * <p>An ObjectFactory allows you to programatically 
- * construct new instances of the Java representation 
- * for XML content. The Java representation of XML 
- * content can consist of schema derived interfaces 
- * and classes representing the binding of schema 
- * type definitions, element declarations and model 
- * groups.  Factory methods for each of these are 
- * provided in this class.
- * 
- */
- at XmlRegistry
-public class ObjectFactory {
-
-
-    /**
-     * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: org.savara.activity.model
-     * 
-     */
-    public ObjectFactory() {
-    }
-
-    /**
-     * Create an instance of {@link MessageSent }
-     * 
-     */
-    public MessageSent createMessageSent() {
-        return new MessageSent();
-    }
-
-    /**
-     * Create an instance of {@link InstanceStarted }
-     * 
-     */
-    public InstanceStarted createInstanceStarted() {
-        return new InstanceStarted();
-    }
-
-    /**
-     * Create an instance of {@link InstanceFinished }
-     * 
-     */
-    public InstanceFinished createInstanceFinished() {
-        return new InstanceFinished();
-    }
-
-    /**
-     * Create an instance of {@link MessageReceived }
-     * 
-     */
-    public MessageReceived createMessageReceived() {
-        return new MessageReceived();
-    }
-
-    /**
-     * Create an instance of {@link Error }
-     * 
-     */
-    public Error createError() {
-        return new Error();
-    }
-
-}

Added: branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/Analysis.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/Analysis.java	                        (rev 0)
+++ branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/Analysis.java	2011-01-16 14:41:55 UTC (rev 584)
@@ -0,0 +1,41 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.2-146 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// Generated on: 2011.01.16 at 12:38:02 PM GMT 
+//
+
+
+package org.savara.activity.model;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlSeeAlso;
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ * <p>Java class for Analysis complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="Analysis">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+ at XmlAccessorType(XmlAccessType.FIELD)
+ at XmlType(name = "Analysis")
+ at XmlSeeAlso({
+    ProtocolAnalysis.class
+})
+public abstract class Analysis {
+
+
+}

Added: branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/EndpointActivity.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/EndpointActivity.java	                        (rev 0)
+++ branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/EndpointActivity.java	2011-01-16 14:41:55 UTC (rev 584)
@@ -0,0 +1,165 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.2-146 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// Generated on: 2011.01.16 at 12:38:02 PM GMT 
+//
+
+
+package org.savara.activity.model;
+
+import java.util.ArrayList;
+import java.util.List;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlSchemaType;
+import javax.xml.bind.annotation.XmlSeeAlso;
+import javax.xml.bind.annotation.XmlType;
+import javax.xml.datatype.XMLGregorianCalendar;
+
+
+/**
+ * <p>Java class for EndpointActivity complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="EndpointActivity">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="analysis" type="{http://www.savara.org/activity}Analysis" maxOccurs="unbounded" minOccurs="0"/>
+ *       &lt;/sequence>
+ *       &lt;attribute name="endpointName" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       &lt;attribute name="instanceId" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       &lt;attribute name="timestamp" type="{http://www.w3.org/2001/XMLSchema}dateTime" />
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+ at XmlAccessorType(XmlAccessType.FIELD)
+ at XmlType(name = "EndpointActivity", propOrder = {
+    "analysis"
+})
+ at XmlSeeAlso({
+    LifecycleActivity.class,
+    MessageActivity.class,
+    Error.class
+})
+public abstract class EndpointActivity {
+
+    protected List<Analysis> analysis;
+    @XmlAttribute(name = "endpointName")
+    protected String endpointName;
+    @XmlAttribute(name = "instanceId")
+    protected String instanceId;
+    @XmlAttribute(name = "timestamp")
+    @XmlSchemaType(name = "dateTime")
+    protected XMLGregorianCalendar timestamp;
+
+    /**
+     * Gets the value of the analysis property.
+     * 
+     * <p>
+     * This accessor method returns a reference to the live list,
+     * not a snapshot. Therefore any modification you make to the
+     * returned list will be present inside the JAXB object.
+     * This is why there is not a <CODE>set</CODE> method for the analysis property.
+     * 
+     * <p>
+     * For example, to add a new item, do as follows:
+     * <pre>
+     *    getAnalysis().add(newItem);
+     * </pre>
+     * 
+     * 
+     * <p>
+     * Objects of the following type(s) are allowed in the list
+     * {@link Analysis }
+     * 
+     * 
+     */
+    public List<Analysis> getAnalysis() {
+        if (analysis == null) {
+            analysis = new ArrayList<Analysis>();
+        }
+        return this.analysis;
+    }
+
+    /**
+     * Gets the value of the endpointName property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getEndpointName() {
+        return endpointName;
+    }
+
+    /**
+     * Sets the value of the endpointName property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setEndpointName(String value) {
+        this.endpointName = value;
+    }
+
+    /**
+     * Gets the value of the instanceId property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getInstanceId() {
+        return instanceId;
+    }
+
+    /**
+     * Sets the value of the instanceId property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setInstanceId(String value) {
+        this.instanceId = value;
+    }
+
+    /**
+     * Gets the value of the timestamp property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link XMLGregorianCalendar }
+     *     
+     */
+    public XMLGregorianCalendar getTimestamp() {
+        return timestamp;
+    }
+
+    /**
+     * Sets the value of the timestamp property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link XMLGregorianCalendar }
+     *     
+     */
+    public void setTimestamp(XMLGregorianCalendar value) {
+        this.timestamp = value;
+    }
+
+}

Added: branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/Error.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/Error.java	                        (rev 0)
+++ branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/Error.java	2011-01-16 14:41:55 UTC (rev 584)
@@ -0,0 +1,94 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.2-146 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// Generated on: 2011.01.16 at 12:38:02 PM GMT 
+//
+
+
+package org.savara.activity.model;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ * <p>Java class for Error complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="Error">
+ *   &lt;complexContent>
+ *     &lt;extension base="{http://www.savara.org/activity}EndpointActivity">
+ *       &lt;attribute name="description" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       &lt;attribute name="type" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *     &lt;/extension>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+ at XmlAccessorType(XmlAccessType.FIELD)
+ at XmlType(name = "Error")
+public class Error
+    extends EndpointActivity
+{
+
+    @XmlAttribute(name = "description")
+    protected String description;
+    @XmlAttribute(name = "type")
+    protected String type;
+
+    /**
+     * Gets the value of the description property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getDescription() {
+        return description;
+    }
+
+    /**
+     * Sets the value of the description property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setDescription(String value) {
+        this.description = value;
+    }
+
+    /**
+     * Gets the value of the type property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getType() {
+        return type;
+    }
+
+    /**
+     * Sets the value of the type property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setType(String value) {
+        this.type = value;
+    }
+
+}

Added: branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/InstanceFinished.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/InstanceFinished.java	                        (rev 0)
+++ branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/InstanceFinished.java	2011-01-16 14:41:55 UTC (rev 584)
@@ -0,0 +1,39 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.2-146 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// Generated on: 2011.01.16 at 12:38:02 PM GMT 
+//
+
+
+package org.savara.activity.model;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ * <p>Java class for InstanceFinished complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="InstanceFinished">
+ *   &lt;complexContent>
+ *     &lt;extension base="{http://www.savara.org/activity}LifecycleActivity">
+ *     &lt;/extension>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+ at XmlAccessorType(XmlAccessType.FIELD)
+ at XmlType(name = "InstanceFinished")
+public class InstanceFinished
+    extends LifecycleActivity
+{
+
+
+}

Added: branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/InstanceStarted.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/InstanceStarted.java	                        (rev 0)
+++ branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/InstanceStarted.java	2011-01-16 14:41:55 UTC (rev 584)
@@ -0,0 +1,39 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.2-146 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// Generated on: 2011.01.16 at 12:38:02 PM GMT 
+//
+
+
+package org.savara.activity.model;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ * <p>Java class for InstanceStarted complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="InstanceStarted">
+ *   &lt;complexContent>
+ *     &lt;extension base="{http://www.savara.org/activity}LifecycleActivity">
+ *     &lt;/extension>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+ at XmlAccessorType(XmlAccessType.FIELD)
+ at XmlType(name = "InstanceStarted")
+public class InstanceStarted
+    extends LifecycleActivity
+{
+
+
+}

Added: branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/LifecycleActivity.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/LifecycleActivity.java	                        (rev 0)
+++ branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/LifecycleActivity.java	2011-01-16 14:41:55 UTC (rev 584)
@@ -0,0 +1,44 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.2-146 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// Generated on: 2011.01.16 at 12:38:02 PM GMT 
+//
+
+
+package org.savara.activity.model;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlSeeAlso;
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ * <p>Java class for LifecycleActivity complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="LifecycleActivity">
+ *   &lt;complexContent>
+ *     &lt;extension base="{http://www.savara.org/activity}EndpointActivity">
+ *     &lt;/extension>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+ at XmlAccessorType(XmlAccessType.FIELD)
+ at XmlType(name = "LifecycleActivity")
+ at XmlSeeAlso({
+    InstanceStarted.class,
+    InstanceFinished.class
+})
+public abstract class LifecycleActivity
+    extends EndpointActivity
+{
+
+
+}

Added: branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/MessageActivity.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/MessageActivity.java	                        (rev 0)
+++ branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/MessageActivity.java	2011-01-16 14:41:55 UTC (rev 584)
@@ -0,0 +1,160 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.2-146 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// Generated on: 2011.01.16 at 12:38:02 PM GMT 
+//
+
+
+package org.savara.activity.model;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlSchemaType;
+import javax.xml.bind.annotation.XmlSeeAlso;
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ * <p>Java class for MessageActivity complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="MessageActivity">
+ *   &lt;complexContent>
+ *     &lt;extension base="{http://www.savara.org/activity}EndpointActivity">
+ *       &lt;sequence>
+ *         &lt;element name="value" type="{http://www.w3.org/2001/XMLSchema}anyURI"/>
+ *       &lt;/sequence>
+ *       &lt;attribute name="operationName" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       &lt;attribute name="faultName" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       &lt;attribute name="type" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *     &lt;/extension>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+ at XmlAccessorType(XmlAccessType.FIELD)
+ at XmlType(name = "MessageActivity", propOrder = {
+    "value"
+})
+ at XmlSeeAlso({
+    MessageReceived.class,
+    MessageSent.class
+})
+public abstract class MessageActivity
+    extends EndpointActivity
+{
+
+    @XmlElement(required = true)
+    @XmlSchemaType(name = "anyURI")
+    protected String value;
+    @XmlAttribute(name = "operationName")
+    protected String operationName;
+    @XmlAttribute(name = "faultName")
+    protected String faultName;
+    @XmlAttribute(name = "type")
+    protected String type;
+
+    /**
+     * Gets the value of the value property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getValue() {
+        return value;
+    }
+
+    /**
+     * Sets the value of the value property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setValue(String value) {
+        this.value = value;
+    }
+
+    /**
+     * Gets the value of the operationName property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getOperationName() {
+        return operationName;
+    }
+
+    /**
+     * Sets the value of the operationName property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setOperationName(String value) {
+        this.operationName = value;
+    }
+
+    /**
+     * Gets the value of the faultName property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getFaultName() {
+        return faultName;
+    }
+
+    /**
+     * Sets the value of the faultName property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setFaultName(String value) {
+        this.faultName = value;
+    }
+
+    /**
+     * Gets the value of the type property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getType() {
+        return type;
+    }
+
+    /**
+     * Sets the value of the type property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setType(String value) {
+        this.type = value;
+    }
+
+}

Added: branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/MessageReceived.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/MessageReceived.java	                        (rev 0)
+++ branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/MessageReceived.java	2011-01-16 14:41:55 UTC (rev 584)
@@ -0,0 +1,67 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.2-146 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// Generated on: 2011.01.16 at 12:38:02 PM GMT 
+//
+
+
+package org.savara.activity.model;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ * <p>Java class for MessageReceived complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="MessageReceived">
+ *   &lt;complexContent>
+ *     &lt;extension base="{http://www.savara.org/activity}MessageActivity">
+ *       &lt;attribute name="source" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *     &lt;/extension>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+ at XmlAccessorType(XmlAccessType.FIELD)
+ at XmlType(name = "MessageReceived")
+public class MessageReceived
+    extends MessageActivity
+{
+
+    @XmlAttribute(name = "source")
+    protected String source;
+
+    /**
+     * Gets the value of the source property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getSource() {
+        return source;
+    }
+
+    /**
+     * Sets the value of the source property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setSource(String value) {
+        this.source = value;
+    }
+
+}

Added: branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/MessageSent.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/MessageSent.java	                        (rev 0)
+++ branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/MessageSent.java	2011-01-16 14:41:55 UTC (rev 584)
@@ -0,0 +1,67 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.2-146 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// Generated on: 2011.01.16 at 12:38:02 PM GMT 
+//
+
+
+package org.savara.activity.model;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ * <p>Java class for MessageSent complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="MessageSent">
+ *   &lt;complexContent>
+ *     &lt;extension base="{http://www.savara.org/activity}MessageActivity">
+ *       &lt;attribute name="destination" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *     &lt;/extension>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+ at XmlAccessorType(XmlAccessType.FIELD)
+ at XmlType(name = "MessageSent")
+public class MessageSent
+    extends MessageActivity
+{
+
+    @XmlAttribute(name = "destination")
+    protected String destination;
+
+    /**
+     * Gets the value of the destination property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getDestination() {
+        return destination;
+    }
+
+    /**
+     * Sets the value of the destination property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setDestination(String value) {
+        this.destination = value;
+    }
+
+}

Added: branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/ObjectFactory.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/ObjectFactory.java	                        (rev 0)
+++ branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/ObjectFactory.java	2011-01-16 14:41:55 UTC (rev 584)
@@ -0,0 +1,87 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.2-146 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// Generated on: 2011.01.16 at 12:38:02 PM GMT 
+//
+
+
+package org.savara.activity.model;
+
+import javax.xml.bind.annotation.XmlRegistry;
+
+
+/**
+ * This object contains factory methods for each 
+ * Java content interface and Java element interface 
+ * generated in the org.savara.activity.model package. 
+ * <p>An ObjectFactory allows you to programatically 
+ * construct new instances of the Java representation 
+ * for XML content. The Java representation of XML 
+ * content can consist of schema derived interfaces 
+ * and classes representing the binding of schema 
+ * type definitions, element declarations and model 
+ * groups.  Factory methods for each of these are 
+ * provided in this class.
+ * 
+ */
+ at XmlRegistry
+public class ObjectFactory {
+
+
+    /**
+     * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: org.savara.activity.model
+     * 
+     */
+    public ObjectFactory() {
+    }
+
+    /**
+     * Create an instance of {@link Error }
+     * 
+     */
+    public Error createError() {
+        return new Error();
+    }
+
+    /**
+     * Create an instance of {@link MessageSent }
+     * 
+     */
+    public MessageSent createMessageSent() {
+        return new MessageSent();
+    }
+
+    /**
+     * Create an instance of {@link MessageReceived }
+     * 
+     */
+    public MessageReceived createMessageReceived() {
+        return new MessageReceived();
+    }
+
+    /**
+     * Create an instance of {@link InstanceFinished }
+     * 
+     */
+    public InstanceFinished createInstanceFinished() {
+        return new InstanceFinished();
+    }
+
+    /**
+     * Create an instance of {@link ProtocolAnalysis }
+     * 
+     */
+    public ProtocolAnalysis createProtocolAnalysis() {
+        return new ProtocolAnalysis();
+    }
+
+    /**
+     * Create an instance of {@link InstanceStarted }
+     * 
+     */
+    public InstanceStarted createInstanceStarted() {
+        return new InstanceStarted();
+    }
+
+}

Added: branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/ProtocolAnalysis.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/ProtocolAnalysis.java	                        (rev 0)
+++ branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/ProtocolAnalysis.java	2011-01-16 14:41:55 UTC (rev 584)
@@ -0,0 +1,125 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.2-146 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// Generated on: 2011.01.16 at 12:38:02 PM GMT 
+//
+
+
+package org.savara.activity.model;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ * <p>Java class for ProtocolAnalysis complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="ProtocolAnalysis">
+ *   &lt;complexContent>
+ *     &lt;extension base="{http://www.savara.org/activity}Analysis">
+ *       &lt;attribute name="protocol" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       &lt;attribute name="role" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       &lt;attribute name="expected" type="{http://www.w3.org/2001/XMLSchema}boolean" default="true" />
+ *     &lt;/extension>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+ at XmlAccessorType(XmlAccessType.FIELD)
+ at XmlType(name = "ProtocolAnalysis")
+public class ProtocolAnalysis
+    extends Analysis
+{
+
+    @XmlAttribute(name = "protocol")
+    protected String protocol;
+    @XmlAttribute(name = "role")
+    protected String role;
+    @XmlAttribute(name = "expected")
+    protected Boolean expected;
+
+    /**
+     * Gets the value of the protocol property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getProtocol() {
+        return protocol;
+    }
+
+    /**
+     * Sets the value of the protocol property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setProtocol(String value) {
+        this.protocol = value;
+    }
+
+    /**
+     * Gets the value of the role property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getRole() {
+        return role;
+    }
+
+    /**
+     * Sets the value of the role property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setRole(String value) {
+        this.role = value;
+    }
+
+    /**
+     * Gets the value of the expected property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link Boolean }
+     *     
+     */
+    public boolean isExpected() {
+        if (expected == null) {
+            return true;
+        } else {
+            return expected;
+        }
+    }
+
+    /**
+     * Sets the value of the expected property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link Boolean }
+     *     
+     */
+    public void setExpected(Boolean value) {
+        this.expected = value;
+    }
+
+}

Added: branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/package-info.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/package-info.java	                        (rev 0)
+++ branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/package-info.java	2011-01-16 14:41:55 UTC (rev 584)
@@ -0,0 +1,9 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.2-146 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// Generated on: 2011.01.16 at 12:38:02 PM GMT 
+//
+
+ at javax.xml.bind.annotation.XmlSchema(namespace = "http://www.savara.org/activity", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
+package org.savara.activity.model;

Deleted: branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/package-info.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/package-info.java	2011-01-15 00:09:17 UTC (rev 583)
+++ branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/package-info.java	2011-01-16 14:41:55 UTC (rev 584)
@@ -1,9 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.2-146 
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2011.01.15 at 12:05:04 AM GMT 
-//
-
- at javax.xml.bind.annotation.XmlSchema(namespace = "http://www.savara.org/activity")
-package org.savara.activity;

Deleted: branches/experimental/2.0.x/bundles/org.savara.monitor/src/main/java/org/savara/monitor/ConversationId.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.monitor/src/main/java/org/savara/monitor/ConversationId.java	2011-01-15 00:09:17 UTC (rev 583)
+++ branches/experimental/2.0.x/bundles/org.savara.monitor/src/main/java/org/savara/monitor/ConversationId.java	2011-01-16 14:41:55 UTC (rev 584)
@@ -1,52 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2008, Red Hat Middleware LLC, and others contributors as indicated
- * by the @authors tag. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
-package org.savara.monitor;
-
-import java.util.UUID;
-
-/**
- * This class represents a conversation id.
- *
- */
-public class ConversationId {
-
-	private String m_id=null;
-	
-	public ConversationId() {
-		m_id = UUID.randomUUID().toString();
-	}
-	
-	public ConversationId(String id) {
-		m_id = id;
-	}
-	
-	public int hashCode() {
-		return(m_id.hashCode());
-	}
-	
-	public boolean equals(Object obj) {
-		boolean ret=false;
-		
-		if (obj instanceof ConversationId &&
-				((ConversationId)obj).m_id.equals(m_id)) {
-			ret = true;
-		}
-		
-		return(ret);
-	}
-}

Copied: branches/experimental/2.0.x/bundles/org.savara.monitor/src/main/java/org/savara/monitor/ConversationInstanceId.java (from rev 577, branches/experimental/2.0.x/bundles/org.savara.monitor/src/main/java/org/savara/monitor/ConversationId.java)
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.monitor/src/main/java/org/savara/monitor/ConversationInstanceId.java	                        (rev 0)
+++ branches/experimental/2.0.x/bundles/org.savara.monitor/src/main/java/org/savara/monitor/ConversationInstanceId.java	2011-01-16 14:41:55 UTC (rev 584)
@@ -0,0 +1,70 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, Red Hat Middleware LLC, and others contributors as indicated
+ * by the @authors tag. All rights reserved.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA  02110-1301, USA.
+ */
+package org.savara.monitor;
+
+import java.util.UUID;
+
+/**
+ * This class represents the identity of a conversation instance.
+ *
+ */
+public class ConversationInstanceId {
+
+	private String m_id=null;
+	
+	/**
+	 * The default constructor.
+	 */
+	public ConversationInstanceId() {
+		m_id = UUID.randomUUID().toString();
+	}
+	
+	/**
+	 * The constructor that initializes the id.
+	 * 
+	 * @param id The id
+	 */
+	public ConversationInstanceId(String id) {
+		m_id = id;
+	}
+	
+	/**
+	 * This method returns the id associated with
+	 * the conversation instance.
+	 * 
+	 * @return The id
+	 */
+	public String getId() {
+		return(m_id);
+	}
+	
+	public int hashCode() {
+		return(m_id.hashCode());
+	}
+	
+	public boolean equals(Object obj) {
+		boolean ret=false;
+		
+		if (obj instanceof ConversationInstanceId &&
+				((ConversationInstanceId)obj).m_id.equals(m_id)) {
+			ret = true;
+		}
+		
+		return(ret);
+	}
+}

Modified: branches/experimental/2.0.x/bundles/org.savara.monitor/src/main/java/org/savara/monitor/ConversationStore.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.monitor/src/main/java/org/savara/monitor/ConversationStore.java	2011-01-15 00:09:17 UTC (rev 583)
+++ branches/experimental/2.0.x/bundles/org.savara.monitor/src/main/java/org/savara/monitor/ConversationStore.java	2011-01-16 14:41:55 UTC (rev 584)
@@ -34,7 +34,7 @@
 	 * @throws IllegalArgumentException Conversation id is invalid
 	 * @throws IOException Failed to create new conversation
 	 */
-	public java.io.Serializable create(ConversationId id) throws IllegalArgumentException,
+	public java.io.Serializable create(ConversationInstanceId id) throws IllegalArgumentException,
 									java.io.IOException;
 	
 	/**
@@ -46,7 +46,7 @@
 	 * @throws IllegalArgumentException Conversation id is invalid
 	 * @throws IOException Failed to retrieve conversation
 	 */
-	public java.io.Serializable find(ConversationId id) throws IllegalArgumentException,
+	public java.io.Serializable find(ConversationInstanceId id) throws IllegalArgumentException,
 									java.io.IOException;
 	
 	/**
@@ -57,7 +57,7 @@
 	 * @throws IllegalArgumentException Conversation id is invalid or unknown
 	 * @throws java.io.IOException Failed to remove existing conversation
 	 */
-	public void remove(ConversationId id) throws IllegalArgumentException,
+	public void remove(ConversationInstanceId id) throws IllegalArgumentException,
 									java.io.IOException;
 	
 	/**
@@ -69,7 +69,7 @@
 	 * @throws IllegalArgumentException Conversation id is invalid or unknown
 	 * @throws java.io.IOException Failed to update existing conversation
 	 */
-	public void update(ConversationId id, java.io.Serializable conv) throws IllegalArgumentException,
+	public void update(ConversationInstanceId id, java.io.Serializable conv) throws IllegalArgumentException,
 									java.io.IOException;
 	
 }

Added: branches/experimental/2.0.x/bundles/org.savara.monitor/src/main/java/org/savara/monitor/ProtocolId.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.monitor/src/main/java/org/savara/monitor/ProtocolId.java	                        (rev 0)
+++ branches/experimental/2.0.x/bundles/org.savara.monitor/src/main/java/org/savara/monitor/ProtocolId.java	2011-01-16 14:41:55 UTC (rev 584)
@@ -0,0 +1,78 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, Red Hat Middleware LLC, and others contributors as indicated
+ * by the @authors tag. All rights reserved.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA  02110-1301, USA.
+ */
+package org.savara.monitor;
+
+/**
+ * This class represents a protocol id, used to identify the name
+ * of the protocol used to monitor a conversation, and the role
+ * being played by the endpoint.
+ *
+ */
+public class ProtocolId {
+
+	private String m_name=null;
+	private String m_role=null;
+	
+	/**
+	 * The constructor initialized with the name of the protocol
+	 * and the role being played.
+	 * 
+	 * @param name The name
+	 * @param role The role
+	 */
+	public ProtocolId(String name, String role) {
+		m_name = name;
+		m_role = role;
+	}
+
+	/**
+	 * The name of the protocol.
+	 * 
+	 * @return The protocol name
+	 */
+	public String getName() {
+		return(m_name);
+	}
+	
+	/**
+	 * The role being monitored.
+	 * 
+	 * @return The role
+	 */
+	public String getRole() {
+		return(m_role);
+	}
+	
+	public int hashCode() {
+		return(m_name.hashCode());
+	}
+	
+	public boolean equals(Object obj) {
+		boolean ret=false;
+		
+		if (obj instanceof ProtocolId &&
+				m_name != null && ((ProtocolId)obj).m_name != null &&
+				m_role != null && ((ProtocolId)obj).m_role != null &&
+				((ProtocolId)obj).m_name.equals(m_name) &&
+				((ProtocolId)obj).m_role.equals(m_role)) {
+			ret = true;
+		}
+		
+		return(ret);
+	}
+}

Modified: branches/experimental/2.0.x/bundles/org.savara.monitor/src/main/java/org/savara/monitor/impl/DefaultMonitor.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.monitor/src/main/java/org/savara/monitor/impl/DefaultMonitor.java	2011-01-15 00:09:17 UTC (rev 583)
+++ branches/experimental/2.0.x/bundles/org.savara.monitor/src/main/java/org/savara/monitor/impl/DefaultMonitor.java	2011-01-16 14:41:55 UTC (rev 584)
@@ -75,6 +75,17 @@
 	public boolean sent(Message mesg) {
 		boolean ret=false;
 		
+		// Should instance id be derived from message, or supplied
+		// with message? If simulating, then identity should be
+		// fixed.
+		
+		// Protocol name and role needs to be distinguished when
+		// storing session, as a single conversation, with a
+		// particular business id, may be monitored against
+		// multiple protocols/roles
+		
+		
+		
 		return(ret);
 	}
 	

Modified: branches/experimental/2.0.x/bundles/org.savara.monitor/src/main/java/org/savara/monitor/impl/InMemoryConversationStore.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.monitor/src/main/java/org/savara/monitor/impl/InMemoryConversationStore.java	2011-01-15 00:09:17 UTC (rev 583)
+++ branches/experimental/2.0.x/bundles/org.savara.monitor/src/main/java/org/savara/monitor/impl/InMemoryConversationStore.java	2011-01-16 14:41:55 UTC (rev 584)
@@ -17,15 +17,15 @@
  */
 package org.savara.monitor.impl;
 
-import org.savara.monitor.ConversationId;
+import org.savara.monitor.ConversationInstanceId;
 import org.savara.monitor.ConversationStore;
 import org.scribble.protocol.monitor.Conversation;
 import org.scribble.protocol.monitor.DefaultConversation;
 
 public class InMemoryConversationStore implements ConversationStore {
 
-	private java.util.Map<ConversationId, java.io.Serializable> m_conversations=
-			new java.util.HashMap<ConversationId, java.io.Serializable>();
+	private java.util.Map<ConversationInstanceId, java.io.Serializable> m_conversations=
+			new java.util.HashMap<ConversationInstanceId, java.io.Serializable>();
 	
 	/**
 	 * This method returns a new conversation associated with
@@ -36,7 +36,7 @@
 	 * @throws IllegalArgumentException Conversation id is invalid
 	 * @throws IOException Failed to create new conversation
 	 */
-	public java.io.Serializable create(ConversationId id) throws IllegalArgumentException,
+	public java.io.Serializable create(ConversationInstanceId id) throws IllegalArgumentException,
 									java.io.IOException {
 		if (id == null) {
 			throw new IllegalArgumentException("Id not specified");
@@ -60,7 +60,7 @@
 	 * @throws IllegalArgumentException Conversation id is invalid
 	 * @throws IOException Failed to retrieve conversation
 	 */
-	public java.io.Serializable find(ConversationId id) throws IllegalArgumentException,
+	public java.io.Serializable find(ConversationInstanceId id) throws IllegalArgumentException,
 									java.io.IOException {
 		
 		if (id == null) {
@@ -80,7 +80,7 @@
 	 * @throws IllegalArgumentException Conversation id is invalid or unknown
 	 * @throws java.io.IOException Failed to remove existing conversation
 	 */
-	public void remove(ConversationId id) throws IllegalArgumentException,
+	public void remove(ConversationInstanceId id) throws IllegalArgumentException,
 									java.io.IOException {
 		if (id == null) {
 			throw new IllegalArgumentException("Id not specified");
@@ -100,7 +100,7 @@
 	 * @throws IllegalArgumentException Conversation id is invalid or unknown
 	 * @throws java.io.IOException Failed to update existing conversation
 	 */
-	public void update(ConversationId id, java.io.Serializable conv) throws IllegalArgumentException,
+	public void update(ConversationInstanceId id, java.io.Serializable conv) throws IllegalArgumentException,
 									java.io.IOException {
 		
 		if (id == null) {

Modified: branches/experimental/2.0.x/bundles/org.savara.monitor/src/test/java/org/savara/monitor/impl/InMemoryConversationStoreTest.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.monitor/src/test/java/org/savara/monitor/impl/InMemoryConversationStoreTest.java	2011-01-15 00:09:17 UTC (rev 583)
+++ branches/experimental/2.0.x/bundles/org.savara.monitor/src/test/java/org/savara/monitor/impl/InMemoryConversationStoreTest.java	2011-01-16 14:41:55 UTC (rev 584)
@@ -20,7 +20,7 @@
 import static org.junit.Assert.*;
 
 import org.junit.Test;
-import org.savara.monitor.ConversationId;
+import org.savara.monitor.ConversationInstanceId;
 import org.scribble.protocol.monitor.Conversation;
 
 public class InMemoryConversationStoreTest {
@@ -45,7 +45,7 @@
 		InMemoryConversationStore store=new InMemoryConversationStore();
 		
 		try {
-			ConversationId id=new ConversationId("1");
+			ConversationInstanceId id=new ConversationInstanceId("1");
 			
 			try {
 				store.create(id);
@@ -68,7 +68,7 @@
 		InMemoryConversationStore store=new InMemoryConversationStore();
 		
 		try {
-			ConversationId id=new ConversationId("1");
+			ConversationInstanceId id=new ConversationInstanceId("1");
 
 			if (store.create(id) == null) {
 				fail("No context created");
@@ -84,7 +84,7 @@
 		InMemoryConversationStore store=new InMemoryConversationStore();
 		
 		try {
-			ConversationId id=new ConversationId("1");
+			ConversationInstanceId id=new ConversationInstanceId("1");
 
 			if (store.create(id) == null) {
 				fail("No context created");
@@ -115,7 +115,7 @@
 		InMemoryConversationStore store=new InMemoryConversationStore();
 		
 		try {
-			ConversationId id1=new ConversationId("1");
+			ConversationInstanceId id1=new ConversationInstanceId("1");
 
 			java.io.Serializable c1=null;
 			
@@ -123,7 +123,7 @@
 				fail("No context created for id 1");
 			}
 			
-			ConversationId id2=new ConversationId("2");
+			ConversationInstanceId id2=new ConversationInstanceId("2");
 
 			java.io.Serializable c2=null;
 			
@@ -150,7 +150,7 @@
 		InMemoryConversationStore store=new InMemoryConversationStore();
 		
 		try {
-			ConversationId id1=new ConversationId("1");
+			ConversationInstanceId id1=new ConversationInstanceId("1");
 
 			java.io.Serializable c1=null;
 			
@@ -158,7 +158,7 @@
 				fail("No context created for id 1");
 			}
 			
-			ConversationId id2=new ConversationId("2");
+			ConversationInstanceId id2=new ConversationInstanceId("2");
 
 			java.io.Serializable c2=null;

More information about the savara-commits mailing list