[jboss-cvs] JBoss Messaging SVN: r6690 - in trunk: src/main/org/jboss/messaging/jms/client and 4 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed May 6 08:09:27 EDT 2009
Author: timfox
Date: 2009-05-06 08:09:27 -0400 (Wed, 06 May 2009)
New Revision: 6690
Modified:
trunk/src/main/org/jboss/messaging/core/client/impl/ConnectionManagerImpl.java
trunk/src/main/org/jboss/messaging/jms/client/JBossConnectionFactory.java
trunk/src/main/org/jboss/messaging/jms/server/impl/JMSServerManagerImpl.java
trunk/src/main/org/jboss/messaging/ra/JBMResourceAdapter.java
trunk/tests/src/org/jboss/messaging/tests/integration/client/ClientSessionFactoryTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/jms/connection/ExceptionListenerTest.java
Log:
more tweaks
Modified: trunk/src/main/org/jboss/messaging/core/client/impl/ConnectionManagerImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/client/impl/ConnectionManagerImpl.java 2009-05-06 12:07:45 UTC (rev 6689)
+++ trunk/src/main/org/jboss/messaging/core/client/impl/ConnectionManagerImpl.java 2009-05-06 12:09:27 UTC (rev 6690)
@@ -22,7 +22,6 @@
package org.jboss.messaging.core.client.impl;
-import static org.jboss.messaging.core.remoting.impl.wireformat.PacketImpl.DISCONNECT;
import static org.jboss.messaging.core.remoting.impl.wireformat.PacketImpl.EARLY_RESPONSE;
import java.util.ArrayList;
@@ -52,7 +51,6 @@
import org.jboss.messaging.core.remoting.impl.RemotingConnectionImpl;
import org.jboss.messaging.core.remoting.impl.wireformat.CreateSessionMessage;
import org.jboss.messaging.core.remoting.impl.wireformat.CreateSessionResponseMessage;
-import org.jboss.messaging.core.remoting.impl.wireformat.PacketImpl;
import org.jboss.messaging.core.remoting.spi.Connection;
import org.jboss.messaging.core.remoting.spi.ConnectionLifeCycleListener;
import org.jboss.messaging.core.remoting.spi.Connector;
Modified: trunk/src/main/org/jboss/messaging/jms/client/JBossConnectionFactory.java
===================================================================
--- trunk/src/main/org/jboss/messaging/jms/client/JBossConnectionFactory.java 2009-05-06 12:07:45 UTC (rev 6689)
+++ trunk/src/main/org/jboss/messaging/jms/client/JBossConnectionFactory.java 2009-05-06 12:09:27 UTC (rev 6690)
@@ -182,12 +182,12 @@
// Public ---------------------------------------------------------------------------------------
- public synchronized String getConnectionLoadBalancingPolicyClassName()
+ public synchronized String getLoadBalancingPolicyClassName()
{
return sessionFactory.getLoadBalancingPolicyClassName();
}
- public synchronized void setConnectionLoadBalancingPolicyClassName(String connectionLoadBalancingPolicyClassName)
+ public synchronized void setLoadBalancingPolicyClassName(String connectionLoadBalancingPolicyClassName)
{
sessionFactory.setLoadBalancingPolicyClassName(connectionLoadBalancingPolicyClassName);
}
@@ -232,12 +232,12 @@
sessionFactory.setDiscoveryRefreshTimeout(discoveryRefreshTimeout);
}
- public synchronized long getDiscoveryInitialWaitTimeout()
+ public synchronized long getInitialWaitTimeout()
{
return sessionFactory.getInitialWaitTimeout();
}
- public synchronized void setDiscoveryInitialWaitTimeout(long discoveryInitialWaitTimeout)
+ public synchronized void setInitialWaitTimeout(long discoveryInitialWaitTimeout)
{
sessionFactory.setInitialWaitTimeout(discoveryInitialWaitTimeout);
}
@@ -248,7 +248,7 @@
}
public synchronized void setClientID(String clientID)
- {
+ {
checkWrite();
this.clientID = clientID;
}
@@ -499,7 +499,7 @@
final boolean isXA,
final int type) throws JMSException
{
- readOnly = false;
+ readOnly = true;
JBossConnection connection = new JBossConnection(username,
password,
@@ -518,6 +518,7 @@
private void checkWrite()
{
+ log.info("read only is " + readOnly);
if (readOnly)
{
throw new IllegalStateException("Cannot set attribute on JBossConnectionFactory after it has been used");
Modified: trunk/src/main/org/jboss/messaging/jms/server/impl/JMSServerManagerImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/jms/server/impl/JMSServerManagerImpl.java 2009-05-06 12:07:45 UTC (rev 6689)
+++ trunk/src/main/org/jboss/messaging/jms/server/impl/JMSServerManagerImpl.java 2009-05-06 12:09:27 UTC (rev 6690)
@@ -351,7 +351,7 @@
cf.setBlockOnNonPersistentSend(blockOnNonPersistentSend);
cf.setAutoGroup(autoGroup);
cf.setPreAcknowledge(preAcknowledge);
- cf.setConnectionLoadBalancingPolicyClassName(loadBalancingPolicyClassName);
+ cf.setLoadBalancingPolicyClassName(loadBalancingPolicyClassName);
cf.setTransactionBatchSize(transactionBatchSize);
cf.setDupsOKBatchSize(dupsOKBatchSize);
cf.setUseGlobalPools(useGlobalPools);
@@ -419,10 +419,10 @@
cf.setBlockOnNonPersistentSend(blockOnNonPersistentSend);
cf.setAutoGroup(autoGroup);
cf.setPreAcknowledge(preAcknowledge);
- cf.setConnectionLoadBalancingPolicyClassName(loadBalancingPolicyClassName);
+ cf.setLoadBalancingPolicyClassName(loadBalancingPolicyClassName);
cf.setTransactionBatchSize(transactionBatchSize);
cf.setDupsOKBatchSize(dupsOKBatchSize);
- cf.setDiscoveryInitialWaitTimeout(initialWaitTimeout);
+ cf.setInitialWaitTimeout(initialWaitTimeout);
cf.setUseGlobalPools(useGlobalPools);
cf.setScheduledThreadPoolMaxSize(scheduledThreadPoolMaxSize);
cf.setThreadPoolMaxSize(threadPoolMaxSize);
Modified: trunk/src/main/org/jboss/messaging/ra/JBMResourceAdapter.java
===================================================================
--- trunk/src/main/org/jboss/messaging/ra/JBMResourceAdapter.java 2009-05-06 12:07:45 UTC (rev 6689)
+++ trunk/src/main/org/jboss/messaging/ra/JBMResourceAdapter.java 2009-05-06 12:09:27 UTC (rev 6690)
@@ -1316,7 +1316,7 @@
{
if (getLoadBalancingPolicyClassName() != null)
{
- cf.setConnectionLoadBalancingPolicyClassName(getLoadBalancingPolicyClassName());
+ cf.setLoadBalancingPolicyClassName(getLoadBalancingPolicyClassName());
}
if (getPingPeriod() != null)
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/client/ClientSessionFactoryTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/client/ClientSessionFactoryTest.java 2009-05-06 12:07:45 UTC (rev 6689)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/client/ClientSessionFactoryTest.java 2009-05-06 12:09:27 UTC (rev 6690)
@@ -44,7 +44,13 @@
import org.jboss.messaging.utils.Pair;
/**
+ *
+ * A ClientSessionFactoryTest
+ *
* @author <a href="mailto:andy.taylor at jboss.org">Andy Taylor</a>
+ * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
+ *
+ *
*/
public class ClientSessionFactoryTest extends ServiceTestBase
{
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/jms/connection/ExceptionListenerTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/jms/connection/ExceptionListenerTest.java 2009-05-06 12:07:45 UTC (rev 6689)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/jms/connection/ExceptionListenerTest.java 2009-05-06 12:09:27 UTC (rev 6690)
@@ -21,25 +21,6 @@
*/
package org.jboss.messaging.tests.integration.jms.connection;
-import static org.jboss.messaging.core.client.impl.ClientSessionFactoryImpl.DEFAULT_ACK_BATCH_SIZE;
-import static org.jboss.messaging.core.client.impl.ClientSessionFactoryImpl.DEFAULT_AUTO_GROUP;
-import static org.jboss.messaging.core.client.impl.ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_ACKNOWLEDGE;
-import static org.jboss.messaging.core.client.impl.ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_NON_PERSISTENT_SEND;
-import static org.jboss.messaging.core.client.impl.ClientSessionFactoryImpl.DEFAULT_CALL_TIMEOUT;
-import static org.jboss.messaging.core.client.impl.ClientSessionFactoryImpl.DEFAULT_CONNECTION_LOAD_BALANCING_POLICY_CLASS_NAME;
-import static org.jboss.messaging.core.client.impl.ClientSessionFactoryImpl.DEFAULT_CONNECTION_TTL;
-import static org.jboss.messaging.core.client.impl.ClientSessionFactoryImpl.DEFAULT_CONSUMER_MAX_RATE;
-import static org.jboss.messaging.core.client.impl.ClientSessionFactoryImpl.DEFAULT_CONSUMER_WINDOW_SIZE;
-import static org.jboss.messaging.core.client.impl.ClientSessionFactoryImpl.DEFAULT_FAILOVER_ON_SERVER_SHUTDOWN;
-import static org.jboss.messaging.core.client.impl.ClientSessionFactoryImpl.DEFAULT_MAX_CONNECTIONS;
-import static org.jboss.messaging.core.client.impl.ClientSessionFactoryImpl.DEFAULT_MIN_LARGE_MESSAGE_SIZE;
-import static org.jboss.messaging.core.client.impl.ClientSessionFactoryImpl.DEFAULT_PING_PERIOD;
-import static org.jboss.messaging.core.client.impl.ClientSessionFactoryImpl.DEFAULT_PRODUCER_MAX_RATE;
-import static org.jboss.messaging.core.client.impl.ClientSessionFactoryImpl.DEFAULT_PRODUCER_WINDOW_SIZE;
-import static org.jboss.messaging.core.client.impl.ClientSessionFactoryImpl.DEFAULT_RECONNECT_ATTEMPTS;
-import static org.jboss.messaging.core.client.impl.ClientSessionFactoryImpl.DEFAULT_RETRY_INTERVAL;
-import static org.jboss.messaging.core.client.impl.ClientSessionFactoryImpl.DEFAULT_RETRY_INTERVAL_MULTIPLIER;
-
import javax.jms.Connection;
import javax.jms.ExceptionListener;
import javax.jms.JMSException;
More information about the jboss-cvs-commits
mailing list