[jboss-cvs] JBoss Messaging SVN: r6551 - in trunk: examples/jms/symmetric-cluster/server0 and 11 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Fri Apr 24 05:59:44 EDT 2009
Author: timfox
Date: 2009-04-24 05:59:44 -0400 (Fri, 24 Apr 2009)
New Revision: 6551
Modified:
trunk/AS/config/independent/jbm-jboss-beans.xml
trunk/examples/jms/symmetric-cluster/server0/jbm-standalone-beans.xml
trunk/examples/jms/symmetric-cluster/server1/jbm-standalone-beans.xml
trunk/examples/jms/symmetric-cluster/server2/jbm-standalone-beans.xml
trunk/examples/jms/symmetric-cluster/server3/jbm-standalone-beans.xml
trunk/examples/jms/symmetric-cluster/server4/jbm-standalone-beans.xml
trunk/examples/jms/symmetric-cluster/server5/jbm-standalone-beans.xml
trunk/src/config/jbm-cluster-standalone-beans.xml
trunk/src/config/jbm-standalone-beans.xml
trunk/src/main/org/jboss/messaging/jms/server/impl/JMSServerDeployer.java
trunk/tests/jms-tests/src/org/jboss/test/messaging/JBMServerTestCase.java
trunk/tests/joram-tests/src/org/jboss/test/jms/SpawnedJMSServer.java
trunk/tests/src/org/jboss/messaging/tests/integration/jms/cluster/management/ReplicationAwareJMSQueueControlWrapperTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/jms/server/JMSServerDeployerTest.java
Log:
fixed tests
Modified: trunk/AS/config/independent/jbm-jboss-beans.xml
===================================================================
--- trunk/AS/config/independent/jbm-jboss-beans.xml 2009-04-24 09:54:32 UTC (rev 6550)
+++ trunk/AS/config/independent/jbm-jboss-beans.xml 2009-04-24 09:59:44 UTC (rev 6551)
@@ -19,9 +19,9 @@
</bean>
<!-- The core server -->
- <bean name="MessagingServer" class="org.jboss.messaging.core.server.impl.MessagingServerImpl">
+ <bean name="MessagingServer" class="org.jboss.messaging.core.server.impl.MessagingServerImpl">
<start ignored="true"/>
- <stop ignored="true"/>
+ <stop ignored="true"/>
<constructor>
<parameter>
<inject bean="Configuration"/>
Modified: trunk/examples/jms/symmetric-cluster/server0/jbm-standalone-beans.xml
===================================================================
--- trunk/examples/jms/symmetric-cluster/server0/jbm-standalone-beans.xml 2009-04-24 09:54:32 UTC (rev 6550)
+++ trunk/examples/jms/symmetric-cluster/server0/jbm-standalone-beans.xml 2009-04-24 09:59:44 UTC (rev 6551)
@@ -51,7 +51,7 @@
<bean name="JMSServerManager" class="org.jboss.messaging.jms.server.impl.JMSServerManagerImpl">
<constructor>
<parameter>
- <inject bean="MessagingServer" state="CREATE"/>
+ <inject bean="MessagingServer"/>
</parameter>
</constructor>
</bean>
Modified: trunk/examples/jms/symmetric-cluster/server1/jbm-standalone-beans.xml
===================================================================
--- trunk/examples/jms/symmetric-cluster/server1/jbm-standalone-beans.xml 2009-04-24 09:54:32 UTC (rev 6550)
+++ trunk/examples/jms/symmetric-cluster/server1/jbm-standalone-beans.xml 2009-04-24 09:59:44 UTC (rev 6551)
@@ -51,7 +51,7 @@
<bean name="JMSServerManager" class="org.jboss.messaging.jms.server.impl.JMSServerManagerImpl">
<constructor>
<parameter>
- <inject bean="MessagingServer" state="CREATE"/>
+ <inject bean="MessagingServer"/>
</parameter>
</constructor>
</bean>
Modified: trunk/examples/jms/symmetric-cluster/server2/jbm-standalone-beans.xml
===================================================================
--- trunk/examples/jms/symmetric-cluster/server2/jbm-standalone-beans.xml 2009-04-24 09:54:32 UTC (rev 6550)
+++ trunk/examples/jms/symmetric-cluster/server2/jbm-standalone-beans.xml 2009-04-24 09:59:44 UTC (rev 6551)
@@ -51,7 +51,7 @@
<bean name="JMSServerManager" class="org.jboss.messaging.jms.server.impl.JMSServerManagerImpl">
<constructor>
<parameter>
- <inject bean="MessagingServer" state="CREATE"/>
+ <inject bean="MessagingServer"/>
</parameter>
</constructor>
</bean>
Modified: trunk/examples/jms/symmetric-cluster/server3/jbm-standalone-beans.xml
===================================================================
--- trunk/examples/jms/symmetric-cluster/server3/jbm-standalone-beans.xml 2009-04-24 09:54:32 UTC (rev 6550)
+++ trunk/examples/jms/symmetric-cluster/server3/jbm-standalone-beans.xml 2009-04-24 09:59:44 UTC (rev 6551)
@@ -51,7 +51,7 @@
<bean name="JMSServerManager" class="org.jboss.messaging.jms.server.impl.JMSServerManagerImpl">
<constructor>
<parameter>
- <inject bean="MessagingServer" state="CREATE"/>
+ <inject bean="MessagingServer"/>
</parameter>
</constructor>
</bean>
Modified: trunk/examples/jms/symmetric-cluster/server4/jbm-standalone-beans.xml
===================================================================
--- trunk/examples/jms/symmetric-cluster/server4/jbm-standalone-beans.xml 2009-04-24 09:54:32 UTC (rev 6550)
+++ trunk/examples/jms/symmetric-cluster/server4/jbm-standalone-beans.xml 2009-04-24 09:59:44 UTC (rev 6551)
@@ -51,7 +51,7 @@
<bean name="JMSServerManager" class="org.jboss.messaging.jms.server.impl.JMSServerManagerImpl">
<constructor>
<parameter>
- <inject bean="MessagingServer" state="CREATE"/>
+ <inject bean="MessagingServer"/>
</parameter>
</constructor>
</bean>
Modified: trunk/examples/jms/symmetric-cluster/server5/jbm-standalone-beans.xml
===================================================================
--- trunk/examples/jms/symmetric-cluster/server5/jbm-standalone-beans.xml 2009-04-24 09:54:32 UTC (rev 6550)
+++ trunk/examples/jms/symmetric-cluster/server5/jbm-standalone-beans.xml 2009-04-24 09:59:44 UTC (rev 6551)
@@ -51,7 +51,7 @@
<bean name="JMSServerManager" class="org.jboss.messaging.jms.server.impl.JMSServerManagerImpl">
<constructor>
<parameter>
- <inject bean="MessagingServer" state="CREATE"/>
+ <inject bean="MessagingServer"/>
</parameter>
</constructor>
</bean>
Modified: trunk/src/config/jbm-cluster-standalone-beans.xml
===================================================================
--- trunk/src/config/jbm-cluster-standalone-beans.xml 2009-04-24 09:54:32 UTC (rev 6550)
+++ trunk/src/config/jbm-cluster-standalone-beans.xml 2009-04-24 09:59:44 UTC (rev 6551)
@@ -125,6 +125,8 @@
</bean>
<bean name="ManagementService" class="org.jboss.messaging.core.management.impl.ManagementServiceImpl">
+ <start ignored="true"/>
+ <stop ignored="true"/>
<constructor>
<parameter>
<inject bean="MBeanServer"/>
Modified: trunk/src/config/jbm-standalone-beans.xml
===================================================================
--- trunk/src/config/jbm-standalone-beans.xml 2009-04-24 09:54:32 UTC (rev 6550)
+++ trunk/src/config/jbm-standalone-beans.xml 2009-04-24 09:59:44 UTC (rev 6551)
@@ -32,7 +32,9 @@
</bean>
<!-- The core server -->
- <bean name="MessagingServer" class="org.jboss.messaging.core.server.impl.MessagingServerImpl">
+ <bean name="MessagingServer" class="org.jboss.messaging.core.server.impl.MessagingServerImpl">
+ <start ignored="true"/>
+ <stop ignored="true"/>
<constructor>
<parameter>
<inject bean="Configuration"/>
Modified: trunk/src/main/org/jboss/messaging/jms/server/impl/JMSServerDeployer.java
===================================================================
--- trunk/src/main/org/jboss/messaging/jms/server/impl/JMSServerDeployer.java 2009-04-24 09:54:32 UTC (rev 6550)
+++ trunk/src/main/org/jboss/messaging/jms/server/impl/JMSServerDeployer.java 2009-04-24 09:59:44 UTC (rev 6551)
@@ -135,7 +135,7 @@
*/
@Override
public void deploy(final Node node) throws Exception
- {
+ {
createAndBindObject(node);
}
@@ -149,6 +149,7 @@
{
if (node.getNodeName().equals(CONNECTION_FACTORY_NODE_NAME))
{
+ log.info("Got connecti0on factory node");
NodeList children = node.getChildNodes();
long pingPeriod = ClientSessionFactoryImpl.DEFAULT_PING_PERIOD;
Modified: trunk/tests/jms-tests/src/org/jboss/test/messaging/JBMServerTestCase.java
===================================================================
--- trunk/tests/jms-tests/src/org/jboss/test/messaging/JBMServerTestCase.java 2009-04-24 09:54:32 UTC (rev 6550)
+++ trunk/tests/jms-tests/src/org/jboss/test/messaging/JBMServerTestCase.java 2009-04-24 09:59:44 UTC (rev 6551)
@@ -172,14 +172,12 @@
{
System.setProperty("java.naming.factory.initial", getContextFactory());
servers.get(0).start(getContainerConfig(), getConfiguration(), false);
- //deployAdministeredObjects();
}
public void startNoDelete() throws Exception
{
System.setProperty("java.naming.factory.initial", getContextFactory());
servers.get(0).start(getContainerConfig(), getConfiguration(), false);
- //deployAdministeredObjects();
}
public void stopServerPeer() throws Exception
@@ -191,7 +189,6 @@
{
System.setProperty("java.naming.factory.initial", getContextFactory());
servers.get(0).startServerPeer();
- //deployAdministeredObjects();
}
protected HashMap<String, Object> getConfiguration()
Modified: trunk/tests/joram-tests/src/org/jboss/test/jms/SpawnedJMSServer.java
===================================================================
--- trunk/tests/joram-tests/src/org/jboss/test/jms/SpawnedJMSServer.java 2009-04-24 09:54:32 UTC (rev 6550)
+++ trunk/tests/joram-tests/src/org/jboss/test/jms/SpawnedJMSServer.java 2009-04-24 09:59:44 UTC (rev 6551)
@@ -76,16 +76,15 @@
conf.getAcceptorConfigurations().add(new TransportConfiguration(NettyAcceptorFactory.class.getName()));
conf.setSecurityEnabled(false);
conf.setEnableFileDeployment(true);
+
final MessagingServer server = Messaging.newMessagingServer(conf);
- //server.start();
- JMSServerManager serverManager = new JMSServerManagerImpl(server);
- serverManager.start();
-
Hashtable<String, String> env = new Hashtable<String, String>();
env.put("java.naming.factory.initial", "org.jnp.interfaces.NamingContextFactory");
env.put("java.naming.factory.url.pkgs", "org.jboss.naming:org.jnp.interfaces");
- serverManager.setContext(new InitialContext(env));
+ JMSServerManager serverManager = new JMSServerManagerImpl(server);
+ serverManager.setContext(new InitialContext(env));
+ serverManager.start();
// create the reader before printing OK so that if the test is quick
// we will still capture the STOP message sent by the client
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-04-24 09:54:32 UTC (rev 6550)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/jms/cluster/management/ReplicationAwareJMSQueueControlWrapperTest.java 2009-04-24 09:59:44 UTC (rev 6551)
@@ -310,15 +310,14 @@
{
doSetup(false);
- liveServerManager = new JMSServerManagerImpl(liveServer);
- liveServerManager.setContext(new NullInitialContext());
- liveServerManager.start();
-
-
backupServerManager = new JMSServerManagerImpl(backupServer);
backupServerManager.setContext(new NullInitialContext());
backupServerManager.start();
+ liveServerManager = new JMSServerManagerImpl(liveServer);
+ liveServerManager.setContext(new NullInitialContext());
+ liveServerManager.start();
+
String queueName = randomString();
liveServerManager.createQueue(queueName, queueName);
backupServerManager.createQueue(queueName, queueName);
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/jms/server/JMSServerDeployerTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/jms/server/JMSServerDeployerTest.java 2009-04-24 09:54:32 UTC (rev 6550)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/jms/server/JMSServerDeployerTest.java 2009-04-24 09:59:44 UTC (rev 6551)
@@ -34,6 +34,7 @@
import org.jboss.messaging.core.config.cluster.DiscoveryGroupConfiguration;
import org.jboss.messaging.core.config.impl.ConfigurationImpl;
import org.jboss.messaging.core.deployers.DeploymentManager;
+import org.jboss.messaging.core.deployers.impl.FileDeploymentManager;
import org.jboss.messaging.jms.client.JBossConnectionFactory;
import org.jboss.messaging.jms.server.JMSServerManager;
import org.jboss.messaging.jms.server.impl.JMSServerDeployer;
@@ -145,6 +146,8 @@
config = new ConfigurationImpl();
+ deploymentManager = new FileDeploymentManager(config.getFileDeployerScanPeriod());
+
jmsServer = new DummyJMSServerManager();
context = new InVMContext();
More information about the jboss-cvs-commits
mailing list