[jboss-cvs] JBoss Messaging SVN: r4330 - in trunk: src/main/org/jboss/messaging/core/config and 9 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed May 28 15:21:15 EDT 2008
Author: timfox
Date: 2008-05-28 15:21:15 -0400 (Wed, 28 May 2008)
New Revision: 4330
Modified:
trunk/src/main/org/jboss/messaging/core/client/impl/ClientConnectionFactoryImpl.java
trunk/src/main/org/jboss/messaging/core/client/impl/ClientConnectionImpl.java
trunk/src/main/org/jboss/messaging/core/client/impl/ServerPingerImpl.java
trunk/src/main/org/jboss/messaging/core/config/Configuration.java
trunk/src/main/org/jboss/messaging/core/config/impl/ConfigurationImpl.java
trunk/src/main/org/jboss/messaging/core/config/impl/FileConfiguration.java
trunk/src/main/org/jboss/messaging/jms/client/JBossConnectionFactory.java
trunk/src/main/org/jboss/messaging/jms/server/JMSServerManager.java
trunk/src/main/org/jboss/messaging/jms/server/impl/JMSServerDeployer.java
trunk/src/main/org/jboss/messaging/jms/server/impl/JMSServerManagerImpl.java
trunk/tests/jms-tests/src/org/jboss/test/messaging/JBMServerTestCase.java
trunk/tests/jms-tests/src/org/jboss/test/messaging/jms/AcknowledgementTest.java
trunk/tests/jms-tests/src/org/jboss/test/messaging/jms/CTSMiscellaneousTest.java
trunk/tests/jms-tests/src/org/jboss/test/messaging/tools/container/LocalTestServer.java
trunk/tests/jms-tests/src/org/jboss/test/messaging/tools/container/RMITestServer.java
trunk/tests/jms-tests/src/org/jboss/test/messaging/tools/container/Server.java
trunk/tests/src/org/jboss/messaging/tests/integration/jms/server/impl/JMSServerManagerimplTest.java
trunk/tests/src/org/jboss/messaging/tests/unit/core/config/impl/ConfigurationTest.java
Log:
Removed strict tck
Modified: trunk/src/main/org/jboss/messaging/core/client/impl/ClientConnectionFactoryImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/client/impl/ClientConnectionFactoryImpl.java 2008-05-28 16:32:57 UTC (rev 4329)
+++ trunk/src/main/org/jboss/messaging/core/client/impl/ClientConnectionFactoryImpl.java 2008-05-28 19:21:15 UTC (rev 4330)
@@ -66,8 +66,6 @@
private final ConnectionParams connectionParams;
- private final boolean strictTck;
-
private int defaultConsumerWindowSize;
private int defaultConsumerMaxRate;
@@ -86,14 +84,12 @@
// Constructors ---------------------------------------------------------------------------------
public ClientConnectionFactoryImpl(final Location location, final ConnectionParams connectionParams,
- final boolean strictTck,
final int defaultConsumerWindowSize, final int defaultConsumerMaxRate,
final int defaultProducerWindowSize, final int defaultProducerMaxRate,
final boolean defaultBlockOnAcknowledge,
final boolean defaultSendNonPersistentMessagesBlocking)
{
this.location = location;
- this.strictTck = strictTck;
this.defaultConsumerWindowSize = defaultConsumerWindowSize;
this.defaultConsumerMaxRate = defaultConsumerMaxRate;
this.defaultProducerWindowSize = defaultProducerWindowSize;
@@ -115,7 +111,6 @@
protected ClientConnectionFactoryImpl(final Location location, final ConnectionParams connectionParams, final boolean dummy)
{
- this.strictTck = false;
this.defaultConsumerWindowSize = 1024 * 1024;
this.defaultConsumerMaxRate = -1;
this.defaultProducerWindowSize = 1024 * 1024;
@@ -149,7 +144,7 @@
CreateConnectionResponse response =
(CreateConnectionResponse)remotingConnection.sendBlocking(0, 0, request);
- return new ClientConnectionImpl(response.getConnectionTargetID(), strictTck, remotingConnection,
+ return new ClientConnectionImpl(response.getConnectionTargetID(), remotingConnection,
defaultConsumerWindowSize, defaultConsumerMaxRate,
defaultProducerWindowSize, defaultProducerMaxRate,
defaultBlockOnAcknowledge, defaultSendNonPersistentMessagesBlocking, response.getServerVersion());
@@ -204,11 +199,6 @@
defaultProducerWindowSize = size;
}
- public boolean isStrictTck()
- {
- return strictTck;
- }
-
public int getDefaultProducerMaxRate()
{
return defaultProducerMaxRate;
Modified: trunk/src/main/org/jboss/messaging/core/client/impl/ClientConnectionImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/client/impl/ClientConnectionImpl.java 2008-05-28 16:32:57 UTC (rev 4329)
+++ trunk/src/main/org/jboss/messaging/core/client/impl/ClientConnectionImpl.java 2008-05-28 19:21:15 UTC (rev 4330)
@@ -60,8 +60,6 @@
private final RemotingConnection remotingConnection;
- private final boolean strictTck;
-
private final Set<ClientSession> sessions = new ConcurrentHashSet<ClientSession>();
private volatile boolean closed;
@@ -86,7 +84,6 @@
// Constructors ---------------------------------------------------------------------------------
public ClientConnectionImpl(final long serverTargetID,
- final boolean strictTck,
final RemotingConnection connection,
final int defaultConsumerWindowSize,
final int defaultConsumerMaxRate,
@@ -98,8 +95,6 @@
{
this.serverTargetID = serverTargetID;
- this.strictTck = strictTck;
-
this.remotingConnection = connection;
this.defaultConsumerWindowSize = defaultConsumerWindowSize;
Modified: trunk/src/main/org/jboss/messaging/core/client/impl/ServerPingerImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/client/impl/ServerPingerImpl.java 2008-05-28 16:32:57 UTC (rev 4329)
+++ trunk/src/main/org/jboss/messaging/core/client/impl/ServerPingerImpl.java 2008-05-28 19:21:15 UTC (rev 4330)
@@ -21,18 +21,14 @@
*/
package org.jboss.messaging.core.client.impl;
+import org.jboss.messaging.core.logging.Logger;
+import org.jboss.messaging.core.remoting.KeepAliveHandler;
+import org.jboss.messaging.core.remoting.Packet;
+import org.jboss.messaging.core.remoting.PacketHandler;
+import org.jboss.messaging.core.remoting.PacketReturner;
import org.jboss.messaging.core.remoting.impl.wireformat.Ping;
import org.jboss.messaging.core.remoting.impl.wireformat.Pong;
-import org.jboss.messaging.core.remoting.impl.mina.CleanUpNotifier;
-import org.jboss.messaging.core.remoting.*;
-import org.jboss.messaging.core.logging.Logger;
-import org.jboss.messaging.core.client.ServerPinger;
-import org.jboss.messaging.core.exception.MessagingException;
-import org.apache.mina.common.IoSession;
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.TimeUnit;
-
/**
* @author <a href="ataylor at redhat.com">Andy Taylor</a>
*/
Modified: trunk/src/main/org/jboss/messaging/core/config/Configuration.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/config/Configuration.java 2008-05-28 16:32:57 UTC (rev 4329)
+++ trunk/src/main/org/jboss/messaging/core/config/Configuration.java 2008-05-28 19:21:15 UTC (rev 4330)
@@ -39,8 +39,6 @@
{
List<String> getDefaultInterceptors();
- Boolean isStrictTck();
-
Boolean isClustered();
Integer getScheduledThreadPoolMaxSize();
Modified: trunk/src/main/org/jboss/messaging/core/config/impl/ConfigurationImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/config/impl/ConfigurationImpl.java 2008-05-28 16:32:57 UTC (rev 4329)
+++ trunk/src/main/org/jboss/messaging/core/config/impl/ConfigurationImpl.java 2008-05-28 19:21:15 UTC (rev 4330)
@@ -53,8 +53,6 @@
protected List<String> defaultInterceptors = new ArrayList<String>();
- protected boolean strictTck = false;
-
protected boolean clustered = false;
protected int scheduledThreadPoolMaxSize = 30;
@@ -120,16 +118,6 @@
return defaultInterceptors;
}
- public Boolean isStrictTck()
- {
- return strictTck || "true".equalsIgnoreCase(System.getProperty("jboss.messaging.stricttck"));
- }
-
- public void setStrictTck(Boolean strictTck)
- {
- strictTck = strictTck || "true".equalsIgnoreCase(System.getProperty("jboss.messaging.stricttck"));
- }
-
public Boolean isClustered()
{
return clustered;
Modified: trunk/src/main/org/jboss/messaging/core/config/impl/FileConfiguration.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/config/impl/FileConfiguration.java 2008-05-28 16:32:57 UTC (rev 4329)
+++ trunk/src/main/org/jboss/messaging/core/config/impl/FileConfiguration.java 2008-05-28 19:21:15 UTC (rev 4330)
@@ -56,8 +56,6 @@
xml = XMLUtil.replaceSystemProps(xml);
Element e = XMLUtil.stringToElement(xml);
- strictTck = getBoolean(e, "strict-tck", strictTck);
-
clustered = getBoolean(e, "clustered", clustered);
scheduledThreadPoolMaxSize = getInteger(e, "scheduled-executor-max-pool-size", scheduledThreadPoolMaxSize);
Modified: trunk/src/main/org/jboss/messaging/jms/client/JBossConnectionFactory.java
===================================================================
--- trunk/src/main/org/jboss/messaging/jms/client/JBossConnectionFactory.java 2008-05-28 16:32:57 UTC (rev 4329)
+++ trunk/src/main/org/jboss/messaging/jms/client/JBossConnectionFactory.java 2008-05-28 19:21:15 UTC (rev 4330)
@@ -82,8 +82,6 @@
private final ConnectionParams connectionParams;
- private final boolean strictTck;
-
private final int defaultConsumerWindowSize;
private final int defaultConsumerMaxRate;
@@ -102,7 +100,6 @@
final int dupsOKBatchSize,
final Location location,
final ConnectionParams connectionParams,
- final boolean strictTck,
final int defaultConsumerWindowSize,
final int defaultConsumerMaxRate,
final int defaultProducerWindowSize,
@@ -114,7 +111,6 @@
this.dupsOKBatchSize = dupsOKBatchSize;
this.location = location;
this.connectionParams = connectionParams;
- this.strictTck = strictTck;
this.defaultConsumerMaxRate = defaultConsumerMaxRate;
this.defaultConsumerWindowSize = defaultConsumerWindowSize;
this.defaultProducerMaxRate = defaultProducerMaxRate;
@@ -228,7 +224,6 @@
connectionFactory = new ClientConnectionFactoryImpl(
location,
connectionParams,
- strictTck,
defaultConsumerWindowSize,
defaultConsumerMaxRate,
defaultProducerWindowSize,
Modified: trunk/src/main/org/jboss/messaging/jms/server/JMSServerManager.java
===================================================================
--- trunk/src/main/org/jboss/messaging/jms/server/JMSServerManager.java 2008-05-28 16:32:57 UTC (rev 4329)
+++ trunk/src/main/org/jboss/messaging/jms/server/JMSServerManager.java 2008-05-28 19:21:15 UTC (rev 4330)
@@ -82,7 +82,6 @@
* @param name the name of this connection factory
* @param clientID the client id
* @param dupsOKBatchSize the bath size
- * @param strictTck Whether it is strict TCK or not
* @param consumerWindowSize The consumer window size
* @param consumerMaxRate the Consumer max rate
* @param producerWindowSize the producer window size
@@ -92,7 +91,7 @@
* @throws Exception if a problem occurred creating the connection factory
*/
boolean createConnectionFactory(String name, String clientID,
- int dupsOKBatchSize, boolean strictTck,
+ int dupsOKBatchSize,
int consumerWindowSize, int consumerMaxRate,
int producerWindowSize, int producerMaxRate,
boolean blockOnAcknowledge,
@@ -104,7 +103,6 @@
* @param name the name of this connection factory
* @param clientID the client id
* @param dupsOKBatchSize the bath size
- * @param strictTck Whether it is strict TCK or not
* @param consumerWindowSize The consumer window size
* @param consumerMaxRate the Consumer max rate
* @param producerWindowSize the producer window size
@@ -114,7 +112,6 @@
* @throws Exception if a problem occurred creating the connection factory
*/
boolean createConnectionFactory(String name, String clientID, int dupsOKBatchSize,
- boolean strictTck,
int consumerWindowSize, int consumerMaxRate,
int producerWindowSize, int producerMaxRate,
boolean blockOnAcknowledge,
Modified: trunk/src/main/org/jboss/messaging/jms/server/impl/JMSServerDeployer.java
===================================================================
--- trunk/src/main/org/jboss/messaging/jms/server/impl/JMSServerDeployer.java 2008-05-28 16:32:57 UTC (rev 4329)
+++ trunk/src/main/org/jboss/messaging/jms/server/impl/JMSServerDeployer.java 2008-05-28 19:21:15 UTC (rev 4330)
@@ -45,12 +45,8 @@
private static final String CONSUMER_MAX_RATE = "consumer-max-rate";
private static final String PRODUCER_WINDOW_SIZE = "producer-window-size";
private static final String PRODUCER_MAX_RATE = "producer-max-rate";
- private static final String SUPPORTS_FAILOVER = "supports-failover";
- private static final String SUPPORTS_LOAD_BALANCING = "supports-load-balancing";
- private static final String LOAD_BALANCING_FACTORY = "load-balancing-factory";
private static final String BLOCK_ON_ACKNOWLEDGE = "block-on-acknowledge";
private static final String SEND_NP_MESSAGES_SYNCHRONOUSLY = "send-np-messages-synchronously";
- private static final String STRICT_TCK = "strict-tck";
private static final String ENTRY_NODE_NAME = "entry";
private static final String CONNECTION_FACTORY_NODE_NAME = "connection-factory";
private static final String QUEUE_NODE_NAME = "queue";
@@ -123,8 +119,7 @@
{
// See http://www.jboss.com/index.html?module=bb&op=viewtopic&p=4076040#4076040
NodeList attributes = node.getChildNodes();
- boolean cfStrictTck = false;
-
+
String clientID = null;
int dupsOKBatchSize = 1000;
@@ -137,12 +132,8 @@
for (int j = 0; j < attributes.getLength(); j++)
{
- if (STRICT_TCK.equalsIgnoreCase(attributes.item(j).getNodeName()))
+ if (CONSUMER_WINDOW_SIZE_ELEMENT.equalsIgnoreCase(attributes.item(j).getNodeName()))
{
- cfStrictTck = Boolean.parseBoolean(attributes.item(j).getTextContent().trim());
- }
- else if (CONSUMER_WINDOW_SIZE_ELEMENT.equalsIgnoreCase(attributes.item(j).getNodeName()))
- {
consumerWindowSize = Integer.parseInt(attributes.item(j).getTextContent().trim());
}
else if (CONSUMER_MAX_RATE.equalsIgnoreCase(attributes.item(j).getNodeName()))
@@ -173,18 +164,6 @@
{
sendNonPersistentMessagesSynchronously = Boolean.parseBoolean(attributes.item(j).getTextContent().trim());
}
-// if (SUPPORTS_FAILOVER.equalsIgnoreCase(attributes.item(j).getNodeName()))
-// {
-// //setSupportsFailover(Boolean.parseBoolean(attributes.item(j).getTextContent().trim()));
-// }
-// if (SUPPORTS_LOAD_BALANCING.equalsIgnoreCase(attributes.item(j).getNodeName()))
-// {
-// //setSupportsLoadBalancing(Boolean.parseBoolean(attributes.item(j).getTextContent().trim()));
-// }
-// if (LOAD_BALANCING_FACTORY.equalsIgnoreCase(attributes.item(j).getNodeName()))
-// {
-// //setLoadBalancingFactory(attributes.item(j).getTextContent().trim());
-// }
}
NodeList children = node.getChildNodes();
@@ -196,8 +175,8 @@
{
String jndiName = child.getAttributes().getNamedItem("name").getNodeValue();
String name = node.getAttributes().getNamedItem(getKeyAttribute()).getNodeValue();
- jmsServerManager.createConnectionFactory(name, clientID, dupsOKBatchSize, cfStrictTck,
- consumerWindowSize, consumerMaxRate, producerWindowSize, producerMaxRate,
+ jmsServerManager.createConnectionFactory(name, clientID, dupsOKBatchSize,
+ consumerWindowSize, consumerMaxRate, producerWindowSize, producerMaxRate,
blockOnAcknowledge, sendNonPersistentMessagesSynchronously, jndiName);
}
}
Modified: trunk/src/main/org/jboss/messaging/jms/server/impl/JMSServerManagerImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/jms/server/impl/JMSServerManagerImpl.java 2008-05-28 16:32:57 UTC (rev 4329)
+++ trunk/src/main/org/jboss/messaging/jms/server/impl/JMSServerManagerImpl.java 2008-05-28 19:21:15 UTC (rev 4330)
@@ -40,7 +40,6 @@
import org.jboss.messaging.jms.server.SubscriptionInfo;
import org.jboss.messaging.util.JNDIUtil;
import org.jboss.messaging.util.Pair;
-import org.jboss.messaging.util.SimpleString;
/**
* A Deployer used to create and add to JNDI queues, topics and connection factories. Typically this would only be used
@@ -230,7 +229,7 @@
// }
public boolean createConnectionFactory(String name, String clientID,
- int dupsOKBatchSize, boolean strictTck, int consumerWindowSize, int consumerMaxRate,
+ int dupsOKBatchSize, int consumerWindowSize, int consumerMaxRate,
int producerWindowSize, int producerMaxRate, boolean blockOnAcknowledge,
boolean defaultSendNonPersistentMessagesBlocking, String jndiBinding) throws Exception
{
@@ -240,7 +239,6 @@
cf = new JBossConnectionFactory( clientID, dupsOKBatchSize,
messagingServerManagement.getConfiguration().getLocation(),
messagingServerManagement.getConfiguration().getConnectionParams(),
- messagingServerManagement.getConfiguration().isStrictTck() || strictTck,
consumerWindowSize, consumerMaxRate, producerWindowSize, producerMaxRate,
blockOnAcknowledge,
defaultSendNonPersistentMessagesBlocking
@@ -260,7 +258,7 @@
public boolean createConnectionFactory(String name, String clientID, int dupsOKBatchSize,
- boolean strictTck, int consumerWindowSize, int consumerMaxRate,
+ int consumerWindowSize, int consumerMaxRate,
int producerWindowSize, int producerMaxRate, boolean blockOnAcknowledge,
boolean defaultSendNonPersistentMessagesBlocking,
List<String> jndiBindings) throws Exception
@@ -271,7 +269,6 @@
cf = new JBossConnectionFactory( clientID, dupsOKBatchSize,
messagingServerManagement.getConfiguration().getLocation(),
messagingServerManagement.getConfiguration().getConnectionParams(),
- messagingServerManagement.getConfiguration().isStrictTck() || strictTck,
consumerWindowSize, consumerMaxRate, producerWindowSize, producerMaxRate,
blockOnAcknowledge, defaultSendNonPersistentMessagesBlocking
);
Modified: trunk/tests/jms-tests/src/org/jboss/test/messaging/JBMServerTestCase.java
===================================================================
--- trunk/tests/jms-tests/src/org/jboss/test/messaging/JBMServerTestCase.java 2008-05-28 16:32:57 UTC (rev 4329)
+++ trunk/tests/jms-tests/src/org/jboss/test/messaging/JBMServerTestCase.java 2008-05-28 19:21:15 UTC (rev 4330)
@@ -769,11 +769,6 @@
servers.get(server).deployConnectionFactory(objectName, jndiBindings);
}
- public void deployConnectionFactory(String objectName, List<String> jndiBindings, boolean strictTck) throws Exception
- {
- servers.get(0).deployConnectionFactory(objectName, jndiBindings, strictTck);
- }
-
public void deployConnectionFactory(String clientId,
String objectName,
List<String> jndiBindings,
@@ -782,13 +777,12 @@
int defaultTempQueuePageSize,
int defaultTempQueueDownCacheSize,
boolean supportsFailover,
- boolean supportsLoadBalancing,
- boolean strictTck,
+ boolean supportsLoadBalancing,
int dupsOkBatchSize,
boolean blockOnAcknowledge) throws Exception
{
servers.get(0).deployConnectionFactory(clientId, objectName, jndiBindings, prefetchSize, defaultTempQueueFullSize,
- defaultTempQueuePageSize, defaultTempQueueDownCacheSize, supportsFailover, supportsLoadBalancing, strictTck, dupsOkBatchSize, blockOnAcknowledge);
+ defaultTempQueuePageSize, defaultTempQueueDownCacheSize, supportsFailover, supportsLoadBalancing, dupsOkBatchSize, blockOnAcknowledge);
}
public static void deployConnectionFactory(String objectName,
Modified: trunk/tests/jms-tests/src/org/jboss/test/messaging/jms/AcknowledgementTest.java
===================================================================
--- trunk/tests/jms-tests/src/org/jboss/test/messaging/jms/AcknowledgementTest.java 2008-05-28 16:32:57 UTC (rev 4329)
+++ trunk/tests/jms-tests/src/org/jboss/test/messaging/jms/AcknowledgementTest.java 2008-05-28 19:21:15 UTC (rev 4330)
@@ -66,7 +66,7 @@
protected void setUp() throws Exception
{
super.setUp();
- getJmsServerManager().createConnectionFactory("ackconnectionfactory", null, 1000, true, 1024 * 1024, -1, 1000, -1, true, true, "/ackconnectionfactory");
+ getJmsServerManager().createConnectionFactory("ackconnectionfactory", null, 1000, 1024 * 1024, -1, 1000, -1, true, true, "/ackconnectionfactory");
cf = (JBossConnectionFactory) getInitialContext().lookup("/ackconnectionfactory");
}
@@ -698,7 +698,7 @@
ArrayList<String> bindings = new ArrayList<String>();
bindings.add("mycf");
- deployConnectionFactory(null, "MyConnectionFactory2", bindings, -1, -1, -1, -1, false, false, false, BATCH_SIZE, true);
+ deployConnectionFactory(null, "MyConnectionFactory2", bindings, -1, -1, -1, -1, false, false, BATCH_SIZE, true);
Connection conn = null;
@@ -780,7 +780,7 @@
ArrayList<String> bindings = new ArrayList<String>();
bindings.add("mycf");
- deployConnectionFactory(null, "MyConnectionFactory2", bindings, -1, -1, -1, -1, false, false, false, BATCH_SIZE, true);
+ deployConnectionFactory(null, "MyConnectionFactory2", bindings, -1, -1, -1, -1, false, false, BATCH_SIZE, true);
Connection conn = null;
try
Modified: trunk/tests/jms-tests/src/org/jboss/test/messaging/jms/CTSMiscellaneousTest.java
===================================================================
--- trunk/tests/jms-tests/src/org/jboss/test/messaging/jms/CTSMiscellaneousTest.java 2008-05-28 16:32:57 UTC (rev 4329)
+++ trunk/tests/jms-tests/src/org/jboss/test/messaging/jms/CTSMiscellaneousTest.java 2008-05-28 19:21:15 UTC (rev 4330)
@@ -84,7 +84,7 @@
bindings.add("StrictTCKConnectionFactory");
getJmsServerManager().createConnectionFactory("StrictTCKConnectionFactory", null,
- 1000, true, 1024 * 1024, -1, 1000, -1, true, true, "/StrictTCKConnectionFactory");
+ 1000, 1024 * 1024, -1, 1000, -1, true, true, "/StrictTCKConnectionFactory");
cf = (JBossConnectionFactory) getInitialContext().lookup("/StrictTCKConnectionFactory");
}
Modified: trunk/tests/jms-tests/src/org/jboss/test/messaging/tools/container/LocalTestServer.java
===================================================================
--- trunk/tests/jms-tests/src/org/jboss/test/messaging/tools/container/LocalTestServer.java 2008-05-28 16:32:57 UTC (rev 4329)
+++ trunk/tests/jms-tests/src/org/jboss/test/messaging/tools/container/LocalTestServer.java 2008-05-28 19:21:15 UTC (rev 4330)
@@ -596,28 +596,23 @@
public void deployConnectionFactory(String clientId, String objectName,
List<String> jndiBindings) throws Exception
{
- deployConnectionFactory(clientId, objectName, jndiBindings, -1, -1, -1, -1, false, false, false, -1, false);
+ deployConnectionFactory(clientId, objectName, jndiBindings, -1, -1, -1, -1, false, false, -1, false);
}
public void deployConnectionFactory(String objectName,
List<String> jndiBindings,
int consumerWindowSize) throws Exception
{
- deployConnectionFactory(null, objectName, jndiBindings, consumerWindowSize, -1, -1, -1, false, false, false, -1, false);
+ deployConnectionFactory(null, objectName, jndiBindings, consumerWindowSize, -1, -1, -1, false, false, -1, false);
}
public void deployConnectionFactory(String objectName,
List<String> jndiBindings) throws Exception
{
- deployConnectionFactory(null, objectName, jndiBindings, -1, -1, -1, -1, false, false, false, -1, false);
+ deployConnectionFactory(null, objectName, jndiBindings, -1, -1, -1, -1, false, false, -1, false);
}
- public void deployConnectionFactory(String objectName, List<String> jndiBindings, boolean strictTck) throws Exception
- {
- deployConnectionFactory(null, objectName, jndiBindings, -1, -1, -1, -1, false, false, strictTck, -1, false);
- }
-
public void deployConnectionFactory(String objectName,
List<String> jndiBindings,
int prefetchSize,
@@ -626,7 +621,7 @@
int defaultTempQueueDownCacheSize) throws Exception
{
this.deployConnectionFactory(null, objectName, jndiBindings, prefetchSize, defaultTempQueueFullSize,
- defaultTempQueuePageSize, defaultTempQueueDownCacheSize, false, false, false, -1, false);
+ defaultTempQueuePageSize, defaultTempQueueDownCacheSize, false, false, -1, false);
}
public void deployConnectionFactory(String objectName,
@@ -634,7 +629,7 @@
boolean supportsFailover, boolean supportsLoadBalancing) throws Exception
{
this.deployConnectionFactory(null, objectName, jndiBindings, -1, -1,
- -1, -1, supportsFailover, supportsLoadBalancing, false, -1, false);
+ -1, -1, supportsFailover, supportsLoadBalancing, -1, false);
}
public void deployConnectionFactory(String clientId,
@@ -645,14 +640,13 @@
int defaultTempQueuePageSize,
int defaultTempQueueDownCacheSize,
boolean supportsFailover,
- boolean supportsLoadBalancing,
- boolean strictTck,
+ boolean supportsLoadBalancing,
int dupsOkBatchSize,
boolean blockOnAcknowledge) throws Exception
{
log.info("deploying connection factory with name: " + objectName + " and dupsok: " + dupsOkBatchSize);
getJMSServerManager().createConnectionFactory(objectName, clientId, dupsOkBatchSize,
- strictTck, prefetchSize, -1, 1000, -1, blockOnAcknowledge, true, jndiBindings);
+ prefetchSize, -1, 1000, -1, blockOnAcknowledge, true, jndiBindings);
}
Modified: trunk/tests/jms-tests/src/org/jboss/test/messaging/tools/container/RMITestServer.java
===================================================================
--- trunk/tests/jms-tests/src/org/jboss/test/messaging/tools/container/RMITestServer.java 2008-05-28 16:32:57 UTC (rev 4329)
+++ trunk/tests/jms-tests/src/org/jboss/test/messaging/tools/container/RMITestServer.java 2008-05-28 19:21:15 UTC (rev 4330)
@@ -418,13 +418,6 @@
server.deployConnectionFactory(objectName, jndiBindings, prefetchSize);
}
-
- public void deployConnectionFactory(String objectName, List<String> jndiBindings, boolean strictTck) throws Exception
- {
- server.deployConnectionFactory(objectName, jndiBindings, strictTck);
-
- }
-
public void deployConnectionFactory(String clientId,
String objectName,
List<String> jndiBindings,
@@ -434,12 +427,11 @@
int defaultTempQueueDownCacheSize,
boolean supportsFailover,
boolean supportsLoadBalancing,
- boolean strictTck,
int dupsOkBatchSize,
boolean blockOnAcknowledge) throws Exception
{
server.deployConnectionFactory(clientId, objectName, jndiBindings, prefetchSize, defaultTempQueueFullSize, defaultTempQueuePageSize, defaultTempQueueDownCacheSize,
- supportsFailover, supportsLoadBalancing, strictTck, dupsOkBatchSize, blockOnAcknowledge);
+ supportsFailover, supportsLoadBalancing, dupsOkBatchSize, blockOnAcknowledge);
}
public void deployConnectionFactory(String objectName,
List<String> jndiBindings,
Modified: trunk/tests/jms-tests/src/org/jboss/test/messaging/tools/container/Server.java
===================================================================
--- trunk/tests/jms-tests/src/org/jboss/test/messaging/tools/container/Server.java 2008-05-28 16:32:57 UTC (rev 4329)
+++ trunk/tests/jms-tests/src/org/jboss/test/messaging/tools/container/Server.java 2008-05-28 19:21:15 UTC (rev 4330)
@@ -195,8 +195,7 @@
int defaultTempQueuePageSize,
int defaultTempQueueDownCacheSize,
boolean supportsFailover,
- boolean supportsLoadBalancing,
- boolean strictTck,
+ boolean supportsLoadBalancing,
int dupsOkBatchSize,
boolean blockOnAcknowledge) throws Exception;
@@ -251,8 +250,6 @@
void flushManagedConnectionPool() throws Exception;
- void deployConnectionFactory(String objectName, List<String> jndiBindings, boolean strictTck) throws Exception;
-
MessagingServer getMessagingServer() throws Exception;
InitialContext getInitialContext() throws Exception;
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/jms/server/impl/JMSServerManagerimplTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/jms/server/impl/JMSServerManagerimplTest.java 2008-05-28 16:32:57 UTC (rev 4329)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/jms/server/impl/JMSServerManagerimplTest.java 2008-05-28 19:21:15 UTC (rev 4330)
@@ -234,7 +234,7 @@
public void testCreateAndDestroyConnectionFactory() throws Exception
{
- jmsServerManager.createConnectionFactory("newtestcf", "anid", 100, true, 1000, -1, 1000, -1, false, false, "newtestcf");
+ jmsServerManager.createConnectionFactory("newtestcf", "anid", 100, 1000, -1, 1000, -1, false, false, "newtestcf");
JBossConnectionFactory jbcf = (JBossConnectionFactory) initialContext.lookup("newtestcf");
assertNotNull(jbcf);
assertNotNull(jbcf.getDelegate());
@@ -251,7 +251,7 @@
ArrayList<String> bindings = new ArrayList<String>();
bindings.add("oranewtestcf");
bindings.add("newtestcf");
- jmsServerManager.createConnectionFactory("newtestcf", "anid", 100, true, 1000, -1, 1000, -1, false, false, bindings);
+ jmsServerManager.createConnectionFactory("newtestcf", "anid", 100, 1000, -1, 1000, -1, false, false, bindings);
jbcf = (JBossConnectionFactory) initialContext.lookup("newtestcf");
assertNotNull(jbcf);
assertNotNull(jbcf.getDelegate());
Modified: trunk/tests/src/org/jboss/messaging/tests/unit/core/config/impl/ConfigurationTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/core/config/impl/ConfigurationTest.java 2008-05-28 16:32:57 UTC (rev 4329)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/core/config/impl/ConfigurationTest.java 2008-05-28 19:21:15 UTC (rev 4330)
@@ -47,11 +47,6 @@
configuration = null;
}
- public void testSetStrictTck() throws Exception
- {
- assertEquals("failed to set strict tck", Boolean.TRUE, configuration.isStrictTck());
- }
-
public void testSetClustered() throws Exception
{
assertEquals("failed to set clustered", Boolean.TRUE, configuration.isClustered());
More information about the jboss-cvs-commits
mailing list