[jboss-cvs] JBoss Messaging SVN: r3405 - in branches/Branch_MC_Integration_New: src/main/org/jboss/jms/message and 4 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Dec 4 04:29:43 EST 2007
Author: ataylor
Date: 2007-12-04 04:29:43 -0500 (Tue, 04 Dec 2007)
New Revision: 3405
Removed:
branches/Branch_MC_Integration_New/src/etc/server/default/deploy/jbm-connection-factories.xml
branches/Branch_MC_Integration_New/src/etc/server/default/deploy/jbm-destinations.xml
Modified:
branches/Branch_MC_Integration_New/src/main/org/jboss/jms/message/JBossMessage.java
branches/Branch_MC_Integration_New/src/main/org/jboss/jms/server/bridge/Bridge.java
branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/MessagingTestCase.java
branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/jms/clustering/MultiThreadFailoverTest.java
branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/tools/ServerManagement.java
Log:
fixed bug in compilation
Deleted: branches/Branch_MC_Integration_New/src/etc/server/default/deploy/jbm-connection-factories.xml
===================================================================
--- branches/Branch_MC_Integration_New/src/etc/server/default/deploy/jbm-connection-factories.xml 2007-12-03 17:36:11 UTC (rev 3404)
+++ branches/Branch_MC_Integration_New/src/etc/server/default/deploy/jbm-connection-factories.xml 2007-12-04 09:29:43 UTC (rev 3405)
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
- Messaging Connection Factories configuration.
-
- $Id: connection-factories-service.xml 3201 2007-10-19 10:39:50Z timfox $
- -->
-
-<factories>
-
- <!-- The default connection factory does not support automatic failover or load balancing-
- this is so we can maintain compatiblity with applications written for JBoss MQ which use this
- connection factory.
- -->
- <factory name="ConnectionFactory">
- <jndi-bindings>
- <binding>/ConnectionFactory</binding>
- <binding>/XAConnectionFactory</binding>
- <binding>java:/ConnectionFactory</binding>
- <binding>java:/XAConnectionFactory</binding>
- </jndi-bindings>
- </factory>
-
- <factory name="ClusteredConnectionFactory">
- <jndi-bindings>
- <binding>/ClusteredConnectionFactory</binding>
- <binding>/ClusteredXAConnectionFactory</binding>
- <binding>java:/ClusteredConnectionFactory</binding>
- <binding>java:/ClusteredXAConnectionFactory</binding>
- </jndi-bindings>
- <supports-failover>true</supports-failover>
- <supports-load-balancing>true</supports-load-balancing>
- </factory>
-
- <factory name="jboss.messaging.connectionfactory:service=ClusterPullConnectionFactory">
- <supports-failover>true</supports-failover>
- <supports-load-balancing>true</supports-load-balancing>
- </factory>
- <!-- An example connection factory with all attributes shown -->
-
- <factory name="jboss.messaging.connectionfactory:service=MyExampleConnectionFactory">
- <!-- You can specify the default Client ID to use for connections created using this factory -->
- <client-id>MyClientID</client-id>
- <!-- PrefetchSize determines the approximate maximum number of messages the client consumer will buffer locally -->
- <prefetch-size>150</prefetch-size>
- <!-- Paging params to be used for temporary queues -->
- <default-temp-queue-full-size>200000</default-temp-queue-full-size>
- <default-temp-queue-page-size>2000</default-temp-queue-page-size>
- <default-temp-queue-down-cache-size>2000</default-temp-queue-down-cache-size>
- <!-- The batch size to use when using the DUPS_OK_ACKNOWLEDGE acknowledgement mode -->
- <dups-ok-batch-size>5000</dups-ok-batch-size>
- <!-- Does this connection factory support automatic failover? -->
- <supports-failover>false</supports-failover>
- <!-- Does this connection factory support automatic client side load balancing? -->
- <supports-load-balancing>false</supports-load-balancing>
- <!-- The class name of the factory used to create the load balancing policy to use on the client side -->
- <load-balancing-factory>org.jboss.jms.client.plugin.RoundRobinLoadBalancingFactory</load-balancing-factory>
- <!-- Whether we should be strict TCK compliant, i.e. how we deal with foreign messages, defaults to false-->
- <strict-tck>true</strict-tck>
- <!-- Disable JBoss Remoting Connector sanity checks - There is rarely a good reason to set this to true -->
- <disable-remoting-checks>false</disable-remoting-checks>
- <!-- The connection factory will be bound in the following places in JNDI -->
- <jndi-bindings>
- <binding>/acme/MyExampleConnectionFactory</binding>
- <binding>/acme/MyExampleConnectionFactoryDupe</binding>
- <binding>java:/xyz/CF1</binding>
- <binding>java:/connectionfactories/acme/connection_factory</binding>
- </jndi-bindings>
- </factory>
-
-</factories>
\ No newline at end of file
Deleted: branches/Branch_MC_Integration_New/src/etc/server/default/deploy/jbm-destinations.xml
===================================================================
--- branches/Branch_MC_Integration_New/src/etc/server/default/deploy/jbm-destinations.xml 2007-12-03 17:36:11 UTC (rev 3404)
+++ branches/Branch_MC_Integration_New/src/etc/server/default/deploy/jbm-destinations.xml 2007-12-04 09:29:43 UTC (rev 3405)
@@ -1,84 +0,0 @@
-<destinations>
- <!--
- The Default Dead Letter Queue. This destination is a dependency of an EJB MDB container.
- -->
- <queue name="DLQ"/>
- <!--
- The Default Expiry Queue.
- -->
- <queue name="ExpiryQueue"/>
- <!--
- Example destinations.
- -->
- <topic name="testTopic">
- <security>
- <role name="guest" read="true" write="true"/>
- <role name="publisher" read="true" write="true" create="false"/>
- <role name="durpublisher" read="true" write="true" create="true"/>
- </security>
- </topic>
-
- <topic name="securedTopic">
- <security>
- <role name="publisher" read="true" write="true" create="false"/>
- </security>
- </topic>
-
- <topic name="testDurableTopic">
- <security>
- <role name="guest" read="true" write="true"/>
- <role name="publisher" read="true" write="true" create="false"/>
- <role name="durpublisher" read="true" write="true" create="true"/>
- </security>
- </topic>
-
- <queue name="testQueue">
- <security>
- <role name="guest" read="true" write="true"/>
- <role name="publisher" read="true" write="true" create="false"/>
- <role name="noacc" read="false" write="false" create="false"/>
- </security>
- </queue>
-
- <queue name="A"/>
- <queue name="B"/>
- <queue name="C"/>
- <queue name="D"/>
- <queue name="ex"/>
-
- <!-- It's possible for indiviual queues and topics to use a specific queue for
-an expiry or DLQ -->
-
- <queue name="PrivateDLQ"/>
- <queue name="PrivateExpiryQueue"/>
- <queue name="QueueWithOwnDLQAndExpiryQueue">
- <dlq>PrivateDLQ</dlq>
- <expiry-queue>PrivateExpiryQueue</expiry-queue>
- </queue>
-
- <topic name="TopicWithOwnDLQAndExpiryQueue">
- <dlq>PrivateDLQ</dlq>
- <expiry-queue>PrivateExpiryQueue</expiry-queue>
- </topic>
-
- <!-- Queues and Topics can also specify their own redelivery delay -->
- <queue name="QueueWithOwnRedeliveryDelay">
- <redelivery-delay>5000</redelivery-delay>
- </queue>
-
- <topic name="TopicWithOwnRedeliveryDelay">
- <redelivery-delay>5000</redelivery-delay>
- </topic>
-
- <!--
- Example clustered destinations.
- -->
- <queue name="testDistributedQueue">
- <clustered>true</clustered>
- </queue>
-
- <topic name="testDistributedTopic">
- <clustered>true</clustered>
- </topic>
-
-</destinations>
\ No newline at end of file
Modified: branches/Branch_MC_Integration_New/src/main/org/jboss/jms/message/JBossMessage.java
===================================================================
--- branches/Branch_MC_Integration_New/src/main/org/jboss/jms/message/JBossMessage.java 2007-12-03 17:36:11 UTC (rev 3404)
+++ branches/Branch_MC_Integration_New/src/main/org/jboss/jms/message/JBossMessage.java 2007-12-04 09:29:43 UTC (rev 3405)
@@ -32,6 +32,7 @@
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.Serializable;
+import java.lang.IllegalStateException;
import java.util.*;
/**
Modified: branches/Branch_MC_Integration_New/src/main/org/jboss/jms/server/bridge/Bridge.java
===================================================================
--- branches/Branch_MC_Integration_New/src/main/org/jboss/jms/server/bridge/Bridge.java 2007-12-03 17:36:11 UTC (rev 3404)
+++ branches/Branch_MC_Integration_New/src/main/org/jboss/jms/server/bridge/Bridge.java 2007-12-04 09:29:43 UTC (rev 3405)
@@ -33,6 +33,7 @@
import javax.transaction.Transaction;
import javax.transaction.TransactionManager;
import javax.transaction.xa.XAResource;
+import java.lang.IllegalStateException;
import java.util.*;
/**
Modified: branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/MessagingTestCase.java
===================================================================
--- branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/MessagingTestCase.java 2007-12-03 17:36:11 UTC (rev 3404)
+++ branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/MessagingTestCase.java 2007-12-04 09:29:43 UTC (rev 3405)
@@ -33,6 +33,7 @@
import javax.naming.InitialContext;
import javax.sql.DataSource;
import javax.transaction.TransactionManager;
+import java.lang.IllegalStateException;
import java.lang.ref.WeakReference;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
Modified: branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/jms/clustering/MultiThreadFailoverTest.java
===================================================================
--- branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/jms/clustering/MultiThreadFailoverTest.java 2007-12-03 17:36:11 UTC (rev 3404)
+++ branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/jms/clustering/MultiThreadFailoverTest.java 2007-12-04 09:29:43 UTC (rev 3405)
@@ -28,6 +28,7 @@
import org.jboss.test.messaging.tools.ServerManagement;
import javax.jms.*;
+import java.lang.IllegalStateException;
import java.util.ArrayList;
import java.util.Iterator;
Modified: branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/tools/ServerManagement.java
===================================================================
--- branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/tools/ServerManagement.java 2007-12-03 17:36:11 UTC (rev 3404)
+++ branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/tools/ServerManagement.java 2007-12-04 09:29:43 UTC (rev 3405)
@@ -308,7 +308,7 @@
if (remoteDebugIndex != null)
{
- sb.append("-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005 ");
+ sb.append("-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5006 ");
}
More information about the jboss-cvs-commits
mailing list