Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoberto E. Escobar2012-04-13 21:22:06 +0000
committerRoberto E. Escobar2012-04-13 21:22:06 +0000
commitf97e58b2c70927a2c896a06d99027ac0b760686f (patch)
tree2301a90de231e1962c7b765a7abc68ad42cf5440
parentc3d840e4703cb62d9db92362b737a7f1c7f8ed46 (diff)
downloadorg.eclipse.osee-f97e58b2c70927a2c896a06d99027ac0b760686f.tar.gz
org.eclipse.osee-f97e58b2c70927a2c896a06d99027ac0b760686f.tar.xz
org.eclipse.osee-f97e58b2c70927a2c896a06d99027ac0b760686f.zip
feature[ats_VGR8B]: Convert messaging event res to DS
-rw-r--r--plugins/org.eclipse.osee.framework.messaging.event.res/.project5
-rw-r--r--plugins/org.eclipse.osee.framework.messaging.event.res/META-INF/MANIFEST.MF2
-rw-r--r--plugins/org.eclipse.osee.framework.messaging.event.res/OSGI-INF/osee.core.model.event.service.xml8
-rw-r--r--plugins/org.eclipse.osee.framework.messaging.event.res/build.properties8
-rw-r--r--plugins/org.eclipse.osee.framework.messaging.event.res/plugin.xml31
-rw-r--r--plugins/org.eclipse.osee.framework.messaging.event.res/src-gen/org/eclipse/osee/framework/messaging/event/res/msgs/RemoteAccessControlEvent1.java159
-rw-r--r--plugins/org.eclipse.osee.framework.messaging.event.res/src-gen/org/eclipse/osee/framework/messaging/event/res/msgs/RemoteBranchEvent1.java148
-rw-r--r--plugins/org.eclipse.osee.framework.messaging.event.res/src-gen/org/eclipse/osee/framework/messaging/event/res/msgs/RemoteBroadcastEvent1.java202
-rw-r--r--plugins/org.eclipse.osee.framework.messaging.event.res/src-gen/org/eclipse/osee/framework/messaging/event/res/msgs/RemotePersistEvent1.java320
-rw-r--r--plugins/org.eclipse.osee.framework.messaging.event.res/src-gen/org/eclipse/osee/framework/messaging/event/res/msgs/RemoteTransactionEvent1.java159
-rw-r--r--plugins/org.eclipse.osee.framework.messaging.event.res/src/org/eclipse/osee/framework/messaging/event/res/IOseeCoreModelEventService.java8
-rw-r--r--plugins/org.eclipse.osee.framework.messaging.event.res/src/org/eclipse/osee/framework/messaging/event/res/internal/Activator.java35
-rw-r--r--plugins/org.eclipse.osee.framework.messaging.event.res/src/org/eclipse/osee/framework/messaging/event/res/internal/OseeCoreModelEventServiceImpl.java50
-rw-r--r--plugins/org.eclipse.osee.framework.messaging.event.res/src/org/eclipse/osee/framework/messaging/event/res/internal/OseeCoreModelEventServiceProxy.java90
-rw-r--r--plugins/org.eclipse.osee.framework.messaging.event.res/src/org/eclipse/osee/framework/messaging/event/res/internal/OseeCoreModelEventServiceRegHandler.java67
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event/systems/InternalEventManager.java5
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/internal/OseeEventSystemServiceRegHandler.java8
17 files changed, 571 insertions, 734 deletions
diff --git a/plugins/org.eclipse.osee.framework.messaging.event.res/.project b/plugins/org.eclipse.osee.framework.messaging.event.res/.project
index 6bceb71c6d2..19b9650a351 100644
--- a/plugins/org.eclipse.osee.framework.messaging.event.res/.project
+++ b/plugins/org.eclipse.osee.framework.messaging.event.res/.project
@@ -20,6 +20,11 @@
<arguments>
</arguments>
</buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.ds.core.builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.pde.PluginNature</nature>
diff --git a/plugins/org.eclipse.osee.framework.messaging.event.res/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.framework.messaging.event.res/META-INF/MANIFEST.MF
index 4f46e19a823..6a8cdd496b1 100644
--- a/plugins/org.eclipse.osee.framework.messaging.event.res/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.osee.framework.messaging.event.res/META-INF/MANIFEST.MF
@@ -4,7 +4,6 @@ Bundle-Name: Framework Event Service (Incubation)
Bundle-SymbolicName: org.eclipse.osee.framework.messaging.event.res;singleton:=true
Bundle-Version: 0.9.9.qualifier
Eclipse-ExtensibleAPI: true
-Bundle-Activator: org.eclipse.osee.framework.messaging.event.res.internal.Activator
Bundle-ActivationPolicy: lazy
Bundle-Description: Skynet Event Service - Skynet Cache Network Manager
Bundle-Vendor: Eclipse Open System Engineering Environment
@@ -20,3 +19,4 @@ Import-Package: org.eclipse.core.runtime,
org.osgi.framework
Export-Package: org.eclipse.osee.framework.messaging.event.res,
org.eclipse.osee.framework.messaging.event.res.msgs
+Service-Component: OSGI-INF/osee.core.model.event.service.xml
diff --git a/plugins/org.eclipse.osee.framework.messaging.event.res/OSGI-INF/osee.core.model.event.service.xml b/plugins/org.eclipse.osee.framework.messaging.event.res/OSGI-INF/osee.core.model.event.service.xml
new file mode 100644
index 00000000000..5ffdea35391
--- /dev/null
+++ b/plugins/org.eclipse.osee.framework.messaging.event.res/OSGI-INF/osee.core.model.event.service.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" activate="start" deactivate="stop" name="org.eclipse.osee.framework.messaging.event.res.internal.OseeCoreModelEventServiceProxy">
+ <implementation class="org.eclipse.osee.framework.messaging.event.res.internal.OseeCoreModelEventServiceProxy"/>
+ <service>
+ <provide interface="org.eclipse.osee.framework.messaging.event.res.IOseeCoreModelEventService"/>
+ </service>
+ <reference bind="setMessageService" cardinality="1..1" interface="org.eclipse.osee.framework.messaging.MessageService" name="MessageService" policy="static"/>
+</scr:component>
diff --git a/plugins/org.eclipse.osee.framework.messaging.event.res/build.properties b/plugins/org.eclipse.osee.framework.messaging.event.res/build.properties
index 8776ab47f14..46fa70a8159 100644
--- a/plugins/org.eclipse.osee.framework.messaging.event.res/build.properties
+++ b/plugins/org.eclipse.osee.framework.messaging.event.res/build.properties
@@ -1,7 +1,7 @@
-source.. = src/,\
- src-gen/
output.. = bin/
bin.includes = META-INF/,\
- plugin.xml,\
.,\
- jaxb/
+ jaxb/,\
+ OSGI-INF/
+source.. = src/,\
+ src-gen/
diff --git a/plugins/org.eclipse.osee.framework.messaging.event.res/plugin.xml b/plugins/org.eclipse.osee.framework.messaging.event.res/plugin.xml
deleted file mode 100644
index 2038b0a2cde..00000000000
--- a/plugins/org.eclipse.osee.framework.messaging.event.res/plugin.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin>
- <extension
- point="org.eclipse.osee.framework.jini.JiniInterface">
- <Interface classname="org.eclipse.osee.framework.messaging.event.res.ISkynetEventService"/>
- <Interface classname="org.eclipse.osee.framework.messaging.event.res.IFrameworkEvent"/>
- <Interface classname="org.eclipse.osee.framework.messaging.event.res.IFrameworkEventListener"/>
- <Interface classname="org.eclipse.osee.framework.messaging.event.res.event.AttributeChange"/>
- </extension>
- <extension
- point="org.eclipse.osee.framework.jini.JiniInterface">
- <RegisterBundle/>
- </extension>
- <extension
- id="EventService"
- name="EventService"
- point="org.eclipse.core.runtime.applications">
- <application>
- <run class="org.eclipse.osee.framework.messaging.event.framework.service.SkynetEventServicePlatformRunnable"/>
- </application>
- </extension>
- <extension
- id="EventServiceProd"
- point="org.eclipse.core.runtime.products">
- <product
- application="org.eclipse.osee.framework.messaging.event.skynet.EventService"
- name="EventServiceProd"/>
- </extension>
-
-</plugin>
diff --git a/plugins/org.eclipse.osee.framework.messaging.event.res/src-gen/org/eclipse/osee/framework/messaging/event/res/msgs/RemoteAccessControlEvent1.java b/plugins/org.eclipse.osee.framework.messaging.event.res/src-gen/org/eclipse/osee/framework/messaging/event/res/msgs/RemoteAccessControlEvent1.java
index 56b77747d47..0b090e7038a 100644
--- a/plugins/org.eclipse.osee.framework.messaging.event.res/src-gen/org/eclipse/osee/framework/messaging/event/res/msgs/RemoteAccessControlEvent1.java
+++ b/plugins/org.eclipse.osee.framework.messaging.event.res/src-gen/org/eclipse/osee/framework/messaging/event/res/msgs/RemoteAccessControlEvent1.java
@@ -5,7 +5,6 @@
// Generated on: 2011.08.22 at 10:40:57 AM MST
//
-
package org.eclipse.osee.framework.messaging.event.res.msgs;
import java.util.ArrayList;
@@ -16,11 +15,11 @@ 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 RemoteAccessControlEvent1 complex type.
- *
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>
+ * Java class for RemoteAccessControlEvent1 complex type.
+ * <p>
+ * The following schema fragment specifies the expected content contained within this class.
*
* <pre>
* &lt;complexType name="RemoteAccessControlEvent1">
@@ -35,101 +34,75 @@ import org.eclipse.osee.framework.messaging.event.res.RemoteEvent;
* &lt;/complexContent>
* &lt;/complexType>
* </pre>
- *
- *
*/
@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "RemoteAccessControlEvent1", propOrder = {
- "eventTypeGuid",
- "artifacts",
- "networkSender"
-})
-public class RemoteAccessControlEvent1
- extends RemoteEvent
-{
+@XmlType(name = "RemoteAccessControlEvent1", propOrder = {"eventTypeGuid", "artifacts", "networkSender"})
+public class RemoteAccessControlEvent1 extends RemoteEvent {
- @XmlElement(required = true)
- protected String eventTypeGuid;
- @XmlElement(required = true)
- protected List<RemoteBasicGuidArtifact1> artifacts;
- @XmlElement(required = true)
- protected RemoteNetworkSender1 networkSender;
+ @XmlElement(required = true)
+ protected String eventTypeGuid;
+ @XmlElement(required = true)
+ protected List<RemoteBasicGuidArtifact1> artifacts;
+ @XmlElement(required = true)
+ protected RemoteNetworkSender1 networkSender;
- /**
- * Gets the value of the eventTypeGuid property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getEventTypeGuid() {
- return eventTypeGuid;
- }
+ /**
+ * Gets the value of the eventTypeGuid property.
+ *
+ * @return possible object is {@link String }
+ */
+ public String getEventTypeGuid() {
+ return eventTypeGuid;
+ }
- /**
- * Sets the value of the eventTypeGuid property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setEventTypeGuid(String value) {
- this.eventTypeGuid = value;
- }
+ /**
+ * Sets the value of the eventTypeGuid property.
+ *
+ * @param value allowed object is {@link String }
+ */
+ public void setEventTypeGuid(String value) {
+ this.eventTypeGuid = 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 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;
- }
+ /**
+ * Gets the value of the networkSender property.
+ *
+ * @return possible object is {@link RemoteNetworkSender1 }
+ */
+ @Override
+ 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;
- }
+ /**
+ * 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/RemoteBranchEvent1.java b/plugins/org.eclipse.osee.framework.messaging.event.res/src-gen/org/eclipse/osee/framework/messaging/event/res/msgs/RemoteBranchEvent1.java
index b421f3ecdad..8bb7fb14d42 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
@@ -5,7 +5,6 @@
// Generated on: 2011.08.22 at 10:40:57 AM MST
//
-
package org.eclipse.osee.framework.messaging.event.res.msgs;
import javax.xml.bind.annotation.XmlAccessType;
@@ -14,11 +13,11 @@ 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 RemoteBranchEvent1 complex type.
- *
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>
+ * Java class for RemoteBranchEvent1 complex type.
+ * <p>
+ * The following schema fragment specifies the expected content contained within this class.
*
* <pre>
* &lt;complexType name="RemoteBranchEvent1">
@@ -33,96 +32,71 @@ import org.eclipse.osee.framework.messaging.event.res.RemoteEvent;
* &lt;/complexContent>
* &lt;/complexType>
* </pre>
- *
- *
*/
@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "RemoteBranchEvent1", propOrder = {
- "eventTypeGuid",
- "branchGuid",
- "networkSender"
-})
-public class RemoteBranchEvent1
- extends RemoteEvent
-{
+@XmlType(name = "RemoteBranchEvent1", propOrder = {"eventTypeGuid", "branchGuid", "networkSender"})
+public class RemoteBranchEvent1 extends RemoteEvent {
- @XmlElement(required = true)
- protected String eventTypeGuid;
- @XmlElement(required = true)
- protected String branchGuid;
- @XmlElement(required = true)
- protected RemoteNetworkSender1 networkSender;
+ @XmlElement(required = true)
+ protected String eventTypeGuid;
+ @XmlElement(required = true)
+ protected String branchGuid;
+ @XmlElement(required = true)
+ protected RemoteNetworkSender1 networkSender;
- /**
- * Gets the value of the eventTypeGuid property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getEventTypeGuid() {
- return eventTypeGuid;
- }
+ /**
+ * Gets the value of the eventTypeGuid property.
+ *
+ * @return possible object is {@link String }
+ */
+ public String getEventTypeGuid() {
+ return eventTypeGuid;
+ }
- /**
- * Sets the value of the eventTypeGuid property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setEventTypeGuid(String value) {
- this.eventTypeGuid = value;
- }
+ /**
+ * Sets the value of the eventTypeGuid property.
+ *
+ * @param value allowed object is {@link String }
+ */
+ public void setEventTypeGuid(String value) {
+ this.eventTypeGuid = value;
+ }
- /**
- * Gets the value of the branchGuid property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getBranchGuid() {
- return branchGuid;
- }
+ /**
+ * 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;
- }
+ /**
+ * 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;
- }
+ /**
+ * Gets the value of the networkSender property.
+ *
+ * @return possible object is {@link RemoteNetworkSender1 }
+ */
+ @Override
+ 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;
- }
+ /**
+ * 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 73447af216f..d9371a37b79 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
@@ -5,7 +5,6 @@
// Generated on: 2011.08.22 at 10:40:57 AM MST
//
-
package org.eclipse.osee.framework.messaging.event.res.msgs;
import java.util.ArrayList;
@@ -16,11 +15,11 @@ 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 RemoteBroadcastEvent1 complex type.
- *
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>
+ * Java class for RemoteBroadcastEvent1 complex type.
+ * <p>
+ * The following schema fragment specifies the expected content contained within this class.
*
* <pre>
* &lt;complexType name="RemoteBroadcastEvent1">
@@ -36,128 +35,95 @@ import org.eclipse.osee.framework.messaging.event.res.RemoteEvent;
* &lt;/complexContent>
* &lt;/complexType>
* </pre>
- *
- *
*/
@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "RemoteBroadcastEvent1", propOrder = {
- "eventTypeGuid",
- "userIds",
- "message",
- "networkSender"
-})
-public class RemoteBroadcastEvent1
- extends RemoteEvent
-{
+@XmlType(name = "RemoteBroadcastEvent1", propOrder = {"eventTypeGuid", "userIds", "message", "networkSender"})
+public class RemoteBroadcastEvent1 extends RemoteEvent {
- @XmlElement(required = true)
- protected String eventTypeGuid;
- @XmlElement(required = true)
- protected List<String> userIds;
- @XmlElement(required = true)
- protected String message;
- @XmlElement(required = true)
- protected RemoteNetworkSender1 networkSender;
+ @XmlElement(required = true)
+ protected String eventTypeGuid;
+ @XmlElement(required = true)
+ protected List<String> userIds;
+ @XmlElement(required = true)
+ protected String message;
+ @XmlElement(required = true)
+ protected RemoteNetworkSender1 networkSender;
- /**
- * Gets the value of the eventTypeGuid property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getEventTypeGuid() {
- return eventTypeGuid;
- }
+ /**
+ * Gets the value of the eventTypeGuid property.
+ *
+ * @return possible object is {@link String }
+ */
+ public String getEventTypeGuid() {
+ return eventTypeGuid;
+ }
- /**
- * Sets the value of the eventTypeGuid property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setEventTypeGuid(String value) {
- this.eventTypeGuid = value;
- }
+ /**
+ * Sets the value of the eventTypeGuid property.
+ *
+ * @param value allowed object is {@link String }
+ */
+ public void setEventTypeGuid(String value) {
+ this.eventTypeGuid = value;
+ }
- /**
- * Gets the value of the userIds 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 userIds property.
- *
- * <p>
- * For example, to add a new item, do as follows:
- * <pre>
- * getUserIds().add(newItem);
- * </pre>
- *
- *
- * <p>
- * Objects of the following type(s) are allowed in the list
- * {@link String }
- *
- *
- */
- public List<String> getUserIds() {
- if (userIds == null) {
- userIds = new ArrayList<String>();
- }
- return this.userIds;
- }
+ /**
+ * Gets the value of the userIds 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 userIds property.
+ * <p>
+ * For example, to add a new item, do as follows:
+ *
+ * <pre>
+ * getUserIds().add(newItem);
+ * </pre>
+ * <p>
+ * Objects of the following type(s) are allowed in the list {@link String }
+ */
+ public List<String> getUserIds() {
+ if (userIds == null) {
+ userIds = new ArrayList<String>();
+ }
+ return this.userIds;
+ }
- /**
- * Gets the value of the message property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getMessage() {
- return message;
- }
+ /**
+ * Gets the value of the message property.
+ *
+ * @return possible object is {@link String }
+ */
+ public String getMessage() {
+ return message;
+ }
- /**
- * Sets the value of the message property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setMessage(String value) {
- this.message = value;
- }
+ /**
+ * Sets the value of the message property.
+ *
+ * @param value allowed object is {@link String }
+ */
+ public void setMessage(String value) {
+ this.message = value;
+ }
- /**
- * Gets the value of the networkSender property.
- *
- * @return
- * possible object is
- * {@link RemoteNetworkSender1 }
- *
- */
- public RemoteNetworkSender1 getNetworkSender() {
- return networkSender;
- }
+ /**
+ * Gets the value of the networkSender property.
+ *
+ * @return possible object is {@link RemoteNetworkSender1 }
+ */
+ @Override
+ 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;
- }
+ /**
+ * 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/RemotePersistEvent1.java b/plugins/org.eclipse.osee.framework.messaging.event.res/src-gen/org/eclipse/osee/framework/messaging/event/res/msgs/RemotePersistEvent1.java
index 62d3b209b83..a039c903f47 100644
--- a/plugins/org.eclipse.osee.framework.messaging.event.res/src-gen/org/eclipse/osee/framework/messaging/event/res/msgs/RemotePersistEvent1.java
+++ b/plugins/org.eclipse.osee.framework.messaging.event.res/src-gen/org/eclipse/osee/framework/messaging/event/res/msgs/RemotePersistEvent1.java
@@ -5,7 +5,6 @@
// Generated on: 2011.08.22 at 10:40:57 AM MST
//
-
package org.eclipse.osee.framework.messaging.event.res.msgs;
import java.util.ArrayList;
@@ -16,11 +15,11 @@ 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 RemotePersistEvent1 complex type.
- *
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>
+ * Java class for RemotePersistEvent1 complex type.
+ * <p>
+ * The following schema fragment specifies the expected content contained within this class.
*
* <pre>
* &lt;complexType name="RemotePersistEvent1">
@@ -38,183 +37,144 @@ import org.eclipse.osee.framework.messaging.event.res.RemoteEvent;
* &lt;/complexContent>
* &lt;/complexType>
* </pre>
- *
- *
*/
@XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "RemotePersistEvent1", propOrder = {
- "branchGuid",
- "transactionId",
- "artifacts",
- "relations",
- "relationReorders",
- "networkSender"
-})
-public class RemotePersistEvent1
- extends RemoteEvent
-{
-
- @XmlElement(required = true)
- protected String branchGuid;
- protected int transactionId;
- @XmlElement(required = true)
- protected List<RemoteBasicGuidArtifact1> artifacts;
- @XmlElement(required = true)
- protected List<RemoteBasicGuidRelation1> relations;
- @XmlElement(required = true)
- protected List<RemoteBasicGuidRelationReorder1> relationReorders;
- @XmlElement(required = true)
- protected RemoteNetworkSender1 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 RemoteBasicGuidArtifact1 }
- *
- *
- */
- public List<RemoteBasicGuidArtifact1> getArtifacts() {
- if (artifacts == null) {
- artifacts = new ArrayList<RemoteBasicGuidArtifact1>();
- }
- 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 RemoteBasicGuidRelation1 }
- *
- *
- */
- public List<RemoteBasicGuidRelation1> getRelations() {
- if (relations == null) {
- relations = new ArrayList<RemoteBasicGuidRelation1>();
- }
- return this.relations;
- }
-
- /**
- * Gets the value of the relationReorders 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 relationReorders property.
- *
- * <p>
- * For example, to add a new item, do as follows:
- * <pre>
- * getRelationReorders().add(newItem);
- * </pre>
- *
- *
- * <p>
- * Objects of the following type(s) are allowed in the list
- * {@link RemoteBasicGuidRelationReorder1 }
- *
- *
- */
- public List<RemoteBasicGuidRelationReorder1> getRelationReorders() {
- if (relationReorders == null) {
- relationReorders = new ArrayList<RemoteBasicGuidRelationReorder1>();
- }
- return this.relationReorders;
- }
-
- /**
- * 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;
- }
+ "branchGuid",
+ "transactionId",
+ "artifacts",
+ "relations",
+ "relationReorders",
+ "networkSender"})
+public class RemotePersistEvent1 extends RemoteEvent {
+
+ @XmlElement(required = true)
+ protected String branchGuid;
+ protected int transactionId;
+ @XmlElement(required = true)
+ protected List<RemoteBasicGuidArtifact1> artifacts;
+ @XmlElement(required = true)
+ protected List<RemoteBasicGuidRelation1> relations;
+ @XmlElement(required = true)
+ protected List<RemoteBasicGuidRelationReorder1> relationReorders;
+ @XmlElement(required = true)
+ protected RemoteNetworkSender1 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 RemoteBasicGuidArtifact1 }
+ */
+ public List<RemoteBasicGuidArtifact1> getArtifacts() {
+ if (artifacts == null) {
+ artifacts = new ArrayList<RemoteBasicGuidArtifact1>();
+ }
+ 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 RemoteBasicGuidRelation1 }
+ */
+ public List<RemoteBasicGuidRelation1> getRelations() {
+ if (relations == null) {
+ relations = new ArrayList<RemoteBasicGuidRelation1>();
+ }
+ return this.relations;
+ }
+
+ /**
+ * Gets the value of the relationReorders 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 relationReorders property.
+ * <p>
+ * For example, to add a new item, do as follows:
+ *
+ * <pre>
+ * getRelationReorders().add(newItem);
+ * </pre>
+ * <p>
+ * Objects of the following type(s) are allowed in the list {@link RemoteBasicGuidRelationReorder1 }
+ */
+ public List<RemoteBasicGuidRelationReorder1> getRelationReorders() {
+ if (relationReorders == null) {
+ relationReorders = new ArrayList<RemoteBasicGuidRelationReorder1>();
+ }
+ return this.relationReorders;
+ }
+
+ /**
+ * Gets the value of the networkSender property.
+ *
+ * @return possible object is {@link RemoteNetworkSender1 }
+ */
+ @Override
+ 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/RemoteTransactionEvent1.java b/plugins/org.eclipse.osee.framework.messaging.event.res/src-gen/org/eclipse/osee/framework/messaging/event/res/msgs/RemoteTransactionEvent1.java
index 6a7d14c1ac7..bec50f658ee 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
@@ -5,7 +5,6 @@
// Generated on: 2011.08.22 at 10:40:57 AM MST
//
-
package org.eclipse.osee.framework.messaging.event.res.msgs;
import java.util.ArrayList;
@@ -16,11 +15,11 @@ 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 RemoteTransactionEvent1 complex type.
- *
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>
+ * Java class for RemoteTransactionEvent1 complex type.
+ * <p>
+ * The following schema fragment specifies the expected content contained within this class.
*
* <pre>
* &lt;complexType name="RemoteTransactionEvent1">
@@ -35,101 +34,75 @@ import org.eclipse.osee.framework.messaging.event.res.RemoteEvent;
* &lt;/complexContent>
* &lt;/complexType>
* </pre>
- *
- *
*/
@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "RemoteTransactionEvent1", propOrder = {
- "eventTypeGuid",
- "transactions",
- "networkSender"
-})
-public class RemoteTransactionEvent1
- extends RemoteEvent
-{
+@XmlType(name = "RemoteTransactionEvent1", propOrder = {"eventTypeGuid", "transactions", "networkSender"})
+public class RemoteTransactionEvent1 extends RemoteEvent {
- @XmlElement(required = true)
- protected String eventTypeGuid;
- @XmlElement(required = true)
- protected List<RemoteTransactionChange1> transactions;
- @XmlElement(required = true)
- protected RemoteNetworkSender1 networkSender;
+ @XmlElement(required = true)
+ protected String eventTypeGuid;
+ @XmlElement(required = true)
+ protected List<RemoteTransactionChange1> transactions;
+ @XmlElement(required = true)
+ protected RemoteNetworkSender1 networkSender;
- /**
- * Gets the value of the eventTypeGuid property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getEventTypeGuid() {
- return eventTypeGuid;
- }
+ /**
+ * Gets the value of the eventTypeGuid property.
+ *
+ * @return possible object is {@link String }
+ */
+ public String getEventTypeGuid() {
+ return eventTypeGuid;
+ }
- /**
- * Sets the value of the eventTypeGuid property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setEventTypeGuid(String value) {
- this.eventTypeGuid = value;
- }
+ /**
+ * Sets the value of the eventTypeGuid property.
+ *
+ * @param value allowed object is {@link String }
+ */
+ public void setEventTypeGuid(String value) {
+ this.eventTypeGuid = value;
+ }
- /**
- * Gets the value of the transactions 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 transactions property.
- *
- * <p>
- * For example, to add a new item, do as follows:
- * <pre>
- * getTransactions().add(newItem);
- * </pre>
- *
- *
- * <p>
- * Objects of the following type(s) are allowed in the list
- * {@link RemoteTransactionChange1 }
- *
- *
- */
- public List<RemoteTransactionChange1> getTransactions() {
- if (transactions == null) {
- transactions = new ArrayList<RemoteTransactionChange1>();
- }
- return this.transactions;
- }
+ /**
+ * Gets the value of the transactions 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 transactions property.
+ * <p>
+ * For example, to add a new item, do as follows:
+ *
+ * <pre>
+ * getTransactions().add(newItem);
+ * </pre>
+ * <p>
+ * Objects of the following type(s) are allowed in the list {@link RemoteTransactionChange1 }
+ */
+ public List<RemoteTransactionChange1> getTransactions() {
+ if (transactions == null) {
+ transactions = new ArrayList<RemoteTransactionChange1>();
+ }
+ return this.transactions;
+ }
- /**
- * Gets the value of the networkSender property.
- *
- * @return
- * possible object is
- * {@link RemoteNetworkSender1 }
- *
- */
- public RemoteNetworkSender1 getNetworkSender() {
- return networkSender;
- }
+ /**
+ * Gets the value of the networkSender property.
+ *
+ * @return possible object is {@link RemoteNetworkSender1 }
+ */
+ @Override
+ 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;
- }
+ /**
+ * 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/org/eclipse/osee/framework/messaging/event/res/IOseeCoreModelEventService.java b/plugins/org.eclipse.osee.framework.messaging.event.res/src/org/eclipse/osee/framework/messaging/event/res/IOseeCoreModelEventService.java
index 7b9f383bfab..fec36860eb2 100644
--- a/plugins/org.eclipse.osee.framework.messaging.event.res/src/org/eclipse/osee/framework/messaging/event/res/IOseeCoreModelEventService.java
+++ b/plugins/org.eclipse.osee.framework.messaging.event.res/src/org/eclipse/osee/framework/messaging/event/res/IOseeCoreModelEventService.java
@@ -18,13 +18,13 @@ import org.eclipse.osee.framework.messaging.ConnectionListener;
*/
public interface IOseeCoreModelEventService {
- void addFrameworkListener(IFrameworkEventListener frameworkEventListener);
+ void addFrameworkListener(IFrameworkEventListener frameworkEventListener) throws OseeCoreException;
- void removeFrameworkListener(IFrameworkEventListener frameworkEventListener);
+ void removeFrameworkListener(IFrameworkEventListener frameworkEventListener) throws OseeCoreException;
- void addConnectionListener(ConnectionListener connectionListener);
+ void addConnectionListener(ConnectionListener connectionListener) throws OseeCoreException;
- void removeConnectionListener(ConnectionListener connectionListener);
+ void removeConnectionListener(ConnectionListener connectionListener) throws OseeCoreException;
void sendRemoteEvent(RemoteEvent remoteEvent) throws OseeCoreException;
diff --git a/plugins/org.eclipse.osee.framework.messaging.event.res/src/org/eclipse/osee/framework/messaging/event/res/internal/Activator.java b/plugins/org.eclipse.osee.framework.messaging.event.res/src/org/eclipse/osee/framework/messaging/event/res/internal/Activator.java
deleted file mode 100644
index 664ff1b2fde..00000000000
--- a/plugins/org.eclipse.osee.framework.messaging.event.res/src/org/eclipse/osee/framework/messaging/event/res/internal/Activator.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2007 Boeing.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Boeing - initial API and implementation
- *******************************************************************************/
-package org.eclipse.osee.framework.messaging.event.res.internal;
-
-import org.eclipse.osee.framework.core.util.ServiceDependencyTracker;
-import org.eclipse.osee.framework.jdk.core.util.Lib;
-import org.osgi.framework.BundleActivator;
-import org.osgi.framework.BundleContext;
-
-/**
- * @author Donald G. Dunne
- */
-public class Activator implements BundleActivator {
-
- private ServiceDependencyTracker tracker;
-
- @Override
- public void start(BundleContext context) throws Exception {
- tracker = new ServiceDependencyTracker(context, new OseeCoreModelEventServiceRegHandler());
- tracker.open();
- }
-
- @Override
- public void stop(BundleContext context) throws Exception {
- Lib.close(tracker);
- }
-} \ No newline at end of file
diff --git a/plugins/org.eclipse.osee.framework.messaging.event.res/src/org/eclipse/osee/framework/messaging/event/res/internal/OseeCoreModelEventServiceImpl.java b/plugins/org.eclipse.osee.framework.messaging.event.res/src/org/eclipse/osee/framework/messaging/event/res/internal/OseeCoreModelEventServiceImpl.java
index e3c79050c65..27c0ca5c8e8 100644
--- a/plugins/org.eclipse.osee.framework.messaging.event.res/src/org/eclipse/osee/framework/messaging/event/res/internal/OseeCoreModelEventServiceImpl.java
+++ b/plugins/org.eclipse.osee.framework.messaging.event.res/src/org/eclipse/osee/framework/messaging/event/res/internal/OseeCoreModelEventServiceImpl.java
@@ -11,16 +11,17 @@
package org.eclipse.osee.framework.messaging.event.res.internal;
import java.util.Collection;
-import java.util.HashMap;
import java.util.HashSet;
import java.util.Map;
import java.util.Map.Entry;
+import java.util.concurrent.ConcurrentHashMap;
import java.util.logging.Level;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
import org.eclipse.osee.framework.jdk.core.type.HashCollection;
import org.eclipse.osee.framework.logging.OseeLog;
import org.eclipse.osee.framework.messaging.ConnectionListener;
import org.eclipse.osee.framework.messaging.ConnectionNode;
+import org.eclipse.osee.framework.messaging.MessageService;
import org.eclipse.osee.framework.messaging.OseeMessagingListener;
import org.eclipse.osee.framework.messaging.OseeMessagingStatusCallback;
import org.eclipse.osee.framework.messaging.event.res.IFrameworkEventListener;
@@ -33,15 +34,30 @@ import org.eclipse.osee.framework.messaging.event.res.RemoteEvent;
public class OseeCoreModelEventServiceImpl implements OseeMessagingStatusCallback, IOseeCoreModelEventService {
private final Map<IFrameworkEventListener, HashCollection<ResMessages, OseeMessagingListener>> subscriptions =
- new HashMap<IFrameworkEventListener, HashCollection<ResMessages, OseeMessagingListener>>();
+ new ConcurrentHashMap<IFrameworkEventListener, HashCollection<ResMessages, OseeMessagingListener>>();
+
private final Map<ResMessages, Boolean> messages;
- private final ConnectionNode connectionNode;
+ private final MessageService messageService;
+
+ private ConnectionNode connectionNode;
- public OseeCoreModelEventServiceImpl(ConnectionNode connectionNode, Map<ResMessages, Boolean> messages) {
- this.connectionNode = connectionNode;
+ public OseeCoreModelEventServiceImpl(MessageService messageService, Map<ResMessages, Boolean> messages) {
+ this.messageService = messageService;
this.messages = messages;
}
+ private synchronized ConnectionNode getConnectionNode() {
+ if (connectionNode == null) {
+ try {
+ connectionNode = messageService.getDefault();
+ } catch (OseeCoreException ex) {
+ OseeLog.log(OseeCoreModelEventServiceProxy.class, Level.SEVERE,
+ "Error initializing OseeCoreModelEventServiceProxy");
+ }
+ }
+ return connectionNode;
+ }
+
@Override
public void success() {
// do nothing
@@ -49,20 +65,20 @@ public class OseeCoreModelEventServiceImpl implements OseeMessagingStatusCallbac
@Override
public void fail(Throwable th) {
- OseeLog.log(Activator.class, Level.SEVERE, th);
-
+ OseeLog.log(OseeCoreModelEventServiceImpl.class, Level.SEVERE, th);
}
@Override
public void sendRemoteEvent(RemoteEvent remoteEvent) throws OseeCoreException {
ResMessages resMessage = getResMessageType(remoteEvent);
if (resMessage == null) {
- OseeLog.logf(Activator.class, Level.INFO, "ResEventManager: Unhandled remote event [%s]", resMessage);
- } else if (connectionNode == null) {
- OseeLog.logf(Activator.class, Level.INFO,
+ OseeLog.logf(OseeCoreModelEventServiceImpl.class, Level.INFO, "ResEventManager: Unhandled remote event [%s]",
+ resMessage);
+ } else if (getConnectionNode() == null) {
+ OseeLog.logf(OseeCoreModelEventServiceImpl.class, Level.INFO,
"ResEventManager: Connection node was null - unable to send remote event [%s]", resMessage);
} else {
- connectionNode.send(resMessage, remoteEvent, this);
+ getConnectionNode().send(resMessage, remoteEvent, this);
}
}
@@ -82,17 +98,17 @@ public class OseeCoreModelEventServiceImpl implements OseeMessagingStatusCallbac
@Override
public void addConnectionListener(ConnectionListener connectionListener) {
- connectionNode.addConnectionListener(connectionListener);
+ getConnectionNode().addConnectionListener(connectionListener);
}
@Override
public void removeConnectionListener(ConnectionListener connectionListener) {
- connectionNode.removeConnectionListener(connectionListener);
+ getConnectionNode().removeConnectionListener(connectionListener);
}
@Override
public void addFrameworkListener(IFrameworkEventListener frameworkEventListener) {
- OseeLog.log(Activator.class, Level.INFO, "Registering Client for Remote Events");
+ OseeLog.log(OseeCoreModelEventServiceImpl.class, Level.INFO, "Registering Client for Remote Events");
for (Entry<ResMessages, Boolean> messageEntries : messages.entrySet()) {
ResMessages resMessageID = messageEntries.getKey();
@@ -103,7 +119,7 @@ public class OseeCoreModelEventServiceImpl implements OseeMessagingStatusCallbac
@Override
public void removeFrameworkListener(IFrameworkEventListener frameworkEventListener) {
- OseeLog.log(Activator.class, Level.INFO, "De-Registering Client for Remote Events");
+ OseeLog.log(OseeCoreModelEventServiceImpl.class, Level.INFO, "De-Registering Client for Remote Events");
HashCollection<ResMessages, OseeMessagingListener> listeners = subscriptions.get(frameworkEventListener);
if (listeners != null) {
@@ -111,7 +127,7 @@ public class OseeCoreModelEventServiceImpl implements OseeMessagingStatusCallbac
Collection<OseeMessagingListener> listernerList = listeners.getValues(messageID);
if (listernerList != null) {
for (OseeMessagingListener listener : listernerList) {
- connectionNode.unsubscribe(messageID, listener, this);
+ getConnectionNode().unsubscribe(messageID, listener, this);
}
}
}
@@ -121,7 +137,7 @@ public class OseeCoreModelEventServiceImpl implements OseeMessagingStatusCallbac
private <T extends RemoteEvent> void subscribe(ResMessages messageId, Class<T> clazz, boolean isVerbose, IFrameworkEventListener frameworkEventListener) {
OseeMessagingListener listener = new FrameworkRelayMessagingListener<T>(clazz, frameworkEventListener, isVerbose);
- connectionNode.subscribe(messageId, listener, this);
+ getConnectionNode().subscribe(messageId, listener, this);
HashCollection<ResMessages, OseeMessagingListener> listeners = subscriptions.get(frameworkEventListener);
if (listeners == null) {
listeners = new HashCollection<ResMessages, OseeMessagingListener>(true, HashSet.class);
diff --git a/plugins/org.eclipse.osee.framework.messaging.event.res/src/org/eclipse/osee/framework/messaging/event/res/internal/OseeCoreModelEventServiceProxy.java b/plugins/org.eclipse.osee.framework.messaging.event.res/src/org/eclipse/osee/framework/messaging/event/res/internal/OseeCoreModelEventServiceProxy.java
new file mode 100644
index 00000000000..7e6243387ed
--- /dev/null
+++ b/plugins/org.eclipse.osee.framework.messaging.event.res/src/org/eclipse/osee/framework/messaging/event/res/internal/OseeCoreModelEventServiceProxy.java
@@ -0,0 +1,90 @@
+/*******************************************************************************
+ * Copyright (c) 2010 Boeing.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Boeing - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.osee.framework.messaging.event.res.internal;
+
+import java.util.HashMap;
+import java.util.Map;
+import org.eclipse.osee.framework.core.exception.OseeCoreException;
+import org.eclipse.osee.framework.core.util.Conditions;
+import org.eclipse.osee.framework.messaging.ConnectionListener;
+import org.eclipse.osee.framework.messaging.MessageService;
+import org.eclipse.osee.framework.messaging.event.res.IFrameworkEventListener;
+import org.eclipse.osee.framework.messaging.event.res.IOseeCoreModelEventService;
+import org.eclipse.osee.framework.messaging.event.res.RemoteEvent;
+
+/**
+ * @author Roberto E. Escobar
+ */
+public class OseeCoreModelEventServiceProxy implements IOseeCoreModelEventService {
+
+ private MessageService messageService;
+ private IOseeCoreModelEventService proxiedService;
+
+ public void setMessageService(MessageService messageService) {
+ this.messageService = messageService;
+ }
+
+ private IOseeCoreModelEventService getProxiedService() {
+ return proxiedService;
+ }
+
+ public void start() {
+ Map<ResMessages, Boolean> eventMessageConfig = new HashMap<ResMessages, Boolean>();
+
+ eventMessageConfig.put(ResMessages.RemoteAccessControlEvent1, Boolean.TRUE);
+ eventMessageConfig.put(ResMessages.RemoteBranchEvent1, Boolean.TRUE);
+ eventMessageConfig.put(ResMessages.RemoteBroadcastEvent1, Boolean.TRUE);
+ eventMessageConfig.put(ResMessages.RemotePersistEvent1, Boolean.FALSE);
+ eventMessageConfig.put(ResMessages.RemoteTransactionEvent1, Boolean.TRUE);
+
+ proxiedService = new OseeCoreModelEventServiceImpl(messageService, eventMessageConfig);
+ }
+
+ public void stop() {
+ proxiedService = null;
+ }
+
+ private void checkInitialized() throws OseeCoreException {
+ Conditions.checkNotNull(getProxiedService(),
+ "IOseeCoreModelEventService was not initialized correctly. Make sure start() was called");
+ }
+
+ @Override
+ public void addFrameworkListener(IFrameworkEventListener frameworkEventListener) throws OseeCoreException {
+ checkInitialized();
+ getProxiedService().addFrameworkListener(frameworkEventListener);
+ }
+
+ @Override
+ public void removeFrameworkListener(IFrameworkEventListener frameworkEventListener) throws OseeCoreException {
+ checkInitialized();
+ getProxiedService().removeFrameworkListener(frameworkEventListener);
+ }
+
+ @Override
+ public void addConnectionListener(ConnectionListener connectionListener) throws OseeCoreException {
+ checkInitialized();
+ getProxiedService().addConnectionListener(connectionListener);
+ }
+
+ @Override
+ public void removeConnectionListener(ConnectionListener connectionListener) throws OseeCoreException {
+ checkInitialized();
+ getProxiedService().removeConnectionListener(connectionListener);
+ }
+
+ @Override
+ public void sendRemoteEvent(RemoteEvent remoteEvent) throws OseeCoreException {
+ checkInitialized();
+ getProxiedService().sendRemoteEvent(remoteEvent);
+ }
+
+}
diff --git a/plugins/org.eclipse.osee.framework.messaging.event.res/src/org/eclipse/osee/framework/messaging/event/res/internal/OseeCoreModelEventServiceRegHandler.java b/plugins/org.eclipse.osee.framework.messaging.event.res/src/org/eclipse/osee/framework/messaging/event/res/internal/OseeCoreModelEventServiceRegHandler.java
deleted file mode 100644
index dafdab435ca..00000000000
--- a/plugins/org.eclipse.osee.framework.messaging.event.res/src/org/eclipse/osee/framework/messaging/event/res/internal/OseeCoreModelEventServiceRegHandler.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Boeing.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Boeing - initial API and implementation
- *******************************************************************************/
-package org.eclipse.osee.framework.messaging.event.res.internal;
-
-import java.util.HashMap;
-import java.util.Map;
-import java.util.logging.Level;
-import org.eclipse.osee.framework.core.exception.OseeCoreException;
-import org.eclipse.osee.framework.core.util.AbstractTrackingHandler;
-import org.eclipse.osee.framework.logging.OseeLog;
-import org.eclipse.osee.framework.messaging.ConnectionNode;
-import org.eclipse.osee.framework.messaging.MessageService;
-import org.eclipse.osee.framework.messaging.event.res.IOseeCoreModelEventService;
-import org.osgi.framework.BundleContext;
-import org.osgi.framework.ServiceRegistration;
-
-/**
- * @author Roberto E. Escobar
- */
-public class OseeCoreModelEventServiceRegHandler extends AbstractTrackingHandler {
-
- private static final Class<?>[] DEPENDENCIES = new Class<?>[] {MessageService.class};
-
- private final Map<ResMessages, Boolean> eventMessageConfig = new HashMap<ResMessages, Boolean>();
- private ServiceRegistration registration;
-
- public OseeCoreModelEventServiceRegHandler() {
- eventMessageConfig.put(ResMessages.RemoteAccessControlEvent1, Boolean.TRUE);
- eventMessageConfig.put(ResMessages.RemoteBranchEvent1, Boolean.TRUE);
- eventMessageConfig.put(ResMessages.RemoteBroadcastEvent1, Boolean.TRUE);
- eventMessageConfig.put(ResMessages.RemotePersistEvent1, Boolean.FALSE);
- eventMessageConfig.put(ResMessages.RemoteTransactionEvent1, Boolean.TRUE);
- }
-
- @Override
- public Class<?>[] getDependencies() {
- return DEPENDENCIES;
- }
-
- @Override
- public void onActivate(BundleContext context, Map<Class<?>, Object> services) {
- MessageService messageService = getService(MessageService.class, services);
- try {
- ConnectionNode connectionNode = messageService.getDefault();
- IOseeCoreModelEventService service = new OseeCoreModelEventServiceImpl(connectionNode, eventMessageConfig);
- registration = context.registerService(IOseeCoreModelEventService.class.getName(), service, null);
- } catch (OseeCoreException ex) {
- OseeLog.log(Activator.class, Level.SEVERE, ex);
- }
- }
-
- @Override
- public void onDeActivate() {
- if (registration != null) {
- registration.unregister();
- }
- }
-
-}
diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event/systems/InternalEventManager.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event/systems/InternalEventManager.java
index ae3fe4d233a..94bc27665a2 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event/systems/InternalEventManager.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event/systems/InternalEventManager.java
@@ -18,6 +18,7 @@ import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Status;
import org.eclipse.core.runtime.jobs.Job;
+import org.eclipse.osee.framework.core.exception.OseeCoreException;
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;
@@ -73,11 +74,11 @@ public class InternalEventManager {
this.connectionStatus = connectionStatus;
}
- public void start() {
+ public void start() throws OseeCoreException {
coreModelEventService.addFrameworkListener(frameworkListener);
}
- public void stop() {
+ public void stop() throws OseeCoreException {
coreModelEventService.removeFrameworkListener(frameworkListener);
}
diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/internal/OseeEventSystemServiceRegHandler.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/internal/OseeEventSystemServiceRegHandler.java
index 7f84eaf0121..ae5cdb7bc61 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/internal/OseeEventSystemServiceRegHandler.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/internal/OseeEventSystemServiceRegHandler.java
@@ -121,8 +121,12 @@ public class OseeEventSystemServiceRegHandler extends AbstractTrackingHandler {
InternalEventManager eventManager = eventManagerData.getMessageEventManager();
if (eventManager != null) {
- coreModelEventService.removeConnectionListener(connectionStatusListener);
- eventManager.stop();
+ try {
+ coreModelEventService.removeConnectionListener(connectionStatusListener);
+ eventManager.stop();
+ } catch (OseeCoreException ex) {
+ OseeLog.log(Activator.class, Level.SEVERE, ex);
+ }
// OseeEventManager.kickLocalRemEvent(eventManager, RemoteEventServiceEventType.Rem_DisConnected);
eventManagerData.setMessageEventManager(null);
}

Back to the top