Author: objectiser Date: 2011-01-25 11:45:38 -0500 (Tue, 25 Jan 2011) New Revision: 621 Added: branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/Conversation.java branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/Facet.java branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/Interaction.java branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/Lifecycle.java branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/Process.java branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/Task.java Removed: 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/LifecycleActivity.java branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/MessageActivity.java Modified: branches/experimental/2.0.x/bundles/org.savara.activity/schema/Activity.xsd branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/Activity.java 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/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/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.activity/src/test/java/org/savara/activity/validation/DefaultActivityValidationManagerTest.java Log: Update to activity model to allow different facets of an event to be reported, rather than a single hierarchy for representing the different event types. 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-25 15:18:08 UTC (rev 620) +++ branches/experimental/2.0.x/bundles/org.savara.activity/schema/Activity.xsd 2011-01-25 16:45:38 UTC (rev 621) @@ -1,38 +1,61 @@ <?xml version="1.0" encoding="UTF-8"?> <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="Activity" abstract="true"> + <complexType name="Activity"> <sequence> + <element name="facet" type="tns:Facet" maxOccurs="unbounded" minOccurs="1"></element> <element name="analysis" type="tns:Analysis" minOccurs="0" maxOccurs="unbounded"> </element> </sequence> + <attribute name="id" type="ID"></attribute> <attribute name="componentName" type="string"></attribute> <attribute name="componentInstanceId" type="string"></attribute> - <attribute name="conversationInstanceId" type="string"></attribute> <attribute name="timestamp" type="dateTime"></attribute> </complexType> - <complexType name="EndpointActivity"> + <complexType name="Facet" abstract="true"></complexType> + + <complexType name="Conversation"> <complexContent> - <extension base="tns:Activity"> - <attribute name="endpointAddress" type="string"></attribute> + <extension base="tns:Facet"> + <attribute name="conversationInstanceId" type="string"></attribute> </extension> </complexContent> </complexType> + <complexType name="Process"> + <complexContent> + <extension base="tns:Facet"> + <!-- May be the same as the 'componentInstanceId' --> + <attribute name="processInstanceId" type="string"></attribute> + <attribute name="processDefinitionId" type="string"></attribute> + <attribute name="processName" type="string"></attribute> + </extension> + </complexContent> + </complexType> + + <complexType name="Task"> + <complexContent> + <extension base="tns:Facet"> + <attribute name="taskDefinitionId" type="string"></attribute> + <attribute name="taskName" type="string"></attribute> + </extension> + </complexContent> + </complexType> + <complexType name="Error"> <complexContent> - <extension base="tns:Activity"> + <extension base="tns:Facet"> <attribute name="description" type="string"></attribute> <attribute name="type" type="string"></attribute> </extension> </complexContent> </complexType> - <complexType name="MessageActivity" abstract="true"> + <complexType name="Interaction" abstract="true"> <complexContent> - <extension base="tns:EndpointActivity"> + <extension base="tns:Facet"> <sequence> <element name="value" type="anyURI"></element> </sequence> @@ -46,7 +69,7 @@ <complexType name="MessageSent"> <complexContent> - <extension base="tns:MessageActivity"> + <extension base="tns:Interaction"> <attribute name="destination" type="string"></attribute> </extension> </complexContent> @@ -54,29 +77,29 @@ <complexType name="MessageReceived"> <complexContent> - <extension base="tns:MessageActivity"> + <extension base="tns:Interaction"> <attribute name="source" type="string"></attribute> </extension> </complexContent> </complexType> - <complexType name="LifecycleActivity" abstract="true"> + <complexType name="Lifecycle" abstract="true"> <complexContent> - <extension base="tns:Activity"> + <extension base="tns:Facet"> </extension> </complexContent> </complexType> <complexType name="InstanceFinished"> <complexContent> - <extension base="tns:LifecycleActivity"> + <extension base="tns:Lifecycle"> </extension> </complexContent> </complexType> <complexType name="InstanceStarted"> <complexContent> - <extension base="tns:LifecycleActivity"> + <extension base="tns:Lifecycle"> </extension> </complexContent> </complexType> Modified: branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/Activity.java =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/Activity.java 2011-01-25 15:18:08 UTC (rev 620) +++ branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/Activity.java 2011-01-25 16:45:38 UTC (rev 621) @@ -2,7 +2,7 @@ // 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/... // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2011.01.19 at 06:07:44 PM GMT +// Generated on: 2011.01.25 at 04:37:56 PM GMT // @@ -13,9 +13,12 @@ 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.XmlID; import javax.xml.bind.annotation.XmlSchemaType; -import javax.xml.bind.annotation.XmlSeeAlso; import javax.xml.bind.annotation.XmlType; +import javax.xml.bind.annotation.adapters.CollapsedStringAdapter; +import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import javax.xml.datatype.XMLGregorianCalendar; @@ -29,11 +32,12 @@ * &lt;complexContent> * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> * &lt;sequence> + * &lt;element name="facet" type="{http://www.savara.org/activity}Facet" maxOccurs="unbounded"/> * &lt;element name="analysis" type="{http://www.savara.org/activity}Analysis" maxOccurs="unbounded" minOccurs="0"/> * &lt;/sequence> + * &lt;attribute name="id" type="{http://www.w3.org/2001/XMLSchema}ID" /> * &lt;attribute name="componentName" type="{http://www.w3.org/2001/XMLSchema}string" /> * &lt;attribute name="componentInstanceId" type="{http://www.w3.org/2001/XMLSchema}string" /> - * &lt;attribute name="conversationInstanceId" type="{http://www.w3.org/2001/XMLSchema}string" /> * &lt;attribute name="timestamp" type="{http://www.w3.org/2001/XMLSchema}dateTime" /> * &lt;/restriction> * &lt;/complexContent> @@ -44,27 +48,57 @@ */ @XmlAccessorType(XmlAccessType.FIELD) @XmlType(name = "Activity", propOrder = { + "facet", "analysis" }) -@XmlSeeAlso({ - LifecycleActivity.class, - EndpointActivity.class, - Error.class -}) -public abstract class Activity { +public class Activity { + @XmlElement(required = true) + protected List<Facet> facet; protected List<Analysis> analysis; + @XmlAttribute(name = "id") + @XmlJavaTypeAdapter(CollapsedStringAdapter.class) + @XmlID + @XmlSchemaType(name = "ID") + protected String id; @XmlAttribute(name = "componentName") protected String componentName; @XmlAttribute(name = "componentInstanceId") protected String componentInstanceId; - @XmlAttribute(name = "conversationInstanceId") - protected String conversationInstanceId; @XmlAttribute(name = "timestamp") @XmlSchemaType(name = "dateTime") protected XMLGregorianCalendar timestamp; /** + * Gets the value of the facet 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 facet property. + * + * <p> + * For example, to add a new item, do as follows: + * <pre> + * getFacet().add(newItem); + * </pre> + * + * + * <p> + * Objects of the following type(s) are allowed in the list + * {@link Facet } + * + * + */ + public List<Facet> getFacet() { + if (facet == null) { + facet = new ArrayList<Facet>(); + } + return this.facet; + } + + /** * Gets the value of the analysis property. * * <p> @@ -94,75 +128,75 @@ } /** - * Gets the value of the componentName property. + * Gets the value of the id property. * * @return * possible object is * {@link String } * */ - public String getComponentName() { - return componentName; + public String getId() { + return id; } /** - * Sets the value of the componentName property. + * Sets the value of the id property. * * @param value * allowed object is * {@link String } * */ - public void setComponentName(String value) { - this.componentName = value; + public void setId(String value) { + this.id = value; } /** - * Gets the value of the componentInstanceId property. + * Gets the value of the componentName property. * * @return * possible object is * {@link String } * */ - public String getComponentInstanceId() { - return componentInstanceId; + public String getComponentName() { + return componentName; } /** - * Sets the value of the componentInstanceId property. + * Sets the value of the componentName property. * * @param value * allowed object is * {@link String } * */ - public void setComponentInstanceId(String value) { - this.componentInstanceId = value; + public void setComponentName(String value) { + this.componentName = value; } /** - * Gets the value of the conversationInstanceId property. + * Gets the value of the componentInstanceId property. * * @return * possible object is * {@link String } * */ - public String getConversationInstanceId() { - return conversationInstanceId; + public String getComponentInstanceId() { + return componentInstanceId; } /** - * Sets the value of the conversationInstanceId property. + * Sets the value of the componentInstanceId property. * * @param value * allowed object is * {@link String } * */ - public void setConversationInstanceId(String value) { - this.conversationInstanceId = value; + public void setComponentInstanceId(String value) { + this.componentInstanceId = value; } /** Modified: 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 2011-01-25 15:18:08 UTC (rev 620) +++ branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/Analysis.java 2011-01-25 16:45:38 UTC (rev 621) @@ -2,7 +2,7 @@ // 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/... // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2011.01.19 at 06:07:44 PM GMT +// Generated on: 2011.01.25 at 04:37:56 PM GMT // Added: branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/Conversation.java =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/Conversation.java (rev 0) +++ branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/Conversation.java 2011-01-25 16:45:38 UTC (rev 621) @@ -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/... +// Any modifications to this file will be lost upon recompilation of the source schema. +// Generated on: 2011.01.25 at 04:37:56 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 Conversation complex type. + * + * <p>The following schema fragment specifies the expected content contained within this class. + * + * <pre> + * &lt;complexType name="Conversation"> + * &lt;complexContent> + * &lt;extension base="{http://www.savara.org/activity}Facet"> + * &lt;attribute name="conversationInstanceId" type="{http://www.w3.org/2001/XMLSchema}string" /> + * &lt;/extension> + * &lt;/complexContent> + * &lt;/complexType> + * </pre> + * + * + */ +(a)XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "Conversation") +public class Conversation + extends Facet +{ + + @XmlAttribute(name = "conversationInstanceId") + protected String conversationInstanceId; + + /** + * Gets the value of the conversationInstanceId property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getConversationInstanceId() { + return conversationInstanceId; + } + + /** + * Sets the value of the conversationInstanceId property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setConversationInstanceId(String value) { + this.conversationInstanceId = value; + } + +} Deleted: 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 2011-01-25 15:18:08 UTC (rev 620) +++ branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/EndpointActivity.java 2011-01-25 16:45:38 UTC (rev 621) @@ -1,71 +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/... -// Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2011.01.19 at 06:07:44 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.XmlSeeAlso; -import javax.xml.bind.annotation.XmlType; - - -/** - * <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;extension base="{http://www.savara.org/activity}Activity"> - * &lt;attribute name="endpointAddress" type="{http://www.w3.org/2001/XMLSchema}string" /> - * &lt;/extension> - * &lt;/complexContent> - * &lt;/complexType> - * </pre> - * - * - */ -(a)XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "EndpointActivity") -@XmlSeeAlso({ - MessageActivity.class -}) -public class EndpointActivity - extends Activity -{ - - @XmlAttribute(name = "endpointAddress") - protected String endpointAddress; - - /** - * Gets the value of the endpointAddress property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getEndpointAddress() { - return endpointAddress; - } - - /** - * Sets the value of the endpointAddress property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setEndpointAddress(String value) { - this.endpointAddress = value; - } - -} Modified: 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 2011-01-25 15:18:08 UTC (rev 620) +++ branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/Error.java 2011-01-25 16:45:38 UTC (rev 621) @@ -2,7 +2,7 @@ // 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/... // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2011.01.19 at 06:07:44 PM GMT +// Generated on: 2011.01.25 at 04:37:56 PM GMT // @@ -22,7 +22,7 @@ * <pre> * &lt;complexType name="Error"> * &lt;complexContent> - * &lt;extension base="{http://www.savara.org/activity}Activity"> + * &lt;extension base="{http://www.savara.org/activity}Facet"> * &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> @@ -35,7 +35,7 @@ @XmlAccessorType(XmlAccessType.FIELD) @XmlType(name = "Error") public class Error - extends Activity + extends Facet { @XmlAttribute(name = "description") Added: branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/Facet.java =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/Facet.java (rev 0) +++ branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/Facet.java 2011-01-25 16:45:38 UTC (rev 621) @@ -0,0 +1,46 @@ +// +// 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/... +// Any modifications to this file will be lost upon recompilation of the source schema. +// Generated on: 2011.01.25 at 04:37:56 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 Facet complex type. + * + * <p>The following schema fragment specifies the expected content contained within this class. + * + * <pre> + * &lt;complexType name="Facet"> + * &lt;complexContent> + * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> + * &lt;/restriction> + * &lt;/complexContent> + * &lt;/complexType> + * </pre> + * + * + */ +(a)XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "Facet") +@XmlSeeAlso({ + Conversation.class, + Error.class, + Process.class, + Task.class, + Interaction.class, + Lifecycle.class +}) +public abstract class Facet { + + +} Modified: 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 2011-01-25 15:18:08 UTC (rev 620) +++ branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/InstanceFinished.java 2011-01-25 16:45:38 UTC (rev 621) @@ -2,7 +2,7 @@ // 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/... // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2011.01.19 at 06:07:44 PM GMT +// Generated on: 2011.01.25 at 04:37:56 PM GMT // @@ -21,7 +21,7 @@ * <pre> * &lt;complexType name="InstanceFinished"> * &lt;complexContent> - * &lt;extension base="{http://www.savara.org/activity}LifecycleActivity"> + * &lt;extension base="{http://www.savara.org/activity}Lifecycle"> * &lt;/extension> * &lt;/complexContent> * &lt;/complexType> @@ -32,7 +32,7 @@ @XmlAccessorType(XmlAccessType.FIELD) @XmlType(name = "InstanceFinished") public class InstanceFinished - extends LifecycleActivity + extends Lifecycle { Modified: 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 2011-01-25 15:18:08 UTC (rev 620) +++ branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/InstanceStarted.java 2011-01-25 16:45:38 UTC (rev 621) @@ -2,7 +2,7 @@ // 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/... // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2011.01.19 at 06:07:44 PM GMT +// Generated on: 2011.01.25 at 04:37:56 PM GMT // @@ -21,7 +21,7 @@ * <pre> * &lt;complexType name="InstanceStarted"> * &lt;complexContent> - * &lt;extension base="{http://www.savara.org/activity}LifecycleActivity"> + * &lt;extension base="{http://www.savara.org/activity}Lifecycle"> * &lt;/extension> * &lt;/complexContent> * &lt;/complexType> @@ -32,7 +32,7 @@ @XmlAccessorType(XmlAccessType.FIELD) @XmlType(name = "InstanceStarted") public class InstanceStarted - extends LifecycleActivity + extends Lifecycle { Added: branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/Interaction.java =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/Interaction.java (rev 0) +++ branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/Interaction.java 2011-01-25 16:45:38 UTC (rev 621) @@ -0,0 +1,191 @@ +// +// 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/... +// Any modifications to this file will be lost upon recompilation of the source schema. +// Generated on: 2011.01.25 at 04:37:56 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 Interaction complex type. + * + * <p>The following schema fragment specifies the expected content contained within this class. + * + * <pre> + * &lt;complexType name="Interaction"> + * &lt;complexContent> + * &lt;extension base="{http://www.savara.org/activity}Facet"> + * &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="messageType" type="{http://www.w3.org/2001/XMLSchema}string" /> + * &lt;attribute name="request" type="{http://www.w3.org/2001/XMLSchema}boolean" default="true" /> + * &lt;/extension> + * &lt;/complexContent> + * &lt;/complexType> + * </pre> + * + * + */ +(a)XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "Interaction", propOrder = { + "value" +}) +@XmlSeeAlso({ + MessageReceived.class, + MessageSent.class +}) +public abstract class Interaction + extends Facet +{ + + @XmlElement(required = true) + @XmlSchemaType(name = "anyURI") + protected String value; + @XmlAttribute(name = "operationName") + protected String operationName; + @XmlAttribute(name = "faultName") + protected String faultName; + @XmlAttribute(name = "messageType") + protected String messageType; + @XmlAttribute(name = "request") + protected Boolean request; + + /** + * 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 messageType property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getMessageType() { + return messageType; + } + + /** + * Sets the value of the messageType property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setMessageType(String value) { + this.messageType = value; + } + + /** + * Gets the value of the request property. + * + * @return + * possible object is + * {@link Boolean } + * + */ + public boolean isRequest() { + if (request == null) { + return true; + } else { + return request; + } + } + + /** + * Sets the value of the request property. + * + * @param value + * allowed object is + * {@link Boolean } + * + */ + public void setRequest(Boolean value) { + this.request = value; + } + +} Added: branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/Lifecycle.java =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/Lifecycle.java (rev 0) +++ branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/Lifecycle.java 2011-01-25 16:45:38 UTC (rev 621) @@ -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/... +// Any modifications to this file will be lost upon recompilation of the source schema. +// Generated on: 2011.01.25 at 04:37:56 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 Lifecycle complex type. + * + * <p>The following schema fragment specifies the expected content contained within this class. + * + * <pre> + * &lt;complexType name="Lifecycle"> + * &lt;complexContent> + * &lt;extension base="{http://www.savara.org/activity}Facet"> + * &lt;/extension> + * &lt;/complexContent> + * &lt;/complexType> + * </pre> + * + * + */ +(a)XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "Lifecycle") +@XmlSeeAlso({ + InstanceStarted.class, + InstanceFinished.class +}) +public abstract class Lifecycle + extends Facet +{ + + +} Deleted: 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 2011-01-25 15:18:08 UTC (rev 620) +++ branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/LifecycleActivity.java 2011-01-25 16:45:38 UTC (rev 621) @@ -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/... -// Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2011.01.19 at 06:07:44 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}Activity"> - * &lt;/extension> - * &lt;/complexContent> - * &lt;/complexType> - * </pre> - * - * - */ -(a)XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "LifecycleActivity") -@XmlSeeAlso({ - InstanceStarted.class, - InstanceFinished.class -}) -public abstract class LifecycleActivity - extends Activity -{ - - -} Deleted: 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 2011-01-25 15:18:08 UTC (rev 620) +++ branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/MessageActivity.java 2011-01-25 16:45:38 UTC (rev 621) @@ -1,191 +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/... -// Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2011.01.19 at 06:07:44 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="messageType" type="{http://www.w3.org/2001/XMLSchema}string" /> - * &lt;attribute name="request" type="{http://www.w3.org/2001/XMLSchema}boolean" default="true" /> - * &lt;/extension> - * &lt;/complexContent> - * &lt;/complexType> - * </pre> - * - * - */ -(a)XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "MessageActivity", propOrder = { - "value" -}) -@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 = "messageType") - protected String messageType; - @XmlAttribute(name = "request") - protected Boolean request; - - /** - * 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 messageType property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getMessageType() { - return messageType; - } - - /** - * Sets the value of the messageType property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setMessageType(String value) { - this.messageType = value; - } - - /** - * Gets the value of the request property. - * - * @return - * possible object is - * {@link Boolean } - * - */ - public boolean isRequest() { - if (request == null) { - return true; - } else { - return request; - } - } - - /** - * Sets the value of the request property. - * - * @param value - * allowed object is - * {@link Boolean } - * - */ - public void setRequest(Boolean value) { - this.request = value; - } - -} Modified: 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 2011-01-25 15:18:08 UTC (rev 620) +++ branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/MessageReceived.java 2011-01-25 16:45:38 UTC (rev 621) @@ -2,7 +2,7 @@ // 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/... // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2011.01.19 at 06:07:44 PM GMT +// Generated on: 2011.01.25 at 04:37:56 PM GMT // @@ -22,7 +22,7 @@ * <pre> * &lt;complexType name="MessageReceived"> * &lt;complexContent> - * &lt;extension base="{http://www.savara.org/activity}MessageActivity"> + * &lt;extension base="{http://www.savara.org/activity}Interaction"> * &lt;attribute name="source" type="{http://www.w3.org/2001/XMLSchema}string" /> * &lt;/extension> * &lt;/complexContent> @@ -34,7 +34,7 @@ @XmlAccessorType(XmlAccessType.FIELD) @XmlType(name = "MessageReceived") public class MessageReceived - extends MessageActivity + extends Interaction { @XmlAttribute(name = "source") Modified: 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 2011-01-25 15:18:08 UTC (rev 620) +++ branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/MessageSent.java 2011-01-25 16:45:38 UTC (rev 621) @@ -2,7 +2,7 @@ // 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/... // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2011.01.19 at 06:07:44 PM GMT +// Generated on: 2011.01.25 at 04:37:56 PM GMT // @@ -22,7 +22,7 @@ * <pre> * &lt;complexType name="MessageSent"> * &lt;complexContent> - * &lt;extension base="{http://www.savara.org/activity}MessageActivity"> + * &lt;extension base="{http://www.savara.org/activity}Interaction"> * &lt;attribute name="destination" type="{http://www.w3.org/2001/XMLSchema}string" /> * &lt;/extension> * &lt;/complexContent> @@ -34,7 +34,7 @@ @XmlAccessorType(XmlAccessType.FIELD) @XmlType(name = "MessageSent") public class MessageSent - extends MessageActivity + extends Interaction { @XmlAttribute(name = "destination") Modified: 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 2011-01-25 15:18:08 UTC (rev 620) +++ branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/ObjectFactory.java 2011-01-25 16:45:38 UTC (rev 621) @@ -2,7 +2,7 @@ // 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/... // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2011.01.19 at 06:07:44 PM GMT +// Generated on: 2011.01.25 at 04:37:56 PM GMT // @@ -37,6 +37,30 @@ } /** + * Create an instance of {@link Conversation } + * + */ + public Conversation createConversation() { + return new Conversation(); + } + + /** + * Create an instance of {@link Task } + * + */ + public Task createTask() { + return new Task(); + } + + /** + * Create an instance of {@link Activity } + * + */ + public Activity createActivity() { + return new Activity(); + } + + /** * Create an instance of {@link MessageReceived } * */ @@ -45,14 +69,22 @@ } /** - * Create an instance of {@link EndpointActivity } + * Create an instance of {@link ProtocolAnalysis } * */ - public EndpointActivity createEndpointActivity() { - return new EndpointActivity(); + public ProtocolAnalysis createProtocolAnalysis() { + return new ProtocolAnalysis(); } /** + * Create an instance of {@link Error } + * + */ + public Error createError() { + return new Error(); + } + + /** * Create an instance of {@link InstanceFinished } * */ @@ -61,11 +93,11 @@ } /** - * Create an instance of {@link InstanceStarted } + * Create an instance of {@link Process } * */ - public InstanceStarted createInstanceStarted() { - return new InstanceStarted(); + public Process createProcess() { + return new Process(); } /** @@ -77,19 +109,11 @@ } /** - * Create an instance of {@link Error } + * Create an instance of {@link InstanceStarted } * */ - public Error createError() { - return new Error(); + public InstanceStarted createInstanceStarted() { + return new InstanceStarted(); } - /** - * Create an instance of {@link ProtocolAnalysis } - * - */ - public ProtocolAnalysis createProtocolAnalysis() { - return new ProtocolAnalysis(); - } - } Added: branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/Process.java =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/Process.java (rev 0) +++ branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/Process.java 2011-01-25 16:45:38 UTC (rev 621) @@ -0,0 +1,121 @@ +// +// 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/... +// Any modifications to this file will be lost upon recompilation of the source schema. +// Generated on: 2011.01.25 at 04:37:56 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 Process complex type. + * + * <p>The following schema fragment specifies the expected content contained within this class. + * + * <pre> + * &lt;complexType name="Process"> + * &lt;complexContent> + * &lt;extension base="{http://www.savara.org/activity}Facet"> + * &lt;attribute name="processInstanceId" type="{http://www.w3.org/2001/XMLSchema}string" /> + * &lt;attribute name="processDefinitionId" type="{http://www.w3.org/2001/XMLSchema}string" /> + * &lt;attribute name="processName" type="{http://www.w3.org/2001/XMLSchema}string" /> + * &lt;/extension> + * &lt;/complexContent> + * &lt;/complexType> + * </pre> + * + * + */ +(a)XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "Process") +public class Process + extends Facet +{ + + @XmlAttribute(name = "processInstanceId") + protected String processInstanceId; + @XmlAttribute(name = "processDefinitionId") + protected String processDefinitionId; + @XmlAttribute(name = "processName") + protected String processName; + + /** + * Gets the value of the processInstanceId property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getProcessInstanceId() { + return processInstanceId; + } + + /** + * Sets the value of the processInstanceId property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setProcessInstanceId(String value) { + this.processInstanceId = value; + } + + /** + * Gets the value of the processDefinitionId property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getProcessDefinitionId() { + return processDefinitionId; + } + + /** + * Sets the value of the processDefinitionId property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setProcessDefinitionId(String value) { + this.processDefinitionId = value; + } + + /** + * Gets the value of the processName property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getProcessName() { + return processName; + } + + /** + * Sets the value of the processName property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setProcessName(String value) { + this.processName = value; + } + +} Modified: 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 2011-01-25 15:18:08 UTC (rev 620) +++ branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/ProtocolAnalysis.java 2011-01-25 16:45:38 UTC (rev 621) @@ -2,7 +2,7 @@ // 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/... // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2011.01.19 at 06:07:44 PM GMT +// Generated on: 2011.01.25 at 04:37:56 PM GMT // Added: branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/Task.java =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/Task.java (rev 0) +++ branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/Task.java 2011-01-25 16:45:38 UTC (rev 621) @@ -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/... +// Any modifications to this file will be lost upon recompilation of the source schema. +// Generated on: 2011.01.25 at 04:37:56 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 Task complex type. + * + * <p>The following schema fragment specifies the expected content contained within this class. + * + * <pre> + * &lt;complexType name="Task"> + * &lt;complexContent> + * &lt;extension base="{http://www.savara.org/activity}Facet"> + * &lt;attribute name="taskDefinitionId" type="{http://www.w3.org/2001/XMLSchema}string" /> + * &lt;attribute name="taskName" type="{http://www.w3.org/2001/XMLSchema}string" /> + * &lt;/extension> + * &lt;/complexContent> + * &lt;/complexType> + * </pre> + * + * + */ +(a)XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "Task") +public class Task + extends Facet +{ + + @XmlAttribute(name = "taskDefinitionId") + protected String taskDefinitionId; + @XmlAttribute(name = "taskName") + protected String taskName; + + /** + * Gets the value of the taskDefinitionId property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getTaskDefinitionId() { + return taskDefinitionId; + } + + /** + * Sets the value of the taskDefinitionId property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setTaskDefinitionId(String value) { + this.taskDefinitionId = value; + } + + /** + * Gets the value of the taskName property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getTaskName() { + return taskName; + } + + /** + * Sets the value of the taskName property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setTaskName(String value) { + this.taskName = value; + } + +} Modified: 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 2011-01-25 15:18:08 UTC (rev 620) +++ branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/package-info.java 2011-01-25 16:45:38 UTC (rev 621) @@ -2,7 +2,7 @@ // 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/... // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2011.01.19 at 06:07:44 PM GMT +// Generated on: 2011.01.25 at 04:37:56 PM GMT // @javax.xml.bind.annotation.XmlSchema(namespace = "http://www.savara.org/activity", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED) Modified: branches/experimental/2.0.x/bundles/org.savara.activity/src/test/java/org/savara/activity/validation/DefaultActivityValidationManagerTest.java =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.activity/src/test/java/org/savara/activity/validation/DefaultActivityValidationManagerTest.java 2011-01-25 15:18:08 UTC (rev 620) +++ branches/experimental/2.0.x/bundles/org.savara.activity/src/test/java/org/savara/activity/validation/DefaultActivityValidationManagerTest.java 2011-01-25 16:45:38 UTC (rev 621) @@ -70,7 +70,7 @@ avm.addActivityAnalyser(tav); avm.addActivityValidator(tav); - Activity act=new MessageSent(); + Activity act=new Activity(); avm.process(act); }