Author: davsclaus
Date: Tue Mar 1 05:35:08 2011
New Revision: 1075667
URL: http://svn.apache.org/viewvc?rev=1075667&view=rev
Log:
Polished and fixed CS.
Modified:
camel/trunk/components/camel-context/pom.xml
camel/trunk/components/camel-context/src/main/java/org/apache/camel/component/context/LocalContextComponent.java
camel/trunk/components/camel-context/src/test/java/org/apache/camel/component/context/JavaDslBlackBoxTest.java
camel/trunk/components/camel-context/src/test/java/org/apache/camel/component/context/JavaDslBlackBoxWithVerboseUriTest.java
camel/trunk/components/camel-context/src/test/java/org/apache/camel/component/context/SpringDslContextComponentTest.java
camel/trunk/components/camel-context/src/test/resources/org/apache/camel/component/context/SpringDslContextComponentTest-context.xml
Modified: camel/trunk/components/camel-context/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-context/pom.xml?rev=1075667&r1=1075666&r2=1075667&view=diff
==============================================================================
--- camel/trunk/components/camel-context/pom.xml (original)
+++ camel/trunk/components/camel-context/pom.xml Tue Mar 1 05:35:08 2011
@@ -51,11 +51,6 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-core-xml</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
<artifactId>camel-test</artifactId>
<scope>test</scope>
</dependency>
Modified:
camel/trunk/components/camel-context/src/main/java/org/apache/camel/component/context/LocalContextComponent.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-context/src/main/java/org/apache/camel/component/context/LocalContextComponent.java?rev=1075667&r1=1075666&r2=1075667&view=diff
==============================================================================
---
camel/trunk/components/camel-context/src/main/java/org/apache/camel/component/context/LocalContextComponent.java
(original)
+++
camel/trunk/components/camel-context/src/main/java/org/apache/camel/component/context/LocalContextComponent.java
Tue Mar 1 05:35:08 2011
@@ -65,13 +65,11 @@ public class LocalContextComponent exten
protected Endpoint createEndpoint(String uri, String remaining,
Map<String, Object> parameters)
throws Exception {
-
-
// lets first check if we are using a fully qualified name:
[context:]contextId:endpointUri
Map<String, Endpoint> map = getLocalCamelContext().getEndpointMap();
- if (LOG.isDebugEnabled()) {
- LOG.debug("Trying to lookup " + remaining + " in local map " +
map.keySet());
+ if (LOG.isTraceEnabled()) {
+ LOG.trace("Trying to lookup " + remaining + " in local map " +
map.keySet());
}
Endpoint endpoint = map.get(remaining);
if (endpoint != null) {
@@ -97,7 +95,7 @@ public class LocalContextComponent exten
protected void logUsingEndpoint(String uri, Endpoint endpoint) {
if (LOG.isDebugEnabled()) {
- LOG.debug("Mapping the URI " + uri + " to local endpoint " +
endpoint);
+ LOG.debug("Mapping the URI: " + uri + " to local endpoint: " +
endpoint);
}
}
Modified:
camel/trunk/components/camel-context/src/test/java/org/apache/camel/component/context/JavaDslBlackBoxTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-context/src/test/java/org/apache/camel/component/context/JavaDslBlackBoxTest.java?rev=1075667&r1=1075666&r2=1075667&view=diff
==============================================================================
---
camel/trunk/components/camel-context/src/test/java/org/apache/camel/component/context/JavaDslBlackBoxTest.java
(original)
+++
camel/trunk/components/camel-context/src/test/java/org/apache/camel/component/context/JavaDslBlackBoxTest.java
Tue Mar 1 05:35:08 2011
@@ -67,7 +67,6 @@ public class JavaDslBlackBoxTest extends
registry.bind("accounts", blackBox);
return registry;
-
}
@Override
@@ -76,6 +75,7 @@ public class JavaDslBlackBoxTest extends
@Override
public void configure() throws Exception {
from("direct:start").to("accounts:purchaseOrder");
+
from("accounts:invoice").to("mock:results");
}
};
Modified:
camel/trunk/components/camel-context/src/test/java/org/apache/camel/component/context/JavaDslBlackBoxWithVerboseUriTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-context/src/test/java/org/apache/camel/component/context/JavaDslBlackBoxWithVerboseUriTest.java?rev=1075667&r1=1075666&r2=1075667&view=diff
==============================================================================
---
camel/trunk/components/camel-context/src/test/java/org/apache/camel/component/context/JavaDslBlackBoxWithVerboseUriTest.java
(original)
+++
camel/trunk/components/camel-context/src/test/java/org/apache/camel/component/context/JavaDslBlackBoxWithVerboseUriTest.java
Tue Mar 1 05:35:08 2011
@@ -29,6 +29,7 @@ public class JavaDslBlackBoxWithVerboseU
@Override
public void configure() throws Exception {
from("direct:start").to("context:accounts:direct://purchaseOrder");
+
from("context:accounts:direct://invoice").to("mock:results");
}
};
Modified:
camel/trunk/components/camel-context/src/test/java/org/apache/camel/component/context/SpringDslContextComponentTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-context/src/test/java/org/apache/camel/component/context/SpringDslContextComponentTest.java?rev=1075667&r1=1075666&r2=1075667&view=diff
==============================================================================
---
camel/trunk/components/camel-context/src/test/java/org/apache/camel/component/context/SpringDslContextComponentTest.java
(original)
+++
camel/trunk/components/camel-context/src/test/java/org/apache/camel/component/context/SpringDslContextComponentTest.java
Tue Mar 1 05:35:08 2011
@@ -1,5 +1,4 @@
/**
- *
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
@@ -7,7 +6,7 @@
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -17,6 +16,8 @@
*/
package org.apache.camel.component.context;
+import java.util.List;
+
import org.apache.camel.EndpointInject;
import org.apache.camel.Exchange;
import org.apache.camel.Message;
@@ -24,19 +25,14 @@ import org.apache.camel.Produce;
import org.apache.camel.ProducerTemplate;
import org.apache.camel.component.mock.MockEndpoint;
import org.junit.Test;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import org.springframework.test.context.ContextConfiguration;
import
org.springframework.test.context.junit4.AbstractJUnit4SpringContextTests;
-import java.util.List;
-
/**
* Test defining a context component using the Spring XML DSL
*/
@ContextConfiguration
public class SpringDslContextComponentTest extends
AbstractJUnit4SpringContextTests {
- private static final transient Logger LOG =
LoggerFactory.getLogger(SpringDslContextComponentTest.class);
@EndpointInject(uri = "tester:results")
private MockEndpoint resultEndpoint;
@@ -46,9 +42,8 @@ public class SpringDslContextComponentTe
@Test
public void testUsingContextComponent() throws Exception {
-
Object accounts = applicationContext.getBean("accounts");
- System.out.println("Found accounts: " + accounts);
+ logger.info("Found accounts: " + accounts);
resultEndpoint.expectedHeaderReceived("received", "true");
resultEndpoint.expectedMessageCount(2);
@@ -61,7 +56,7 @@ public class SpringDslContextComponentTe
List<Exchange> receivedExchanges =
resultEndpoint.getReceivedExchanges();
for (Exchange exchange : receivedExchanges) {
Message in = exchange.getIn();
- LOG.info("Received from: " + exchange.getFromEndpoint() + "
headers: " + in.getHeaders() + " body: " + in.getBody());
+ logger.info("Received from: " + exchange.getFromEndpoint() + "
headers: " + in.getHeaders() + " body: " + in.getBody());
}
}
}
Modified:
camel/trunk/components/camel-context/src/test/resources/org/apache/camel/component/context/SpringDslContextComponentTest-context.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-context/src/test/resources/org/apache/camel/component/context/SpringDslContextComponentTest-context.xml?rev=1075667&r1=1075666&r2=1075667&view=diff
==============================================================================
---
camel/trunk/components/camel-context/src/test/resources/org/apache/camel/component/context/SpringDslContextComponentTest-context.xml
(original)
+++
camel/trunk/components/camel-context/src/test/resources/org/apache/camel/component/context/SpringDslContextComponentTest-context.xml
Tue Mar 1 05:35:08 2011
@@ -49,7 +49,4 @@
</route>
</camelContext>
-
-
-
-</beans>
+</beans>
\ No newline at end of file
