Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorddunne2010-04-13 16:04:55 -0400
committerddunne2010-04-13 16:04:55 -0400
commit9f930ee32a9291178971bdd6a90bb83fcd101018 (patch)
tree91138d81ea067259ca78409cebf003c91ef40f54
parent5540bb983666cdb148334ff68fc3fa21b0f55e24 (diff)
downloadorg.eclipse.osee-9f930ee32a9291178971bdd6a90bb83fcd101018.tar.gz
org.eclipse.osee-9f930ee32a9291178971bdd6a90bb83fcd101018.tar.xz
org.eclipse.osee-9f930ee32a9291178971bdd6a90bb83fcd101018.zip
events
-rw-r--r--plugins/org.eclipse.osee.framework.messaging.event.res/jaxb/README.txt2
-rw-r--r--plugins/org.eclipse.osee.framework.messaging.event.res/jaxb/resMessages.xsd1
-rw-r--r--plugins/org.eclipse.osee.framework.messaging.event.res/src-gen/org/eclipse/osee/framework/messaging/event/res/msgs/ObjectFactory.java2
-rw-r--r--plugins/org.eclipse.osee.framework.messaging.event.res/src-gen/org/eclipse/osee/framework/messaging/event/res/msgs/RemoteAccessControlArtifactsEvent1.java2
-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.java2
-rw-r--r--plugins/org.eclipse.osee.framework.messaging.event.res/src-gen/org/eclipse/osee/framework/messaging/event/res/msgs/RemoteBasicModifiedGuidArtifact1.java2
-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.java2
-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.java2
-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.java32
-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.java2
-rw-r--r--plugins/org.eclipse.osee.framework.messaging.event.res/src/org/eclipse/osee/framework/messaging/event/res/RemoteEventUtil.java6
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/event/ArtifactEventManagerLoopbackTest.java2
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/event/ArtifactEventManagerTest.java21
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core/jaxb/frameworkMessages.xsd6
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core/src-gen/org/eclipse/osee/framework/skynet/core/event/msgs/ObjectFactory.java7
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core/src-gen/org/eclipse/osee/framework/skynet/core/event/msgs/PurgedArtifactsEvent.java80
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/Artifact.java13
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/ArtifactTransactionData.java13
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/attribute/AttributeTransactionData.java5
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event/InternalEventManager2.java (renamed from plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event2/InternalEventManager2.java)118
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event/OseeEventManager.java15
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event/RemoteEventManager2.java (renamed from plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event2/RemoteEventManager2.java)46
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event/Sender.java13
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event2/FrameworkEventUtil.java12
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event2/artifact/EventBasicGuidArtifact.java4
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/relation/RelationTransactionData.java5
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/transaction/BaseTransactionData.java7
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/transaction/SkynetTransaction.java21
-rw-r--r--plugins/org.eclipse.osee.support.test/src/org/eclipse/osee/support/test/MasterTestSuite_TestDbTests.java5
34 files changed, 227 insertions, 231 deletions
diff --git a/plugins/org.eclipse.osee.framework.messaging.event.res/jaxb/README.txt b/plugins/org.eclipse.osee.framework.messaging.event.res/jaxb/README.txt
index 19b2db2a2b..6984717177 100644
--- a/plugins/org.eclipse.osee.framework.messaging.event.res/jaxb/README.txt
+++ b/plugins/org.eclipse.osee.framework.messaging.event.res/jaxb/README.txt
@@ -1 +1 @@
-xjc resMessages.xsd -extension -d ../src-gen -p org.eclipse.osee.framework.skynet.core.event.msgs \ No newline at end of file
+xjc resMessages.xsd -extension -d ../src-gen -p org.eclipse.osee.framework.messaging.event.res.msgs \ No newline at end of file
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 08c47d0112..0245ef200d 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
@@ -68,6 +68,7 @@
<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>
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 444826752f..335c443f2f 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.07 at 08:56:57 PM MST
+// Generated on: 2010.04.13 at 12:05:13 PM MST
//
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
index ab8607b8ce..aedb7897c7 100644
--- 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
@@ -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.07 at 08:56:57 PM MST
+// Generated on: 2010.04.13 at 12:05:13 PM MST
//
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 4141e956c5..f44c9d5de6 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.07 at 08:56:57 PM MST
+// Generated on: 2010.04.13 at 12:05:13 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 0e080a8e18..5a4cfa025d 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,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.07 at 08:56:57 PM MST
+// Generated on: 2010.04.13 at 12:05:13 PM MST
//
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
index 1846f03acc..fa2aad2325 100644
--- 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
@@ -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.07 at 08:56:57 PM MST
+// Generated on: 2010.04.13 at 12:05:13 PM MST
//
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 49e2d8e8c7..ca4fda7574 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.07 at 08:56:57 PM MST
+// Generated on: 2010.04.13 at 12:05:13 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
index 5ceec11267..7b2016fa7a 100644
--- 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
@@ -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.07 at 08:56:57 PM MST
+// Generated on: 2010.04.13 at 12:05:13 PM MST
//
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 1bba097518..182484d4b5 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.07 at 08:56:57 PM MST
+// Generated on: 2010.04.13 at 12:05:13 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
index 904ab5720e..12517955e3 100644
--- 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
@@ -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.07 at 08:56:57 PM MST
+// Generated on: 2010.04.13 at 12:05:13 PM MST
//
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 6e6841bfb5..ea572453c1 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.07 at 08:56:57 PM MST
+// Generated on: 2010.04.13 at 12:05:13 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
index 922ec7ea1e..b1c591b7e2 100644
--- 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
@@ -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.07 at 08:56:57 PM MST
+// Generated on: 2010.04.13 at 12:05:13 PM MST
//
@@ -28,6 +28,7 @@ import org.eclipse.osee.framework.messaging.event.res.RemoteEvent;
* &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>
@@ -38,7 +39,8 @@ import org.eclipse.osee.framework.messaging.event.res.RemoteEvent;
*/
@XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "RemotePurgedArtifactsEvent1", propOrder = {
- "artifacts"
+ "artifacts",
+ "networkSender"
})
public class RemotePurgedArtifactsEvent1
extends RemoteEvent
@@ -46,6 +48,8 @@ public class RemotePurgedArtifactsEvent1
@XmlElement(required = true)
protected List<RemoteBasicGuidArtifact1> artifacts;
+ @XmlElement(required = true)
+ protected RemoteNetworkSender1 networkSender;
/**
* Gets the value of the artifacts property.
@@ -76,4 +80,28 @@ public class RemotePurgedArtifactsEvent1
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 c749048b10..5a082652c5 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.07 at 08:56:57 PM MST
+// Generated on: 2010.04.13 at 12:05:13 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 39400d5d63..ecef0e243e 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.04.07 at 08:56:57 PM MST
+// Generated on: 2010.04.13 at 12:05:13 PM MST
//
diff --git a/plugins/org.eclipse.osee.framework.messaging.event.res/src/org/eclipse/osee/framework/messaging/event/res/RemoteEventUtil.java b/plugins/org.eclipse.osee.framework.messaging.event.res/src/org/eclipse/osee/framework/messaging/event/res/RemoteEventUtil.java
index 3b17e836b2..f75eab2238 100644
--- a/plugins/org.eclipse.osee.framework.messaging.event.res/src/org/eclipse/osee/framework/messaging/event/res/RemoteEventUtil.java
+++ b/plugins/org.eclipse.osee.framework.messaging.event.res/src/org/eclipse/osee/framework/messaging/event/res/RemoteEventUtil.java
@@ -12,10 +12,10 @@ import org.eclipse.osee.framework.messaging.event.res.msgs.RemoteNetworkSender1;
*/
public class RemoteEventUtil {
- public static RemoteNetworkSender1 getNetworkSender(Object sourceObject, String sessionId, String machineName, String userId, String machineIp, int port, String clientVersion) {
+ public static RemoteNetworkSender1 getNetworkSender(String sourceObject, String sessionId, String machineName, String userId, String machineIp, int port, String clientVersion) {
RemoteNetworkSender1 networkSender = new RemoteNetworkSender1();
- networkSender.setSourceObject(String.valueOf(sourceObject));
- networkSender.setSourceObject(sessionId);
+ networkSender.setSourceObject(sourceObject);
+ networkSender.setSessionId(sessionId);
networkSender.setMachineName(machineName);
networkSender.setUserId(userId);
networkSender.setMachineIp(machineIp);
diff --git a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/event/ArtifactEventManagerLoopbackTest.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/event/ArtifactEventManagerLoopbackTest.java
index 33eeb2453f..e953fa6502 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/event/ArtifactEventManagerLoopbackTest.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/event/ArtifactEventManagerLoopbackTest.java
@@ -5,7 +5,7 @@
*/
package org.eclipse.osee.framework.skynet.core.test.event;
-import org.eclipse.osee.framework.skynet.core.event2.InternalEventManager2;
+import org.eclipse.osee.framework.skynet.core.event.InternalEventManager2;
import org.junit.AfterClass;
import org.junit.BeforeClass;
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 c3f88db20f..9cc404c664 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
@@ -86,6 +86,11 @@ public class ArtifactEventManagerTest {
Thread.sleep(3000);
Assert.assertEquals(2, resultEventArtifacts.size());
+ if (isRemoteTest()) {
+ Assert.assertTrue(resultSender.isRemote());
+ } else {
+ Assert.assertTrue(resultSender.isLocal());
+ }
boolean addedFound = false, modifiedFound = false;
for (EventBasicGuidArtifact guidArt : resultEventArtifacts) {
if (guidArt.getModType() == EventModType.Added) addedFound = true;
@@ -105,6 +110,11 @@ public class ArtifactEventManagerTest {
Thread.sleep(3000);
Assert.assertEquals(1, resultEventArtifacts.size());
+ if (isRemoteTest()) {
+ Assert.assertTrue(resultSender.isRemote());
+ } else {
+ Assert.assertTrue(resultSender.isLocal());
+ }
EventBasicGuidArtifact guidArt = resultEventArtifacts.iterator().next();
Assert.assertEquals(EventModType.Modified, guidArt.getModType());
Assert.assertEquals(newArt.getGuid(), guidArt.getGuid());
@@ -121,6 +131,11 @@ public class ArtifactEventManagerTest {
boolean deletedFound = false;
modifiedFound = false;
for (EventBasicGuidArtifact guidArt1 : resultEventArtifacts) {
+ if (isRemoteTest()) {
+ Assert.assertTrue(resultSender.isRemote());
+ } else {
+ Assert.assertTrue(resultSender.isLocal());
+ }
if (guidArt1.getModType() == EventModType.Deleted) deletedFound = true;
if (guidArt1.getModType() == EventModType.Modified) modifiedFound = true;
Assert.assertEquals(newArt.getGuid(), guidArt1.getGuid());
@@ -158,6 +173,11 @@ public class ArtifactEventManagerTest {
Assert.assertEquals(1, resultEventArtifacts.size());
EventBasicGuidArtifact guidArt = resultEventArtifacts.iterator().next();
Assert.assertEquals(EventModType.Purged, guidArt.getModType());
+ if (isRemoteTest()) {
+ Assert.assertTrue(resultSender.isRemote());
+ } else {
+ Assert.assertTrue(resultSender.isLocal());
+ }
Assert.assertEquals(newArt.getGuid(), guidArt.getGuid());
Assert.assertEquals(newArt.getArtifactType().getGuid(), guidArt.getArtTypeGuid());
Assert.assertEquals(newArt.getBranch().getGuid(), guidArt.getBranchGuid());
@@ -199,6 +219,7 @@ public class ArtifactEventManagerTest {
Assert.assertEquals(1, resultEventArtifacts.size());
EventBasicGuidArtifact guidArt = resultEventArtifacts.iterator().next();
Assert.assertEquals(EventModType.Reloaded, guidArt.getModType());
+ Assert.assertTrue(resultSender.isLocal());
Assert.assertEquals(newArt.getGuid(), guidArt.getGuid());
Assert.assertEquals(newArt.getArtifactType().getGuid(), guidArt.getArtTypeGuid());
Assert.assertEquals(newArt.getBranch().getGuid(), guidArt.getBranchGuid());
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 d225745bab..f8ec75c456 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core/jaxb/frameworkMessages.xsd
+++ b/plugins/org.eclipse.osee.framework.skynet.core/jaxb/frameworkMessages.xsd
@@ -65,12 +65,6 @@
</xsd:sequence>
</xsd:complexType>
-<xsd:complexType name="PurgedArtifactsEvent">
- <xsd:sequence>
- <xsd:element name="artifacts" type="DefaultBasicGuidArtifact" maxOccurs="unbounded" minOccurs="1"/>
- </xsd:sequence>
-</xsd:complexType>
-
<xsd:complexType name="AccessControlArtifactsEvent">
<xsd:sequence>
<xsd:element name="modTypeGuid" type="xsd:string"/>
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
index b8a2c96981..29db5ea8be 100644
--- 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
@@ -64,13 +64,6 @@ public class ObjectFactory {
}
/**
- * Create an instance of {@link PurgedArtifactsEvent }
- */
- public PurgedArtifactsEvent createPurgedArtifactsEvent() {
- return new PurgedArtifactsEvent();
- }
-
- /**
* Create an instance of {@link BroadcastEvent }
*/
public BroadcastEvent createBroadcastEvent() {
diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src-gen/org/eclipse/osee/framework/skynet/core/event/msgs/PurgedArtifactsEvent.java b/plugins/org.eclipse.osee.framework.skynet.core/src-gen/org/eclipse/osee/framework/skynet/core/event/msgs/PurgedArtifactsEvent.java
deleted file mode 100644
index a4ea982305..0000000000
--- a/plugins/org.eclipse.osee.framework.skynet.core/src-gen/org/eclipse/osee/framework/skynet/core/event/msgs/PurgedArtifactsEvent.java
+++ /dev/null
@@ -1,80 +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 PurgedArtifactsEvent complex type.
- *
- * <p>The following schema fragment specifies the expected content contained within this class.
- *
- * <pre>
- * &lt;complexType name="PurgedArtifactsEvent">
- * &lt;complexContent>
- * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- * &lt;sequence>
- * &lt;element name="artifacts" type="{}DefaultBasicGuidArtifact" maxOccurs="unbounded"/>
- * &lt;/sequence>
- * &lt;/restriction>
- * &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- *
- *
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "PurgedArtifactsEvent", propOrder = {
- "artifacts"
-})
-public class PurgedArtifactsEvent
- extends FrameworkEvent
-{
-
- @XmlElement(required = true)
- protected List<DefaultBasicGuidArtifact> artifacts;
-
- /**
- * 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/org/eclipse/osee/framework/skynet/core/artifact/Artifact.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/Artifact.java
index 9ff7d71e63..5bb5775a80 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/Artifact.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/Artifact.java
@@ -32,6 +32,7 @@ import org.eclipse.core.runtime.Platform;
import org.eclipse.osee.framework.core.data.DefaultBasicGuidArtifact;
import org.eclipse.osee.framework.core.data.IArtifactType;
import org.eclipse.osee.framework.core.data.IAttributeType;
+import org.eclipse.osee.framework.core.data.IBasicGuidArtifact;
import org.eclipse.osee.framework.core.data.IOseeBranch;
import org.eclipse.osee.framework.core.data.IRelationSorterId;
import org.eclipse.osee.framework.core.data.Identity;
@@ -94,7 +95,7 @@ import org.eclipse.osee.framework.skynet.core.transaction.TransactionManager;
import org.eclipse.osee.framework.skynet.core.types.IArtifact;
import org.osgi.framework.Bundle;
-public class Artifact implements IArtifact, IAdaptable, Comparable<Artifact>, Named, Identity {
+public class Artifact implements IArtifact, IAdaptable, Comparable<Artifact>, Named, Identity, IBasicGuidArtifact {
public static final String UNNAMED = "Unnamed";
public static final String BEFORE_GUID_STRING = "/BeforeGUID/PrePend";
public static final String AFTER_GUID_STRING = "/AfterGUID";
@@ -1934,4 +1935,14 @@ public class Artifact implements IArtifact, IAdaptable, Comparable<Artifact>, Na
public DefaultBasicGuidArtifact getBasicGuidArtifact() {
return new DefaultBasicGuidArtifact(getBranch().getGuid(), getArtifactType().getGuid(), getGuid());
}
+
+ @Override
+ public String getArtTypeGuid() {
+ return getArtifactType().getGuid();
+ }
+
+ @Override
+ public String getBranchGuid() {
+ return getBranch().getGuid();
+ }
}
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 30b1bc950e..c0fa3c61e8 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
@@ -11,7 +11,6 @@
package org.eclipse.osee.framework.skynet.core.artifact;
import java.util.Collection;
-import java.util.Set;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
import org.eclipse.osee.framework.core.exception.OseeDataStoreException;
import org.eclipse.osee.framework.core.model.TransactionRecord;
@@ -20,8 +19,7 @@ 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.event2.artifact.EventBasicGuidArtifact;
-import org.eclipse.osee.framework.skynet.core.event2.artifact.EventModType;
+import org.eclipse.osee.framework.skynet.core.event.msgs.TransactionEvent;
import org.eclipse.osee.framework.skynet.core.transaction.BaseTransactionData;
import org.eclipse.osee.framework.skynet.core.transaction.SkynetTransaction;
@@ -75,25 +73,22 @@ public class ArtifactTransactionData extends BaseTransactionData {
}
@Override
- protected void internalAddToEvents(Collection<ArtifactTransactionModifiedEvent> events, Set<EventBasicGuidArtifact> artifactChanges) throws OseeCoreException {
+ protected void internalAddToEvents(Collection<ArtifactTransactionModifiedEvent> events, TransactionEvent transactionEvent) throws OseeCoreException {
ArtifactModType artifactModType;
- EventModType eventModType;
switch (getModificationType()) {
case MODIFIED:
artifactModType = ArtifactModType.Changed;
- eventModType = EventModType.Modified;
break;
case DELETED:
artifactModType = ArtifactModType.Deleted;
- eventModType = EventModType.Deleted;
+ transactionEvent.getDeleted().add(artifact.getBasicGuidArtifact());
break;
default:
artifactModType = ArtifactModType.Added;
- eventModType = EventModType.Added;
+ transactionEvent.getAdded().add(artifact.getBasicGuidArtifact());
break;
}
events.add(new ArtifactModifiedEvent(new Sender(this.getClass().getName()), artifactModType, artifact,
artifact.getTransactionNumber(), artifact.getDirtySkynetAttributeChanges()));
- artifactChanges.add(new EventBasicGuidArtifact(eventModType, artifact));
}
} \ No newline at end of file
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 7987d198bb..7c3c516649 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
@@ -11,7 +11,6 @@
package org.eclipse.osee.framework.skynet.core.attribute;
import java.util.Collection;
-import java.util.Set;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
import org.eclipse.osee.framework.core.exception.OseeDataStoreException;
import org.eclipse.osee.framework.core.exception.OseeExceptions;
@@ -25,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.event2.artifact.EventBasicGuidArtifact;
+import org.eclipse.osee.framework.skynet.core.event.msgs.TransactionEvent;
import org.eclipse.osee.framework.skynet.core.transaction.BaseTransactionData;
import org.eclipse.osee.framework.skynet.core.transaction.SkynetTransaction;
@@ -137,6 +136,6 @@ public class AttributeTransactionData extends BaseTransactionData {
}
@Override
- protected void internalAddToEvents(Collection<ArtifactTransactionModifiedEvent> events, Set<EventBasicGuidArtifact> artifactChanges) throws OseeCoreException {
+ protected void internalAddToEvents(Collection<ArtifactTransactionModifiedEvent> events, TransactionEvent transactionEvent) throws OseeCoreException {
}
} \ No newline at end of file
diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event2/InternalEventManager2.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event/InternalEventManager2.java
index 5a46f26f06..006ce85a4d 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event2/InternalEventManager2.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event/InternalEventManager2.java
@@ -3,26 +3,26 @@
*
* PLACE_YOUR_DISTRIBUTION_STATEMENT_RIGHT_HERE
*/
-package org.eclipse.osee.framework.skynet.core.event2;
+package org.eclipse.osee.framework.skynet.core.event;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
import java.util.List;
+import java.util.Set;
import java.util.concurrent.CopyOnWriteArrayList;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.ThreadFactory;
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.IEventListener;
-import org.eclipse.osee.framework.skynet.core.event.InternalEventManager;
-import org.eclipse.osee.framework.skynet.core.event.OseeEventThreadFactory;
-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.FrameworkEventUtil;
import org.eclipse.osee.framework.skynet.core.event2.artifact.ArtifactEventManager;
+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;
@@ -54,64 +54,60 @@ public class InternalEventManager2 {
executorService.submit(runnable);
}
- // // Kick LOCAL ArtifactReloadEvent
- // static void kickArtifactReloadEvent(final Sender sender, final Collection<? extends Artifact> artifacts) {
- // if (isDisableEvents()) {
- // return;
- // }
- // eventLog("OEM: kickArtifactReloadEvent #Reloads: " + artifacts.size() + " - " + sender);
- // Runnable runnable = new Runnable() {
- // public void run() {
- // try {
- // // Log if this is a loopback and what is happening
- // if (enableRemoteEventLoopback) {
- // OseeLog.log(
- // InternalEventManager.class,
- // Level.WARNING,
- // "OEM2: kickArtifactReloadEvent Loopback enabled" + (sender.isLocal() ? " - Ignoring Local Kick" : " - Kicking Local from Loopback"));
- // }
- //
- // // Kick LOCAL
- // if (!enableRemoteEventLoopback) {
- // Set<EventBasicGuidArtifact> artifactChanges = new HashSet<EventBasicGuidArtifact>();
- // for (Artifact artifact : artifacts) {
- // artifactChanges.add(new EventBasicGuidArtifact(EventModType.Reloaded, artifact));
- // }
- // ArtifactEventManager.processArtifactChanges(sender, artifactChanges);
- // }
- // } catch (Exception ex) {
- // OseeLog.log(Activator.class, Level.SEVERE, ex);
- // }
- // }
- // };
- // execute(runnable);
- // }
+ // Kick LOCAL ArtifactReloadEvent
+ static void kickArtifactReloadEvent(final Sender sender, final Set<EventBasicGuidArtifact> artifactChanges) {
+ if (isDisableEvents()) {
+ return;
+ }
+ eventLog("OEM: kickArtifactReloadEvent #Reloads: " + artifactChanges.size() + " - " + sender);
+ Runnable runnable = new Runnable() {
+ public void run() {
+ try {
+ // Log if this is a loopback and what is happening
+ if (enableRemoteEventLoopback) {
+ OseeLog.log(
+ InternalEventManager.class,
+ Level.WARNING,
+ "OEM2: kickArtifactReloadEvent Loopback enabled" + (sender.isLocal() ? " - Ignoring Local Kick" : " - Kicking Local from Loopback"));
+ }
+
+ // Kick LOCAL
+ if (!enableRemoteEventLoopback) {
+ ArtifactEventManager.processArtifactChanges(sender, artifactChanges);
+ }
+ } catch (Exception ex) {
+ OseeLog.log(Activator.class, Level.SEVERE, ex);
+ }
+ }
+ };
+ execute(runnable);
+ }
// Kick LOCAL and REMOTE purged event depending on sender
- // static void kickArtifactsPurgedEvent(final Sender sender, final Set<EventBasicGuidArtifact> artifactChanges) throws OseeCoreException {
- // if (isDisableEvents()) {
- // return;
- // }
- // eventLog("OEM2:kickArtifactsPurgedEvent " + sender + " - " + artifactChanges);
- // Runnable runnable = new Runnable() {
- // public void run() {
- // // Kick LOCAL
- // ArtifactEventManager.processArtifactChanges(sender, artifactChanges);
- //
- // // Kick REMOTE (If source was Local and this was not a default branch changed event
- // try {
- // if (sender.isLocal()) {
- // RemoteEventManager2.kick(new org.eclipse.osee.framework.messaging.event.res.event.NetworkArtifactPurgeEvent(
- // artifactChanges, sender.getNetworkSenderRes()));
- // }
- // } catch (OseeCoreException ex) {
- // OseeLog.log(Activator.class, Level.SEVERE, ex);
- // }
- // }
- // };
- // execute(runnable);
- // }
- //
+ static void kickArtifactsPurgedEvent(final Sender sender, final Set<EventBasicGuidArtifact> artifactChanges) throws OseeCoreException {
+ if (isDisableEvents()) {
+ return;
+ }
+ eventLog("OEM2:kickArtifactsPurgedEvent " + sender + " - " + artifactChanges);
+ Runnable runnable = new Runnable() {
+ public void run() {
+ // Kick LOCAL
+ ArtifactEventManager.processArtifactChanges(sender, artifactChanges);
+
+ // Kick REMOTE (If source was Local and this was not a default branch changed event
+ try {
+ if (sender.isLocal()) {
+ RemoteEventManager2.kick(FrameworkEventUtil.getRemotePurgedArtifactsEvent(sender.getNetworkSender2(),
+ artifactChanges));
+ }
+ } catch (OseeCoreException ex) {
+ OseeLog.log(Activator.class, Level.SEVERE, ex);
+ }
+ }
+ };
+ execute(runnable);
+ }
+
// // Kick LOCAL and REMOTE artifact change type depending on sender
// static void kickArtifactsChangeTypeEvent(final Sender sender, final Set<EventBasicGuidArtifact> artifactChanges, final String toArtifactTypeGuid) throws OseeCoreException {
// if (isDisableEvents()) {
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 5eaa02e9f7..6c68973854 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,8 +19,9 @@ 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.event2.InternalEventManager2;
+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.EventModType;
import org.eclipse.osee.framework.skynet.core.relation.RelationEventType;
import org.eclipse.osee.framework.skynet.core.relation.RelationLink;
import org.eclipse.osee.framework.skynet.core.utility.LoadedArtifacts;
@@ -123,7 +124,7 @@ public class OseeEventManager {
return;
}
InternalEventManager.kickArtifactsPurgedEvent(getSender(source), loadedArtifacts);
- // InternalEventManager2.kickArtifactsPurgedEvent(getSender(source), artifactChanges);
+ InternalEventManager2.kickArtifactsPurgedEvent(getSender(source), artifactChanges);
}
// Kick LOCAL and REMOTE artifact change type depending on sender
@@ -145,21 +146,23 @@ public class OseeEventManager {
}
// Kick LOCAL and REMOTE transaction event
- public static void kickTransactionEvent(Object source, Collection<ArtifactTransactionModifiedEvent> xModifiedEvents, Set<EventBasicGuidArtifact> artifactChanges) throws OseeAuthenticationRequiredException {
+ public static void kickTransactionEvent(Object source, Collection<ArtifactTransactionModifiedEvent> xModifiedEvents, TransactionEvent transactionEvent) throws OseeAuthenticationRequiredException {
if (isDisableEvents()) {
return;
}
InternalEventManager.kickTransactionEvent(getSender(source), xModifiedEvents);
- // InternalEventManager2.kickTransactionEvent(getSender(source), artifactChanges);
+ transactionEvent.setNetworkSender(getSender(source).getNetworkSender2());
+ InternalEventManager2.kickTransactionEvent(getSender(source), transactionEvent);
}
// Kick LOCAL transaction event
- public static void kickArtifactReloadEvent(Object source, Collection<? extends Artifact> artifacts) throws OseeAuthenticationRequiredException {
+ public static void kickArtifactReloadEvent(Object source, Collection<? extends Artifact> artifacts) throws OseeCoreException {
if (isDisableEvents()) {
return;
}
InternalEventManager.kickArtifactReloadEvent(getSender(source), artifacts);
- // InternalEventManager2.kickArtifactReloadEvent(getSender(source), artifacts);
+ InternalEventManager2.kickArtifactReloadEvent(getSender(source), EventBasicGuidArtifact.get(
+ EventModType.Reloaded, artifacts));
}
/**
diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event2/RemoteEventManager2.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event/RemoteEventManager2.java
index 45f5e870e0..dd66636768 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event2/RemoteEventManager2.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event/RemoteEventManager2.java
@@ -8,11 +8,13 @@
* Contributors:
* Boeing - initial API and implementation
*******************************************************************************/
-package org.eclipse.osee.framework.skynet.core.event2;
+package org.eclipse.osee.framework.skynet.core.event;
import java.rmi.RemoteException;
import java.util.Collection;
import java.util.Collections;
+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;
@@ -23,9 +25,13 @@ import org.eclipse.osee.framework.jdk.core.util.GUID;
import org.eclipse.osee.framework.logging.OseeLog;
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.msgs.RemoteBasicGuidArtifact1;
+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.event.Sender;
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.artifact.EventBasicGuidArtifact;
+import org.eclipse.osee.framework.skynet.core.event2.artifact.EventModType;
import org.eclipse.osee.framework.skynet.core.internal.Activator;
/**
@@ -73,32 +79,24 @@ public class RemoteEventManager2 {
RemoteTransactionEvent1 event1 = (RemoteTransactionEvent1) event;
TransactionEvent transEvent = FrameworkEventUtil.getTransactionEvent(event1);
InternalEventManager2.kickTransactionEvent(sender, transEvent);
+ // TODO process transaction event by updating artifact/relation caches
+ } catch (Exception ex) {
+ OseeLog.log(Activator.class, Level.SEVERE, ex);
+ }
+ } else if (event instanceof RemotePurgedArtifactsEvent1) {
+ try {
+ RemotePurgedArtifactsEvent1 event1 = (RemotePurgedArtifactsEvent1) event;
+ Set<EventBasicGuidArtifact> artifactChanges = new HashSet<EventBasicGuidArtifact>();
+ for (RemoteBasicGuidArtifact1 guidArt : event1.getArtifacts()) {
+ artifactChanges.add(new EventBasicGuidArtifact(EventModType.Purged,
+ FrameworkEventUtil.getBasicGuidArtifact(guidArt)));
+ }
+ // TODO process transaction event by updating artifact/relation caches
+ InternalEventManager2.kickArtifactsPurgedEvent(sender, artifactChanges);
} catch (Exception ex) {
OseeLog.log(Activator.class, Level.SEVERE, ex);
}
}
- // else if (event instanceof NetworkArtifactDeletedEvent) {
- // try {
- // for (DefaultBasicGuidArtifact guidArt : ((NetworkArtifactDeletedEvent) event).getDefaultBasicGuidArtifacts()) {
- // artifactChanges.add(new EventBasicGuidArtifact(EventModType.Deleted, guidArt));
- // Artifact cacheArtifact = ArtifactCache.getActive(guidArt);
- // RemoteEventManager.internalHandleRemoteArtifactDeleted(cacheArtifact);
- // }
- // lastArtifactRelationModChangeSender = sender;
- // } catch (Exception ex) {
- // OseeLog.log(Activator.class, Level.SEVERE, ex);
- // }
- // } else if (event instanceof NetworkArtifactModifiedEvent) {
- // try {
- // for (DefaultBasicGuidArtifact guidArt : ((NetworkArtifactModifiedEvent) event).getDefaultBasicGuidArtifacts()) {
- // artifactChanges.add(new EventBasicGuidArtifact(EventModType.Modified, guidArt));
- // Artifact cacheArtifact = ArtifactCache.getActive(guidArt);
- // RemoteEventManager.internalHandleRemoteArtifactModified(cacheArtifact);
- // }
- // lastArtifactRelationModChangeSender = sender;
- // } catch (Exception ex) {
- // OseeLog.log(Activator.class, Level.SEVERE, ex);
- // }
// } else if (event instanceof NetworkArtifactChangeTypeEvent) {
// try {
// // TODO do work here to reload change type artifact if loaded
diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event/Sender.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event/Sender.java
index 6c9114b9c4..6d26824c94 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event/Sender.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event/Sender.java
@@ -88,6 +88,19 @@ public class Sender {
oseeSession.getUserId(), oseeSession.getMachineIp(), oseeSession.getPort(), oseeSession.getVersion());
}
+ public org.eclipse.osee.framework.skynet.core.event.msgs.NetworkSender getNetworkSender2() {
+ org.eclipse.osee.framework.skynet.core.event.msgs.NetworkSender sender =
+ new org.eclipse.osee.framework.skynet.core.event.msgs.NetworkSender();
+ sender.setSourceObject(sourceObject);
+ sender.setSessionId(oseeSession.getId());
+ sender.setMachineName(oseeSession.getMachineName());
+ sender.setUserId(oseeSession.getUserId());
+ sender.setMachineIp(oseeSession.getMachineIp());
+ sender.setPort(oseeSession.getPort());
+ sender.setClientVersion(oseeSession.getVersion());
+ return sender;
+ }
+
public RemoteNetworkSender1 getNetworkSenderRes() {
RemoteNetworkSender1 sender = new RemoteNetworkSender1();
sender.setSourceObject(sourceObject);
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 7f3473b7cc..f60b27dada 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,16 +5,19 @@
*/
package org.eclipse.osee.framework.skynet.core.event2;
+import java.util.Set;
import org.eclipse.osee.framework.core.data.DefaultBasicGuidArtifact;
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.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.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;
/**
* @author Donald G. Dunne
@@ -71,6 +74,15 @@ public class FrameworkEventUtil {
return remoteGuidArt;
}
+ 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 BasicModifiedGuidArtifact getBasicModifiedGuidArtifact(RemoteBasicModifiedGuidArtifact1 remGuidArt) {
BasicModifiedGuidArtifact guidArt = new BasicModifiedGuidArtifact();
guidArt.setArtGuid(remGuidArt.getArtGuid());
diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event2/artifact/EventBasicGuidArtifact.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event2/artifact/EventBasicGuidArtifact.java
index c085e0a4be..826105bf11 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event2/artifact/EventBasicGuidArtifact.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event2/artifact/EventBasicGuidArtifact.java
@@ -64,6 +64,10 @@ public class EventBasicGuidArtifact extends DefaultBasicGuidArtifact {
return eventArts;
}
+ public DefaultBasicGuidArtifact getBasicGuidArtifact() {
+ return new DefaultBasicGuidArtifact(getBranchGuid(), getArtTypeGuid(), getGuid());
+ }
+
@Override
public int hashCode() {
final int prime = 31;
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 9e1ede4d51..451ba726d8 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
@@ -11,7 +11,6 @@
package org.eclipse.osee.framework.skynet.core.relation;
import java.util.Collection;
-import java.util.Set;
import org.eclipse.osee.framework.core.enums.ModificationType;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
import org.eclipse.osee.framework.core.exception.OseeDataStoreException;
@@ -21,7 +20,7 @@ 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.RelationModifiedEvent;
import org.eclipse.osee.framework.skynet.core.event.Sender;
-import org.eclipse.osee.framework.skynet.core.event2.artifact.EventBasicGuidArtifact;
+import org.eclipse.osee.framework.skynet.core.event.msgs.TransactionEvent;
import org.eclipse.osee.framework.skynet.core.transaction.BaseTransactionData;
import org.eclipse.osee.framework.skynet.core.transaction.SkynetTransaction;
@@ -81,7 +80,7 @@ public class RelationTransactionData extends BaseTransactionData {
}
@Override
- protected void internalAddToEvents(Collection<ArtifactTransactionModifiedEvent> events, Set<EventBasicGuidArtifact> artifactChanges) throws OseeCoreException {
+ protected void internalAddToEvents(Collection<ArtifactTransactionModifiedEvent> events, TransactionEvent transactionEvent) throws OseeCoreException {
RelationEventType relationEventType =
getModificationType().isDeleted() ? RelationEventType.Deleted : RelationEventType.Added;
events.add(new RelationModifiedEvent(new Sender(this.getClass().getName()), relationEventType, relation,
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 e8bae052a6..d8d17fe533 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
@@ -11,14 +11,13 @@
package org.eclipse.osee.framework.skynet.core.transaction;
import java.util.Collection;
-import java.util.Set;
import org.eclipse.osee.framework.core.enums.ModificationType;
import org.eclipse.osee.framework.core.enums.TxChange;
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.event2.artifact.EventBasicGuidArtifact;
+import org.eclipse.osee.framework.skynet.core.event.msgs.TransactionEvent;
/**
* @author Jeff C. Phillips
@@ -119,6 +118,8 @@ public abstract class BaseTransactionData {
/**
* Should not be called by application. This should only be called once after the transaction has been committed.
+ *
+ * @param transactionEvent TODO
*/
- protected abstract void internalAddToEvents(Collection<ArtifactTransactionModifiedEvent> events, Set<EventBasicGuidArtifact> artifactChanges) throws OseeCoreException;
+ protected abstract void internalAddToEvents(Collection<ArtifactTransactionModifiedEvent> events, TransactionEvent transactionEvent) throws OseeCoreException;
}
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 06eed2eb80..3ad7bc4de7 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,8 +49,9 @@ 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.event2.artifact.EventBasicGuidArtifact;
-import org.eclipse.osee.framework.skynet.core.event2.artifact.EventModifiedBasicGuidArtifact;
+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.internal.Activator;
import org.eclipse.osee.framework.skynet.core.relation.RelationLink;
import org.eclipse.osee.framework.skynet.core.relation.RelationTransactionData;
@@ -377,7 +378,7 @@ public class SkynetTransaction extends DbTransaction {
private void updateModifiedCachedObject() throws OseeCoreException {
Collection<ArtifactTransactionModifiedEvent> xModifiedEvents = new ArrayList<ArtifactTransactionModifiedEvent>();
- Set<EventBasicGuidArtifact> artifactChanges = new HashSet<EventBasicGuidArtifact>();
+ TransactionEvent transactionEvent = new TransactionEvent();
// Update all transaction items before collecting events
for (BaseTransactionData transactionData : transactionDataItems.values()) {
@@ -386,7 +387,7 @@ public class SkynetTransaction extends DbTransaction {
// Collect events before clearing any dirty flags
for (BaseTransactionData transactionData : transactionDataItems.values()) {
- transactionData.internalAddToEvents(xModifiedEvents, artifactChanges);
+ transactionData.internalAddToEvents(xModifiedEvents, transactionEvent);
}
for (Artifact artifact : artifactReferences) {
@@ -394,8 +395,14 @@ public class SkynetTransaction extends DbTransaction {
xModifiedEvents.add(new ArtifactModifiedEvent(new Sender(this.getClass().getName()),
ArtifactModType.Changed, artifact, artifact.getTransactionNumber(),
artifact.getDirtySkynetAttributeChanges()));
- artifactChanges.add(new EventModifiedBasicGuidArtifact(artifact,
- artifact.getDirtyFrameworkAttributeChanges()));
+ 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);
}
}
// Clear all dirty flags
@@ -404,7 +411,7 @@ public class SkynetTransaction extends DbTransaction {
}
if (xModifiedEvents.size() > 0) {
- OseeEventManager.kickTransactionEvent(this, xModifiedEvents, artifactChanges);
+ OseeEventManager.kickTransactionEvent(this, xModifiedEvents, transactionEvent);
xModifiedEvents.clear();
}
}
diff --git a/plugins/org.eclipse.osee.support.test/src/org/eclipse/osee/support/test/MasterTestSuite_TestDbTests.java b/plugins/org.eclipse.osee.support.test/src/org/eclipse/osee/support/test/MasterTestSuite_TestDbTests.java
index 53b403eca7..3966b3b29e 100644
--- a/plugins/org.eclipse.osee.support.test/src/org/eclipse/osee/support/test/MasterTestSuite_TestDbTests.java
+++ b/plugins/org.eclipse.osee.support.test/src/org/eclipse/osee/support/test/MasterTestSuite_TestDbTests.java
@@ -14,6 +14,7 @@ import static org.junit.Assert.assertTrue;
import org.eclipse.osee.ats.test.AtsTest_TestDb_Suite;
import org.eclipse.osee.framework.core.client.ClientSessionManager;
import org.eclipse.osee.framework.messaging.event.res.test.FrameworkRes_TestDb_Suite;
+import org.eclipse.osee.framework.skynet.core.test.FrameworkCore_TestDb_Suite;
import org.eclipse.osee.framework.skynet.core.test.cases.ArtifactQueryTestDemo;
import org.eclipse.osee.framework.ui.skynet.test.FrameworkUi_TestDb_Suite;
import org.eclipse.osee.support.test.util.TestUtil;
@@ -23,8 +24,8 @@ import org.junit.runner.RunWith;
import org.junit.runners.Suite;
@RunWith(Suite.class)
-@Suite.SuiteClasses( {FrameworkRes_TestDb_Suite.class, ArtifactQueryTestDemo.class, AtsTest_TestDb_Suite.class,
- FrameworkUi_TestDb_Suite.class})
+@Suite.SuiteClasses( {FrameworkRes_TestDb_Suite.class, FrameworkCore_TestDb_Suite.class, ArtifactQueryTestDemo.class,
+ AtsTest_TestDb_Suite.class, FrameworkUi_TestDb_Suite.class})
/**
* This Test Suite is to run against a postgres database with ATS Developer as the DbInit.<br>
* <br>

Back to the top