*** empty log message ***

6 files changed, 29 insertions, 21 deletions

diff --git a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/ConnectionFactoryImpl.java b/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/ConnectionFactoryImpl.java
index 825ec75cb7..ba6382c7c0 100644
--- a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/ConnectionFactoryImpl.java
+++ b/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/ConnectionFactoryImpl.java
@@ -10,7 +10,7 @@
  **************************************************************************/
 package org.eclipse.net4j.internal.jms;
 
-import org.eclipse.net4j.ITransportContainer;
+import org.eclipse.net4j.util.container.IManagedContainer;
 
 import javax.jms.Connection;
 import javax.jms.ConnectionFactory;
@@ -62,7 +62,7 @@ public class ConnectionFactoryImpl implements ConnectionFactory, Remote, Seriali
 
   public Connection createConnection(String userName, String password) throws JMSException
   {
-    return new ConnectionImpl((ITransportContainer)transportContainer, connectorType, connectorDescription, userName,
+    return new ConnectionImpl((IManagedContainer)transportContainer, connectorType, connectorDescription, userName,
         password);
   }
 }
diff --git a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/ConnectionImpl.java b/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/ConnectionImpl.java
index 8ce5f00a1e..01fabd8c48 100644
--- a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/ConnectionImpl.java
+++ b/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/ConnectionImpl.java
@@ -12,7 +12,7 @@ package org.eclipse.net4j.internal.jms;
 
 import org.eclipse.net4j.IChannel;
 import org.eclipse.net4j.IConnector;
-import org.eclipse.net4j.ITransportContainer;
+import org.eclipse.net4j.Net4jUtil;
 import org.eclipse.net4j.internal.jms.bundle.OM;
 import org.eclipse.net4j.internal.jms.protocol.JMSClientProtocol;
 import org.eclipse.net4j.internal.jms.protocol.JMSLogonRequest;
@@ -25,6 +25,7 @@ import org.eclipse.net4j.jms.JMSUtil;
 import org.eclipse.net4j.util.container.IContainer;
 import org.eclipse.net4j.util.container.IContainerDelta;
 import org.eclipse.net4j.util.container.IContainerEvent;
+import org.eclipse.net4j.util.container.IManagedContainer;
 import org.eclipse.net4j.util.container.IContainerDelta.Kind;
 import org.eclipse.net4j.util.event.IListener;
 import org.eclipse.net4j.util.lifecycle.ILifecycle;
@@ -60,7 +61,7 @@ public class ConnectionImpl extends Lifecycle implements Connection, IContainer<
 
   private long sendTimeout = 2500;
 
-  private ITransportContainer transportContainer;
+  private IManagedContainer transportContainer;
 
   private IChannel channel;
 
@@ -93,7 +94,7 @@ public class ConnectionImpl extends Lifecycle implements Connection, IContainer<
 
   private boolean stopped = true;
 
-  public ConnectionImpl(ITransportContainer transportContainer, String connectorType, String connectorDescription,
+  public ConnectionImpl(IManagedContainer transportContainer, String connectorType, String connectorDescription,
       String userName, String password) throws JMSException
   {
     this.transportContainer = transportContainer == null ? JMSUtil.getTransportContainer() : transportContainer;
@@ -107,7 +108,7 @@ public class ConnectionImpl extends Lifecycle implements Connection, IContainer<
     this.userName = userName;
     this.password = password;
 
-    IConnector connector = transportContainer.getConnector(connectorType, connectorDescription);
+    IConnector connector = Net4jUtil.getConnector(transportContainer, connectorType, connectorDescription);
     JMSClientProtocol protocol = new JMSClientProtocol();
     protocol.setConnection(this);
     channel = connector.openChannel(protocol);
@@ -169,7 +170,7 @@ public class ConnectionImpl extends Lifecycle implements Connection, IContainer<
     return session;
   }
 
-  public ITransportContainer getTransportContainer()
+  public IManagedContainer getTransportContainer()
   {
     return transportContainer;
   }
diff --git a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/bundle/OM.java b/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/bundle/OM.java
index 0ada75d830..423e291e9d 100644
--- a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/bundle/OM.java
+++ b/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/bundle/OM.java
@@ -10,8 +10,8 @@
  **************************************************************************/
 package org.eclipse.net4j.internal.jms.bundle;
 
-import org.eclipse.net4j.IPluginTransportContainer;
 import org.eclipse.net4j.jms.JMSUtil;
+import org.eclipse.net4j.util.container.IPluginTransportContainer;
 import org.eclipse.net4j.util.om.OMBundle;
 import org.eclipse.net4j.util.om.OMPlatform;
 import org.eclipse.net4j.util.om.OSGiActivator;
diff --git a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSClientProtocolFactory.java b/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSClientProtocolFactory.java
index 4565a70a83..29d88cf246 100644
--- a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSClientProtocolFactory.java
+++ b/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSClientProtocolFactory.java
@@ -11,21 +11,29 @@
 package org.eclipse.net4j.internal.jms.protocol;
 
 import org.eclipse.net4j.jms.JMSProtocolConstants;
+import org.eclipse.net4j.util.container.IManagedContainer;
 
 import org.eclipse.internal.net4j.ClientProtocolFactory;
 
 /**
  * @author Eike Stepper
  */
-public final class JMSClientProtocolFactory extends ClientProtocolFactory
+public final class JMSClientProtocolFactory extends ClientProtocolFactory<JMSClientProtocol>
 {
+  public static final String TYPE = JMSProtocolConstants.PROTOCOL_NAME;
+
   public JMSClientProtocolFactory()
   {
-    super(JMSProtocolConstants.PROTOCOL_NAME);
+    super(TYPE);
   }
 
-  public Object create(String description)
+  public JMSClientProtocol create(String description)
   {
     return new JMSClientProtocol();
   }
+
+  public static JMSClientProtocol get(IManagedContainer container, String description)
+  {
+    return (JMSClientProtocol)container.getElement(PRODUCT_GROUP, TYPE, description);
+  }
 }
\ No newline at end of file
diff --git a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/jms/JMSInitialContext.java b/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/jms/JMSInitialContext.java
index 9d1ec85f66..da6e384ca9 100644
--- a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/jms/JMSInitialContext.java
+++ b/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/jms/JMSInitialContext.java
@@ -10,8 +10,8 @@
  **************************************************************************/
 package org.eclipse.net4j.jms;
 
-import org.eclipse.net4j.ITransportContainer;
 import org.eclipse.net4j.internal.jms.ConnectionFactoryImpl;
+import org.eclipse.net4j.util.container.IManagedContainer;
 
 import javax.naming.InitialContext;
 import javax.naming.Name;
@@ -24,26 +24,26 @@ import java.util.Hashtable;
  */
 public class JMSInitialContext extends InitialContext
 {
-  private ITransportContainer transportContainer;
+  private IManagedContainer transportContainer;
 
-  public JMSInitialContext(ITransportContainer transportContainer) throws NamingException
+  public JMSInitialContext(IManagedContainer transportContainer) throws NamingException
   {
     this.transportContainer = transportContainer;
   }
 
-  public JMSInitialContext(boolean lazy, ITransportContainer transportContainer) throws NamingException
+  public JMSInitialContext(boolean lazy, IManagedContainer transportContainer) throws NamingException
   {
     super(lazy);
     this.transportContainer = transportContainer;
   }
 
-  public JMSInitialContext(Hashtable<?, ?> environment, ITransportContainer transportContainer) throws NamingException
+  public JMSInitialContext(Hashtable<?, ?> environment, IManagedContainer transportContainer) throws NamingException
   {
     super(environment);
     this.transportContainer = transportContainer;
   }
 
-  public ITransportContainer getTransportContainer()
+  public IManagedContainer getTransportContainer()
   {
     return transportContainer;
   }
diff --git a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/jms/JMSUtil.java b/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/jms/JMSUtil.java
index 2ba324d3a5..1851d6505c 100644
--- a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/jms/JMSUtil.java
+++ b/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/jms/JMSUtil.java
@@ -10,7 +10,6 @@
  **************************************************************************/
 package org.eclipse.net4j.jms;
 
-import org.eclipse.net4j.ITransportContainer;
 import org.eclipse.net4j.internal.jms.protocol.JMSClientProtocolFactory;
 import org.eclipse.net4j.util.container.IManagedContainer;
 
@@ -22,7 +21,7 @@ import javax.naming.NamingException;
  */
 public final class JMSUtil
 {
-  private static ITransportContainer transportContainer;
+  private static IManagedContainer transportContainer;
 
   private JMSUtil()
   {
@@ -43,12 +42,12 @@ public final class JMSUtil
     return new JMSInitialContext(transportContainer);
   }
 
-  public static ITransportContainer getTransportContainer()
+  public static IManagedContainer getTransportContainer()
   {
     return transportContainer;
   }
 
-  public static void setTransportContainer(ITransportContainer transportContainer)
+  public static void setTransportContainer(IManagedContainer transportContainer)
   {
     JMSUtil.transportContainer = transportContainer;
   }