You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2009/10/21 15:23:43 UTC
svn commit: r828007 - in /camel/trunk/components/camel-jms/src:
main/java/org/apache/camel/component/jms/
test/java/org/apache/camel/component/jms/
Author: davsclaus
Date: Wed Oct 21 13:23:43 2009
New Revision: 828007
URL: http://svn.apache.org/viewvc?rev=828007&view=rev
Log:
MR-190: Added more tests and removed unusued code.
Modified:
camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsConfiguration.java
camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsEndpoint.java
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsEndpointConfigurationTest.java
Modified: camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsConfiguration.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsConfiguration.java?rev=828007&r1=828006&r2=828007&view=diff
==============================================================================
--- camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsConfiguration.java (original)
+++ camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsConfiguration.java Wed Oct 21 13:23:43 2009
@@ -1243,11 +1243,13 @@
}
public void setReplyTo(String replyToDestination) {
- if (!replyToDestination.startsWith(QUEUE_PREFIX)) {
- throw new IllegalArgumentException("ReplyTo destination value has to be of type queue; "
- + "e.g: \"queue:replyQueue\"");
+ if (replyToDestination.startsWith(QUEUE_PREFIX)) {
+ this.replyToDestination = removeStartingCharacters(replyToDestination.substring(QUEUE_PREFIX.length()), '/');
+ } else if (replyToDestination.startsWith(TOPIC_PREFIX)) {
+ this.replyToDestination = removeStartingCharacters(replyToDestination.substring(TOPIC_PREFIX.length()), '/');
+ } else {
+ this.replyToDestination = replyToDestination;
}
- this.replyToDestination = removeStartingCharacters(replyToDestination.substring(QUEUE_PREFIX.length()), '/');
}
public String getReplyToDestinationSelectorName() {
Modified: camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsEndpoint.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsEndpoint.java?rev=828007&r1=828006&r2=828007&view=diff
==============================================================================
--- camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsEndpoint.java (original)
+++ camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsEndpoint.java Wed Oct 21 13:23:43 2009
@@ -132,36 +132,6 @@
return new JmsProducer(this);
}
- /**
- * Creates a producer using the given template for InOnly message exchanges
- */
- public JmsProducer createProducer(JmsOperations template) throws Exception {
- JmsProducer answer = createProducer();
- if (template instanceof JmsTemplate) {
- JmsTemplate jmsTemplate = (JmsTemplate) template;
- jmsTemplate.setPubSubDomain(pubSubDomain);
- if (destinationName != null) {
- jmsTemplate.setDefaultDestinationName(destinationName);
- } else if (destination != null) {
- jmsTemplate.setDefaultDestination(destination);
- }
- // TODO: Why is this destination resolver disabled for producer? Its enable for consumer!
- /*
- else {
- DestinationResolver resolver = getDestinationResolver();
- if (resolver != null) {
- jmsTemplate.setDestinationResolver(resolver);
- }
- else {
- throw new IllegalArgumentException("Neither destination, destinationName or destinationResolver are specified on this endpoint!");
- }
- }
- */
- }
- answer.setInOnlyTemplate(template);
- return answer;
- }
-
public JmsConsumer createConsumer(Processor processor) throws Exception {
AbstractMessageListenerContainer listenerContainer = configuration.createMessageListenerContainer(this);
return createConsumer(processor, listenerContainer);
@@ -369,15 +339,6 @@
return template;
}
- public void checkValidTemplate(JmsTemplate template) {
- if (template.getDestinationResolver() == null) {
- if (this instanceof DestinationEndpoint) {
- final DestinationEndpoint destinationEndpoint = (DestinationEndpoint) this;
- template.setDestinationResolver(JmsConfiguration.createDestinationResolver(destinationEndpoint));
- }
- }
- }
-
// Delegated properties from the configuration
//-------------------------------------------------------------------------
@ManagedAttribute
@@ -909,10 +870,6 @@
@Override
protected String createEndpointUri() {
String scheme = "jms";
- Component owner = getComponent();
- if (owner != null) {
- // TODO get the scheme of the component?
- }
if (destination != null) {
return scheme + ":" + destination;
} else if (destinationName != null) {
Modified: camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsEndpointConfigurationTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsEndpointConfigurationTest.java?rev=828007&r1=828006&r2=828007&view=diff
==============================================================================
--- camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsEndpointConfigurationTest.java (original)
+++ camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsEndpointConfigurationTest.java Wed Oct 21 13:23:43 2009
@@ -162,16 +162,6 @@
assertEquals(true, endpoint.getConfiguration().isLazyCreateTransactionManager());
}
- @Test
- public void testInvalidReplyTo() throws Exception {
- try {
- resolveMandatoryEndpoint("jms:queue:Foo?replyTo=foo");
- fail("Should have thrown exception");
- } catch (ResolveEndpointFailedException e) {
- // expected
- }
- }
-
protected void assertCacheLevel(JmsEndpoint endpoint, int expected) throws Exception {
JmsConsumer consumer = endpoint.createConsumer(dummyProcessor);