feature[ats_ATS272148]: Remove activemq

23 files changed, 43 insertions, 618 deletions

diff --git a/org.eclipse.ote.bytemessage/src/org/eclipse/ote/bytemessage/OteByteMessage.java b/org.eclipse.ote.bytemessage/src/org/eclipse/ote/bytemessage/OteByteMessage.java
index 0ebdf0920..2f6233d8d 100644
--- a/org.eclipse.ote.bytemessage/src/org/eclipse/ote/bytemessage/OteByteMessage.java
+++ b/org.eclipse.ote.bytemessage/src/org/eclipse/ote/bytemessage/OteByteMessage.java
@@ -31,6 +31,10 @@ public class OteByteMessage extends Message<ITestEnvironmentMessageSystemAccesso
       setMemSource(OteByteMessageType.OTE_BYTE_MESSAGE);
    }
    
+   public OteByteMessage(String name, String topic, int defaultByteSize) {
+      this(name, topic, 1, defaultByteSize);
+   }
+   
    public OteByteMessage(byte[] bytedata) {
 	  super("holder", 0, 0, false, 0, 0);
 	  data = new OteByteMessageData(this, bytedata.length);
diff --git a/org.eclipse.ote.bytemessage/src/org/eclipse/ote/bytemessage/OteByteMessageListener.java b/org.eclipse.ote.bytemessage/src/org/eclipse/ote/bytemessage/OteByteMessageListener.java
new file mode 100644
index 000000000..66e2f14b1
--- /dev/null
+++ b/org.eclipse.ote.bytemessage/src/org/eclipse/ote/bytemessage/OteByteMessageListener.java
@@ -0,0 +1,7 @@
+package org.eclipse.ote.bytemessage;
+
+public interface OteByteMessageListener<T extends OteByteMessage> {
+   
+   void onDataAvailable(T message);
+
+}
diff --git a/org.eclipse.ote.bytemessage/src/org/eclipse/ote/bytemessage/OteByteMessageUtil.java b/org.eclipse.ote.bytemessage/src/org/eclipse/ote/bytemessage/OteByteMessageUtil.java
index 7c9025019..750bf0263 100644
--- a/org.eclipse.ote.bytemessage/src/org/eclipse/ote/bytemessage/OteByteMessageUtil.java
+++ b/org.eclipse.ote.bytemessage/src/org/eclipse/ote/bytemessage/OteByteMessageUtil.java
@@ -138,5 +138,37 @@ public class OteByteMessageUtil {
       props.put("event.topics", signal.getHeader().TOPIC.getValue());
       return context.registerService(EventHandler.class, eventHandler, props);
    }
+   
+   public static <T extends OteByteMessage> ServiceRegistration<EventHandler> subscribe(T signal, OteByteMessageListener<T> eventHandler) {
+      BundleContext context = ServiceUtility.getContext();
+      if (context == null) {
+         return null;
+      }
+      Hashtable<String, Object> props = new Hashtable<String, Object>();
+      props.put("event.topics", signal.getHeader().TOPIC.getValue());
+      return context.registerService(EventHandler.class, new EventHandlerForOteByteMessage<T>(signal, eventHandler), props);
+   }
+   
+   private static class EventHandlerForOteByteMessage<T extends OteByteMessage> implements EventHandler {
+
+      private final T message;
+      private OteByteMessageListener<T> listener;
+      
+      public EventHandlerForOteByteMessage(T message, OteByteMessageListener<T> listener){
+         this.message = message;
+         this.listener = listener;
+      }
+      
+      @Override
+      public void handleEvent(Event arg0) {
+         try{
+            message.setData(OteByteMessageUtil.getBytes(arg0));
+            listener.onDataAvailable(message);
+         } catch (Throwable th){
+            th.printStackTrace();
+         }
+      }
+      
+   }
 
 }
diff --git a/org.eclipse.ote.event.bridge.jms/.classpath b/org.eclipse.ote.event.bridge.jms/.classpath
deleted file mode 100644
index ad32c83a7..000000000
--- a/org.eclipse.ote.event.bridge.jms/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/org.eclipse.ote.event.bridge.jms/.project b/org.eclipse.ote.event.bridge.jms/.project
deleted file mode 100644
index 250ac9aaa..000000000
--- a/org.eclipse.ote.event.bridge.jms/.project
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.ote.event.bridge.jms</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ds.core.builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/org.eclipse.ote.event.bridge.jms/META-INF/MANIFEST.MF b/org.eclipse.ote.event.bridge.jms/META-INF/MANIFEST.MF
deleted file mode 100644
index 9d5e35a10..000000000
--- a/org.eclipse.ote.event.bridge.jms/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,17 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: OTE Jms Event Bridge  (Incubation)
-Bundle-SymbolicName: org.eclipse.ote.event.bridge.jms;singleton:=true
-Bundle-Version: 0.11.0.qualifier
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Import-Package: org.eclipse.core.runtime;version="3.4.0",
- org.eclipse.osee.framework.core.data,
- org.eclipse.osee.framework.core.exception,
- org.eclipse.osee.framework.jdk.core.type,
- org.eclipse.osee.framework.logging,
- org.eclipse.osee.framework.messaging,
- org.eclipse.osee.ote.message,
- org.eclipse.osee.ote.message.elements,
- org.eclipse.ote.bytemessage,
- org.eclipse.ote.jms.node,
- org.osgi.service.event;version="1.3.0"
diff --git a/org.eclipse.ote.event.bridge.jms/OSGI-INF/EventToJmsComponent.xml b/org.eclipse.ote.event.bridge.jms/OSGI-INF/EventToJmsComponent.xml
deleted file mode 100644
index 46f0f20a9..000000000
--- a/org.eclipse.ote.event.bridge.jms/OSGI-INF/EventToJmsComponent.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" activate="start" deactivate="stop" enabled="true" immediate="true" name="org.eclipse.ote.event.bridge.jms.EventToJms">
-   <implementation class="org.eclipse.ote.event.bridge.jms.EventToJmsComponent"/>
-   <property name="event.topics" type="String" value="ote/*"/>
-   <reference bind="bindConnectionNode" cardinality="1..1" interface="org.eclipse.ote.jms.node.JmsConnectionNodeProvider" name="JmsConnectionNodeProvider" policy="static" unbind="unbindConnectionNode"/>
-   <reference bind="bindEventAdmin" cardinality="1..1" interface="org.osgi.service.event.EventAdmin" name="EventAdmin" policy="static" unbind="unbindEventAdmin"/>
-   <service>
-      <provide interface="org.osgi.service.event.EventHandler"/>
-   </service>
-</scr:component>
diff --git a/org.eclipse.ote.event.bridge.jms/build.properties b/org.eclipse.ote.event.bridge.jms/build.properties
deleted file mode 100644
index 6210e849b..000000000
--- a/org.eclipse.ote.event.bridge.jms/build.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-output.. = bin/
-bin.includes = META-INF/,\
-               .,\
-               OSGI-INF/
-source.. = src/
diff --git a/org.eclipse.ote.event.bridge.jms/pom.xml b/org.eclipse.ote.event.bridge.jms/pom.xml
deleted file mode 100644
index aba57b90e..000000000
--- a/org.eclipse.ote.event.bridge.jms/pom.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
-	<modelVersion>4.0.0</modelVersion>
-
-
-	<parent>
-		<groupId>org.eclipse.ote</groupId>
-		<artifactId>org.eclipse.ote.parent</artifactId>
-		<version>0.11.0-SNAPSHOT</version>
-		<relativePath>../org.eclipse.ote.parent</relativePath>
-	</parent>
-
-	<artifactId>org.eclipse.ote.event.bridge.jms</artifactId>
-	<packaging>eclipse-plugin</packaging>
-	<name>Eclipse OTE Event Bridge (Incubation)</name>
-
-</project>
diff --git a/org.eclipse.ote.event.bridge.jms/src/org/eclipse/ote/event/bridge/jms/BridgeMessages.java b/org.eclipse.ote.event.bridge.jms/src/org/eclipse/ote/event/bridge/jms/BridgeMessages.java
deleted file mode 100644
index 772596b40..000000000
--- a/org.eclipse.ote.event.bridge.jms/src/org/eclipse/ote/event/bridge/jms/BridgeMessages.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2013 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.ote.event.bridge.jms;
-
-import org.eclipse.osee.framework.messaging.MessageID;
-
-public enum BridgeMessages implements MessageID {
-	
-	BYTE_MESSAGE("OTE_BYTE_MESSAGE");
-	
-	private String id;
-
-	BridgeMessages(String id){
-		this.id = id;
-	}
-	
-	@Override
-	public Class<?> getSerializationClass() {
-		return null;
-	}
-
-	@Override
-	public boolean isReplyRequired() {
-		return false;
-	}
-
-	@Override
-	public boolean isTopic() {
-		return true;
-	}
-
-	@Override
-	public String getId() {
-		return id;
-	}
-
-	@Override
-	public String getName() {
-		return id;
-	}
-
-}
diff --git a/org.eclipse.ote.event.bridge.jms/src/org/eclipse/ote/event/bridge/jms/EventToJmsComponent.java b/org.eclipse.ote.event.bridge.jms/src/org/eclipse/ote/event/bridge/jms/EventToJmsComponent.java
deleted file mode 100644
index 03a0e2a27..000000000
--- a/org.eclipse.ote.event.bridge.jms/src/org/eclipse/ote/event/bridge/jms/EventToJmsComponent.java
+++ /dev/null
@@ -1,111 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2013 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.ote.event.bridge.jms;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
-import java.util.concurrent.CopyOnWriteArrayList;
-import java.util.logging.Level;
-
-import org.eclipse.osee.framework.logging.OseeLog;
-import org.eclipse.osee.framework.messaging.OseeMessagingListener;
-import org.eclipse.osee.framework.messaging.ReplyConnection;
-import org.eclipse.ote.bytemessage.OteByteMessage;
-import org.eclipse.ote.bytemessage.OteByteMessageUtil;
-import org.eclipse.ote.jms.node.JmsConnectionNodeProvider;
-import org.osgi.service.event.Event;
-import org.osgi.service.event.EventAdmin;
-import org.osgi.service.event.EventHandler;
-
-public class EventToJmsComponent extends OseeMessagingListener implements EventHandler {
-
-   private JmsConnectionNodeProvider connecitonNode;
-   private EventAdmin eventAdmin;
-   private final List<Event> eventQueue;
-   private final UUID MYID;
-
-   public EventToJmsComponent(){
-      eventQueue = new CopyOnWriteArrayList<Event>();
-      MYID = UUID.randomUUID();
-   }
-
-   void start(){
-   }
-
-   void stop(){
-   }
-
-   public synchronized void bindConnectionNode(JmsConnectionNodeProvider connectionNode){
-      this.connecitonNode = connectionNode;
-      connecitonNode.getConnectionNode().subscribe(BridgeMessages.BYTE_MESSAGE, this);
-      for(Event event:eventQueue){
-         sendEvent(event);
-      }
-      eventQueue.clear();
-   }
-
-   public synchronized void unbindConnectionNode(JmsConnectionNodeProvider connectionNode){
-      connecitonNode.getConnectionNode().unsubscribe(BridgeMessages.BYTE_MESSAGE, this);
-      this.connecitonNode = null;
-   }
-
-   public void bindEventAdmin(EventAdmin eventAdmin){
-      this.eventAdmin = eventAdmin;
-   }
-
-   public void unbindEventAdmin(EventAdmin eventAdmin){
-      this.eventAdmin = null;
-   }
-
-   @Override
-   public synchronized void handleEvent(Event event) {
-      if(connecitonNode != null){
-         sendEvent(event);
-      } else {
-         eventQueue.add(event);
-      }
-   }
-
-   private void sendEvent(Event event){
-      Object obj = event.getProperty("bytes");
-      if(obj != null && obj instanceof byte[]){
-         try {
-            UUID id = OteByteMessageUtil.getUUID((byte[])obj);
-            if(!id.equals(MYID)){
-               OteByteMessage msg = new OteByteMessage((byte[])obj);
-               OteByteMessageUtil.setUUID(msg, MYID);
-               connecitonNode.getConnectionNode().send(BridgeMessages.BYTE_MESSAGE, obj);
-            }
-         } catch (Exception e) {
-            e.printStackTrace();
-         }
-      }
-   }
-
-   @Override
-   public void process(Object message, Map<String, Object> headers, ReplyConnection replyConnection) {
-      if(message instanceof byte[]){
-         UUID id = OteByteMessageUtil.getUUID((byte[])message);
-         if(!id.equals(MYID)){
-            OteByteMessage msg = new OteByteMessage((byte[])message);
-            OteByteMessageUtil.setUUID(msg, MYID);
-            Map<String, Object> data = new HashMap<String, Object>();
-            data.put("bytes", msg.getData());
-            Event newevent = new Event(msg.getHeader().TOPIC.getValue(), data);
-            eventAdmin.sendEvent(newevent);
-         }
-      } else {
-         OseeLog.log(EventToJmsComponent.class, Level.SEVERE, "not a recognized message" + message.getClass());
-      }
-   }
-}
diff --git a/org.eclipse.ote.jms.node/.classpath b/org.eclipse.ote.jms.node/.classpath
deleted file mode 100644
index ad32c83a7..000000000
--- a/org.eclipse.ote.jms.node/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/org.eclipse.ote.jms.node/.project b/org.eclipse.ote.jms.node/.project
deleted file mode 100644
index 9c2b6a547..000000000
--- a/org.eclipse.ote.jms.node/.project
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.ote.jms.node</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ds.core.builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/org.eclipse.ote.jms.node/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.ote.jms.node/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index c537b6306..000000000
--- a/org.eclipse.ote.jms.node/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,7 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
-org.eclipse.jdt.core.compiler.compliance=1.6
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.6
diff --git a/org.eclipse.ote.jms.node/META-INF/MANIFEST.MF b/org.eclipse.ote.jms.node/META-INF/MANIFEST.MF
deleted file mode 100644
index 2b50b7e8b..000000000
--- a/org.eclipse.ote.jms.node/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,20 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Ote JMS Node  (Incubation)
-Bundle-SymbolicName: org.eclipse.ote.jms.node;singleton:=true
-Bundle-Version: 0.11.0.qualifier
-Bundle-Vendor: The Boeing Company
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Import-Package: org.eclipse.osee.connection.service,
- org.eclipse.osee.framework.core.exception,
- org.eclipse.osee.framework.jdk.core.type,
- org.eclipse.osee.framework.jdk.core.util;resolution:=optional,
- org.eclipse.osee.framework.logging,
- org.eclipse.osee.framework.messaging,
- org.eclipse.osee.ote.core.environment,
- org.eclipse.osee.ote.core.environment.interfaces,
- org.eclipse.osee.ote.service;resolution:=optional
-Export-Package: org.eclipse.ote.jms.node
-Require-Bundle: org.eclipse.core.runtime
-Service-Component: OSGI-INF/*.xml
-Bundle-ActivationPolicy: lazy
diff --git a/org.eclipse.ote.jms.node/OSGI-INF/ClientSideConnectionNodeLifecycleController.xml b/org.eclipse.ote.jms.node/OSGI-INF/ClientSideConnectionNodeLifecycleController.xml
deleted file mode 100644
index 33dd49950..000000000
--- a/org.eclipse.ote.jms.node/OSGI-INF/ClientSideConnectionNodeLifecycleController.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?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.ote.jms.node.ClientSideConnectionNodeLifecycleController">
-   <implementation class="org.eclipse.ote.jms.node.internal.ClientSideConnectionNodeLifecycleController"/>
-      <reference bind="setClientService"
-			  cardinality="1..1"
-			  interface="org.eclipse.osee.ote.service.IOteClientService"
-			  name="IOteClientService"
-			  policy="dynamic"/>
-   <reference bind="setMessageService"
-			  cardinality="1..1"
-			  interface="org.eclipse.osee.framework.messaging.MessageService"
-			  name="MessageService"
-			  policy="dynamic"/>
-</scr:component>
diff --git a/org.eclipse.ote.jms.node/OSGI-INF/ServerSideConnectionNodeProvider.xml b/org.eclipse.ote.jms.node/OSGI-INF/ServerSideConnectionNodeProvider.xml
deleted file mode 100644
index 1e967db5c..000000000
--- a/org.eclipse.ote.jms.node/OSGI-INF/ServerSideConnectionNodeProvider.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" activate="start" deactivate="stop" enabled="true" immediate="true" name="org.eclipse.ote.jms.node.ServerSideConnectionNodeProvider">
-   <implementation class="org.eclipse.ote.jms.node.internal.ServerSideConnectionNodeProviderImpl"/>
-   <reference
-              cardinality="1..1"
-              interface="org.eclipse.osee.framework.messaging.MessageService"
-              name="MessageService"
-              policy="static"
-              bind="setMessageService"
-              unbind="unsetMessageService"/>
-   <service>
-      <provide interface="org.eclipse.ote.jms.node.JmsConnectionNodeProvider"/>
-   </service>
-   <reference bind="bindHostTestEnvironment" cardinality="1..1" interface="org.eclipse.osee.ote.core.environment.interfaces.IHostTestEnvironment" name="IHostTestEnvironment" policy="static" unbind="unbindHostTestEnvironment"/>
-</scr:component>
diff --git a/org.eclipse.ote.jms.node/build.properties b/org.eclipse.ote.jms.node/build.properties
deleted file mode 100644
index 6210e849b..000000000
--- a/org.eclipse.ote.jms.node/build.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-output.. = bin/
-bin.includes = META-INF/,\
-               .,\
-               OSGI-INF/
-source.. = src/
diff --git a/org.eclipse.ote.jms.node/pom.xml b/org.eclipse.ote.jms.node/pom.xml
deleted file mode 100644
index e26ebba72..000000000
--- a/org.eclipse.ote.jms.node/pom.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
-	<modelVersion>4.0.0</modelVersion>
-
-	<parent>
-		<groupId>org.eclipse.ote</groupId>
-		<artifactId>org.eclipse.ote.parent</artifactId>
-		<version>0.11.0-SNAPSHOT</version>
-		<relativePath>../org.eclipse.ote.parent</relativePath>
-	</parent>
-
-	<artifactId>org.eclipse.ote.jms.node</artifactId>
-	<packaging>eclipse-plugin</packaging>
-	<name>Eclipse OTE JMS Node Connection  (Incubation)</name>
-
-
- 
-
-</project>
\ No newline at end of file
diff --git a/org.eclipse.ote.jms.node/src/org/eclipse/ote/jms/node/JmsConnectionNodeProvider.java b/org.eclipse.ote.jms.node/src/org/eclipse/ote/jms/node/JmsConnectionNodeProvider.java
deleted file mode 100644
index ba5edb26e..000000000
--- a/org.eclipse.ote.jms.node/src/org/eclipse/ote/jms/node/JmsConnectionNodeProvider.java
+++ /dev/null
@@ -1,17 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2013 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.ote.jms.node;
-
-import org.eclipse.osee.framework.messaging.ConnectionNode;
-
-public interface JmsConnectionNodeProvider {
-	ConnectionNode getConnectionNode();
-}
diff --git a/org.eclipse.ote.jms.node/src/org/eclipse/ote/jms/node/internal/ClientSideConnectionNodeLifecycleController.java b/org.eclipse.ote.jms.node/src/org/eclipse/ote/jms/node/internal/ClientSideConnectionNodeLifecycleController.java
deleted file mode 100644
index dd9bef637..000000000
--- a/org.eclipse.ote.jms.node/src/org/eclipse/ote/jms/node/internal/ClientSideConnectionNodeLifecycleController.java
+++ /dev/null
@@ -1,129 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2013 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.ote.jms.node.internal;
-
-import java.io.Serializable;
-import java.util.Map.Entry;
-import java.util.logging.Level;
-
-import org.eclipse.osee.connection.service.IServiceConnector;
-import org.eclipse.osee.framework.jdk.core.util.EnhancedProperties;
-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.NodeInfo;
-import org.eclipse.osee.ote.service.ConnectionEvent;
-import org.eclipse.osee.ote.service.IOteClientService;
-import org.eclipse.osee.ote.service.ITestConnectionListener;
-import org.eclipse.ote.jms.node.JmsConnectionNodeProvider;
-import org.osgi.framework.BundleContext;
-import org.osgi.framework.ServiceRegistration;
-
-
-
-/**
- * @author Michael P. Masterson
- */
-public final class ClientSideConnectionNodeLifecycleController implements ITestConnectionListener {
-
-   private MessageService messageService;
-   private IOteClientService clientService;
-   private BundleContext context;
-   private ServiceRegistration<?> registration;
-
-   public void start(BundleContext context) {
-      this.context = context;
-      clientService.addConnectionListener(this);
-
-   }
-
-   public void stop() {
-      clientService.removeConnectionListener(this);
-      unregisterConnectionNode();
-      this.messageService = null;
-      this.clientService = null;
-      this.context = null;
-
-   }
-
-   public void setMessageService(MessageService messageService) {
-      this.messageService = messageService;
-   }
-
-   public void setClientService(IOteClientService clientService) {
-      this.clientService = clientService;
-   }
-
-   @Override
-   public void onPostConnect(ConnectionEvent event) {
-      if (context == null) {
-         OseeLog.log(getClass(), Level.SEVERE, "Received a onPostConnect event with a null context.");
-         return;
-      }
-      IServiceConnector connector = event.getConnector();
-      registerConnectionNode(connector);
-   }
-
-   /**
-    * @param connector
-    */
-   private void registerConnectionNode(IServiceConnector connector) {
-      Object obj = connector.getProperty("OTEEmbeddedBroker", null);
-      if (obj != null && obj instanceof NodeInfo) {
-         debug("Registering client connection service");
-         NodeInfo nodeInfo = (NodeInfo) obj;
-         registerConnectionNode(nodeInfo);
-      } else {
-         debug(String.format("Problem using connector...%s:%s", obj.getClass(), obj));
-         EnhancedProperties properties = connector.getProperties();
-         for( Entry<String, Serializable> entry : properties.entrySet() ) {
-            debug(String.format("\t%s = %s", entry.getKey(), entry.getValue()));
-         }
-      }
-   }
-
-   /**
-    * @param nodeInfo
-    */
-   private void registerConnectionNode(NodeInfo nodeInfo) {
-      try {
-         ConnectionNode node = messageService.get(nodeInfo);
-         registration =
-               context.registerService(JmsConnectionNodeProvider.class.getName(), new ClientSideConnectionNodeProviderImpl(node), null);
-      } catch (Exception ex) {
-         OseeLog.log(getClass(), Level.SEVERE, ex);
-      }
-   }
-
-   @Override
-   public void onConnectionLost(IServiceConnector connector) {
-      unregisterConnectionNode();
-   }
-
-
-
-   private void unregisterConnectionNode() {
-      if (registration != null) {
-         registration.unregister();
-         registration = null;
-      }
-   }
-
-   @Override
-   public void onPreDisconnect(ConnectionEvent event) {
-      unregisterConnectionNode();
-   }
-
-   private void debug(String msg ) {
-      if( System.getProperty("ote.jms.node.debug") != null )
-         System.out.println(msg);
-   }
-}
diff --git a/org.eclipse.ote.jms.node/src/org/eclipse/ote/jms/node/internal/ClientSideConnectionNodeProviderImpl.java b/org.eclipse.ote.jms.node/src/org/eclipse/ote/jms/node/internal/ClientSideConnectionNodeProviderImpl.java
deleted file mode 100644
index 60ad7819a..000000000
--- a/org.eclipse.ote.jms.node/src/org/eclipse/ote/jms/node/internal/ClientSideConnectionNodeProviderImpl.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2013 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.ote.jms.node.internal;
-
-import org.eclipse.osee.framework.messaging.ConnectionNode;
-import org.eclipse.ote.jms.node.JmsConnectionNodeProvider;
-
-
-public final class ClientSideConnectionNodeProviderImpl implements JmsConnectionNodeProvider{
-
-	private final ConnectionNode node;
-
-	ClientSideConnectionNodeProviderImpl(ConnectionNode node) {
-		this.node = node;
-	}
-
-	@Override
-	public ConnectionNode getConnectionNode() {
-		return node;
-	}
-}
diff --git a/org.eclipse.ote.jms.node/src/org/eclipse/ote/jms/node/internal/ServerSideConnectionNodeProviderImpl.java b/org.eclipse.ote.jms.node/src/org/eclipse/ote/jms/node/internal/ServerSideConnectionNodeProviderImpl.java
deleted file mode 100644
index 5de9eb14d..000000000
--- a/org.eclipse.ote.jms.node/src/org/eclipse/ote/jms/node/internal/ServerSideConnectionNodeProviderImpl.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2013 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.ote.jms.node.internal;
-
-import java.util.logging.Level;
-
-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.NodeInfo;
-import org.eclipse.osee.ote.core.environment.interfaces.IHostTestEnvironment;
-import org.eclipse.ote.jms.node.JmsConnectionNodeProvider;
-
-
-
-/**
- * @author Michael P. Masterson
- */
-public final class ServerSideConnectionNodeProviderImpl implements JmsConnectionNodeProvider {
-   private IHostTestEnvironment testEnv;
-   private MessageService messageService;
-
-   private static JmsConnectionNodeProvider instance;
-
-   public void start() {
-      instance = this;
-   }
-
-   public void stop() {
-   }
-
-   public synchronized void bindHostTestEnvironment(IHostTestEnvironment testEnv) {
-      this.testEnv = testEnv;
-   }
-
-   public synchronized void unbindHostTestEnvironment(IHostTestEnvironment testEnv) {
-      this.testEnv = null;
-   }
-
-   public synchronized void setMessageService(MessageService messageService) {
-      this.messageService = messageService;
-   }
-
-   public synchronized void unsetMessageService(MessageService messageService) {
-      this.messageService = null;
-   }
-
-   public static JmsConnectionNodeProvider getInstance() {
-      return instance;
-   }
-
-   @Override
-   public synchronized ConnectionNode getConnectionNode() {
-      try {
-         NodeInfo info = testEnv.getBroker();
-         ConnectionNode connection = messageService.get(info);
-         return connection;
-      } catch (Exception ex) {
-         OseeLog.log(this.getClass(), Level.SEVERE, ex);
-      }
-      return null;
-   }
-}