[jboss-cvs] JBoss Messaging SVN: r5879 - in trunk: src/main/org/jboss/messaging/jms/server/impl and 7 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Feb 17 04:30:51 EST 2009
Author: jmesnil
Date: 2009-02-17 04:30:51 -0500 (Tue, 17 Feb 2009)
New Revision: 5879
Modified:
trunk/.classpath
trunk/build-messaging.xml
trunk/src/main/org/jboss/messaging/jms/server/impl/JMSServerManagerImpl.java
trunk/tests/joram-tests/src/org/jboss/test/jms/AbstractAdmin.java
trunk/tests/joram-tests/src/org/jboss/test/jms/GenericAdmin.java
trunk/tests/joram-tests/src/org/jboss/test/jms/JBossMessagingAdmin.java
trunk/tests/joram-tests/src/org/objectweb/jtests/jms/admin/Admin.java
trunk/tests/joram-tests/src/org/objectweb/jtests/jms/conform/message/headers/MessageHeaderTest.java
trunk/tests/joram-tests/src/org/objectweb/jtests/jms/framework/PTPTestCase.java
trunk/tests/joram-tests/src/org/objectweb/jtests/jms/framework/PubSubTestCase.java
trunk/tests/joram-tests/src/org/objectweb/jtests/jms/framework/UnifiedTestCase.java
trunk/tests/src/org/jboss/messaging/tests/integration/jms/cluster/management/ReplicationAwareJMSQueueControlWrapperTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/jms/consumer/ConsumerTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/jms/management/JMSQueueControlTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/jms/management/JMSServerControlTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/jms/management/TopicControlTest.java
Log:
* in joram-tests, use a InVMContext instead of a real JNDI server
* replaced JMSServerManagerImp.setInitialContext(InitialContext) by setContext(Context)
Modified: trunk/.classpath
===================================================================
--- trunk/.classpath 2009-02-16 16:02:22 UTC (rev 5878)
+++ trunk/.classpath 2009-02-17 09:30:51 UTC (rev 5879)
@@ -52,7 +52,6 @@
<classpathentry kind="lib" path="thirdparty/jboss/integration/lib/jboss-transaction-spi.jar"/>
<classpathentry kind="lib" path="thirdparty/jboss/jboss-jaspi-api/lib/jboss-jaspi-api.jar"/>
<classpathentry kind="lib" path="thirdparty/jboss/common/lib/jboss-common.jar"/>
- <classpathentry kind="lib" path="thirdparty/jboss/jnpserver/lib/jnpserver.jar"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="lib" path="thirdparty/jboss/jbossts14/lib/jbossjta-integration.jar"/>
<classpathentry kind="lib" path="thirdparty/jboss/jboss-javaee/lib/jboss-javaee.jar"/>
Modified: trunk/build-messaging.xml
===================================================================
--- trunk/build-messaging.xml 2009-02-16 16:02:22 UTC (rev 5878)
+++ trunk/build-messaging.xml 2009-02-17 09:30:51 UTC (rev 5879)
@@ -278,7 +278,7 @@
<path id="joram.test.compilation.classpath">
<path refid="jms.test.compilation.classpath"/>
- <path refid="jboss.jnpserver.classpath"/>
+ <path location="${test.jms.classes.dir}" />
</path>
<path id="findbugs.classpath">
@@ -1115,7 +1115,7 @@
</javac>
</target>
- <target name="compile-joram-tests">
+ <target name="compile-joram-tests" depends="compile-jms-tests">
<mkdir dir="${test.joram.classes.dir}"/>
<javac target="${javac.target}"
source="${javac.source}"
Modified: trunk/src/main/org/jboss/messaging/jms/server/impl/JMSServerManagerImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/jms/server/impl/JMSServerManagerImpl.java 2009-02-16 16:02:22 UTC (rev 5878)
+++ trunk/src/main/org/jboss/messaging/jms/server/impl/JMSServerManagerImpl.java 2009-02-17 09:30:51 UTC (rev 5879)
@@ -66,9 +66,9 @@
private static final Logger log = Logger.getLogger(JMSServerManagerImpl.class);
/**
- * the initial context to bind to
+ * the context to bind to
*/
- private InitialContext initialContext;
+ private Context context;
private final Map<String, List<String>> destinations = new HashMap<String, List<String>>();
@@ -122,7 +122,7 @@
{
try
{
- initialContext = new InitialContext();
+ context = new InitialContext();
}
catch (NamingException e)
{
@@ -185,7 +185,7 @@
}
for (String jndiBinding : jndiBindings)
{
- initialContext.unbind(jndiBinding);
+ context.unbind(jndiBinding);
}
return true;
}
@@ -344,7 +344,7 @@
}
for (String jndiBinding : jndiBindings)
{
- initialContext.unbind(jndiBinding);
+ context.unbind(jndiBinding);
}
connectionFactoryBindings.remove(name);
connectionFactories.remove(name);
@@ -381,9 +381,9 @@
// Public --------------------------------------------------------
- public void setInitialContext(final InitialContext initialContext)
+ public void setContext(final Context context)
{
- this.initialContext = initialContext;
+ this.context = context;
}
// Private -------------------------------------------------------
@@ -422,7 +422,7 @@
jndiNameInContext = jndiName.substring(sepIndex + 1);
try
{
- initialContext.lookup(jndiName);
+ context.lookup(jndiName);
log.warn("Binding for " + jndiName + " already exists");
return false;
@@ -432,7 +432,7 @@
// OK
}
- Context c = JNDIUtil.createContext(initialContext, parentContext);
+ Context c = JNDIUtil.createContext(context, parentContext);
c.rebind(jndiNameInContext, objectToBind);
return true;
Modified: trunk/tests/joram-tests/src/org/jboss/test/jms/AbstractAdmin.java
===================================================================
--- trunk/tests/joram-tests/src/org/jboss/test/jms/AbstractAdmin.java 2009-02-16 16:02:22 UTC (rev 5878)
+++ trunk/tests/joram-tests/src/org/jboss/test/jms/AbstractAdmin.java 2009-02-17 09:30:51 UTC (rev 5879)
@@ -50,7 +50,7 @@
}
- public InitialContext createInitialContext() throws NamingException
+ public InitialContext createContext() throws NamingException
{
return new InitialContext();
}
Modified: trunk/tests/joram-tests/src/org/jboss/test/jms/GenericAdmin.java
===================================================================
--- trunk/tests/joram-tests/src/org/jboss/test/jms/GenericAdmin.java 2009-02-16 16:02:22 UTC (rev 5878)
+++ trunk/tests/joram-tests/src/org/jboss/test/jms/GenericAdmin.java 2009-02-17 09:30:51 UTC (rev 5879)
@@ -21,6 +21,7 @@
*/
package org.jboss.test.jms;
+import javax.naming.Context;
import javax.naming.InitialContext;
import javax.naming.NamingException;
@@ -55,9 +56,9 @@
{
}
- public InitialContext createInitialContext() throws NamingException
+ public Context createContext() throws NamingException
{
- InitialContext ctx = delegate.createInitialContext();
+ Context ctx = delegate.createContext();
log.debug("Using initial context: " + ctx.getEnvironment());
return ctx;
}
Modified: trunk/tests/joram-tests/src/org/jboss/test/jms/JBossMessagingAdmin.java
===================================================================
--- trunk/tests/joram-tests/src/org/jboss/test/jms/JBossMessagingAdmin.java 2009-02-16 16:02:22 UTC (rev 5878)
+++ trunk/tests/joram-tests/src/org/jboss/test/jms/JBossMessagingAdmin.java 2009-02-17 09:30:51 UTC (rev 5879)
@@ -41,10 +41,8 @@
import static org.jboss.messaging.core.client.impl.ClientSessionFactoryImpl.DEFAULT_RETRY_INTERVAL_MULTIPLIER;
import static org.jboss.messaging.core.client.impl.ClientSessionFactoryImpl.DEFAULT_SEND_WINDOW_SIZE;
-import java.util.Hashtable;
-
import javax.management.ObjectName;
-import javax.naming.InitialContext;
+import javax.naming.Context;
import javax.naming.NamingException;
import junit.framework.Assert;
@@ -65,8 +63,7 @@
import org.jboss.messaging.core.server.impl.MessagingServiceImpl;
import org.jboss.messaging.jms.server.impl.JMSServerManagerImpl;
import org.jboss.messaging.util.SimpleString;
-import org.jnp.server.Main;
-import org.jnp.server.NamingBeanImpl;
+import org.jboss.test.messaging.tools.container.InVMInitialContextFactory;
import org.objectweb.jtests.jms.admin.Admin;
/**
@@ -87,12 +84,18 @@
private MessagingServiceImpl embeddedServer;
- private NamingBeanImpl namingInfo;
+ private Context context;
- private Main jndiServer;
-
public JBossMessagingAdmin()
{
+ try
+ {
+ context = new InVMInitialContextFactory().getInitialContext(InVMInitialContextFactory.getJNDIEnvironment());
+ }
+ catch (NamingException e)
+ {
+ e.printStackTrace();
+ }
}
public void start() throws Exception
@@ -153,14 +156,9 @@
}
- public InitialContext createInitialContext() throws NamingException
+ public Context createContext() throws NamingException
{
- Hashtable<String, String> env = new Hashtable<String, String>();
- env.put("java.naming.factory.initial", "org.jnp.interfaces.NamingContextFactory");
- env.put("java.naming.provider.url", "jnp://localhost:1099");
- env.put("java.naming.factory.url.pkgs", "org.jboss.naming:org.jnp.interfaces");
-
- return new InitialContext(env);
+ return context;
}
public void createQueue(String name)
@@ -266,27 +264,12 @@
embeddedServer.start();
JMSServerManagerImpl serverManager = JMSServerManagerImpl.newJMSServerManagerImpl(embeddedServer.getServer());
serverManager.start();
- serverManager.setInitialContext(createInitialContext());
-
- System.setProperty("java.naming.factory.initial", "org.jnp.interfaces.NamingContextFactory");
- System.setProperty("java.naming.factory.url.pkgs", "org.jboss.naming:org.jnp.interfaces");
-
- namingInfo = new NamingBeanImpl();
- namingInfo.start();
- jndiServer = new Main();
- jndiServer.setNamingInfo(namingInfo);
- jndiServer.setPort(1099);
- jndiServer.setBindAddress("localhost");
- jndiServer.setRmiPort(1098);
- jndiServer.setRmiBindAddress("localhost");
- jndiServer.start();
+ serverManager.setContext(context);
}
public void stopEmbeddedServer() throws Exception
{
embeddedServer.stop();
- jndiServer.stop();
- namingInfo.stop();
}
// Constants -----------------------------------------------------
Modified: trunk/tests/joram-tests/src/org/objectweb/jtests/jms/admin/Admin.java
===================================================================
--- trunk/tests/joram-tests/src/org/objectweb/jtests/jms/admin/Admin.java 2009-02-16 16:02:22 UTC (rev 5878)
+++ trunk/tests/joram-tests/src/org/objectweb/jtests/jms/admin/Admin.java 2009-02-17 09:30:51 UTC (rev 5879)
@@ -24,7 +24,7 @@
package org.objectweb.jtests.jms.admin;
-import javax.naming.InitialContext;
+import javax.naming.Context;
import javax.naming.NamingException;
/**
@@ -44,12 +44,11 @@
public String getName();
/**
- * Returns an <code>InitialContext</code> with correct properties from
- * the JMS Provider.
+ * Returns an <code>Context</code> for the JMS Provider.
*
- * @return an <code>InitialContext</code> with correct properties from the JMS Provider.
+ * @return an <code>Context</code> for the JMS Provider.
*/
- public InitialContext createInitialContext() throws NamingException;
+ public Context createContext() throws NamingException;
/**
* Creates a <code>ConnectionFactory</code> and makes it available
Modified: trunk/tests/joram-tests/src/org/objectweb/jtests/jms/conform/message/headers/MessageHeaderTest.java
===================================================================
--- trunk/tests/joram-tests/src/org/objectweb/jtests/jms/conform/message/headers/MessageHeaderTest.java 2009-02-16 16:02:22 UTC (rev 5878)
+++ trunk/tests/joram-tests/src/org/objectweb/jtests/jms/conform/message/headers/MessageHeaderTest.java 2009-02-17 09:30:51 UTC (rev 5879)
@@ -201,7 +201,7 @@
try
{
admin.createQueue("anotherQueue");
- Context ctx = admin.createInitialContext();
+ Context ctx = admin.createContext();
Queue anotherQueue = (Queue) ctx.lookup("anotherQueue");
assertTrue(anotherQueue != senderQueue);
Modified: trunk/tests/joram-tests/src/org/objectweb/jtests/jms/framework/PTPTestCase.java
===================================================================
--- trunk/tests/joram-tests/src/org/objectweb/jtests/jms/framework/PTPTestCase.java 2009-02-16 16:02:22 UTC (rev 5878)
+++ trunk/tests/joram-tests/src/org/objectweb/jtests/jms/framework/PTPTestCase.java 2009-02-17 09:30:51 UTC (rev 5879)
@@ -31,7 +31,7 @@
import javax.jms.QueueSender;
import javax.jms.QueueSession;
import javax.jms.Session;
-import javax.naming.InitialContext;
+import javax.naming.Context;
import org.jboss.util.NestedRuntimeException;
@@ -51,7 +51,7 @@
public abstract class PTPTestCase extends JMSTestCase
{
- protected InitialContext ctx;
+ protected Context ctx;
private static final String QCF_NAME = "testQCF";
@@ -123,7 +123,7 @@
admin.createQueue(QUEUE_NAME);
// end of admin step, start of JMS client step
- ctx = admin.createInitialContext();
+ ctx = admin.createContext();
senderQCF = (QueueConnectionFactory) ctx.lookup(QCF_NAME);
senderQueue = (Queue) ctx.lookup(QUEUE_NAME);
Modified: trunk/tests/joram-tests/src/org/objectweb/jtests/jms/framework/PubSubTestCase.java
===================================================================
--- trunk/tests/joram-tests/src/org/objectweb/jtests/jms/framework/PubSubTestCase.java 2009-02-16 16:02:22 UTC (rev 5878)
+++ trunk/tests/joram-tests/src/org/objectweb/jtests/jms/framework/PubSubTestCase.java 2009-02-17 09:30:51 UTC (rev 5879)
@@ -31,7 +31,7 @@
import javax.jms.TopicPublisher;
import javax.jms.TopicSession;
import javax.jms.TopicSubscriber;
-import javax.naming.InitialContext;
+import javax.naming.Context;
import org.jboss.util.NestedRuntimeException;
@@ -51,7 +51,7 @@
public abstract class PubSubTestCase extends JMSTestCase
{
- private InitialContext ctx;
+ private Context ctx;
private static final String TCF_NAME = "testTCF";
@@ -123,7 +123,7 @@
admin.createTopic(TOPIC_NAME);
// end of admin step, start of JMS client step
- ctx = admin.createInitialContext();
+ ctx = admin.createContext();
publisherTCF = (TopicConnectionFactory) ctx.lookup(TCF_NAME);
publisherTopic = (Topic) ctx.lookup(TOPIC_NAME);
Modified: trunk/tests/joram-tests/src/org/objectweb/jtests/jms/framework/UnifiedTestCase.java
===================================================================
--- trunk/tests/joram-tests/src/org/objectweb/jtests/jms/framework/UnifiedTestCase.java 2009-02-16 16:02:22 UTC (rev 5878)
+++ trunk/tests/joram-tests/src/org/objectweb/jtests/jms/framework/UnifiedTestCase.java 2009-02-17 09:30:51 UTC (rev 5879)
@@ -34,7 +34,7 @@
import javax.jms.Session;
import javax.jms.Topic;
import javax.jms.TopicConnectionFactory;
-import javax.naming.InitialContext;
+import javax.naming.Context;
import org.jboss.util.NestedRuntimeException;
@@ -55,7 +55,7 @@
public abstract class UnifiedTestCase extends JMSTestCase
{
- protected InitialContext ctx;
+ protected Context ctx;
private static final String CF_NAME = "testCF";
@@ -172,7 +172,7 @@
admin.createTopic(TOPIC_NAME);
// end of admin step, start of JMS client step
- ctx = admin.createInitialContext();
+ ctx = admin.createContext();
producerCF = (ConnectionFactory) ctx.lookup(CF_NAME);
// we see destination of the unified domain as a javax.jms.Destination
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/jms/cluster/management/ReplicationAwareJMSQueueControlWrapperTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/jms/cluster/management/ReplicationAwareJMSQueueControlWrapperTest.java 2009-02-16 16:02:22 UTC (rev 5878)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/jms/cluster/management/ReplicationAwareJMSQueueControlWrapperTest.java 2009-02-17 09:30:51 UTC (rev 5879)
@@ -312,11 +312,11 @@
liveServerManager = JMSServerManagerImpl.newJMSServerManagerImpl(liveService.getServer());
liveServerManager.start();
- liveServerManager.setInitialContext(new NullInitialContext());
+ liveServerManager.setContext(new NullInitialContext());
backupServerManager = JMSServerManagerImpl.newJMSServerManagerImpl(backupService.getServer());
backupServerManager.start();
- backupServerManager.setInitialContext(new NullInitialContext());
+ backupServerManager.setContext(new NullInitialContext());
String queueName = randomString();
liveServerManager.createQueue(queueName, queueName);
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/jms/consumer/ConsumerTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/jms/consumer/ConsumerTest.java 2009-02-16 16:02:22 UTC (rev 5878)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/jms/consumer/ConsumerTest.java 2009-02-17 09:30:51 UTC (rev 5879)
@@ -88,7 +88,7 @@
service.start();
serverManager = JMSServerManagerImpl.newJMSServerManagerImpl(service.getServer());
serverManager.start();
- serverManager.setInitialContext(new NullInitialContext());
+ serverManager.setContext(new NullInitialContext());
serverManager.createQueue(Q_NAME, Q_NAME);
cf = new JBossConnectionFactory(new TransportConfiguration("org.jboss.messaging.core.remoting.impl.invm.InVMConnectorFactory"),
null,
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/jms/management/JMSQueueControlTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/jms/management/JMSQueueControlTest.java 2009-02-16 16:02:22 UTC (rev 5878)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/jms/management/JMSQueueControlTest.java 2009-02-17 09:30:51 UTC (rev 5879)
@@ -320,7 +320,7 @@
serverManager = JMSServerManagerImpl.newJMSServerManagerImpl(service.getServer());
serverManager.start();
- serverManager.setInitialContext(new NullInitialContext());
+ serverManager.setContext(new NullInitialContext());
String queueName = randomString();
serverManager.createQueue(queueName, queueName);
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/jms/management/JMSServerControlTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/jms/management/JMSServerControlTest.java 2009-02-16 16:02:22 UTC (rev 5878)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/jms/management/JMSServerControlTest.java 2009-02-17 09:30:51 UTC (rev 5879)
@@ -85,7 +85,7 @@
JMSServerManagerImpl serverManager = JMSServerManagerImpl.newJMSServerManagerImpl(service.getServer());
serverManager.start();
- serverManager.setInitialContext(new NullInitialContext());
+ serverManager.setContext(new NullInitialContext());
return service;
}
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/jms/management/TopicControlTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/jms/management/TopicControlTest.java 2009-02-16 16:02:22 UTC (rev 5878)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/jms/management/TopicControlTest.java 2009-02-17 09:30:51 UTC (rev 5879)
@@ -218,7 +218,7 @@
serverManager = JMSServerManagerImpl.newJMSServerManagerImpl(service.getServer());
serverManager.start();
- serverManager.setInitialContext(new NullInitialContext());
+ serverManager.setContext(new NullInitialContext());
clientID = randomString();
subscriptionName = randomString();
More information about the jboss-cvs-commits
mailing list