[savara-commits] savara SVN: r586 - in branches/experimental/2.0.x/bundles: org.savara.activity/src/main/java/org/savara/activity/model and 1 other directories.
do-not-reply at jboss.org
do-not-reply at jboss.org
Sun Jan 16 16:52:35 EST 2011
Author: objectiser
Date: 2011-01-16 16:52:35 -0500 (Sun, 16 Jan 2011)
New Revision: 586
Added:
branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/Activity.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/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.contract/src/main/java/org/savara/contract/generator/impl/ContractIntrospector.java
Log:
Update to activity model and to deal with changes to Scribble API.
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-16 16:44:13 UTC (rev 585)
+++ branches/experimental/2.0.x/bundles/org.savara.activity/schema/Activity.xsd 2011-01-16 21:52:35 UTC (rev 586)
@@ -1,18 +1,26 @@
<?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="EndpointActivity" abstract="true">
+ <complexType name="Activity" abstract="true">
<sequence>
<element name="analysis" type="tns:Analysis" minOccurs="0" maxOccurs="unbounded"></element>
</sequence>
- <attribute name="endpointName" type="string"></attribute>
+ <attribute name="componentName" type="string"></attribute>
<attribute name="instanceId" type="string"></attribute>
<attribute name="timestamp" type="dateTime"></attribute>
</complexType>
+ <complexType name="EndpointActivity">
+ <complexContent>
+ <extension base="tns:Activity">
+ <attribute name="endpointName" type="string"></attribute>
+ </extension>
+ </complexContent>
+ </complexType>
+
<complexType name="Error">
<complexContent>
- <extension base="tns:EndpointActivity">
+ <extension base="tns:Activity">
<attribute name="description" type="string"></attribute>
<attribute name="type" type="string"></attribute>
</extension>
@@ -50,7 +58,7 @@
<complexType name="LifecycleActivity" abstract="true">
<complexContent>
- <extension base="tns:EndpointActivity">
+ <extension base="tns:Activity">
</extension>
</complexContent>
</complexType>
Added: 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 (rev 0)
+++ branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/Activity.java 2011-01-16 21:52:35 UTC (rev 586)
@@ -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 06:29:35 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 Activity complex type.
+ *
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ *
+ * <pre>
+ * <complexType name="Activity">
+ * <complexContent>
+ * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ * <sequence>
+ * <element name="analysis" type="{http://www.savara.org/activity}Analysis" maxOccurs="unbounded" minOccurs="0"/>
+ * </sequence>
+ * <attribute name="componentName" type="{http://www.w3.org/2001/XMLSchema}string" />
+ * <attribute name="instanceId" type="{http://www.w3.org/2001/XMLSchema}string" />
+ * <attribute name="timestamp" type="{http://www.w3.org/2001/XMLSchema}dateTime" />
+ * </restriction>
+ * </complexContent>
+ * </complexType>
+ * </pre>
+ *
+ *
+ */
+ at XmlAccessorType(XmlAccessType.FIELD)
+ at XmlType(name = "Activity", propOrder = {
+ "analysis"
+})
+ at XmlSeeAlso({
+ LifecycleActivity.class,
+ EndpointActivity.class,
+ Error.class
+})
+public abstract class Activity {
+
+ protected List<Analysis> analysis;
+ @XmlAttribute(name = "componentName")
+ protected String componentName;
+ @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 componentName property.
+ *
+ * @return
+ * possible object is
+ * {@link String }
+ *
+ */
+ public String getComponentName() {
+ return componentName;
+ }
+
+ /**
+ * Sets the value of the componentName property.
+ *
+ * @param value
+ * allowed object is
+ * {@link String }
+ *
+ */
+ public void setComponentName(String value) {
+ this.componentName = 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;
+ }
+
+}
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-16 16:44:13 UTC (rev 585)
+++ branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/Analysis.java 2011-01-16 21:52:35 UTC (rev 586)
@@ -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/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
+// Generated on: 2011.01.16 at 06:29:35 PM GMT
//
Modified: 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-16 16:44:13 UTC (rev 585)
+++ branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/EndpointActivity.java 2011-01-16 21:52:35 UTC (rev 586)
@@ -2,21 +2,17 @@
// 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
+// Generated on: 2011.01.16 at 06:29:35 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;
/**
@@ -27,14 +23,9 @@
* <pre>
* <complexType name="EndpointActivity">
* <complexContent>
- * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- * <sequence>
- * <element name="analysis" type="{http://www.savara.org/activity}Analysis" maxOccurs="unbounded" minOccurs="0"/>
- * </sequence>
+ * <extension base="{http://www.savara.org/activity}Activity">
* <attribute name="endpointName" type="{http://www.w3.org/2001/XMLSchema}string" />
- * <attribute name="instanceId" type="{http://www.w3.org/2001/XMLSchema}string" />
- * <attribute name="timestamp" type="{http://www.w3.org/2001/XMLSchema}dateTime" />
- * </restriction>
+ * </extension>
* </complexContent>
* </complexType>
* </pre>
@@ -42,55 +33,18 @@
*
*/
@XmlAccessorType(XmlAccessType.FIELD)
- at XmlType(name = "EndpointActivity", propOrder = {
- "analysis"
-})
+ at XmlType(name = "EndpointActivity")
@XmlSeeAlso({
- LifecycleActivity.class,
- MessageActivity.class,
- Error.class
+ MessageActivity.class
})
-public abstract class EndpointActivity {
+public class EndpointActivity
+ extends Activity
+{
- 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
@@ -114,52 +68,4 @@
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;
- }
-
}
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-16 16:44:13 UTC (rev 585)
+++ branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/Error.java 2011-01-16 21:52:35 UTC (rev 586)
@@ -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/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
+// Generated on: 2011.01.16 at 06:29:35 PM GMT
//
@@ -22,7 +22,7 @@
* <pre>
* <complexType name="Error">
* <complexContent>
- * <extension base="{http://www.savara.org/activity}EndpointActivity">
+ * <extension base="{http://www.savara.org/activity}Activity">
* <attribute name="description" type="{http://www.w3.org/2001/XMLSchema}string" />
* <attribute name="type" type="{http://www.w3.org/2001/XMLSchema}string" />
* </extension>
@@ -35,7 +35,7 @@
@XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "Error")
public class Error
- extends EndpointActivity
+ extends Activity
{
@XmlAttribute(name = "description")
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-16 16:44:13 UTC (rev 585)
+++ branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/InstanceFinished.java 2011-01-16 21:52:35 UTC (rev 586)
@@ -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/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
+// Generated on: 2011.01.16 at 06:29:35 PM GMT
//
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-16 16:44:13 UTC (rev 585)
+++ branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/InstanceStarted.java 2011-01-16 21:52:35 UTC (rev 586)
@@ -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/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
+// Generated on: 2011.01.16 at 06:29:35 PM GMT
//
Modified: 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-16 16:44:13 UTC (rev 585)
+++ branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/LifecycleActivity.java 2011-01-16 21:52:35 UTC (rev 586)
@@ -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/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
+// Generated on: 2011.01.16 at 06:29:35 PM GMT
//
@@ -22,7 +22,7 @@
* <pre>
* <complexType name="LifecycleActivity">
* <complexContent>
- * <extension base="{http://www.savara.org/activity}EndpointActivity">
+ * <extension base="{http://www.savara.org/activity}Activity">
* </extension>
* </complexContent>
* </complexType>
@@ -37,7 +37,7 @@
InstanceFinished.class
})
public abstract class LifecycleActivity
- extends EndpointActivity
+ extends Activity
{
Modified: 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-16 16:44:13 UTC (rev 585)
+++ branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/MessageActivity.java 2011-01-16 21:52:35 UTC (rev 586)
@@ -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/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
+// Generated on: 2011.01.16 at 06:29:35 PM GMT
//
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-16 16:44:13 UTC (rev 585)
+++ branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/MessageReceived.java 2011-01-16 21:52:35 UTC (rev 586)
@@ -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/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
+// Generated on: 2011.01.16 at 06:29:35 PM GMT
//
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-16 16:44:13 UTC (rev 585)
+++ branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/MessageSent.java 2011-01-16 21:52:35 UTC (rev 586)
@@ -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/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
+// Generated on: 2011.01.16 at 06:29:35 PM GMT
//
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-16 16:44:13 UTC (rev 585)
+++ branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/ObjectFactory.java 2011-01-16 21:52:35 UTC (rev 586)
@@ -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/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
+// Generated on: 2011.01.16 at 06:29:35 PM GMT
//
@@ -84,4 +84,12 @@
return new InstanceStarted();
}
+ /**
+ * Create an instance of {@link EndpointActivity }
+ *
+ */
+ public EndpointActivity createEndpointActivity() {
+ return new EndpointActivity();
+ }
+
}
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-16 16:44:13 UTC (rev 585)
+++ branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/ProtocolAnalysis.java 2011-01-16 21:52:35 UTC (rev 586)
@@ -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/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
+// Generated on: 2011.01.16 at 06:29:35 PM GMT
//
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-16 16:44:13 UTC (rev 585)
+++ branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/package-info.java 2011-01-16 21:52:35 UTC (rev 586)
@@ -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/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
+// Generated on: 2011.01.16 at 06:29:35 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.contract/src/main/java/org/savara/contract/generator/impl/ContractIntrospector.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.contract/src/main/java/org/savara/contract/generator/impl/ContractIntrospector.java 2011-01-16 16:44:13 UTC (rev 585)
+++ branches/experimental/2.0.x/bundles/org.savara.contract/src/main/java/org/savara/contract/generator/impl/ContractIntrospector.java 2011-01-16 21:52:35 UTC (rev 586)
@@ -46,7 +46,7 @@
import org.scribble.protocol.model.TypeImportList;
import org.scribble.protocol.model.TypeReference;
import org.scribble.protocol.model.When;
-import org.scribble.protocol.util.TypeReferenceUtil;
+import org.scribble.protocol.util.TypesUtil;
/**
* This class examines a protocol to determine the contract that represents
@@ -444,7 +444,7 @@
TypeDefinition td=new TypeDefinition();
td.setName(tref.getName());
- TypeImport ti=TypeReferenceUtil.getTypeImport(tref);
+ TypeImport ti=TypesUtil.getTypeImport(tref);
if (ti != null) {
TypeImportList til=(TypeImportList)ti.getParent();
More information about the savara-commits
mailing list