You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by su...@apache.org on 2012/09/26 17:57:59 UTC
svn commit: r1390582 - in /camel/trunk/components/camel-sjms/src:
main/java/org/apache/camel/component/sjms/
test/java/org/apache/camel/component/sjms/
test/java/org/apache/camel/component/sjms/consumer/
test/java/org/apache/camel/component/sjms/suppor...
Author: sully6768
Date: Wed Sep 26 15:57:58 2012
New Revision: 1390582
URL: http://svn.apache.org/viewvc?rev=1390582&view=rev
Log:
Renamed maxConnections to connectionCount to clarify intent
Modified:
camel/trunk/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/SjmsComponent.java
camel/trunk/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/SjmsEndpointNameOverrideTest.java
camel/trunk/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/SjmsEndpointTest.java
camel/trunk/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/InOnlyTopicDurableConsumerTest.java
camel/trunk/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/support/JmsTestSupport.java
camel/trunk/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/BatchTransactedTopicConsumerTest.java
camel/trunk/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/TransactedTopicProducerTest.java
Modified: camel/trunk/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/SjmsComponent.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/SjmsComponent.java?rev=1390582&r1=1390581&r2=1390582&view=diff
==============================================================================
--- camel/trunk/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/SjmsComponent.java (original)
+++ camel/trunk/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/SjmsComponent.java Wed Sep 26 15:57:58 2012
@@ -42,7 +42,7 @@ public class SjmsComponent extends Defau
private ConnectionResource connectionResource;
private HeaderFilterStrategy headerFilterStrategy = new SjmsHeaderFilterStrategy();
private KeyFormatStrategy keyFormatStrategy;
- private Integer maxConnections = 1;
+ private Integer connectionCount = 1;
private TransactionCommitStrategy transactionCommitStrategy;
/**
@@ -132,7 +132,7 @@ public class SjmsComponent extends Defau
if (getConnectionResource() == null) {
LOGGER.debug("No ConnectionResource provided. Initialize the ConnectionFactoryResource.");
// We always use a connection pool, even for a pool of 1
- ConnectionFactoryResource connections = new ConnectionFactoryResource(getMaxConnections(), getConnectionFactory());
+ ConnectionFactoryResource connections = new ConnectionFactoryResource(getConnectionCount(), getConnectionFactory());
connections.fillPool();
setConnectionResource(connections);
} else if (getConnectionResource() instanceof ConnectionFactoryResource) {
@@ -189,12 +189,12 @@ public class SjmsComponent extends Defau
return connectionResource;
}
- public void setMaxConnections(Integer maxConnections) {
- this.maxConnections = maxConnections;
+ public void setConnectionCount(Integer maxConnections) {
+ this.connectionCount = maxConnections;
}
- public Integer getMaxConnections() {
- return maxConnections;
+ public Integer getConnectionCount() {
+ return connectionCount;
}
public void setKeyFormatStrategy(KeyFormatStrategy keyFormatStrategy) {
Modified: camel/trunk/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/SjmsEndpointNameOverrideTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/SjmsEndpointNameOverrideTest.java?rev=1390582&r1=1390581&r2=1390582&view=diff
==============================================================================
--- camel/trunk/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/SjmsEndpointNameOverrideTest.java (original)
+++ camel/trunk/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/SjmsEndpointNameOverrideTest.java Wed Sep 26 15:57:58 2012
@@ -70,7 +70,7 @@ public class SjmsEndpointNameOverrideTes
ActiveMQConnectionFactory connectionFactory = new ActiveMQConnectionFactory("vm://broker?broker.persistent=false&broker.useJmx=false");
SjmsComponent component = new SjmsComponent();
- component.setMaxConnections(1);
+ component.setConnectionCount(1);
component.setConnectionFactory(connectionFactory);
camelContext.addComponent(BEAN_NAME, component);
Modified: camel/trunk/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/SjmsEndpointTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/SjmsEndpointTest.java?rev=1390582&r1=1390581&r2=1390582&view=diff
==============================================================================
--- camel/trunk/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/SjmsEndpointTest.java (original)
+++ camel/trunk/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/SjmsEndpointTest.java Wed Sep 26 15:57:58 2012
@@ -153,7 +153,7 @@ public class SjmsEndpointTest extends Ca
ActiveMQConnectionFactory connectionFactory = new ActiveMQConnectionFactory("vm://broker?broker.persistent=false&broker.useJmx=false");
SjmsComponent component = new SjmsComponent();
- component.setMaxConnections(3);
+ component.setConnectionCount(3);
component.setConnectionFactory(connectionFactory);
camelContext.addComponent("sjms", component);
Modified: camel/trunk/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/InOnlyTopicDurableConsumerTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/InOnlyTopicDurableConsumerTest.java?rev=1390582&r1=1390581&r2=1390582&view=diff
==============================================================================
--- camel/trunk/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/InOnlyTopicDurableConsumerTest.java (original)
+++ camel/trunk/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/InOnlyTopicDurableConsumerTest.java Wed Sep 26 15:57:58 2012
@@ -68,7 +68,7 @@ public class InOnlyTopicDurableConsumerT
CamelContext camelContext = super.createCamelContext();
SjmsComponent component = new SjmsComponent();
component.setConnectionResource(connectionResource);
- component.setMaxConnections(1);
+ component.setConnectionCount(1);
camelContext.addComponent("sjms", component);
return camelContext;
}
Modified: camel/trunk/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/support/JmsTestSupport.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/support/JmsTestSupport.java?rev=1390582&r1=1390581&r2=1390582&view=diff
==============================================================================
--- camel/trunk/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/support/JmsTestSupport.java (original)
+++ camel/trunk/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/support/JmsTestSupport.java Wed Sep 26 15:57:58 2012
@@ -94,7 +94,7 @@ public class JmsTestSupport extends Came
connection.start();
session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
SjmsComponent component = new SjmsComponent();
- component.setMaxConnections(1);
+ component.setConnectionCount(1);
component.setConnectionFactory(connectionFactory);
camelContext.addComponent("sjms", component);
return camelContext;
Modified: camel/trunk/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/BatchTransactedTopicConsumerTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/BatchTransactedTopicConsumerTest.java?rev=1390582&r1=1390581&r2=1390582&view=diff
==============================================================================
--- camel/trunk/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/BatchTransactedTopicConsumerTest.java (original)
+++ camel/trunk/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/BatchTransactedTopicConsumerTest.java Wed Sep 26 15:57:58 2012
@@ -68,7 +68,7 @@ public class BatchTransactedTopicConsume
ActiveMQConnectionFactory connectionFactory = new ActiveMQConnectionFactory("vm://broker?broker.persistent=false&broker.useJmx=true");
SjmsComponent component = new SjmsComponent();
component.setConnectionFactory(connectionFactory);
- component.setMaxConnections(1);
+ component.setConnectionCount(1);
camelContext.addComponent("sjms", component);
return camelContext;
Modified: camel/trunk/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/TransactedTopicProducerTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/TransactedTopicProducerTest.java?rev=1390582&r1=1390581&r2=1390582&view=diff
==============================================================================
--- camel/trunk/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/TransactedTopicProducerTest.java (original)
+++ camel/trunk/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/TransactedTopicProducerTest.java Wed Sep 26 15:57:58 2012
@@ -70,7 +70,7 @@ public class TransactedTopicProducerTest
CamelContext camelContext = super.createCamelContext();
SjmsComponent component = new SjmsComponent();
component.setConnectionResource(connectionResource);
- component.setMaxConnections(1);
+ component.setConnectionCount(1);
camelContext.addComponent("sjms", component);
return camelContext;
}