Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--plugins/org.eclipse.osee.framework.messaging.event.res/jaxb/resMessages.xsd54
-rw-r--r--plugins/org.eclipse.osee.framework.messaging.event.res/src-gen/org/eclipse/osee/framework/messaging/event/res/msgs/ObjectFactory.java76
-rw-r--r--plugins/org.eclipse.osee.framework.messaging.event.res/src-gen/org/eclipse/osee/framework/messaging/event/res/msgs/RemoteAccessControlArtifactsEvent1.java107
-rw-r--r--plugins/org.eclipse.osee.framework.messaging.event.res/src-gen/org/eclipse/osee/framework/messaging/event/res/msgs/RemoteAttributeChange1.java2
-rw-r--r--plugins/org.eclipse.osee.framework.messaging.event.res/src-gen/org/eclipse/osee/framework/messaging/event/res/msgs/RemoteBasicGuidArtifact1.java95
-rw-r--r--plugins/org.eclipse.osee.framework.messaging.event.res/src-gen/org/eclipse/osee/framework/messaging/event/res/msgs/RemoteBasicGuidRelation1.java30
-rw-r--r--plugins/org.eclipse.osee.framework.messaging.event.res/src-gen/org/eclipse/osee/framework/messaging/event/res/msgs/RemoteBasicModifiedGuidArtifact1.java163
-rw-r--r--plugins/org.eclipse.osee.framework.messaging.event.res/src-gen/org/eclipse/osee/framework/messaging/event/res/msgs/RemoteBranchEvent1.java2
-rw-r--r--plugins/org.eclipse.osee.framework.messaging.event.res/src-gen/org/eclipse/osee/framework/messaging/event/res/msgs/RemoteBranchRenameEvent1.java184
-rw-r--r--plugins/org.eclipse.osee.framework.messaging.event.res/src-gen/org/eclipse/osee/framework/messaging/event/res/msgs/RemoteBroadcastEvent1.java2
-rw-r--r--plugins/org.eclipse.osee.framework.messaging.event.res/src-gen/org/eclipse/osee/framework/messaging/event/res/msgs/RemoteChangeTypeArtifactsEvent1.java135
-rw-r--r--plugins/org.eclipse.osee.framework.messaging.event.res/src-gen/org/eclipse/osee/framework/messaging/event/res/msgs/RemoteNetworkSender1.java2
-rw-r--r--plugins/org.eclipse.osee.framework.messaging.event.res/src-gen/org/eclipse/osee/framework/messaging/event/res/msgs/RemotePurgedArtifactsEvent1.java107
-rw-r--r--plugins/org.eclipse.osee.framework.messaging.event.res/src-gen/org/eclipse/osee/framework/messaging/event/res/msgs/RemoteTransactionDeletedEvent1.java2
-rw-r--r--plugins/org.eclipse.osee.framework.messaging.event.res/src-gen/org/eclipse/osee/framework/messaging/event/res/msgs/RemoteTransactionEvent1.java174
-rw-r--r--plugins/org.eclipse.osee.framework.messaging.event.res/src/org/eclipse/osee/framework/messaging/event/res/ResMessages.java10
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/FrameworkCore_TestDb_Suite.java4
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/event/ArtifactEventManagerTest.java8
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core/jaxb/frameworkMessages.xsd40
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core/src-gen/org/eclipse/osee/framework/skynet/core/event/msgs/AccessControlArtifactsEvent.java108
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core/src-gen/org/eclipse/osee/framework/skynet/core/event/msgs/AttributeChange.java2
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core/src-gen/org/eclipse/osee/framework/skynet/core/event/msgs/BasicModifiedGuidArtifact.java163
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core/src-gen/org/eclipse/osee/framework/skynet/core/event/msgs/BranchEvent.java2
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core/src-gen/org/eclipse/osee/framework/skynet/core/event/msgs/BranchRenameEvent.java184
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core/src-gen/org/eclipse/osee/framework/skynet/core/event/msgs/BroadcastEvent.java2
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core/src-gen/org/eclipse/osee/framework/skynet/core/event/msgs/NetworkSender.java2
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core/src-gen/org/eclipse/osee/framework/skynet/core/event/msgs/ObjectFactory.java94
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core/src-gen/org/eclipse/osee/framework/skynet/core/event/msgs/TransactionDeletedEvent.java2
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core/src-gen/org/eclipse/osee/framework/skynet/core/event/msgs/TransactionEvent.java251
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/ArtifactTransactionData.java10
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/attribute/AttributeTransactionData.java2
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event/FrameworkTransactionData.java2
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event/InternalEventManager.java4
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event/InternalEventManager2.java21
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event/OseeEventManager.java2
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event/RemoteEventManager.java2
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event/RemoteEventManager2.java68
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event2/FrameworkEventManager.java30
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event2/FrameworkEventUtil.java149
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event2/TransactionEvent.java112
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event2/artifact/EventBasicGuidRelation.java4
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event2/artifact/EventModType.java27
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/relation/RelationEventType.java2
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/relation/RelationLink.java12
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/relation/RelationTransactionData.java12
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/transaction/BaseTransactionData.java2
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/transaction/SkynetTransaction.java18
47 files changed, 490 insertions, 1996 deletions
diff --git a/plugins/org.eclipse.osee.framework.messaging.event.res/jaxb/resMessages.xsd b/plugins/org.eclipse.osee.framework.messaging.event.res/jaxb/resMessages.xsd
index 6111022383..0988ddcc8f 100644
--- a/plugins/org.eclipse.osee.framework.messaging.event.res/jaxb/resMessages.xsd
+++ b/plugins/org.eclipse.osee.framework.messaging.event.res/jaxb/resMessages.xsd
@@ -17,30 +17,8 @@
<xsd:sequence>
<xsd:element name="branchGuid" type="xsd:string"/>
<xsd:element name="transactionId" type="xsd:int"/>
- <xsd:element name="modified" type="RemoteBasicModifiedGuidArtifact1" maxOccurs="unbounded" minOccurs="1"/>
- <xsd:element name="added" type="RemoteBasicGuidArtifact1" maxOccurs="unbounded" minOccurs="1"/>
- <xsd:element name="deleted" type="RemoteBasicGuidArtifact1" maxOccurs="unbounded" minOccurs="1"/>
- <xsd:element name="modifiedRel" type="RemoteBasicGuidRelation1" maxOccurs="unbounded" minOccurs="1"/>
- <xsd:element name="addedRel" type="RemoteBasicGuidRelation1" maxOccurs="unbounded" minOccurs="1"/>
- <xsd:element name="deletedRel" type="RemoteBasicGuidRelation1" maxOccurs="unbounded" minOccurs="1"/>
- <xsd:element name="networkSender" type="RemoteNetworkSender1" maxOccurs="1" minOccurs="1"/>
- </xsd:sequence>
-</xsd:complexType>
-
-<xsd:complexType name="RemoteChangeTypeArtifactsEvent1">
- <xsd:sequence>
- <xsd:element name="toArtTypeGuid" type="xsd:string"/>
<xsd:element name="artifacts" type="RemoteBasicGuidArtifact1" maxOccurs="unbounded" minOccurs="1"/>
- <xsd:element name="networkSender" type="RemoteNetworkSender1" maxOccurs="1" minOccurs="1"/>
- </xsd:sequence>
-</xsd:complexType>
-
-<xsd:complexType name="RemoteBranchRenameEvent1">
- <xsd:sequence>
- <xsd:element name="name" type="xsd:string"/>
- <xsd:element name="shortName" type="xsd:string"/>
- <xsd:element name="modTypeGuid" type="xsd:string"/>
- <xsd:element name="branchGuid" type="xsd:string"/>
+ <xsd:element name="relations" type="RemoteBasicGuidRelation1" maxOccurs="unbounded" minOccurs="1"/>
<xsd:element name="networkSender" type="RemoteNetworkSender1" maxOccurs="1" minOccurs="1"/>
</xsd:sequence>
</xsd:complexType>
@@ -69,22 +47,9 @@
</xsd:sequence>
</xsd:complexType>
-<xsd:complexType name="RemotePurgedArtifactsEvent1">
- <xsd:sequence>
- <xsd:element name="artifacts" type="RemoteBasicGuidArtifact1" maxOccurs="unbounded" minOccurs="1"/>
- <xsd:element name="networkSender" type="RemoteNetworkSender1" maxOccurs="1" minOccurs="1"/>
- </xsd:sequence>
-</xsd:complexType>
-
-<xsd:complexType name="RemoteAccessControlArtifactsEvent1">
- <xsd:sequence>
- <xsd:element name="modTypeGuid" type="xsd:string"/>
- <xsd:element name="artifacts" type="RemoteBasicGuidArtifact1" maxOccurs="unbounded" minOccurs="1"/>
- </xsd:sequence>
-</xsd:complexType>
-
<xsd:complexType name="RemoteBasicGuidRelation1">
<xsd:sequence>
+ <xsd:element name="modTypeGuid" type="xsd:string"/>
<xsd:element name="branchGuid" type="xsd:string"/>
<xsd:element name="relTypeGuid" type="xsd:string"/>
<xsd:element name="gammaId" type="xsd:int"/>
@@ -93,14 +58,16 @@
</xsd:sequence>
</xsd:complexType>
-
-<xsd:complexType name="RemoteBasicModifiedGuidArtifact1">
+<xsd:complexType name="RemoteBasicGuidArtifact1">
<xsd:sequence>
+ <xsd:element name="modTypeGuid" type="xsd:string"/>
<xsd:element name="branchGuid" type="xsd:string"/>
<xsd:element name="artTypeGuid" type="xsd:string"/>
- <xsd:element name="artGuid" type="xsd:string"/>
+ <xsd:element name="artGuid" type="xsd:string"/>
<xsd:element name="attributes" type="RemoteAttributeChange1" maxOccurs="unbounded" minOccurs="1"/>
+ <xsd:element name="toArtTypeGuid" type="xsd:string"/>
</xsd:sequence>
+
</xsd:complexType>
<xsd:complexType name="RemoteAttributeChange1">
@@ -113,13 +80,6 @@
</xsd:sequence>
</xsd:complexType>
-<xsd:complexType name="RemoteBasicGuidArtifact1">
- <xsd:sequence>
- <xsd:element name="branchGuid" type="xsd:string"/>
- <xsd:element name="artTypeGuid" type="xsd:string"/>
- <xsd:element name="artGuid" type="xsd:string"/>
- </xsd:sequence>
-</xsd:complexType>
<xsd:complexType name="RemoteNetworkSender1">
<xsd:sequence>
diff --git a/plugins/org.eclipse.osee.framework.messaging.event.res/src-gen/org/eclipse/osee/framework/messaging/event/res/msgs/ObjectFactory.java b/plugins/org.eclipse.osee.framework.messaging.event.res/src-gen/org/eclipse/osee/framework/messaging/event/res/msgs/ObjectFactory.java
index 5765e7e23d..693335cc6d 100644
--- a/plugins/org.eclipse.osee.framework.messaging.event.res/src-gen/org/eclipse/osee/framework/messaging/event/res/msgs/ObjectFactory.java
+++ b/plugins/org.eclipse.osee.framework.messaging.event.res/src-gen/org/eclipse/osee/framework/messaging/event/res/msgs/ObjectFactory.java
@@ -2,7 +2,7 @@
// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.3 in JDK 1.6
// 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: 2010.04.13 at 01:19:00 PM MST
+// Generated on: 2010.05.13 at 02:00:51 PM MST
//
@@ -37,51 +37,19 @@ public class ObjectFactory {
}
/**
- * Create an instance of {@link RemoteChangeTypeArtifactsEvent1 }
- *
- */
- public RemoteChangeTypeArtifactsEvent1 createRemoteChangeTypeArtifactsEvent1() {
- return new RemoteChangeTypeArtifactsEvent1();
- }
-
- /**
- * Create an instance of {@link RemoteBranchRenameEvent1 }
- *
- */
- public RemoteBranchRenameEvent1 createRemoteBranchRenameEvent1() {
- return new RemoteBranchRenameEvent1();
- }
-
- /**
- * Create an instance of {@link RemoteBroadcastEvent1 }
- *
- */
- public RemoteBroadcastEvent1 createRemoteBroadcastEvent1() {
- return new RemoteBroadcastEvent1();
- }
-
- /**
- * Create an instance of {@link RemoteNetworkSender1 }
- *
- */
- public RemoteNetworkSender1 createRemoteNetworkSender1() {
- return new RemoteNetworkSender1();
- }
-
- /**
- * Create an instance of {@link RemotePurgedArtifactsEvent1 }
+ * Create an instance of {@link RemoteTransactionEvent1 }
*
*/
- public RemotePurgedArtifactsEvent1 createRemotePurgedArtifactsEvent1() {
- return new RemotePurgedArtifactsEvent1();
+ public RemoteTransactionEvent1 createRemoteTransactionEvent1() {
+ return new RemoteTransactionEvent1();
}
/**
- * Create an instance of {@link RemoteTransactionEvent1 }
+ * Create an instance of {@link RemoteAttributeChange1 }
*
*/
- public RemoteTransactionEvent1 createRemoteTransactionEvent1() {
- return new RemoteTransactionEvent1();
+ public RemoteAttributeChange1 createRemoteAttributeChange1() {
+ return new RemoteAttributeChange1();
}
/**
@@ -93,43 +61,43 @@ public class ObjectFactory {
}
/**
- * Create an instance of {@link RemoteAttributeChange1 }
+ * Create an instance of {@link RemoteBranchEvent1 }
*
*/
- public RemoteAttributeChange1 createRemoteAttributeChange1() {
- return new RemoteAttributeChange1();
+ public RemoteBranchEvent1 createRemoteBranchEvent1() {
+ return new RemoteBranchEvent1();
}
/**
- * Create an instance of {@link RemoteBasicModifiedGuidArtifact1 }
+ * Create an instance of {@link RemoteBasicGuidArtifact1 }
*
*/
- public RemoteBasicModifiedGuidArtifact1 createRemoteBasicModifiedGuidArtifact1() {
- return new RemoteBasicModifiedGuidArtifact1();
+ public RemoteBasicGuidArtifact1 createRemoteBasicGuidArtifact1() {
+ return new RemoteBasicGuidArtifact1();
}
/**
- * Create an instance of {@link RemoteBasicGuidArtifact1 }
+ * Create an instance of {@link RemoteBroadcastEvent1 }
*
*/
- public RemoteBasicGuidArtifact1 createRemoteBasicGuidArtifact1() {
- return new RemoteBasicGuidArtifact1();
+ public RemoteBroadcastEvent1 createRemoteBroadcastEvent1() {
+ return new RemoteBroadcastEvent1();
}
/**
- * Create an instance of {@link RemoteBranchEvent1 }
+ * Create an instance of {@link RemoteBasicGuidRelation1 }
*
*/
- public RemoteBranchEvent1 createRemoteBranchEvent1() {
- return new RemoteBranchEvent1();
+ public RemoteBasicGuidRelation1 createRemoteBasicGuidRelation1() {
+ return new RemoteBasicGuidRelation1();
}
/**
- * Create an instance of {@link RemoteAccessControlArtifactsEvent1 }
+ * Create an instance of {@link RemoteNetworkSender1 }
*
*/
- public RemoteAccessControlArtifactsEvent1 createRemoteAccessControlArtifactsEvent1() {
- return new RemoteAccessControlArtifactsEvent1();
+ public RemoteNetworkSender1 createRemoteNetworkSender1() {
+ return new RemoteNetworkSender1();
}
}
diff --git a/plugins/org.eclipse.osee.framework.messaging.event.res/src-gen/org/eclipse/osee/framework/messaging/event/res/msgs/RemoteAccessControlArtifactsEvent1.java b/plugins/org.eclipse.osee.framework.messaging.event.res/src-gen/org/eclipse/osee/framework/messaging/event/res/msgs/RemoteAccessControlArtifactsEvent1.java
deleted file mode 100644
index 52a7f301a0..0000000000
--- a/plugins/org.eclipse.osee.framework.messaging.event.res/src-gen/org/eclipse/osee/framework/messaging/event/res/msgs/RemoteAccessControlArtifactsEvent1.java
+++ /dev/null
@@ -1,107 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.3 in JDK 1.6
-// 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: 2010.04.13 at 01:19:00 PM MST
-//
-
-
-package org.eclipse.osee.framework.messaging.event.res.msgs;
-
-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.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-import org.eclipse.osee.framework.messaging.event.res.RemoteEvent;
-
-
-/**
- * <p>Java class for RemoteAccessControlArtifactsEvent1 complex type.
- *
- * <p>The following schema fragment specifies the expected content contained within this class.
- *
- * <pre>
- * &lt;complexType name="RemoteAccessControlArtifactsEvent1">
- * &lt;complexContent>
- * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- * &lt;sequence>
- * &lt;element name="modTypeGuid" type="{http://www.w3.org/2001/XMLSchema}string"/>
- * &lt;element name="artifacts" type="{}RemoteBasicGuidArtifact1" maxOccurs="unbounded"/>
- * &lt;/sequence>
- * &lt;/restriction>
- * &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- *
- *
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "RemoteAccessControlArtifactsEvent1", propOrder = {
- "modTypeGuid",
- "artifacts"
-})
-public class RemoteAccessControlArtifactsEvent1
- extends RemoteEvent
-{
-
- @XmlElement(required = true)
- protected String modTypeGuid;
- @XmlElement(required = true)
- protected List<RemoteBasicGuidArtifact1> artifacts;
-
- /**
- * Gets the value of the modTypeGuid property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getModTypeGuid() {
- return modTypeGuid;
- }
-
- /**
- * Sets the value of the modTypeGuid property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setModTypeGuid(String value) {
- this.modTypeGuid = value;
- }
-
- /**
- * Gets the value of the artifacts 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 artifacts property.
- *
- * <p>
- * For example, to add a new item, do as follows:
- * <pre>
- * getArtifacts().add(newItem);
- * </pre>
- *
- *
- * <p>
- * Objects of the following type(s) are allowed in the list
- * {@link RemoteBasicGuidArtifact1 }
- *
- *
- */
- public List<RemoteBasicGuidArtifact1> getArtifacts() {
- if (artifacts == null) {
- artifacts = new ArrayList<RemoteBasicGuidArtifact1>();
- }
- return this.artifacts;
- }
-
-}
diff --git a/plugins/org.eclipse.osee.framework.messaging.event.res/src-gen/org/eclipse/osee/framework/messaging/event/res/msgs/RemoteAttributeChange1.java b/plugins/org.eclipse.osee.framework.messaging.event.res/src-gen/org/eclipse/osee/framework/messaging/event/res/msgs/RemoteAttributeChange1.java
index c775dece63..091f8b69d4 100644
--- a/plugins/org.eclipse.osee.framework.messaging.event.res/src-gen/org/eclipse/osee/framework/messaging/event/res/msgs/RemoteAttributeChange1.java
+++ b/plugins/org.eclipse.osee.framework.messaging.event.res/src-gen/org/eclipse/osee/framework/messaging/event/res/msgs/RemoteAttributeChange1.java
@@ -2,7 +2,7 @@
// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.3 in JDK 1.6
// 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: 2010.04.26 at 12:16:45 PM MST
+// Generated on: 2010.05.13 at 02:00:51 PM MST
//
diff --git a/plugins/org.eclipse.osee.framework.messaging.event.res/src-gen/org/eclipse/osee/framework/messaging/event/res/msgs/RemoteBasicGuidArtifact1.java b/plugins/org.eclipse.osee.framework.messaging.event.res/src-gen/org/eclipse/osee/framework/messaging/event/res/msgs/RemoteBasicGuidArtifact1.java
index 5d75bdb03b..bb1d46de52 100644
--- a/plugins/org.eclipse.osee.framework.messaging.event.res/src-gen/org/eclipse/osee/framework/messaging/event/res/msgs/RemoteBasicGuidArtifact1.java
+++ b/plugins/org.eclipse.osee.framework.messaging.event.res/src-gen/org/eclipse/osee/framework/messaging/event/res/msgs/RemoteBasicGuidArtifact1.java
@@ -2,12 +2,14 @@
// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.3 in JDK 1.6
// 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: 2010.04.13 at 01:19:00 PM MST
+// Generated on: 2010.05.13 at 02:00:51 PM MST
//
package org.eclipse.osee.framework.messaging.event.res.msgs;
+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.XmlElement;
@@ -25,9 +27,12 @@ import org.eclipse.osee.framework.messaging.event.res.RemoteEvent;
* &lt;complexContent>
* &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
* &lt;sequence>
+ * &lt;element name="modTypeGuid" type="{http://www.w3.org/2001/XMLSchema}string"/>
* &lt;element name="branchGuid" type="{http://www.w3.org/2001/XMLSchema}string"/>
* &lt;element name="artTypeGuid" type="{http://www.w3.org/2001/XMLSchema}string"/>
* &lt;element name="artGuid" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ * &lt;element name="attributes" type="{}RemoteAttributeChange1" maxOccurs="unbounded"/>
+ * &lt;element name="toArtTypeGuid" type="{http://www.w3.org/2001/XMLSchema}string"/>
* &lt;/sequence>
* &lt;/restriction>
* &lt;/complexContent>
@@ -38,20 +43,53 @@ import org.eclipse.osee.framework.messaging.event.res.RemoteEvent;
*/
@XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "RemoteBasicGuidArtifact1", propOrder = {
+ "modTypeGuid",
"branchGuid",
"artTypeGuid",
- "artGuid"
+ "artGuid",
+ "attributes",
+ "toArtTypeGuid"
})
public class RemoteBasicGuidArtifact1
extends RemoteEvent
{
@XmlElement(required = true)
+ protected String modTypeGuid;
+ @XmlElement(required = true)
protected String branchGuid;
@XmlElement(required = true)
protected String artTypeGuid;
@XmlElement(required = true)
protected String artGuid;
+ @XmlElement(required = true)
+ protected List<RemoteAttributeChange1> attributes;
+ @XmlElement(required = true)
+ protected String toArtTypeGuid;
+
+ /**
+ * Gets the value of the modTypeGuid property.
+ *
+ * @return
+ * possible object is
+ * {@link String }
+ *
+ */
+ public String getModTypeGuid() {
+ return modTypeGuid;
+ }
+
+ /**
+ * Sets the value of the modTypeGuid property.
+ *
+ * @param value
+ * allowed object is
+ * {@link String }
+ *
+ */
+ public void setModTypeGuid(String value) {
+ this.modTypeGuid = value;
+ }
/**
* Gets the value of the branchGuid property.
@@ -125,4 +163,57 @@ public class RemoteBasicGuidArtifact1
this.artGuid = value;
}
+ /**
+ * Gets the value of the attributes 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 attributes property.
+ *
+ * <p>
+ * For example, to add a new item, do as follows:
+ * <pre>
+ * getAttributes().add(newItem);
+ * </pre>
+ *
+ *
+ * <p>
+ * Objects of the following type(s) are allowed in the list
+ * {@link RemoteAttributeChange1 }
+ *
+ *
+ */
+ public List<RemoteAttributeChange1> getAttributes() {
+ if (attributes == null) {
+ attributes = new ArrayList<RemoteAttributeChange1>();
+ }
+ return this.attributes;
+ }
+
+ /**
+ * Gets the value of the toArtTypeGuid property.
+ *
+ * @return
+ * possible object is
+ * {@link String }
+ *
+ */
+ public String getToArtTypeGuid() {
+ return toArtTypeGuid;
+ }
+
+ /**
+ * Sets the value of the toArtTypeGuid property.
+ *
+ * @param value
+ * allowed object is
+ * {@link String }
+ *
+ */
+ public void setToArtTypeGuid(String value) {
+ this.toArtTypeGuid = value;
+ }
+
}
diff --git a/plugins/org.eclipse.osee.framework.messaging.event.res/src-gen/org/eclipse/osee/framework/messaging/event/res/msgs/RemoteBasicGuidRelation1.java b/plugins/org.eclipse.osee.framework.messaging.event.res/src-gen/org/eclipse/osee/framework/messaging/event/res/msgs/RemoteBasicGuidRelation1.java
index 8ea2827d38..7e8172cd0d 100644
--- a/plugins/org.eclipse.osee.framework.messaging.event.res/src-gen/org/eclipse/osee/framework/messaging/event/res/msgs/RemoteBasicGuidRelation1.java
+++ b/plugins/org.eclipse.osee.framework.messaging.event.res/src-gen/org/eclipse/osee/framework/messaging/event/res/msgs/RemoteBasicGuidRelation1.java
@@ -2,7 +2,7 @@
// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.3 in JDK 1.6
// 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: 2010.05.12 at 03:22:29 PM MST
+// Generated on: 2010.05.13 at 02:00:51 PM MST
//
@@ -25,6 +25,7 @@ import org.eclipse.osee.framework.messaging.event.res.RemoteEvent;
* &lt;complexContent>
* &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
* &lt;sequence>
+ * &lt;element name="modTypeGuid" type="{http://www.w3.org/2001/XMLSchema}string"/>
* &lt;element name="branchGuid" type="{http://www.w3.org/2001/XMLSchema}string"/>
* &lt;element name="relTypeGuid" type="{http://www.w3.org/2001/XMLSchema}string"/>
* &lt;element name="gammaId" type="{http://www.w3.org/2001/XMLSchema}int"/>
@@ -40,6 +41,7 @@ import org.eclipse.osee.framework.messaging.event.res.RemoteEvent;
*/
@XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "RemoteBasicGuidRelation1", propOrder = {
+ "modTypeGuid",
"branchGuid",
"relTypeGuid",
"gammaId",
@@ -51,6 +53,8 @@ public class RemoteBasicGuidRelation1
{
@XmlElement(required = true)
+ protected String modTypeGuid;
+ @XmlElement(required = true)
protected String branchGuid;
@XmlElement(required = true)
protected String relTypeGuid;
@@ -61,6 +65,30 @@ public class RemoteBasicGuidRelation1
protected RemoteBasicGuidArtifact1 artB;
/**
+ * Gets the value of the modTypeGuid property.
+ *
+ * @return
+ * possible object is
+ * {@link String }
+ *
+ */
+ public String getModTypeGuid() {
+ return modTypeGuid;
+ }
+
+ /**
+ * Sets the value of the modTypeGuid property.
+ *
+ * @param value
+ * allowed object is
+ * {@link String }
+ *
+ */
+ public void setModTypeGuid(String value) {
+ this.modTypeGuid = value;
+ }
+
+ /**
* Gets the value of the branchGuid property.
*
* @return
diff --git a/plugins/org.eclipse.osee.framework.messaging.event.res/src-gen/org/eclipse/osee/framework/messaging/event/res/msgs/RemoteBasicModifiedGuidArtifact1.java b/plugins/org.eclipse.osee.framework.messaging.event.res/src-gen/org/eclipse/osee/framework/messaging/event/res/msgs/RemoteBasicModifiedGuidArtifact1.java
deleted file mode 100644
index 9769634983..0000000000
--- a/plugins/org.eclipse.osee.framework.messaging.event.res/src-gen/org/eclipse/osee/framework/messaging/event/res/msgs/RemoteBasicModifiedGuidArtifact1.java
+++ /dev/null
@@ -1,163 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.3 in JDK 1.6
-// 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: 2010.04.13 at 01:19:00 PM MST
-//
-
-
-package org.eclipse.osee.framework.messaging.event.res.msgs;
-
-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.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-import org.eclipse.osee.framework.messaging.event.res.RemoteEvent;
-
-
-/**
- * <p>Java class for RemoteBasicModifiedGuidArtifact1 complex type.
- *
- * <p>The following schema fragment specifies the expected content contained within this class.
- *
- * <pre>
- * &lt;complexType name="RemoteBasicModifiedGuidArtifact1">
- * &lt;complexContent>
- * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- * &lt;sequence>
- * &lt;element name="branchGuid" type="{http://www.w3.org/2001/XMLSchema}string"/>
- * &lt;element name="artTypeGuid" type="{http://www.w3.org/2001/XMLSchema}string"/>
- * &lt;element name="artGuid" type="{http://www.w3.org/2001/XMLSchema}string"/>
- * &lt;element name="attributes" type="{}RemoteAttributeChange1" maxOccurs="unbounded"/>
- * &lt;/sequence>
- * &lt;/restriction>
- * &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- *
- *
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "RemoteBasicModifiedGuidArtifact1", propOrder = {
- "branchGuid",
- "artTypeGuid",
- "artGuid",
- "attributes"
-})
-public class RemoteBasicModifiedGuidArtifact1
- extends RemoteEvent
-{
-
- @XmlElement(required = true)
- protected String branchGuid;
- @XmlElement(required = true)
- protected String artTypeGuid;
- @XmlElement(required = true)
- protected String artGuid;
- @XmlElement(required = true)
- protected List<RemoteAttributeChange1> attributes;
-
- /**
- * Gets the value of the branchGuid property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getBranchGuid() {
- return branchGuid;
- }
-
- /**
- * Sets the value of the branchGuid property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setBranchGuid(String value) {
- this.branchGuid = value;
- }
-
- /**
- * Gets the value of the artTypeGuid property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getArtTypeGuid() {
- return artTypeGuid;
- }
-
- /**
- * Sets the value of the artTypeGuid property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setArtTypeGuid(String value) {
- this.artTypeGuid = value;
- }
-
- /**
- * Gets the value of the artGuid property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getArtGuid() {
- return artGuid;
- }
-
- /**
- * Sets the value of the artGuid property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setArtGuid(String value) {
- this.artGuid = value;
- }
-
- /**
- * Gets the value of the attributes 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 attributes property.
- *
- * <p>
- * For example, to add a new item, do as follows:
- * <pre>
- * getAttributes().add(newItem);
- * </pre>
- *
- *
- * <p>
- * Objects of the following type(s) are allowed in the list
- * {@link RemoteAttributeChange1 }
- *
- *
- */
- public List<RemoteAttributeChange1> getAttributes() {
- if (attributes == null) {
- attributes = new ArrayList<RemoteAttributeChange1>();
- }
- return this.attributes;
- }
-
-}
diff --git a/plugins/org.eclipse.osee.framework.messaging.event.res/src-gen/org/eclipse/osee/framework/messaging/event/res/msgs/RemoteBranchEvent1.java b/plugins/org.eclipse.osee.framework.messaging.event.res/src-gen/org/eclipse/osee/framework/messaging/event/res/msgs/RemoteBranchEvent1.java
index 23d880a270..882591627c 100644
--- a/plugins/org.eclipse.osee.framework.messaging.event.res/src-gen/org/eclipse/osee/framework/messaging/event/res/msgs/RemoteBranchEvent1.java
+++ b/plugins/org.eclipse.osee.framework.messaging.event.res/src-gen/org/eclipse/osee/framework/messaging/event/res/msgs/RemoteBranchEvent1.java
@@ -2,7 +2,7 @@
// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.3 in JDK 1.6
// 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: 2010.04.13 at 01:19:00 PM MST
+// Generated on: 2010.05.13 at 02:00:51 PM MST
//
diff --git a/plugins/org.eclipse.osee.framework.messaging.event.res/src-gen/org/eclipse/osee/framework/messaging/event/res/msgs/RemoteBranchRenameEvent1.java b/plugins/org.eclipse.osee.framework.messaging.event.res/src-gen/org/eclipse/osee/framework/messaging/event/res/msgs/RemoteBranchRenameEvent1.java
deleted file mode 100644
index b12170eb59..0000000000
--- a/plugins/org.eclipse.osee.framework.messaging.event.res/src-gen/org/eclipse/osee/framework/messaging/event/res/msgs/RemoteBranchRenameEvent1.java
+++ /dev/null
@@ -1,184 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.3 in JDK 1.6
-// 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: 2010.04.13 at 01:19:00 PM MST
-//
-
-
-package org.eclipse.osee.framework.messaging.event.res.msgs;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-import org.eclipse.osee.framework.messaging.event.res.RemoteEvent;
-
-
-/**
- * <p>Java class for RemoteBranchRenameEvent1 complex type.
- *
- * <p>The following schema fragment specifies the expected content contained within this class.
- *
- * <pre>
- * &lt;complexType name="RemoteBranchRenameEvent1">
- * &lt;complexContent>
- * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- * &lt;sequence>
- * &lt;element name="name" type="{http://www.w3.org/2001/XMLSchema}string"/>
- * &lt;element name="shortName" type="{http://www.w3.org/2001/XMLSchema}string"/>
- * &lt;element name="modTypeGuid" type="{http://www.w3.org/2001/XMLSchema}string"/>
- * &lt;element name="branchGuid" type="{http://www.w3.org/2001/XMLSchema}string"/>
- * &lt;element name="networkSender" type="{}RemoteNetworkSender1"/>
- * &lt;/sequence>
- * &lt;/restriction>
- * &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- *
- *
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "RemoteBranchRenameEvent1", propOrder = {
- "name",
- "shortName",
- "modTypeGuid",
- "branchGuid",
- "networkSender"
-})
-public class RemoteBranchRenameEvent1
- extends RemoteEvent
-{
-
- @XmlElement(required = true)
- protected String name;
- @XmlElement(required = true)
- protected String shortName;
- @XmlElement(required = true)
- protected String modTypeGuid;
- @XmlElement(required = true)
- protected String branchGuid;
- @XmlElement(required = true)
- protected RemoteNetworkSender1 networkSender;
-
- /**
- * Gets the value of the name property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getName() {
- return name;
- }
-
- /**
- * Sets the value of the name property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setName(String value) {
- this.name = value;
- }
-
- /**
- * Gets the value of the shortName property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getShortName() {
- return shortName;
- }
-
- /**
- * Sets the value of the shortName property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setShortName(String value) {
- this.shortName = value;
- }
-
- /**
- * Gets the value of the modTypeGuid property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getModTypeGuid() {
- return modTypeGuid;
- }
-
- /**
- * Sets the value of the modTypeGuid property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setModTypeGuid(String value) {
- this.modTypeGuid = value;
- }
-
- /**
- * Gets the value of the branchGuid property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getBranchGuid() {
- return branchGuid;
- }
-
- /**
- * Sets the value of the branchGuid property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setBranchGuid(String value) {
- this.branchGuid = value;
- }
-
- /**
- * Gets the value of the networkSender property.
- *
- * @return
- * possible object is
- * {@link RemoteNetworkSender1 }
- *
- */
- public RemoteNetworkSender1 getNetworkSender() {
- return networkSender;
- }
-
- /**
- * Sets the value of the networkSender property.
- *
- * @param value
- * allowed object is
- * {@link RemoteNetworkSender1 }
- *
- */
- public void setNetworkSender(RemoteNetworkSender1 value) {
- this.networkSender = value;
- }
-
-}
diff --git a/plugins/org.eclipse.osee.framework.messaging.event.res/src-gen/org/eclipse/osee/framework/messaging/event/res/msgs/RemoteBroadcastEvent1.java b/plugins/org.eclipse.osee.framework.messaging.event.res/src-gen/org/eclipse/osee/framework/messaging/event/res/msgs/RemoteBroadcastEvent1.java
index 3dde300e87..ae57d82a0c 100644
--- a/plugins/org.eclipse.osee.framework.messaging.event.res/src-gen/org/eclipse/osee/framework/messaging/event/res/msgs/RemoteBroadcastEvent1.java
+++ b/plugins/org.eclipse.osee.framework.messaging.event.res/src-gen/org/eclipse/osee/framework/messaging/event/res/msgs/RemoteBroadcastEvent1.java
@@ -2,7 +2,7 @@
// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.3 in JDK 1.6
// 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: 2010.04.13 at 01:19:00 PM MST
+// Generated on: 2010.05.13 at 02:00:51 PM MST
//
diff --git a/plugins/org.eclipse.osee.framework.messaging.event.res/src-gen/org/eclipse/osee/framework/messaging/event/res/msgs/RemoteChangeTypeArtifactsEvent1.java b/plugins/org.eclipse.osee.framework.messaging.event.res/src-gen/org/eclipse/osee/framework/messaging/event/res/msgs/RemoteChangeTypeArtifactsEvent1.java
deleted file mode 100644
index 2066671608..0000000000
--- a/plugins/org.eclipse.osee.framework.messaging.event.res/src-gen/org/eclipse/osee/framework/messaging/event/res/msgs/RemoteChangeTypeArtifactsEvent1.java
+++ /dev/null
@@ -1,135 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.3 in JDK 1.6
-// 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: 2010.04.13 at 01:19:00 PM MST
-//
-
-
-package org.eclipse.osee.framework.messaging.event.res.msgs;
-
-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.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-import org.eclipse.osee.framework.messaging.event.res.RemoteEvent;
-
-
-/**
- * <p>Java class for RemoteChangeTypeArtifactsEvent1 complex type.
- *
- * <p>The following schema fragment specifies the expected content contained within this class.
- *
- * <pre>
- * &lt;complexType name="RemoteChangeTypeArtifactsEvent1">
- * &lt;complexContent>
- * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- * &lt;sequence>
- * &lt;element name="toArtTypeGuid" type="{http://www.w3.org/2001/XMLSchema}string"/>
- * &lt;element name="artifacts" type="{}RemoteBasicGuidArtifact1" maxOccurs="unbounded"/>
- * &lt;element name="networkSender" type="{}RemoteNetworkSender1"/>
- * &lt;/sequence>
- * &lt;/restriction>
- * &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- *
- *
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "RemoteChangeTypeArtifactsEvent1", propOrder = {
- "toArtTypeGuid",
- "artifacts",
- "networkSender"
-})
-public class RemoteChangeTypeArtifactsEvent1
- extends RemoteEvent
-{
-
- @XmlElement(required = true)
- protected String toArtTypeGuid;
- @XmlElement(required = true)
- protected List<RemoteBasicGuidArtifact1> artifacts;
- @XmlElement(required = true)
- protected RemoteNetworkSender1 networkSender;
-
- /**
- * Gets the value of the toArtTypeGuid property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getToArtTypeGuid() {
- return toArtTypeGuid;
- }
-
- /**
- * Sets the value of the toArtTypeGuid property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setToArtTypeGuid(String value) {
- this.toArtTypeGuid = value;
- }
-
- /**
- * Gets the value of the artifacts 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 artifacts property.
- *
- * <p>
- * For example, to add a new item, do as follows:
- * <pre>
- * getArtifacts().add(newItem);
- * </pre>
- *
- *
- * <p>
- * Objects of the following type(s) are allowed in the list
- * {@link RemoteBasicGuidArtifact1 }
- *
- *
- */
- public List<RemoteBasicGuidArtifact1> getArtifacts() {
- if (artifacts == null) {
- artifacts = new ArrayList<RemoteBasicGuidArtifact1>();
- }
- return this.artifacts;
- }
-
- /**
- * Gets the value of the networkSender property.
- *
- * @return
- * possible object is
- * {@link RemoteNetworkSender1 }
- *
- */
- public RemoteNetworkSender1 getNetworkSender() {
- return networkSender;
- }
-
- /**
- * Sets the value of the networkSender property.
- *
- * @param value
- * allowed object is
- * {@link RemoteNetworkSender1 }
- *
- */
- public void setNetworkSender(RemoteNetworkSender1 value) {
- this.networkSender = value;
- }
-
-}
diff --git a/plugins/org.eclipse.osee.framework.messaging.event.res/src-gen/org/eclipse/osee/framework/messaging/event/res/msgs/RemoteNetworkSender1.java b/plugins/org.eclipse.osee.framework.messaging.event.res/src-gen/org/eclipse/osee/framework/messaging/event/res/msgs/RemoteNetworkSender1.java
index 4dcf994db6..daa5684652 100644
--- a/plugins/org.eclipse.osee.framework.messaging.event.res/src-gen/org/eclipse/osee/framework/messaging/event/res/msgs/RemoteNetworkSender1.java
+++ b/plugins/org.eclipse.osee.framework.messaging.event.res/src-gen/org/eclipse/osee/framework/messaging/event/res/msgs/RemoteNetworkSender1.java
@@ -2,7 +2,7 @@
// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.3 in JDK 1.6
// 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: 2010.04.13 at 01:19:00 PM MST
+// Generated on: 2010.05.13 at 02:00:51 PM MST
//
diff --git a/plugins/org.eclipse.osee.framework.messaging.event.res/src-gen/org/eclipse/osee/framework/messaging/event/res/msgs/RemotePurgedArtifactsEvent1.java b/plugins/org.eclipse.osee.framework.messaging.event.res/src-gen/org/eclipse/osee/framework/messaging/event/res/msgs/RemotePurgedArtifactsEvent1.java
deleted file mode 100644
index 5892fc4aac..0000000000
--- a/plugins/org.eclipse.osee.framework.messaging.event.res/src-gen/org/eclipse/osee/framework/messaging/event/res/msgs/RemotePurgedArtifactsEvent1.java
+++ /dev/null
@@ -1,107 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.3 in JDK 1.6
-// 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: 2010.04.13 at 01:19:00 PM MST
-//
-
-
-package org.eclipse.osee.framework.messaging.event.res.msgs;
-
-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.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-import org.eclipse.osee.framework.messaging.event.res.RemoteEvent;
-
-
-/**
- * <p>Java class for RemotePurgedArtifactsEvent1 complex type.
- *
- * <p>The following schema fragment specifies the expected content contained within this class.
- *
- * <pre>
- * &lt;complexType name="RemotePurgedArtifactsEvent1">
- * &lt;complexContent>
- * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- * &lt;sequence>
- * &lt;element name="artifacts" type="{}RemoteBasicGuidArtifact1" maxOccurs="unbounded"/>
- * &lt;element name="networkSender" type="{}RemoteNetworkSender1"/>
- * &lt;/sequence>
- * &lt;/restriction>
- * &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- *
- *
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "RemotePurgedArtifactsEvent1", propOrder = {
- "artifacts",
- "networkSender"
-})
-public class RemotePurgedArtifactsEvent1
- extends RemoteEvent
-{
-
- @XmlElement(required = true)
- protected List<RemoteBasicGuidArtifact1> artifacts;
- @XmlElement(required = true)
- protected RemoteNetworkSender1 networkSender;
-
- /**
- * Gets the value of the artifacts 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 artifacts property.
- *
- * <p>
- * For example, to add a new item, do as follows:
- * <pre>
- * getArtifacts().add(newItem);
- * </pre>
- *
- *
- * <p>
- * Objects of the following type(s) are allowed in the list
- * {@link RemoteBasicGuidArtifact1 }
- *
- *
- */
- public List<RemoteBasicGuidArtifact1> getArtifacts() {
- if (artifacts == null) {
- artifacts = new ArrayList<RemoteBasicGuidArtifact1>();
- }
- return this.artifacts;
- }
-
- /**
- * Gets the value of the networkSender property.
- *
- * @return
- * possible object is
- * {@link RemoteNetworkSender1 }
- *
- */
- public RemoteNetworkSender1 getNetworkSender() {
- return networkSender;
- }
-
- /**
- * Sets the value of the networkSender property.
- *
- * @param value
- * allowed object is
- * {@link RemoteNetworkSender1 }
- *
- */
- public void setNetworkSender(RemoteNetworkSender1 value) {
- this.networkSender = value;
- }
-
-}
diff --git a/plugins/org.eclipse.osee.framework.messaging.event.res/src-gen/org/eclipse/osee/framework/messaging/event/res/msgs/RemoteTransactionDeletedEvent1.java b/plugins/org.eclipse.osee.framework.messaging.event.res/src-gen/org/eclipse/osee/framework/messaging/event/res/msgs/RemoteTransactionDeletedEvent1.java
index af61084225..d50c133361 100644
--- a/plugins/org.eclipse.osee.framework.messaging.event.res/src-gen/org/eclipse/osee/framework/messaging/event/res/msgs/RemoteTransactionDeletedEvent1.java
+++ b/plugins/org.eclipse.osee.framework.messaging.event.res/src-gen/org/eclipse/osee/framework/messaging/event/res/msgs/RemoteTransactionDeletedEvent1.java
@@ -2,7 +2,7 @@
// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.3 in JDK 1.6
// 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: 2010.04.13 at 01:19:00 PM MST
+// Generated on: 2010.05.13 at 02:00:51 PM MST
//
diff --git a/plugins/org.eclipse.osee.framework.messaging.event.res/src-gen/org/eclipse/osee/framework/messaging/event/res/msgs/RemoteTransactionEvent1.java b/plugins/org.eclipse.osee.framework.messaging.event.res/src-gen/org/eclipse/osee/framework/messaging/event/res/msgs/RemoteTransactionEvent1.java
index b8301a432f..de1fdcc699 100644
--- a/plugins/org.eclipse.osee.framework.messaging.event.res/src-gen/org/eclipse/osee/framework/messaging/event/res/msgs/RemoteTransactionEvent1.java
+++ b/plugins/org.eclipse.osee.framework.messaging.event.res/src-gen/org/eclipse/osee/framework/messaging/event/res/msgs/RemoteTransactionEvent1.java
@@ -2,7 +2,7 @@
// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.3 in JDK 1.6
// 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: 2010.05.12 at 03:22:29 PM MST
+// Generated on: 2010.05.13 at 02:00:51 PM MST
//
@@ -29,12 +29,8 @@ import org.eclipse.osee.framework.messaging.event.res.RemoteEvent;
* &lt;sequence>
* &lt;element name="branchGuid" type="{http://www.w3.org/2001/XMLSchema}string"/>
* &lt;element name="transactionId" type="{http://www.w3.org/2001/XMLSchema}int"/>
- * &lt;element name="modified" type="{}RemoteBasicModifiedGuidArtifact1" maxOccurs="unbounded"/>
- * &lt;element name="added" type="{}RemoteBasicGuidArtifact1" maxOccurs="unbounded"/>
- * &lt;element name="deleted" type="{}RemoteBasicGuidArtifact1" maxOccurs="unbounded"/>
- * &lt;element name="modifiedRel" type="{}RemoteBasicGuidRelation1" maxOccurs="unbounded"/>
- * &lt;element name="addedRel" type="{}RemoteBasicGuidRelation1" maxOccurs="unbounded"/>
- * &lt;element name="deletedRel" type="{}RemoteBasicGuidRelation1" maxOccurs="unbounded"/>
+ * &lt;element name="artifacts" type="{}RemoteBasicGuidArtifact1" maxOccurs="unbounded"/>
+ * &lt;element name="relations" type="{}RemoteBasicGuidRelation1" maxOccurs="unbounded"/>
* &lt;element name="networkSender" type="{}RemoteNetworkSender1"/>
* &lt;/sequence>
* &lt;/restriction>
@@ -48,12 +44,8 @@ import org.eclipse.osee.framework.messaging.event.res.RemoteEvent;
@XmlType(name = "RemoteTransactionEvent1", propOrder = {
"branchGuid",
"transactionId",
- "modified",
- "added",
- "deleted",
- "modifiedRel",
- "addedRel",
- "deletedRel",
+ "artifacts",
+ "relations",
"networkSender"
})
public class RemoteTransactionEvent1
@@ -64,17 +56,9 @@ public class RemoteTransactionEvent1
protected String branchGuid;
protected int transactionId;
@XmlElement(required = true)
- protected List<RemoteBasicModifiedGuidArtifact1> modified;
+ protected List<RemoteBasicGuidArtifact1> artifacts;
@XmlElement(required = true)
- protected List<RemoteBasicGuidArtifact1> added;
- @XmlElement(required = true)
- protected List<RemoteBasicGuidArtifact1> deleted;
- @XmlElement(required = true)
- protected List<RemoteBasicGuidRelation1> modifiedRel;
- @XmlElement(required = true)
- protected List<RemoteBasicGuidRelation1> addedRel;
- @XmlElement(required = true)
- protected List<RemoteBasicGuidRelation1> deletedRel;
+ protected List<RemoteBasicGuidRelation1> relations;
@XmlElement(required = true)
protected RemoteNetworkSender1 networkSender;
@@ -119,47 +103,18 @@ public class RemoteTransactionEvent1
}
/**
- * Gets the value of the modified 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 modified property.
- *
- * <p>
- * For example, to add a new item, do as follows:
- * <pre>
- * getModified().add(newItem);
- * </pre>
- *
- *
- * <p>
- * Objects of the following type(s) are allowed in the list
- * {@link RemoteBasicModifiedGuidArtifact1 }
- *
- *
- */
- public List<RemoteBasicModifiedGuidArtifact1> getModified() {
- if (modified == null) {
- modified = new ArrayList<RemoteBasicModifiedGuidArtifact1>();
- }
- return this.modified;
- }
-
- /**
- * Gets the value of the added property.
+ * Gets the value of the artifacts 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 added property.
+ * This is why there is not a <CODE>set</CODE> method for the artifacts property.
*
* <p>
* For example, to add a new item, do as follows:
* <pre>
- * getAdded().add(newItem);
+ * getArtifacts().add(newItem);
* </pre>
*
*
@@ -169,113 +124,26 @@ public class RemoteTransactionEvent1
*
*
*/
- public List<RemoteBasicGuidArtifact1> getAdded() {
- if (added == null) {
- added = new ArrayList<RemoteBasicGuidArtifact1>();
- }
- return this.added;
- }
-
- /**
- * Gets the value of the deleted 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 deleted property.
- *
- * <p>
- * For example, to add a new item, do as follows:
- * <pre>
- * getDeleted().add(newItem);
- * </pre>
- *
- *
- * <p>
- * Objects of the following type(s) are allowed in the list
- * {@link RemoteBasicGuidArtifact1 }
- *
- *
- */
- public List<RemoteBasicGuidArtifact1> getDeleted() {
- if (deleted == null) {
- deleted = new ArrayList<RemoteBasicGuidArtifact1>();
- }
- return this.deleted;
- }
-
- /**
- * Gets the value of the modifiedRel 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 modifiedRel property.
- *
- * <p>
- * For example, to add a new item, do as follows:
- * <pre>
- * getModifiedRel().add(newItem);
- * </pre>
- *
- *
- * <p>
- * Objects of the following type(s) are allowed in the list
- * {@link RemoteBasicGuidRelation1 }
- *
- *
- */
- public List<RemoteBasicGuidRelation1> getModifiedRel() {
- if (modifiedRel == null) {
- modifiedRel = new ArrayList<RemoteBasicGuidRelation1>();
- }
- return this.modifiedRel;
- }
-
- /**
- * Gets the value of the addedRel 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 addedRel property.
- *
- * <p>
- * For example, to add a new item, do as follows:
- * <pre>
- * getAddedRel().add(newItem);
- * </pre>
- *
- *
- * <p>
- * Objects of the following type(s) are allowed in the list
- * {@link RemoteBasicGuidRelation1 }
- *
- *
- */
- public List<RemoteBasicGuidRelation1> getAddedRel() {
- if (addedRel == null) {
- addedRel = new ArrayList<RemoteBasicGuidRelation1>();
+ public List<RemoteBasicGuidArtifact1> getArtifacts() {
+ if (artifacts == null) {
+ artifacts = new ArrayList<RemoteBasicGuidArtifact1>();
}
- return this.addedRel;
+ return this.artifacts;
}
/**
- * Gets the value of the deletedRel property.
+ * Gets the value of the relations 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 deletedRel property.
+ * This is why there is not a <CODE>set</CODE> method for the relations property.
*
* <p>
* For example, to add a new item, do as follows:
* <pre>
- * getDeletedRel().add(newItem);
+ * getRelations().add(newItem);
* </pre>
*
*
@@ -285,11 +153,11 @@ public class RemoteTransactionEvent1
*
*
*/
- public List<RemoteBasicGuidRelation1> getDeletedRel() {
- if (deletedRel == null) {
- deletedRel = new ArrayList<RemoteBasicGuidRelation1>();
+ public List<RemoteBasicGuidRelation1> getRelations() {
+ if (relations == null) {
+ relations = new ArrayList<RemoteBasicGuidRelation1>();
}
- return this.deletedRel;
+ return this.relations;
}
/**
diff --git a/plugins/org.eclipse.osee.framework.messaging.event.res/src/org/eclipse/osee/framework/messaging/event/res/ResMessages.java b/plugins/org.eclipse.osee.framework.messaging.event.res/src/org/eclipse/osee/framework/messaging/event/res/ResMessages.java
index be3ac4f00d..1b0791f5bd 100644
--- a/plugins/org.eclipse.osee.framework.messaging.event.res/src/org/eclipse/osee/framework/messaging/event/res/ResMessages.java
+++ b/plugins/org.eclipse.osee.framework.messaging.event.res/src/org/eclipse/osee/framework/messaging/event/res/ResMessages.java
@@ -1,30 +1,20 @@
package org.eclipse.osee.framework.messaging.event.res;
import org.eclipse.osee.framework.messaging.MessageID;
-import org.eclipse.osee.framework.messaging.event.res.msgs.RemoteAccessControlArtifactsEvent1;
import org.eclipse.osee.framework.messaging.event.res.msgs.RemoteAttributeChange1;
import org.eclipse.osee.framework.messaging.event.res.msgs.RemoteBasicGuidArtifact1;
-import org.eclipse.osee.framework.messaging.event.res.msgs.RemoteBasicModifiedGuidArtifact1;
import org.eclipse.osee.framework.messaging.event.res.msgs.RemoteBranchEvent1;
-import org.eclipse.osee.framework.messaging.event.res.msgs.RemoteBranchRenameEvent1;
import org.eclipse.osee.framework.messaging.event.res.msgs.RemoteBroadcastEvent1;
-import org.eclipse.osee.framework.messaging.event.res.msgs.RemoteChangeTypeArtifactsEvent1;
import org.eclipse.osee.framework.messaging.event.res.msgs.RemoteNetworkSender1;
-import org.eclipse.osee.framework.messaging.event.res.msgs.RemotePurgedArtifactsEvent1;
import org.eclipse.osee.framework.messaging.event.res.msgs.RemoteTransactionDeletedEvent1;
import org.eclipse.osee.framework.messaging.event.res.msgs.RemoteTransactionEvent1;
public enum ResMessages implements MessageID {
- RemoteAccessControlArtifactsEvent1(true, "Aylfa1sC4iArrIaXxugA", "topic:org.eclipse.osee.coverage.msgs.RemoteAccessControlArtifactsEvent1", RemoteAccessControlArtifactsEvent1.class, false),
RemoteAttributeChange1(true, "Aylfa1tqjhm0dvCeWVQA", "topic:org.eclipse.osee.coverage.msgs.RemoteAttributeChange1", RemoteAttributeChange1.class, false),
RemoteBasicGuidArtifact1(true, "Aylfa1uaknpjHWHAw8QA", "topic:org.eclipse.osee.coverage.msgs.RemoteBasicGuidArtifact1", RemoteBasicGuidArtifact1.class, false),
- RemoteBasicModifiedGuidArtifact1(true, "Aylfa1vJfz6i30DiUMQA", "topic:org.eclipse.osee.coverage.msgs.RemoteBasicModifiedGuidArtifact1", RemoteBasicModifiedGuidArtifact1.class, false),
RemoteBranchEvent1(true, "Aylfa1wlKXIbX2gOrVgA", "topic:org.eclipse.osee.coverage.msgs.RemoteBranchEvent1", RemoteBranchEvent1.class, false),
- RemoteBranchRenameEvent1(true, "Aylfa1yHYFczc6m9GoAA", "topic:org.eclipse.osee.coverage.msgs.RemoteBranchRenameEvent1", RemoteBranchRenameEvent1.class, false),
RemoteBroadcastEvent1(true, "Aylfa1y3ZBSIGbVU3JgA", "topic:org.eclipse.osee.coverage.msgs.RemoteBroadcastEvent1", RemoteBroadcastEvent1.class, false),
- RemoteChangeTypeArtifactsEvent1(true, "Aylfa1znaBzUzmyid9gA", "topic:org.eclipse.osee.coverage.msgs.RemoteChangeTypeArtifactsEvent1", RemoteChangeTypeArtifactsEvent1.class, false),
RemoteNetworkSender1(true, "Aylfa10VPjPhpdOzeLQA", "topic:org.eclipse.osee.coverage.msgs.RemoteNetworkSender1", RemoteNetworkSender1.class, false),
- RemotePurgedArtifactsEvent1(true, "Aylfa11DE1DsqNVGkEgA", "topic:org.eclipse.osee.coverage.msgs.RemotePurgedArtifactsEvent1", RemotePurgedArtifactsEvent1.class, false),
RemoteTransactionDeletedEvent1(true, "AISIbRbFbXOVTBRJsqQA", "topic:org.eclipse.osee.coverage.msgs.RemoteTransactionDeletedEvent1", RemoteTransactionDeletedEvent1.class, false),
RemoteTransactionEvent1(true, "AISIbRj0KGBv62x2pMAA", "topic:org.eclipse.osee.coverage.msgs.RemoteTransactionEvent1", RemoteTransactionEvent1.class, false);
diff --git a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/FrameworkCore_TestDb_Suite.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/FrameworkCore_TestDb_Suite.java
index a02bfe4022..2f0a508005 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/FrameworkCore_TestDb_Suite.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/FrameworkCore_TestDb_Suite.java
@@ -19,8 +19,8 @@ import org.junit.runner.RunWith;
import org.junit.runners.Suite;
@RunWith(Suite.class)
-@Suite.SuiteClasses( {RemoteNetworkSenderTest.class, ArtifactEventManagerTest.class,
- ArtifactEventManagerLoopbackTest.class, ArtifactLoaderTest.class, Artifact_getLastModified.class,})
+@Suite.SuiteClasses( {ArtifactEventManagerLoopbackTest.class, RemoteNetworkSenderTest.class,
+ ArtifactEventManagerTest.class, ArtifactLoaderTest.class, Artifact_getLastModified.class,})
/**
* @author Donald G. Dunne
*/
diff --git a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/event/ArtifactEventManagerTest.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/event/ArtifactEventManagerTest.java
index 06a661728a..95ad23ae92 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/event/ArtifactEventManagerTest.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/event/ArtifactEventManagerTest.java
@@ -19,6 +19,7 @@ import java.util.Set;
import junit.framework.Assert;
import org.eclipse.osee.framework.core.enums.CoreArtifactTypes;
import org.eclipse.osee.framework.core.enums.CoreRelationTypes;
+import org.eclipse.osee.framework.jdk.core.util.OseeProperties;
import org.eclipse.osee.framework.logging.SevereLoggingMonitor;
import org.eclipse.osee.framework.skynet.core.OseeSystemArtifacts;
import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
@@ -58,6 +59,11 @@ public class ArtifactEventManagerTest {
}
}
+ @org.junit.Before
+ public void setUpTest() {
+ OseeProperties.setNewEvents(true);
+ }
+
// artifact listener create for use by all tests to just capture result eventArtifacts for query
private ArtifactEventListener artifactEventListener = new ArtifactEventListener();
@@ -190,7 +196,7 @@ public class ArtifactEventManagerTest {
Assert.assertTrue(resultSender.isLocal());
}
EventBasicGuidRelation guidArt = resultEventRelations.iterator().next();
- Assert.assertEquals(RelationEventType.RationaleMod, guidArt.getModType());
+ Assert.assertEquals(RelationEventType.ModifiedRationale, guidArt.getModType());
Assert.assertEquals(CoreRelationTypes.Default_Hierarchical__Child.getGuid(), guidArt.getRelTypeGuid());
Assert.assertEquals(newArt.getRelations(rootArt).iterator().next().getGammaId(), guidArt.getGammaId());
Assert.assertEquals(rootArt, guidArt.getArtA());
diff --git a/plugins/org.eclipse.osee.framework.skynet.core/jaxb/frameworkMessages.xsd b/plugins/org.eclipse.osee.framework.skynet.core/jaxb/frameworkMessages.xsd
index b7ecfc11b9..2a3e4f424d 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core/jaxb/frameworkMessages.xsd
+++ b/plugins/org.eclipse.osee.framework.skynet.core/jaxb/frameworkMessages.xsd
@@ -13,30 +13,6 @@
</xsd:appinfo>
</xsd:annotation>
-<xsd:complexType name="TransactionEvent">
- <xsd:sequence>
- <xsd:element name="branchGuid" type="xsd:string"/>
- <xsd:element name="transactionId" type="xsd:int"/>
- <xsd:element name="modified" type="BasicModifiedGuidArtifact" maxOccurs="unbounded" minOccurs="1"/>
- <xsd:element name="added" type="DefaultBasicGuidArtifact" maxOccurs="unbounded" minOccurs="1"/>
- <xsd:element name="deleted" type="DefaultBasicGuidArtifact" maxOccurs="unbounded" minOccurs="1"/>
- <xsd:element name="modifiedRel" type="DefaultBasicGuidRelation" maxOccurs="unbounded" minOccurs="1"/>
- <xsd:element name="addedRel" type="DefaultBasicGuidRelation" maxOccurs="unbounded" minOccurs="1"/>
- <xsd:element name="deletedRel" type="DefaultBasicGuidRelation" maxOccurs="unbounded" minOccurs="1"/>
- <xsd:element name="networkSender" type="NetworkSender" maxOccurs="1" minOccurs="1"/>
- </xsd:sequence>
-</xsd:complexType>
-
-<xsd:complexType name="BranchRenameEvent">
- <xsd:sequence>
- <xsd:element name="name" type="xsd:string"/>
- <xsd:element name="shortName" type="xsd:string"/>
- <xsd:element name="modTypeGuid" type="xsd:string"/>
- <xsd:element name="branchGuid" type="xsd:string"/>
- <xsd:element name="networkSender" type="NetworkSender" maxOccurs="1" minOccurs="1"/>
- </xsd:sequence>
-</xsd:complexType>
-
<xsd:complexType name="BranchEvent">
<xsd:sequence>
<xsd:element name="modTypeGuid" type="xsd:string"/>
@@ -61,22 +37,6 @@
</xsd:sequence>
</xsd:complexType>
-<xsd:complexType name="AccessControlArtifactsEvent">
- <xsd:sequence>
- <xsd:element name="modTypeGuid" type="xsd:string"/>
- <xsd:element name="artifacts" type="DefaultBasicGuidArtifact" maxOccurs="unbounded" minOccurs="1"/>
- </xsd:sequence>
-</xsd:complexType>
-
-<xsd:complexType name="BasicModifiedGuidArtifact">
- <xsd:sequence>
- <xsd:element name="branchGuid" type="xsd:string"/>
- <xsd:element name="artTypeGuid" type="xsd:string"/>
- <xsd:element name="artGuid" type="xsd:string"/>
- <xsd:element name="attributes" type="AttributeChange" maxOccurs="unbounded" minOccurs="1"/>
- </xsd:sequence>
-</xsd:complexType>
-
<xsd:complexType name="AttributeChange">
<xsd:sequence>
<xsd:element name="attrTypeGuid" type="xsd:string"/>
diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src-gen/org/eclipse/osee/framework/skynet/core/event/msgs/AccessControlArtifactsEvent.java b/plugins/org.eclipse.osee.framework.skynet.core/src-gen/org/eclipse/osee/framework/skynet/core/event/msgs/AccessControlArtifactsEvent.java
deleted file mode 100644
index e9e45a709f..0000000000
--- a/plugins/org.eclipse.osee.framework.skynet.core/src-gen/org/eclipse/osee/framework/skynet/core/event/msgs/AccessControlArtifactsEvent.java
+++ /dev/null
@@ -1,108 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.3 in JDK 1.6
-// 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: 2010.04.08 at 02:33:19 PM MST
-//
-
-
-package org.eclipse.osee.framework.skynet.core.event.msgs;
-
-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.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-import org.eclipse.osee.framework.core.data.DefaultBasicGuidArtifact;
-import org.eclipse.osee.framework.skynet.core.event2.FrameworkEvent;
-
-
-/**
- * <p>Java class for AccessControlArtifactsEvent complex type.
- *
- * <p>The following schema fragment specifies the expected content contained within this class.
- *
- * <pre>
- * &lt;complexType name="AccessControlArtifactsEvent">
- * &lt;complexContent>
- * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- * &lt;sequence>
- * &lt;element name="modTypeGuid" type="{http://www.w3.org/2001/XMLSchema}string"/>
- * &lt;element name="artifacts" type="{}DefaultBasicGuidArtifact" maxOccurs="unbounded"/>
- * &lt;/sequence>
- * &lt;/restriction>
- * &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- *
- *
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "AccessControlArtifactsEvent", propOrder = {
- "modTypeGuid",
- "artifacts"
-})
-public class AccessControlArtifactsEvent
- extends FrameworkEvent
-{
-
- @XmlElement(required = true)
- protected String modTypeGuid;
- @XmlElement(required = true)
- protected List<DefaultBasicGuidArtifact> artifacts;
-
- /**
- * Gets the value of the modTypeGuid property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getModTypeGuid() {
- return modTypeGuid;
- }
-
- /**
- * Sets the value of the modTypeGuid property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setModTypeGuid(String value) {
- this.modTypeGuid = value;
- }
-
- /**
- * Gets the value of the artifacts 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 artifacts property.
- *
- * <p>
- * For example, to add a new item, do as follows:
- * <pre>
- * getArtifacts().add(newItem);
- * </pre>
- *
- *
- * <p>
- * Objects of the following type(s) are allowed in the list
- * {@link DefaultBasicGuidArtifact }
- *
- *
- */
- public List<DefaultBasicGuidArtifact> getArtifacts() {
- if (artifacts == null) {
- artifacts = new ArrayList<DefaultBasicGuidArtifact>();
- }
- return this.artifacts;
- }
-
-}
diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src-gen/org/eclipse/osee/framework/skynet/core/event/msgs/AttributeChange.java b/plugins/org.eclipse.osee.framework.skynet.core/src-gen/org/eclipse/osee/framework/skynet/core/event/msgs/AttributeChange.java
index 8b220ff9ab..17271fb069 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core/src-gen/org/eclipse/osee/framework/skynet/core/event/msgs/AttributeChange.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core/src-gen/org/eclipse/osee/framework/skynet/core/event/msgs/AttributeChange.java
@@ -2,7 +2,7 @@
// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.3 in JDK 1.6
// 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: 2010.04.26 at 12:10:24 PM MST
+// Generated on: 2010.05.13 at 02:25:18 PM MST
//
diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src-gen/org/eclipse/osee/framework/skynet/core/event/msgs/BasicModifiedGuidArtifact.java b/plugins/org.eclipse.osee.framework.skynet.core/src-gen/org/eclipse/osee/framework/skynet/core/event/msgs/BasicModifiedGuidArtifact.java
deleted file mode 100644
index dbf34533e0..0000000000
--- a/plugins/org.eclipse.osee.framework.skynet.core/src-gen/org/eclipse/osee/framework/skynet/core/event/msgs/BasicModifiedGuidArtifact.java
+++ /dev/null
@@ -1,163 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.3 in JDK 1.6
-// 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: 2010.04.08 at 02:33:19 PM MST
-//
-
-
-package org.eclipse.osee.framework.skynet.core.event.msgs;
-
-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.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-import org.eclipse.osee.framework.skynet.core.event2.FrameworkEvent;
-
-
-/**
- * <p>Java class for BasicModifiedGuidArtifact complex type.
- *
- * <p>The following schema fragment specifies the expected content contained within this class.
- *
- * <pre>
- * &lt;complexType name="BasicModifiedGuidArtifact">
- * &lt;complexContent>
- * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- * &lt;sequence>
- * &lt;element name="branchGuid" type="{http://www.w3.org/2001/XMLSchema}string"/>
- * &lt;element name="artTypeGuid" type="{http://www.w3.org/2001/XMLSchema}string"/>
- * &lt;element name="artGuid" type="{http://www.w3.org/2001/XMLSchema}string"/>
- * &lt;element name="attributes" type="{}AttributeChange" maxOccurs="unbounded"/>
- * &lt;/sequence>
- * &lt;/restriction>
- * &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- *
- *
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "BasicModifiedGuidArtifact", propOrder = {
- "branchGuid",
- "artTypeGuid",
- "artGuid",
- "attributes"
-})
-public class BasicModifiedGuidArtifact
- extends FrameworkEvent
-{
-
- @XmlElement(required = true)
- protected String branchGuid;
- @XmlElement(required = true)
- protected String artTypeGuid;
- @XmlElement(required = true)
- protected String artGuid;
- @XmlElement(required = true)
- protected List<AttributeChange> attributes;
-
- /**
- * Gets the value of the branchGuid property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getBranchGuid() {
- return branchGuid;
- }
-
- /**
- * Sets the value of the branchGuid property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setBranchGuid(String value) {
- this.branchGuid = value;
- }
-
- /**
- * Gets the value of the artTypeGuid property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getArtTypeGuid() {
- return artTypeGuid;
- }
-
- /**
- * Sets the value of the artTypeGuid property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setArtTypeGuid(String value) {
- this.artTypeGuid = value;
- }
-
- /**
- * Gets the value of the artGuid property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getArtGuid() {
- return artGuid;
- }
-
- /**
- * Sets the value of the artGuid property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setArtGuid(String value) {
- this.artGuid = value;
- }
-
- /**
- * Gets the value of the attributes 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 attributes property.
- *
- * <p>
- * For example, to add a new item, do as follows:
- * <pre>
- * getAttributes().add(newItem);
- * </pre>
- *
- *
- * <p>
- * Objects of the following type(s) are allowed in the list
- * {@link AttributeChange }
- *
- *
- */
- public List<AttributeChange> getAttributes() {
- if (attributes == null) {
- attributes = new ArrayList<AttributeChange>();
- }
- return this.attributes;
- }
-
-}
diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src-gen/org/eclipse/osee/framework/skynet/core/event/msgs/BranchEvent.java b/plugins/org.eclipse.osee.framework.skynet.core/src-gen/org/eclipse/osee/framework/skynet/core/event/msgs/BranchEvent.java
index b697e8a41d..65eae0f4c1 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core/src-gen/org/eclipse/osee/framework/skynet/core/event/msgs/BranchEvent.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core/src-gen/org/eclipse/osee/framework/skynet/core/event/msgs/BranchEvent.java
@@ -2,7 +2,7 @@
// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.3 in JDK 1.6
// 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: 2010.04.08 at 02:33:19 PM MST
+// Generated on: 2010.05.13 at 02:25:18 PM MST
//
diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src-gen/org/eclipse/osee/framework/skynet/core/event/msgs/BranchRenameEvent.java b/plugins/org.eclipse.osee.framework.skynet.core/src-gen/org/eclipse/osee/framework/skynet/core/event/msgs/BranchRenameEvent.java
deleted file mode 100644
index 1549089871..0000000000
--- a/plugins/org.eclipse.osee.framework.skynet.core/src-gen/org/eclipse/osee/framework/skynet/core/event/msgs/BranchRenameEvent.java
+++ /dev/null
@@ -1,184 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.3 in JDK 1.6
-// 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: 2010.04.08 at 02:33:19 PM MST
-//
-
-
-package org.eclipse.osee.framework.skynet.core.event.msgs;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-import org.eclipse.osee.framework.skynet.core.event2.FrameworkEvent;
-
-
-/**
- * <p>Java class for BranchRenameEvent complex type.
- *
- * <p>The following schema fragment specifies the expected content contained within this class.
- *
- * <pre>
- * &lt;complexType name="BranchRenameEvent">
- * &lt;complexContent>
- * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- * &lt;sequence>
- * &lt;element name="name" type="{http://www.w3.org/2001/XMLSchema}string"/>
- * &lt;element name="shortName" type="{http://www.w3.org/2001/XMLSchema}string"/>
- * &lt;element name="modTypeGuid" type="{http://www.w3.org/2001/XMLSchema}string"/>
- * &lt;element name="branchGuid" type="{http://www.w3.org/2001/XMLSchema}string"/>
- * &lt;element name="networkSender" type="{}NetworkSender"/>
- * &lt;/sequence>
- * &lt;/restriction>
- * &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- *
- *
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "BranchRenameEvent", propOrder = {
- "name",
- "shortName",
- "modTypeGuid",
- "branchGuid",
- "networkSender"
-})
-public class BranchRenameEvent
- extends FrameworkEvent
-{
-
- @XmlElement(required = true)
- protected String name;
- @XmlElement(required = true)
- protected String shortName;
- @XmlElement(required = true)
- protected String modTypeGuid;
- @XmlElement(required = true)
- protected String branchGuid;
- @XmlElement(required = true)
- protected NetworkSender networkSender;
-
- /**
- * Gets the value of the name property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getName() {
- return name;
- }
-
- /**
- * Sets the value of the name property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setName(String value) {
- this.name = value;
- }
-
- /**
- * Gets the value of the shortName property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getShortName() {
- return shortName;
- }
-
- /**
- * Sets the value of the shortName property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setShortName(String value) {
- this.shortName = value;
- }
-
- /**
- * Gets the value of the modTypeGuid property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getModTypeGuid() {
- return modTypeGuid;
- }
-
- /**
- * Sets the value of the modTypeGuid property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setModTypeGuid(String value) {
- this.modTypeGuid = value;
- }
-
- /**
- * Gets the value of the branchGuid property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getBranchGuid() {
- return branchGuid;
- }
-
- /**
- * Sets the value of the branchGuid property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setBranchGuid(String value) {
- this.branchGuid = value;
- }
-
- /**
- * Gets the value of the networkSender property.
- *
- * @return
- * possible object is
- * {@link NetworkSender }
- *
- */
- public NetworkSender getNetworkSender() {
- return networkSender;
- }
-
- /**
- * Sets the value of the networkSender property.
- *
- * @param value
- * allowed object is
- * {@link NetworkSender }
- *
- */
- public void setNetworkSender(NetworkSender value) {
- this.networkSender = value;
- }
-
-}
diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src-gen/org/eclipse/osee/framework/skynet/core/event/msgs/BroadcastEvent.java b/plugins/org.eclipse.osee.framework.skynet.core/src-gen/org/eclipse/osee/framework/skynet/core/event/msgs/BroadcastEvent.java
index 2937da6323..b96c4992b3 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core/src-gen/org/eclipse/osee/framework/skynet/core/event/msgs/BroadcastEvent.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core/src-gen/org/eclipse/osee/framework/skynet/core/event/msgs/BroadcastEvent.java
@@ -2,7 +2,7 @@
// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.3 in JDK 1.6
// 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: 2010.04.08 at 02:33:19 PM MST
+// Generated on: 2010.05.13 at 02:25:18 PM MST
//
diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src-gen/org/eclipse/osee/framework/skynet/core/event/msgs/NetworkSender.java b/plugins/org.eclipse.osee.framework.skynet.core/src-gen/org/eclipse/osee/framework/skynet/core/event/msgs/NetworkSender.java
index 0df75cfe14..8134c76ced 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core/src-gen/org/eclipse/osee/framework/skynet/core/event/msgs/NetworkSender.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core/src-gen/org/eclipse/osee/framework/skynet/core/event/msgs/NetworkSender.java
@@ -2,7 +2,7 @@
// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.3 in JDK 1.6
// 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: 2010.04.08 at 02:33:19 PM MST
+// Generated on: 2010.05.13 at 02:25:18 PM MST
//
diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src-gen/org/eclipse/osee/framework/skynet/core/event/msgs/ObjectFactory.java b/plugins/org.eclipse.osee.framework.skynet.core/src-gen/org/eclipse/osee/framework/skynet/core/event/msgs/ObjectFactory.java
deleted file mode 100644
index 2b0a9571c8..0000000000
--- a/plugins/org.eclipse.osee.framework.skynet.core/src-gen/org/eclipse/osee/framework/skynet/core/event/msgs/ObjectFactory.java
+++ /dev/null
@@ -1,94 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.3 in JDK 1.6
-// 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: 2010.04.08 at 02:33:19 PM MST
-//
-
-package org.eclipse.osee.framework.skynet.core.event.msgs;
-
-import javax.xml.bind.annotation.XmlRegistry;
-
-/**
- * This object contains factory methods for each Java content interface and Java element interface generated in the
- * org.eclipse.osee.framework.skynet.core.event.msgs 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.
- */
-@XmlRegistry
-public class ObjectFactory {
-
- /**
- * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package:
- * org.eclipse.osee.framework.skynet.core.event.msgs
- */
- public ObjectFactory() {
- }
-
- /**
- * Create an instance of {@link BranchEvent }
- */
- public BranchEvent createBranchEvent() {
- return new BranchEvent();
- }
-
- /**
- * Create an instance of {@link NetworkSender }
- */
- public NetworkSender createNetworkSender() {
- return new NetworkSender();
- }
-
- /**
- * Create an instance of {@link TransactionDeletedEvent }
- */
- public TransactionDeletedEvent createTransactionDeletedEvent() {
- return new TransactionDeletedEvent();
- }
-
- /**
- * Create an instance of {@link TransactionEvent }
- */
- public TransactionEvent createTransactionEvent() {
- return new TransactionEvent();
- }
-
- /**
- * Create an instance of {@link BroadcastEvent }
- */
- public BroadcastEvent createBroadcastEvent() {
- return new BroadcastEvent();
- }
-
- /**
- * Create an instance of {@link BasicModifiedGuidArtifact }
- */
- public BasicModifiedGuidArtifact createBasicModifiedGuidArtifact() {
- return new BasicModifiedGuidArtifact();
- }
-
- /**
- * Create an instance of {@link AttributeChange }
- */
- public AttributeChange createAttributeChange() {
- return new AttributeChange();
- }
-
- /**
- * Create an instance of {@link BranchRenameEvent }
- */
- public BranchRenameEvent createBranchRenameEvent() {
- return new BranchRenameEvent();
- }
-
- /**
- * Create an instance of {@link AccessControlArtifactsEvent }
- */
- public AccessControlArtifactsEvent createAccessControlArtifactsEvent() {
- return new AccessControlArtifactsEvent();
- }
-
-}
diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src-gen/org/eclipse/osee/framework/skynet/core/event/msgs/TransactionDeletedEvent.java b/plugins/org.eclipse.osee.framework.skynet.core/src-gen/org/eclipse/osee/framework/skynet/core/event/msgs/TransactionDeletedEvent.java
index 4823d46fcc..c08001f267 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core/src-gen/org/eclipse/osee/framework/skynet/core/event/msgs/TransactionDeletedEvent.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core/src-gen/org/eclipse/osee/framework/skynet/core/event/msgs/TransactionDeletedEvent.java
@@ -2,7 +2,7 @@
// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.3 in JDK 1.6
// 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: 2010.04.08 at 02:33:19 PM MST
+// Generated on: 2010.05.13 at 02:25:18 PM MST
//
diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src-gen/org/eclipse/osee/framework/skynet/core/event/msgs/TransactionEvent.java b/plugins/org.eclipse.osee.framework.skynet.core/src-gen/org/eclipse/osee/framework/skynet/core/event/msgs/TransactionEvent.java
deleted file mode 100644
index 6f276a3cc1..0000000000
--- a/plugins/org.eclipse.osee.framework.skynet.core/src-gen/org/eclipse/osee/framework/skynet/core/event/msgs/TransactionEvent.java
+++ /dev/null
@@ -1,251 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.3 in JDK 1.6
-// 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: 2010.04.27 at 09:51:07 PM MST
-//
-
-package org.eclipse.osee.framework.skynet.core.event.msgs;
-
-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.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-import org.eclipse.osee.framework.core.data.DefaultBasicGuidArtifact;
-import org.eclipse.osee.framework.core.data.DefaultBasicGuidRelation;
-import org.eclipse.osee.framework.skynet.core.event2.FrameworkEvent;
-
-/**
- * <p>
- * Java class for TransactionEvent complex type.
- * <p>
- * The following schema fragment specifies the expected content contained within this class.
- *
- * <pre>
- * &lt;complexType name="TransactionEvent">
- * &lt;complexContent>
- * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- * &lt;sequence>
- * &lt;element name="branchGuid" type="{http://www.w3.org/2001/XMLSchema}string"/>
- * &lt;element name="transactionId" type="{http://www.w3.org/2001/XMLSchema}int"/>
- * &lt;element name="modified" type="{}BasicModifiedGuidArtifact" maxOccurs="unbounded"/>
- * &lt;element name="added" type="{}DefaultBasicGuidArtifact" maxOccurs="unbounded"/>
- * &lt;element name="deleted" type="{}DefaultBasicGuidArtifact" maxOccurs="unbounded"/>
- * &lt;element name="modifiedRel" type="{}DefaultBasicGuidRelation" maxOccurs="unbounded"/>
- * &lt;element name="addedRel" type="{}DefaultBasicGuidRelation" maxOccurs="unbounded"/>
- * &lt;element name="deletedRel" type="{}DefaultBasicGuidRelation" maxOccurs="unbounded"/>
- * &lt;element name="networkSender" type="{}NetworkSender"/>
- * &lt;/sequence>
- * &lt;/restriction>
- * &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "TransactionEvent", propOrder = {"branchGuid", "transactionId", "modified", "added", "deleted",
- "modifiedRel", "addedRel", "deletedRel", "networkSender"})
-public class TransactionEvent extends FrameworkEvent {
-
- @XmlElement(required = true)
- protected String branchGuid;
- protected int transactionId;
- @XmlElement(required = true)
- protected List<BasicModifiedGuidArtifact> modified;
- @XmlElement(required = true)
- protected List<DefaultBasicGuidArtifact> added;
- @XmlElement(required = true)
- protected List<DefaultBasicGuidArtifact> deleted;
- @XmlElement(required = true)
- protected List<DefaultBasicGuidRelation> modifiedRel;
- @XmlElement(required = true)
- protected List<DefaultBasicGuidRelation> addedRel;
- @XmlElement(required = true)
- protected List<DefaultBasicGuidRelation> deletedRel;
- @XmlElement(required = true)
- protected NetworkSender networkSender;
-
- /**
- * Gets the value of the branchGuid property.
- *
- * @return possible object is {@link String }
- */
- public String getBranchGuid() {
- return branchGuid;
- }
-
- /**
- * Sets the value of the branchGuid property.
- *
- * @param value allowed object is {@link String }
- */
- public void setBranchGuid(String value) {
- this.branchGuid = value;
- }
-
- /**
- * Gets the value of the transactionId property.
- */
- public int getTransactionId() {
- return transactionId;
- }
-
- /**
- * Sets the value of the transactionId property.
- */
- public void setTransactionId(int value) {
- this.transactionId = value;
- }
-
- /**
- * Gets the value of the modified 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 modified property.
- * <p>
- * For example, to add a new item, do as follows:
- *
- * <pre>
- * getModified().add(newItem);
- * </pre>
- * <p>
- * Objects of the following type(s) are allowed in the list {@link BasicModifiedGuidArtifact }
- */
- public List<BasicModifiedGuidArtifact> getModified() {
- if (modified == null) {
- modified = new ArrayList<BasicModifiedGuidArtifact>();
- }
- return this.modified;
- }
-
- /**
- * Gets the value of the added 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 added property.
- * <p>
- * For example, to add a new item, do as follows:
- *
- * <pre>
- * getAdded().add(newItem);
- * </pre>
- * <p>
- * Objects of the following type(s) are allowed in the list {@link DefaultBasicGuidArtifact }
- */
- public List<DefaultBasicGuidArtifact> getAdded() {
- if (added == null) {
- added = new ArrayList<DefaultBasicGuidArtifact>();
- }
- return this.added;
- }
-
- /**
- * Gets the value of the deleted 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 deleted property.
- * <p>
- * For example, to add a new item, do as follows:
- *
- * <pre>
- * getDeleted().add(newItem);
- * </pre>
- * <p>
- * Objects of the following type(s) are allowed in the list {@link DefaultBasicGuidArtifact }
- */
- public List<DefaultBasicGuidArtifact> getDeleted() {
- if (deleted == null) {
- deleted = new ArrayList<DefaultBasicGuidArtifact>();
- }
- return this.deleted;
- }
-
- /**
- * Gets the value of the modifiedRel 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 modifiedRel property.
- * <p>
- * For example, to add a new item, do as follows:
- *
- * <pre>
- * getModifiedRel().add(newItem);
- * </pre>
- * <p>
- * Objects of the following type(s) are allowed in the list {@link DefaultBasicGuidRelation }
- */
- public List<DefaultBasicGuidRelation> getModifiedRel() {
- if (modifiedRel == null) {
- modifiedRel = new ArrayList<DefaultBasicGuidRelation>();
- }
- return this.modifiedRel;
- }
-
- /**
- * Gets the value of the addedRel 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 addedRel property.
- * <p>
- * For example, to add a new item, do as follows:
- *
- * <pre>
- * getAddedRel().add(newItem);
- * </pre>
- * <p>
- * Objects of the following type(s) are allowed in the list {@link DefaultBasicGuidRelation }
- */
- public List<DefaultBasicGuidRelation> getAddedRel() {
- if (addedRel == null) {
- addedRel = new ArrayList<DefaultBasicGuidRelation>();
- }
- return this.addedRel;
- }
-
- /**
- * Gets the value of the deletedRel 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 deletedRel property.
- * <p>
- * For example, to add a new item, do as follows:
- *
- * <pre>
- * getDeletedRel().add(newItem);
- * </pre>
- * <p>
- * Objects of the following type(s) are allowed in the list {@link DefaultBasicGuidRelation }
- */
- public List<DefaultBasicGuidRelation> getDeletedRel() {
- if (deletedRel == null) {
- deletedRel = new ArrayList<DefaultBasicGuidRelation>();
- }
- return this.deletedRel;
- }
-
- /**
- * Gets the value of the networkSender property.
- *
- * @return possible object is {@link NetworkSender }
- */
- public NetworkSender getNetworkSender() {
- return networkSender;
- }
-
- /**
- * Sets the value of the networkSender property.
- *
- * @param value allowed object is {@link NetworkSender }
- */
- public void setNetworkSender(NetworkSender value) {
- this.networkSender = value;
- }
-
-}
diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/ArtifactTransactionData.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/ArtifactTransactionData.java
index 6298f5c677..eb63991774 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/ArtifactTransactionData.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/ArtifactTransactionData.java
@@ -18,7 +18,9 @@ import org.eclipse.osee.framework.database.core.OseeSql;
import org.eclipse.osee.framework.skynet.core.event.ArtifactModifiedEvent;
import org.eclipse.osee.framework.skynet.core.event.ArtifactTransactionModifiedEvent;
import org.eclipse.osee.framework.skynet.core.event.Sender;
-import org.eclipse.osee.framework.skynet.core.event.msgs.TransactionEvent;
+import org.eclipse.osee.framework.skynet.core.event2.TransactionEvent;
+import org.eclipse.osee.framework.skynet.core.event2.artifact.EventBasicGuidArtifact;
+import org.eclipse.osee.framework.skynet.core.event2.artifact.EventModType;
import org.eclipse.osee.framework.skynet.core.transaction.BaseTransactionData;
import org.eclipse.osee.framework.skynet.core.transaction.SkynetTransaction;
@@ -81,11 +83,13 @@ public class ArtifactTransactionData extends BaseTransactionData {
break;
case DELETED:
artifactModType = ArtifactModType.Deleted;
- transactionEvent.getDeleted().add(artifact.getBasicGuidArtifact());
+ transactionEvent.getArtifacts().add(
+ new EventBasicGuidArtifact(EventModType.Deleted, artifact.getBasicGuidArtifact()));
break;
default:
artifactModType = ArtifactModType.Added;
- transactionEvent.getAdded().add(artifact.getBasicGuidArtifact());
+ transactionEvent.getArtifacts().add(
+ new EventBasicGuidArtifact(EventModType.Added, artifact.getBasicGuidArtifact()));
break;
}
events.add(new ArtifactModifiedEvent(new Sender(this.getClass().getName()), artifactModType, artifact,
diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/attribute/AttributeTransactionData.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/attribute/AttributeTransactionData.java
index e646b71f31..afd51d8e12 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/attribute/AttributeTransactionData.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/attribute/AttributeTransactionData.java
@@ -24,7 +24,7 @@ import org.eclipse.osee.framework.skynet.core.artifact.Attribute;
import org.eclipse.osee.framework.skynet.core.artifact.StaticIdManager;
import org.eclipse.osee.framework.skynet.core.attribute.utils.AttributeURL;
import org.eclipse.osee.framework.skynet.core.event.ArtifactTransactionModifiedEvent;
-import org.eclipse.osee.framework.skynet.core.event.msgs.TransactionEvent;
+import org.eclipse.osee.framework.skynet.core.event2.TransactionEvent;
import org.eclipse.osee.framework.skynet.core.transaction.BaseTransactionData;
import org.eclipse.osee.framework.skynet.core.transaction.SkynetTransaction;
diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event/FrameworkTransactionData.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event/FrameworkTransactionData.java
index 26e7799c91..554eb2a5e4 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event/FrameworkTransactionData.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event/FrameworkTransactionData.java
@@ -377,7 +377,7 @@ public class FrameworkTransactionData {
}
}
}
- if (xRelationModifiedEvent.relationEventType == RelationEventType.RationaleMod) {
+ if (xRelationModifiedEvent.relationEventType == RelationEventType.ModifiedRationale) {
if (loadedRelation != null) {
cacheChangedRelations.add(loadedRelation);
if (loadedRelation.getArtifactA() != null) {
diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event/InternalEventManager.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event/InternalEventManager.java
index be70bcd55c..19d0a81d13 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event/InternalEventManager.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event/InternalEventManager.java
@@ -593,7 +593,7 @@ public class InternalEventManager {
String rationale = link.getRationale();
String descriptorName = link.getRelationType().getName();
- if (relEvent.relationEventType == RelationEventType.RationaleMod) {
+ if (relEvent.relationEventType == RelationEventType.ModifiedRationale) {
networkEvent = new NetworkRelationLinkRationalModifiedEvent(eventBase, rationale);
} else if (relEvent.relationEventType == RelationEventType.Deleted) {
networkEvent = new NetworkRelationLinkDeletedEvent(eventBase);
@@ -742,7 +742,7 @@ public class InternalEventManager {
}
}
}
- if (xRelationModifiedEvent.relationEventType == RelationEventType.RationaleMod) {
+ if (xRelationModifiedEvent.relationEventType == RelationEventType.ModifiedRationale) {
if (loadedRelation != null) {
transData.cacheChangedRelations.add(loadedRelation);
if (loadedRelation.getArtifactA() != null) {
diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event/InternalEventManager2.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event/InternalEventManager2.java
index cc943724c9..1e1fe4a719 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event/InternalEventManager2.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event/InternalEventManager2.java
@@ -19,9 +19,9 @@ import java.util.logging.Level;
import org.eclipse.core.runtime.Platform;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
import org.eclipse.osee.framework.logging.OseeLog;
-import org.eclipse.osee.framework.skynet.core.event.msgs.TransactionEvent;
import org.eclipse.osee.framework.skynet.core.event2.FrameworkEventManager;
import org.eclipse.osee.framework.skynet.core.event2.FrameworkEventUtil;
+import org.eclipse.osee.framework.skynet.core.event2.TransactionEvent;
import org.eclipse.osee.framework.skynet.core.event2.artifact.EventBasicGuidArtifact;
import org.eclipse.osee.framework.skynet.core.internal.Activator;
import org.eclipse.osee.framework.ui.plugin.event.UnloadedArtifact;
@@ -97,8 +97,13 @@ public class InternalEventManager2 {
// Kick REMOTE (If source was Local and this was not a default branch changed event
try {
if (sender.isLocal()) {
- RemoteEventManager2.getInstance().kick(
- FrameworkEventUtil.getRemotePurgedArtifactsEvent(sender.getNetworkSender2(), artifactChanges));
+ TransactionEvent transactionEvent = new TransactionEvent();
+ transactionEvent.setBranchGuid(artifactChanges.iterator().next().getBranchGuid());
+ transactionEvent.setNetworkSender(sender.getNetworkSender2());
+ for (EventBasicGuidArtifact guidArt : artifactChanges) {
+ transactionEvent.getArtifacts().add(guidArt);
+ }
+ RemoteEventManager2.getInstance().kick(FrameworkEventUtil.getRemoteTransactionEvent(transactionEvent));
}
} catch (OseeCoreException ex) {
OseeLog.log(Activator.class, Level.SEVERE, ex);
@@ -122,9 +127,13 @@ public class InternalEventManager2 {
// Kick REMOTE (If source was Local and this was not a default branch changed event
try {
if (sender.isLocal()) {
- RemoteEventManager2.getInstance().kick(
- FrameworkEventUtil.getRemoteChangeTypeArtifactsEvent(sender.getNetworkSender2(),
- toArtifactTypeGuid, artifactChanges));
+ TransactionEvent transactionEvent = new TransactionEvent();
+ transactionEvent.setBranchGuid(artifactChanges.iterator().next().getBranchGuid());
+ transactionEvent.setNetworkSender(sender.getNetworkSender2());
+ for (EventBasicGuidArtifact guidArt : artifactChanges) {
+ transactionEvent.getArtifacts().add(guidArt);
+ }
+ RemoteEventManager2.getInstance().kick(FrameworkEventUtil.getRemoteTransactionEvent(transactionEvent));
}
} catch (OseeCoreException ex) {
OseeLog.log(Activator.class, Level.SEVERE, ex);
diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event/OseeEventManager.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event/OseeEventManager.java
index d031a94fa4..3335ec307e 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event/OseeEventManager.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event/OseeEventManager.java
@@ -19,7 +19,7 @@ import org.eclipse.osee.framework.core.model.Branch;
import org.eclipse.osee.framework.jdk.core.util.OseeProperties;
import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
import org.eclipse.osee.framework.skynet.core.artifact.ArtifactModType;
-import org.eclipse.osee.framework.skynet.core.event.msgs.TransactionEvent;
+import org.eclipse.osee.framework.skynet.core.event2.TransactionEvent;
import org.eclipse.osee.framework.skynet.core.event2.artifact.EventBasicGuidArtifact;
import org.eclipse.osee.framework.skynet.core.event2.artifact.EventModType;
import org.eclipse.osee.framework.skynet.core.relation.RelationEventType;
diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event/RemoteEventManager.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event/RemoteEventManager.java
index 0e5840fcf1..dc52a28ac0 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event/RemoteEventManager.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event/RemoteEventManager.java
@@ -633,7 +633,7 @@ public class RemoteEventManager {
UnloadedRelation unloadedRelation =
new UnloadedRelation(branch.getId(), event.getArtAId(), event.getArtATypeId(),
event.getArtBId(), event.getArtBTypeId(), event.getRelTypeId());
- xModifiedEvents.add(new RelationModifiedEvent(sender, RelationEventType.RationaleMod,
+ xModifiedEvents.add(new RelationModifiedEvent(sender, RelationEventType.ModifiedRationale,
unloadedRelation));
} else if (event instanceof NetworkRelationLinkCreatedEvent) {
UnloadedRelation unloadedRelation =
diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event/RemoteEventManager2.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event/RemoteEventManager2.java
index 9d54478528..33b6f20c10 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event/RemoteEventManager2.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event/RemoteEventManager2.java
@@ -11,8 +11,6 @@
package org.eclipse.osee.framework.skynet.core.event;
import java.rmi.RemoteException;
-import java.util.HashSet;
-import java.util.Set;
import java.util.logging.Level;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus;
@@ -31,9 +29,6 @@ import org.eclipse.osee.framework.messaging.event.res.AttributeEventModification
import org.eclipse.osee.framework.messaging.event.res.IFrameworkEventListener;
import org.eclipse.osee.framework.messaging.event.res.RemoteEvent;
import org.eclipse.osee.framework.messaging.event.res.ResEventManager;
-import org.eclipse.osee.framework.messaging.event.res.msgs.RemoteBasicGuidArtifact1;
-import org.eclipse.osee.framework.messaging.event.res.msgs.RemoteChangeTypeArtifactsEvent1;
-import org.eclipse.osee.framework.messaging.event.res.msgs.RemotePurgedArtifactsEvent1;
import org.eclipse.osee.framework.messaging.event.res.msgs.RemoteTransactionEvent1;
import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
import org.eclipse.osee.framework.skynet.core.artifact.ArtifactCache;
@@ -41,11 +36,11 @@ import org.eclipse.osee.framework.skynet.core.artifact.Attribute;
import org.eclipse.osee.framework.skynet.core.artifact.BranchManager;
import org.eclipse.osee.framework.skynet.core.attribute.AttributeTypeManager;
import org.eclipse.osee.framework.skynet.core.event.msgs.AttributeChange;
-import org.eclipse.osee.framework.skynet.core.event.msgs.BasicModifiedGuidArtifact;
-import org.eclipse.osee.framework.skynet.core.event.msgs.TransactionEvent;
import org.eclipse.osee.framework.skynet.core.event2.FrameworkEventUtil;
+import org.eclipse.osee.framework.skynet.core.event2.TransactionEvent;
import org.eclipse.osee.framework.skynet.core.event2.artifact.EventBasicGuidArtifact;
import org.eclipse.osee.framework.skynet.core.event2.artifact.EventModType;
+import org.eclipse.osee.framework.skynet.core.event2.artifact.EventModifiedBasicGuidArtifact;
import org.eclipse.osee.framework.skynet.core.internal.Activator;
/**
@@ -85,7 +80,7 @@ public class RemoteEventManager2 implements IFrameworkEventListener {
OseeLog.log(Activator.class, Level.SEVERE, ex1);
new Status(Status.ERROR, Activator.PLUGIN_ID, -1, ex1.getLocalizedMessage(), ex1);
}
-
+ // Handles TransactionEvents, ArtifactChangeTypeEvents, ArtifactPurgeEvents
if (remoteEvent instanceof RemoteTransactionEvent1) {
try {
RemoteTransactionEvent1 event1 = (RemoteTransactionEvent1) remoteEvent;
@@ -96,33 +91,6 @@ public class RemoteEventManager2 implements IFrameworkEventListener {
} catch (Exception ex) {
OseeLog.log(Activator.class, Level.SEVERE, ex);
}
- } else if (remoteEvent instanceof RemotePurgedArtifactsEvent1) {
- try {
- RemotePurgedArtifactsEvent1 event1 = (RemotePurgedArtifactsEvent1) remoteEvent;
- Set<EventBasicGuidArtifact> artifactChanges = new HashSet<EventBasicGuidArtifact>();
- for (RemoteBasicGuidArtifact1 guidArt : event1.getArtifacts()) {
- artifactChanges.add(new EventBasicGuidArtifact(EventModType.Purged,
- FrameworkEventUtil.getBasicGuidArtifact(guidArt)));
- }
- // TODO process purge event by updating artifact/relation caches
- InternalEventManager2.kickArtifactsPurgedEvent(sender, artifactChanges);
- } catch (Exception ex) {
- OseeLog.log(Activator.class, Level.SEVERE, ex);
- }
- } else if (remoteEvent instanceof RemoteChangeTypeArtifactsEvent1) {
- try {
- RemoteChangeTypeArtifactsEvent1 event1 = (RemoteChangeTypeArtifactsEvent1) remoteEvent;
- Set<EventBasicGuidArtifact> artifactChanges = new HashSet<EventBasicGuidArtifact>();
- for (RemoteBasicGuidArtifact1 guidArt : event1.getArtifacts()) {
- artifactChanges.add(new EventBasicGuidArtifact(EventModType.Purged,
- FrameworkEventUtil.getBasicGuidArtifact(guidArt)));
- }
- // TODO process change type event by updating artifact/relation caches
- InternalEventManager2.kickArtifactsChangeTypeEvent(sender, artifactChanges,
- event1.getToArtTypeGuid());
- } catch (Exception ex) {
- OseeLog.log(Activator.class, Level.SEVERE, ex);
- }
}
monitor.done();
return Status.OK_STATUS;
@@ -139,16 +107,20 @@ public class RemoteEventManager2 implements IFrameworkEventListener {
private static void updateArtifacts(Sender sender, TransactionEvent transEvent) {
// Handle Added Artifacts
// Nothing to do for added cause they're not in cache yet. Apps will load if they need them.
- for (DefaultBasicGuidArtifact guidArt : transEvent.getAdded()) {
- System.out.println("UpdateArtifacts -> added " + guidArt);
- }
- // Handle Deleted Artifacts
- for (DefaultBasicGuidArtifact guidArt : transEvent.getDeleted()) {
- updateDeletedArtifact(guidArt);
- }
- // Handle Modified Artifacts
- for (BasicModifiedGuidArtifact guidArt : transEvent.getModified()) {
- updateModifiedArtifact(guidArt);
+ for (EventBasicGuidArtifact guidArt : transEvent.getArtifacts()) {
+ if (guidArt.getModType() == EventModType.Added) {
+ System.out.println("UpdateArtifacts -> added " + guidArt);
+ }
+ // Handle Deleted Artifacts
+ else if (guidArt.getModType() == EventModType.Deleted || guidArt.getModType() == EventModType.Purged) {
+ updateDeletedArtifact(guidArt);
+ }
+ // Handle Modified Artifacts
+ else if (guidArt.getModType() == EventModType.Modified) {
+ updateModifiedArtifact((EventModifiedBasicGuidArtifact) guidArt);
+ } else {
+ OseeLog.log(Activator.class, Level.SEVERE, String.format("Unhandled mod type [%s]", guidArt.getModType()));
+ }
}
}
@@ -168,16 +140,16 @@ public class RemoteEventManager2 implements IFrameworkEventListener {
}
}
- private static void updateModifiedArtifact(BasicModifiedGuidArtifact guidArt) {
+ private static void updateModifiedArtifact(EventModifiedBasicGuidArtifact guidArt) {
try {
System.out.println("UpdateArtifacts -> modified " + guidArt);
String branchGuid = guidArt.getBranchGuid();
Branch branch = BranchManager.getBranchByGuid(branchGuid);
- Artifact artifact = ArtifactCache.getActive(guidArt.getArtGuid(), branch);
+ Artifact artifact = ArtifactCache.getActive(guidArt.getGuid(), branch);
if (artifact == null) {
// do nothing, artifact not in cache, so don't need to update
} else if (!artifact.isHistorical()) {
- for (AttributeChange attrChange : guidArt.getAttributes()) {
+ for (AttributeChange attrChange : guidArt.getAttributeChanges()) {
if (!InternalEventManager.isEnableRemoteEventLoopback()) {
ModificationType modificationType =
AttributeEventModificationType.getType(attrChange.getModTypeGuid()).getModificationType();
diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event2/FrameworkEventManager.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event2/FrameworkEventManager.java
index 3e6de747b0..79c1e111ca 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event2/FrameworkEventManager.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event2/FrameworkEventManager.java
@@ -10,20 +10,13 @@ import java.util.Collection;
import java.util.Collections;
import java.util.List;
import java.util.concurrent.CopyOnWriteArrayList;
-import org.eclipse.osee.framework.core.data.DefaultBasicGuidArtifact;
-import org.eclipse.osee.framework.core.data.DefaultBasicGuidRelation;
import org.eclipse.osee.framework.skynet.core.event.IEventListener;
import org.eclipse.osee.framework.skynet.core.event.Sender;
-import org.eclipse.osee.framework.skynet.core.event.msgs.BasicModifiedGuidArtifact;
-import org.eclipse.osee.framework.skynet.core.event.msgs.TransactionEvent;
import org.eclipse.osee.framework.skynet.core.event2.artifact.EventBasicGuidArtifact;
import org.eclipse.osee.framework.skynet.core.event2.artifact.EventBasicGuidRelation;
-import org.eclipse.osee.framework.skynet.core.event2.artifact.EventModType;
-import org.eclipse.osee.framework.skynet.core.event2.artifact.EventModifiedBasicGuidArtifact;
import org.eclipse.osee.framework.skynet.core.event2.artifact.IArtifactListener;
import org.eclipse.osee.framework.skynet.core.event2.filter.FilteredEventListener;
import org.eclipse.osee.framework.skynet.core.event2.filter.IEventFilter;
-import org.eclipse.osee.framework.skynet.core.relation.RelationEventType;
/**
* @author Donald G. Dunne
@@ -58,28 +51,7 @@ public class FrameworkEventManager {
}
public static void processEventArtifactsAndRelations(Sender sender, TransactionEvent transEvent) {
- List<EventBasicGuidArtifact> eventArtifacts = new ArrayList<EventBasicGuidArtifact>();
- List<EventBasicGuidRelation> eventRelations = new ArrayList<EventBasicGuidRelation>();
- for (DefaultBasicGuidArtifact guidArt : transEvent.getAdded()) {
- eventArtifacts.add(new EventBasicGuidArtifact(EventModType.Added, guidArt));
- }
- for (DefaultBasicGuidArtifact guidArt : transEvent.getDeleted()) {
- eventArtifacts.add(new EventBasicGuidArtifact(EventModType.Deleted, guidArt));
- }
- for (BasicModifiedGuidArtifact guidArt : transEvent.getModified()) {
- eventArtifacts.add(new EventModifiedBasicGuidArtifact(guidArt.getBranchGuid(), guidArt.getArtTypeGuid(),
- guidArt.getArtGuid(), guidArt.getAttributes()));
- }
- for (DefaultBasicGuidRelation guidArt : transEvent.getAddedRel()) {
- eventRelations.add(new EventBasicGuidRelation(RelationEventType.Added, guidArt));
- }
- for (DefaultBasicGuidRelation guidArt : transEvent.getDeletedRel()) {
- eventRelations.add(new EventBasicGuidRelation(RelationEventType.Deleted, guidArt));
- }
- for (DefaultBasicGuidRelation guidArt : transEvent.getModifiedRel()) {
- eventRelations.add(new EventBasicGuidRelation(RelationEventType.RationaleMod, guidArt));
- }
- processEventArtifactsAndRelations(sender, eventArtifacts, eventRelations);
+ processEventArtifactsAndRelations(sender, transEvent.getArtifacts(), transEvent.getRelations());
}
public static void processEventArtifactsAndRelations(Sender sender, Collection<EventBasicGuidArtifact> eventArtifacts) {
diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event2/FrameworkEventUtil.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event2/FrameworkEventUtil.java
index d98c1eefde..a5ce8ee33d 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event2/FrameworkEventUtil.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event2/FrameworkEventUtil.java
@@ -5,24 +5,27 @@
*/
package org.eclipse.osee.framework.skynet.core.event2;
+import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
-import java.util.Set;
+import java.util.List;
+import java.util.logging.Level;
import org.eclipse.osee.framework.core.data.DefaultBasicGuidArtifact;
+import org.eclipse.osee.framework.logging.OseeLog;
import org.eclipse.osee.framework.messaging.event.res.msgs.RemoteAttributeChange1;
import org.eclipse.osee.framework.messaging.event.res.msgs.RemoteBasicGuidArtifact1;
-import org.eclipse.osee.framework.messaging.event.res.msgs.RemoteBasicModifiedGuidArtifact1;
-import org.eclipse.osee.framework.messaging.event.res.msgs.RemoteChangeTypeArtifactsEvent1;
+import org.eclipse.osee.framework.messaging.event.res.msgs.RemoteBasicGuidRelation1;
import org.eclipse.osee.framework.messaging.event.res.msgs.RemoteNetworkSender1;
-import org.eclipse.osee.framework.messaging.event.res.msgs.RemotePurgedArtifactsEvent1;
import org.eclipse.osee.framework.messaging.event.res.msgs.RemoteTransactionEvent1;
import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
import org.eclipse.osee.framework.skynet.core.event.msgs.AttributeChange;
-import org.eclipse.osee.framework.skynet.core.event.msgs.BasicModifiedGuidArtifact;
import org.eclipse.osee.framework.skynet.core.event.msgs.NetworkSender;
-import org.eclipse.osee.framework.skynet.core.event.msgs.TransactionEvent;
import org.eclipse.osee.framework.skynet.core.event2.artifact.EventBasicGuidArtifact;
+import org.eclipse.osee.framework.skynet.core.event2.artifact.EventBasicGuidRelation;
import org.eclipse.osee.framework.skynet.core.event2.artifact.EventModType;
+import org.eclipse.osee.framework.skynet.core.event2.artifact.EventModifiedBasicGuidArtifact;
+import org.eclipse.osee.framework.skynet.core.internal.Activator;
+import org.eclipse.osee.framework.skynet.core.relation.RelationEventType;
/**
* @author Donald G. Dunne
@@ -54,14 +57,18 @@ public class FrameworkEventUtil {
event.setNetworkSender(getRemoteNetworkSender(transEvent.getNetworkSender()));
event.setBranchGuid(transEvent.getBranchGuid());
event.setTransactionId(transEvent.getTransactionId());
- for (DefaultBasicGuidArtifact guidArt : transEvent.getAdded()) {
- event.getAdded().add(getRemoteBasicGuidArtifact(guidArt));
- }
- for (DefaultBasicGuidArtifact guidArt : transEvent.getDeleted()) {
- event.getDeleted().add(getRemoteBasicGuidArtifact(guidArt));
+ for (EventBasicGuidArtifact guidArt : transEvent.getArtifacts()) {
+ if (guidArt.getModType() == EventModType.Modified) {
+ event.getArtifacts().add(
+ getRemoteBasicGuidArtifact(guidArt.getModType().getGuid(), guidArt.getBasicGuidArtifact(),
+ ((EventModifiedBasicGuidArtifact) guidArt).getAttributeChanges()));
+ } else {
+ event.getArtifacts().add(
+ getRemoteBasicGuidArtifact(guidArt.getModType().getGuid(), guidArt.getBasicGuidArtifact(), null));
+ }
}
- for (BasicModifiedGuidArtifact guidArt : transEvent.getModified()) {
- event.getModified().add(getBasicModifiedGuidArtifact(guidArt));
+ for (EventBasicGuidRelation guidRel : transEvent.getRelations()) {
+ event.getRelations().add(getRemoteBasicGuidRelation1(guidRel));
}
return event;
}
@@ -71,64 +78,93 @@ public class FrameworkEventUtil {
event.setNetworkSender(getNetworkSender(remEvent.getNetworkSender()));
event.setBranchGuid(remEvent.getBranchGuid());
event.setTransactionId(remEvent.getTransactionId());
- for (RemoteBasicGuidArtifact1 guidArt : remEvent.getAdded()) {
- event.getAdded().add(getBasicGuidArtifact(guidArt));
- }
- for (RemoteBasicGuidArtifact1 guidArt : remEvent.getDeleted()) {
- event.getDeleted().add(getBasicGuidArtifact(guidArt));
+ for (RemoteBasicGuidArtifact1 remGuidArt : remEvent.getArtifacts()) {
+ EventModType modType = EventModType.getType(remGuidArt.getModTypeGuid());
+ // This can happen if new events are added that old releases don't handle
+ if (modType == null) {
+ OseeLog.log(Activator.class, Level.WARNING, String.format("Unhandled remote artifact [%s]", remGuidArt));
+ } else {
+ if (modType == EventModType.Modified) {
+ event.getArtifacts().add(getEventModifiedBasicGuidArtifact(modType, remGuidArt));
+ } else {
+ event.getArtifacts().add(getEventBasicGuidArtifact(modType, remGuidArt));
+ }
+ }
}
- for (RemoteBasicModifiedGuidArtifact1 guidArt : remEvent.getModified()) {
- event.getModified().add(getBasicModifiedGuidArtifact(guidArt));
+ for (RemoteBasicGuidRelation1 guidRel : remEvent.getRelations()) {
+ EventBasicGuidRelation relEvent = getEventBasicGuidRelation(guidRel);
+ // This can happen if new events are added that old releases don't handle
+ if (relEvent == null) {
+ OseeLog.log(Activator.class, Level.WARNING, String.format("Unhandled remote relation [%s]", guidRel));
+ } else {
+ event.getRelations().add(relEvent);
+ }
}
return event;
}
- public static DefaultBasicGuidArtifact getBasicGuidArtifact(RemoteBasicGuidArtifact1 remGuidArt) {
- DefaultBasicGuidArtifact guidArt = new DefaultBasicGuidArtifact();
- guidArt.setGuid(remGuidArt.getArtGuid());
- guidArt.setBranchGuid(remGuidArt.getBranchGuid());
- guidArt.setArtTypeGuid(remGuidArt.getArtTypeGuid());
- return guidArt;
+ public static RemoteBasicGuidRelation1 getRemoteBasicGuidRelation1(EventBasicGuidRelation guidRel) {
+ RemoteBasicGuidRelation1 remEvent = new RemoteBasicGuidRelation1();
+ remEvent.setGammaId(guidRel.getGammaId());
+ remEvent.setBranchGuid(guidRel.getBranchGuid());
+ remEvent.setRelTypeGuid(guidRel.getRelTypeGuid());
+ remEvent.setModTypeGuid(guidRel.getModType().getGuid());
+ remEvent.setArtA(getRemoteBasicGuidArtifact(guidRel.getArtA()));
+ remEvent.setArtB(getRemoteBasicGuidArtifact(guidRel.getArtB()));
+ return remEvent;
}
public static RemoteBasicGuidArtifact1 getRemoteBasicGuidArtifact(DefaultBasicGuidArtifact guidArt) {
- RemoteBasicGuidArtifact1 remoteGuidArt = new RemoteBasicGuidArtifact1();
- remoteGuidArt.setArtGuid(guidArt.getGuid());
- remoteGuidArt.setBranchGuid(guidArt.getBranchGuid());
- remoteGuidArt.setArtTypeGuid(guidArt.getArtTypeGuid());
- return remoteGuidArt;
+ RemoteBasicGuidArtifact1 event = new RemoteBasicGuidArtifact1();
+ event.setBranchGuid(guidArt.getBranchGuid());
+ event.setArtTypeGuid(guidArt.getArtTypeGuid());
+ event.setArtGuid(guidArt.getGuid());
+ return event;
}
- public static RemotePurgedArtifactsEvent1 getRemotePurgedArtifactsEvent(NetworkSender networkSender, Set<EventBasicGuidArtifact> artifactChanges) {
- RemotePurgedArtifactsEvent1 event = new RemotePurgedArtifactsEvent1();
- event.setNetworkSender(getRemoteNetworkSender(networkSender));
- for (EventBasicGuidArtifact guidArt : artifactChanges) {
- event.getArtifacts().add(getRemoteBasicGuidArtifact(guidArt.getBasicGuidArtifact()));
- }
- return event;
+ public static EventBasicGuidRelation getEventBasicGuidRelation(RemoteBasicGuidRelation1 guidRel) {
+ RelationEventType eventType = RelationEventType.getType(guidRel.getModTypeGuid());
+ if (eventType == null) return null;
+ return new EventBasicGuidRelation(eventType, guidRel.getBranchGuid(), guidRel.getRelTypeGuid(),
+ guidRel.getGammaId(), getBasicGuidArtifact(guidRel.getArtA()), getBasicGuidArtifact(guidRel.getArtB()));
+ }
+
+ public static EventBasicGuidArtifact getEventBasicGuidArtifact(EventModType modType, RemoteBasicGuidArtifact1 remGuidArt) {
+ return new EventBasicGuidArtifact(modType, remGuidArt.getBranchGuid(), remGuidArt.getArtTypeGuid(),
+ remGuidArt.getArtGuid());
}
- public static RemoteChangeTypeArtifactsEvent1 getRemoteChangeTypeArtifactsEvent(NetworkSender networkSender, String toArtifactTypeGuid, Set<EventBasicGuidArtifact> artifactChanges) {
- RemoteChangeTypeArtifactsEvent1 event = new RemoteChangeTypeArtifactsEvent1();
- event.setNetworkSender(getRemoteNetworkSender(networkSender));
- for (EventBasicGuidArtifact guidArt : artifactChanges) {
- event.getArtifacts().add(getRemoteBasicGuidArtifact(guidArt.getBasicGuidArtifact()));
+ public static EventModifiedBasicGuidArtifact getEventModifiedBasicGuidArtifact(EventModType modType, RemoteBasicGuidArtifact1 remGuidArt) {
+ List<AttributeChange> attributeChanges = new ArrayList<AttributeChange>();
+ for (RemoteAttributeChange1 remAttrChg : remGuidArt.getAttributes()) {
+ attributeChanges.add(getAttributeChange(remAttrChg));
}
- event.setToArtTypeGuid(toArtifactTypeGuid);
- return event;
+ return new EventModifiedBasicGuidArtifact(remGuidArt.getBranchGuid(), remGuidArt.getArtTypeGuid(),
+ remGuidArt.getArtGuid(), attributeChanges);
}
- public static BasicModifiedGuidArtifact getBasicModifiedGuidArtifact(RemoteBasicModifiedGuidArtifact1 remGuidArt) {
- BasicModifiedGuidArtifact guidArt = new BasicModifiedGuidArtifact();
- guidArt.setArtGuid(remGuidArt.getArtGuid());
+ public static DefaultBasicGuidArtifact getBasicGuidArtifact(RemoteBasicGuidArtifact1 remGuidArt) {
+ DefaultBasicGuidArtifact guidArt = new DefaultBasicGuidArtifact();
+ guidArt.setGuid(remGuidArt.getArtGuid());
guidArt.setBranchGuid(remGuidArt.getBranchGuid());
guidArt.setArtTypeGuid(remGuidArt.getArtTypeGuid());
- for (RemoteAttributeChange1 remAttrChg : remGuidArt.getAttributes()) {
- guidArt.getAttributes().add(getAttributeChange(remAttrChg));
- }
return guidArt;
}
+ public static RemoteBasicGuidArtifact1 getRemoteBasicGuidArtifact(String modTypeGuid, DefaultBasicGuidArtifact guidArt, Collection<AttributeChange> attributeChanges) {
+ RemoteBasicGuidArtifact1 remoteGuidArt = new RemoteBasicGuidArtifact1();
+ remoteGuidArt.setArtGuid(guidArt.getGuid());
+ remoteGuidArt.setBranchGuid(guidArt.getBranchGuid());
+ remoteGuidArt.setArtTypeGuid(guidArt.getArtTypeGuid());
+ remoteGuidArt.setModTypeGuid(modTypeGuid);
+ if (attributeChanges != null) {
+ for (AttributeChange attrChg : attributeChanges) {
+ remoteGuidArt.getAttributes().add(getRemoteAttributeChange(attrChg));
+ }
+ }
+ return remoteGuidArt;
+ }
+
public static AttributeChange getAttributeChange(RemoteAttributeChange1 remAttrChg) {
AttributeChange attrChg = new AttributeChange();
attrChg.setAttributeId(remAttrChg.getAttributeId());
@@ -141,17 +177,6 @@ public class FrameworkEventUtil {
return attrChg;
}
- public static RemoteBasicModifiedGuidArtifact1 getBasicModifiedGuidArtifact(BasicModifiedGuidArtifact guidArt) {
- RemoteBasicModifiedGuidArtifact1 remoteGuidArt = new RemoteBasicModifiedGuidArtifact1();
- remoteGuidArt.setArtGuid(guidArt.getArtGuid());
- remoteGuidArt.setBranchGuid(guidArt.getBranchGuid());
- remoteGuidArt.setArtTypeGuid(guidArt.getArtTypeGuid());
- for (AttributeChange attrChg : guidArt.getAttributes()) {
- remoteGuidArt.getAttributes().add(getRemoteAttributeChange(attrChg));
- }
- return remoteGuidArt;
- }
-
public static RemoteAttributeChange1 getRemoteAttributeChange(AttributeChange attrChg) {
RemoteAttributeChange1 remAttrChg = new RemoteAttributeChange1();
remAttrChg.setAttributeId(attrChg.getAttributeId());
diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event2/TransactionEvent.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event2/TransactionEvent.java
new file mode 100644
index 0000000000..e4ec7a593d
--- /dev/null
+++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event2/TransactionEvent.java
@@ -0,0 +1,112 @@
+package org.eclipse.osee.framework.skynet.core.event2;
+
+import java.util.ArrayList;
+import java.util.List;
+import org.eclipse.osee.framework.core.data.DefaultBasicGuidArtifact;
+import org.eclipse.osee.framework.skynet.core.event.msgs.NetworkSender;
+import org.eclipse.osee.framework.skynet.core.event2.artifact.EventBasicGuidArtifact;
+import org.eclipse.osee.framework.skynet.core.event2.artifact.EventBasicGuidRelation;
+
+public class TransactionEvent extends FrameworkEvent {
+
+ private String branchGuid;
+ private int transactionId;
+ private List<EventBasicGuidArtifact> artifacts;
+ private List<EventBasicGuidRelation> relations;
+ private NetworkSender networkSender;
+
+ /**
+ * Gets the value of the branchGuid property.
+ *
+ * @return possible object is {@link String }
+ */
+ public String getBranchGuid() {
+ return branchGuid;
+ }
+
+ /**
+ * Sets the value of the branchGuid property.
+ *
+ * @param value allowed object is {@link String }
+ */
+ public void setBranchGuid(String value) {
+ this.branchGuid = value;
+ }
+
+ /**
+ * Gets the value of the transactionId property.
+ */
+ public int getTransactionId() {
+ return transactionId;
+ }
+
+ /**
+ * Sets the value of the transactionId property.
+ */
+ public void setTransactionId(int value) {
+ this.transactionId = value;
+ }
+
+ /**
+ * Gets the value of the artifacts 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 artifacts property.
+ * <p>
+ * For example, to add a new item, do as follows:
+ *
+ * <pre>
+ * getArtifacts().add(newItem);
+ * </pre>
+ * <p>
+ * Objects of the following type(s) are allowed in the list {@link DefaultBasicGuidArtifact }
+ */
+ public List<EventBasicGuidArtifact> getArtifacts() {
+ if (artifacts == null) {
+ artifacts = new ArrayList<EventBasicGuidArtifact>();
+ }
+ return this.artifacts;
+ }
+
+ /**
+ * Gets the value of the relations 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 relations property.
+ * <p>
+ * For example, to add a new item, do as follows:
+ *
+ * <pre>
+ * getRelations().add(newItem);
+ * </pre>
+ * <p>
+ * Objects of the following type(s) are allowed in the list {@link EventBasicGuidRelation }
+ */
+ public List<EventBasicGuidRelation> getRelations() {
+ if (relations == null) {
+ relations = new ArrayList<EventBasicGuidRelation>();
+ }
+ return this.relations;
+ }
+
+ /**
+ * Gets the value of the networkSender property.
+ *
+ * @return possible object is {@link NetworkSender }
+ */
+ public NetworkSender getNetworkSender() {
+ return networkSender;
+ }
+
+ /**
+ * Sets the value of the networkSender property.
+ *
+ * @param value allowed object is {@link NetworkSender }
+ */
+ public void setNetworkSender(NetworkSender value) {
+ this.networkSender = value;
+ }
+
+}
diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event2/artifact/EventBasicGuidRelation.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event2/artifact/EventBasicGuidRelation.java
index 7a60e23e23..16e91cbe81 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event2/artifact/EventBasicGuidRelation.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event2/artifact/EventBasicGuidRelation.java
@@ -22,8 +22,8 @@ public class EventBasicGuidRelation extends DefaultBasicGuidRelation {
this.relationEventType = relationEventType;
}
- public EventBasicGuidRelation(RelationEventType relationEventType, String branchGuid, String artTypeGuid, int gammaId, DefaultBasicGuidArtifact artA, DefaultBasicGuidArtifact artB) {
- super(branchGuid, artTypeGuid, gammaId, artA, artB);
+ public EventBasicGuidRelation(RelationEventType relationEventType, String branchGuid, String relTypeGuid, int gammaId, DefaultBasicGuidArtifact artA, DefaultBasicGuidArtifact artB) {
+ super(branchGuid, relTypeGuid, gammaId, artA, artB);
this.relationEventType = relationEventType;
}
diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event2/artifact/EventModType.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event2/artifact/EventModType.java
index 98240ee257..84b86648e4 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event2/artifact/EventModType.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event2/artifact/EventModType.java
@@ -1,6 +1,31 @@
package org.eclipse.osee.framework.skynet.core.event2.artifact;
+
public enum EventModType {
- Modified, Deleted, Purged, Reloaded, Added, ChangeType
+ Modified("AISIbRtFzxuuH0pissgA"),
+ Deleted("AISIbRvYChyA1qUTqXAA"),
+ Purged("AISIbRxrXDC4PjDm6JwA"),
+ Reloaded("AISIbSCAzETv5pfJhNAA"),
+ Added("AISIbSEWTQUeu120fkwA"),
+ ChangeType("AISIbSGpn08WdLdsA6AA");
+
+ private final String guid;
+
+ private EventModType(String guid) {
+ this.guid = guid;
+ }
+
+ public String getGuid() {
+ return guid;
+ }
+
+ public static EventModType getType(String guid) {
+ for (EventModType type : values()) {
+ if (type.guid.equals(guid)) {
+ return type;
+ }
+ }
+ return null;
+ }
};
diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/relation/RelationEventType.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/relation/RelationEventType.java
index c3e3ff1dda..d6ddcb4006 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/relation/RelationEventType.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/relation/RelationEventType.java
@@ -17,7 +17,7 @@ public enum RelationEventType {
Deleted("AISIbR2MjAo7JhvDvkgA"),
Added("AISIbR69A2yjMFpbsSgA"),
- RationaleMod("AISIbR9Tm0dwqN1KdoAA"),
+ ModifiedRationale("AISIbR9Tm0dwqN1KdoAA"),
ReOrdered("AISIbRohWReUi5aitFgA"),
Undeleted("AISIbRqzlF3s4TeMvzgA");
diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/relation/RelationLink.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/relation/RelationLink.java
index 7873b991d6..d707e6e970 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/relation/RelationLink.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/relation/RelationLink.java
@@ -69,7 +69,7 @@ public class RelationLink {
/**
* Return existing RelationLink or create new one. This needs to be synchronized so two threads don't create the same
* link object twice.
- *
+ *
* @param relationId 0 or relationId if already created
*/
public static synchronized RelationLink getOrCreate(int aArtifactId, int bArtifactId, Branch aBranch, Branch bBranch, RelationType relationType, int relationId, int gammaId, String rationale, ModificationType modificationType) {
@@ -105,10 +105,10 @@ public class RelationLink {
}
if (bArtifactId == artifact.getArtId()) {
return RelationSide.SIDE_B;
- }
- throw new IllegalArgumentException("The artifact " + artifact + " is on neither side of " + this);
- }
-
+ }
+ throw new IllegalArgumentException("The artifact " + artifact + " is on neither side of " + this);
+ }
+
public RelationSide getOppositeSide(Artifact artifact) {
return getSide(artifact).oppositeSide();
}
@@ -233,7 +233,7 @@ public class RelationLink {
if (notify) {
try {
- OseeEventManager.kickRelationModifiedEvent(RelationManager.class, RelationEventType.RationaleMod, this,
+ OseeEventManager.kickRelationModifiedEvent(RelationManager.class, RelationEventType.ModifiedRationale, this,
getABranch(), relationType.getName());
} catch (Exception ex) {
OseeLog.log(Activator.class, Level.SEVERE, ex);
diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/relation/RelationTransactionData.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/relation/RelationTransactionData.java
index 2a8ddc36c0..ac3c4e32be 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/relation/RelationTransactionData.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/relation/RelationTransactionData.java
@@ -23,7 +23,8 @@ import org.eclipse.osee.framework.logging.OseeLog;
import org.eclipse.osee.framework.skynet.core.event.ArtifactTransactionModifiedEvent;
import org.eclipse.osee.framework.skynet.core.event.RelationModifiedEvent;
import org.eclipse.osee.framework.skynet.core.event.Sender;
-import org.eclipse.osee.framework.skynet.core.event.msgs.TransactionEvent;
+import org.eclipse.osee.framework.skynet.core.event2.TransactionEvent;
+import org.eclipse.osee.framework.skynet.core.event2.artifact.EventBasicGuidRelation;
import org.eclipse.osee.framework.skynet.core.internal.Activator;
import org.eclipse.osee.framework.skynet.core.transaction.BaseTransactionData;
import org.eclipse.osee.framework.skynet.core.transaction.SkynetTransaction;
@@ -94,11 +95,14 @@ public class RelationTransactionData extends BaseTransactionData {
relation.getGammaId(), relation.getArtifactA().getBasicGuidArtifact(),
relation.getArtifactB().getBasicGuidArtifact());
if (getModificationType() == ModificationType.ARTIFACT_DELETED || getModificationType() == ModificationType.DELETED) {
- transactionEvent.getDeletedRel().add(defaultBasicGuidRelation);
+ transactionEvent.getRelations().add(
+ new EventBasicGuidRelation(RelationEventType.Deleted, defaultBasicGuidRelation));
} else if (getModificationType() == ModificationType.MODIFIED) {
- transactionEvent.getModifiedRel().add(defaultBasicGuidRelation);
+ transactionEvent.getRelations().add(
+ new EventBasicGuidRelation(RelationEventType.ModifiedRationale, defaultBasicGuidRelation));
} else if (getModificationType() == ModificationType.INTRODUCED || getModificationType() == ModificationType.NEW || getModificationType() == ModificationType.UNDELETED) {
- transactionEvent.getAddedRel().add(defaultBasicGuidRelation);
+ transactionEvent.getRelations().add(
+ new EventBasicGuidRelation(RelationEventType.Added, defaultBasicGuidRelation));
} else {
OseeLog.log(Activator.class, Level.SEVERE, "Unhandled relation modified type " + relationEventType);
}
diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/transaction/BaseTransactionData.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/transaction/BaseTransactionData.java
index d8d17fe533..ba77a5bf6f 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/transaction/BaseTransactionData.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/transaction/BaseTransactionData.java
@@ -17,7 +17,7 @@ import org.eclipse.osee.framework.core.exception.OseeCoreException;
import org.eclipse.osee.framework.core.model.TransactionRecord;
import org.eclipse.osee.framework.database.core.OseeSql;
import org.eclipse.osee.framework.skynet.core.event.ArtifactTransactionModifiedEvent;
-import org.eclipse.osee.framework.skynet.core.event.msgs.TransactionEvent;
+import org.eclipse.osee.framework.skynet.core.event2.TransactionEvent;
/**
* @author Jeff C. Phillips
diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/transaction/SkynetTransaction.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/transaction/SkynetTransaction.java
index af76a2d209..4c8699e20d 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/transaction/SkynetTransaction.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/transaction/SkynetTransaction.java
@@ -49,9 +49,8 @@ import org.eclipse.osee.framework.skynet.core.event.ArtifactModifiedEvent;
import org.eclipse.osee.framework.skynet.core.event.ArtifactTransactionModifiedEvent;
import org.eclipse.osee.framework.skynet.core.event.OseeEventManager;
import org.eclipse.osee.framework.skynet.core.event.Sender;
-import org.eclipse.osee.framework.skynet.core.event.msgs.AttributeChange;
-import org.eclipse.osee.framework.skynet.core.event.msgs.BasicModifiedGuidArtifact;
-import org.eclipse.osee.framework.skynet.core.event.msgs.TransactionEvent;
+import org.eclipse.osee.framework.skynet.core.event2.TransactionEvent;
+import org.eclipse.osee.framework.skynet.core.event2.artifact.EventModifiedBasicGuidArtifact;
import org.eclipse.osee.framework.skynet.core.internal.Activator;
import org.eclipse.osee.framework.skynet.core.relation.RelationLink;
import org.eclipse.osee.framework.skynet.core.relation.RelationTransactionData;
@@ -404,14 +403,11 @@ public class SkynetTransaction extends DbTransaction {
xModifiedEvents.add(new ArtifactModifiedEvent(new Sender(this.getClass().getName()),
ArtifactModType.Changed, artifact, artifact.getTransactionNumber(),
artifact.getDirtySkynetAttributeChanges()));
- BasicModifiedGuidArtifact basicModifiedGuidArtifact = new BasicModifiedGuidArtifact();
- basicModifiedGuidArtifact.setBranchGuid(artifact.getBranch().getGuid());
- basicModifiedGuidArtifact.setArtTypeGuid(artifact.getArtifactType().getGuid());
- basicModifiedGuidArtifact.setArtGuid(artifact.getGuid());
- for (AttributeChange attributeChange : artifact.getDirtyFrameworkAttributeChanges()) {
- basicModifiedGuidArtifact.getAttributes().add(attributeChange);
- }
- transactionEvent.getModified().add(basicModifiedGuidArtifact);
+ EventModifiedBasicGuidArtifact guidArt =
+ new EventModifiedBasicGuidArtifact(artifact.getBranch().getGuid(),
+ artifact.getArtifactType().getGuid(), artifact.getGuid(),
+ artifact.getDirtyFrameworkAttributeChanges());
+ transactionEvent.getArtifacts().add(guidArt);
}
}
// Clear all dirty flags

Back to the top