You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ni...@apache.org on 2008/09/22 08:50:07 UTC
svn commit: r697686 - in /activemq/camel/trunk:
camel-core/src/test/java/org/apache/camel/builder/
camel-core/src/test/java/org/apache/camel/processor/
examples/camel-example-cxf/src/main/resources/org/apache/camel/example/camel/transport/
Author: ningjiang
Date: Sun Sep 21 23:50:06 2008
New Revision: 697686
URL: http://svn.apache.org/viewvc?rev=697686&view=rev
Log:
Added one comment for the Camel transport example, also fixed the CS errors in camel-core
Modified:
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/builder/RouteBuilderTest.java
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/SetPropertyTest.java
activemq/camel/trunk/examples/camel-example-cxf/src/main/resources/org/apache/camel/example/camel/transport/CamelDestination.xml
Modified: activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/builder/RouteBuilderTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/builder/RouteBuilderTest.java?rev=697686&r1=697685&r2=697686&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/builder/RouteBuilderTest.java (original)
+++ activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/builder/RouteBuilderTest.java Sun Sep 21 23:50:06 2008
@@ -25,7 +25,6 @@
import org.apache.camel.Producer;
import org.apache.camel.Route;
import org.apache.camel.TestSupport;
-import org.apache.camel.model.RoutesType;
import org.apache.camel.impl.EventDrivenConsumerRoute;
import org.apache.camel.management.InstrumentationProcessor;
import org.apache.camel.management.JmxSystemPropertyKeys;
@@ -39,8 +38,8 @@
import org.apache.camel.processor.Splitter;
import org.apache.camel.processor.idempotent.IdempotentConsumer;
import org.apache.camel.processor.idempotent.MemoryMessageIdRepository;
-import static org.apache.camel.processor.idempotent.MemoryMessageIdRepository.memoryMessageIdRepository;
+import static org.apache.camel.processor.idempotent.MemoryMessageIdRepository.memoryMessageIdRepository;
/**
* @version $Revision$
@@ -69,7 +68,7 @@
Endpoint<Exchange> key = route.getEndpoint();
assertEquals("From endpoint", "seda:a", key.getEndpointUri());
Processor processor = getProcessorWithoutErrorHandler(route);
-
+
SendProcessor sendProcessor;
if (Boolean.getBoolean(JmxSystemPropertyKeys.DISABLED)) {
sendProcessor = assertIsInstanceOf(SendProcessor.class, processor);
@@ -103,13 +102,13 @@
Endpoint key = route.getEndpoint();
assertEquals("From endpoint", "seda:a", key.getEndpointUri());
Processor processor = getProcessorWithoutErrorHandler(route);
-
+
if (!Boolean.getBoolean(JmxSystemPropertyKeys.DISABLED)) {
- InstrumentationProcessor interceptor =
+ InstrumentationProcessor interceptor =
assertIsInstanceOf(InstrumentationProcessor.class, processor);
processor = interceptor.getProcessor();
}
-
+
FilterProcessor filterProcessor = assertIsInstanceOf(FilterProcessor.class, processor);
SendProcessor sendProcessor = assertIsInstanceOf(SendProcessor.class,
unwrapErrorHandler(filterProcessor
@@ -140,9 +139,9 @@
Endpoint key = route.getEndpoint();
assertEquals("From endpoint", "seda:a", key.getEndpointUri());
Processor processor = getProcessorWithoutErrorHandler(route);
-
+
if (!Boolean.getBoolean(JmxSystemPropertyKeys.DISABLED)) {
- InstrumentationProcessor interceptor =
+ InstrumentationProcessor interceptor =
assertIsInstanceOf(InstrumentationProcessor.class, processor);
processor = interceptor.getProcessor();
}
@@ -187,7 +186,7 @@
assertEquals("From endpoint", "seda:a", key.getEndpointUri());
Processor processor = getProcessorWithoutErrorHandler(route);
if (!Boolean.getBoolean(JmxSystemPropertyKeys.DISABLED)) {
- InstrumentationProcessor interceptor =
+ InstrumentationProcessor interceptor =
assertIsInstanceOf(InstrumentationProcessor.class, processor);
processor = interceptor.getProcessor();
}
@@ -218,7 +217,7 @@
assertEquals("From endpoint", "seda:a", key.getEndpointUri());
Processor processor = getProcessorWithoutErrorHandler(route);
if (!Boolean.getBoolean(JmxSystemPropertyKeys.DISABLED)) {
- InstrumentationProcessor interceptor =
+ InstrumentationProcessor interceptor =
assertIsInstanceOf(InstrumentationProcessor.class, processor);
processor = interceptor.getProcessor();
}
@@ -288,11 +287,11 @@
Processor processor = getProcessorWithoutErrorHandler(route);
if (!Boolean.getBoolean(JmxSystemPropertyKeys.DISABLED)) {
- InstrumentationProcessor interceptor =
+ InstrumentationProcessor interceptor =
assertIsInstanceOf(InstrumentationProcessor.class, processor);
processor = interceptor.getProcessor();
}
-
+
DelegateProcessor p1 = assertIsInstanceOf(DelegateProcessor.class, processor);
processor = p1.getProcessor();
@@ -368,7 +367,7 @@
assertEquals("From endpoint", "seda:a", key.getEndpointUri());
Processor processor = getProcessorWithoutErrorHandler(route);
if (!Boolean.getBoolean(JmxSystemPropertyKeys.DISABLED)) {
- InstrumentationProcessor interceptor =
+ InstrumentationProcessor interceptor =
assertIsInstanceOf(InstrumentationProcessor.class, processor);
processor = interceptor.getProcessor();
}
@@ -399,7 +398,7 @@
assertEquals("From endpoint", "seda:a", key.getEndpointUri());
Processor processor = getProcessorWithoutErrorHandler(route);
if (!Boolean.getBoolean(JmxSystemPropertyKeys.DISABLED)) {
- InstrumentationProcessor interceptor =
+ InstrumentationProcessor interceptor =
assertIsInstanceOf(InstrumentationProcessor.class, processor);
processor = interceptor.getProcessor();
}
@@ -431,7 +430,7 @@
assertEquals("From endpoint", "seda:a", key.getEndpointUri());
Processor processor = getProcessorWithoutErrorHandler(route);
if (!Boolean.getBoolean(JmxSystemPropertyKeys.DISABLED)) {
- InstrumentationProcessor interceptor =
+ InstrumentationProcessor interceptor =
assertIsInstanceOf(InstrumentationProcessor.class, processor);
processor = interceptor.getProcessor();
}
@@ -453,7 +452,7 @@
if (!(processor instanceof SendProcessor)) {
processor = unwrapErrorHandler(processor);
}
-
+
SendProcessor sendProcessor = assertIsInstanceOf(SendProcessor.class, processor);
assertEquals("Endpoint URI", uri, sendProcessor.getDestination().getEndpointUri());
}
@@ -462,13 +461,13 @@
if (!(processor instanceof Producer)) {
processor = unwrapErrorHandler(processor);
}
-
+
if (!Boolean.getBoolean(JmxSystemPropertyKeys.DISABLED)) {
- InstrumentationProcessor interceptor =
+ InstrumentationProcessor interceptor =
assertIsInstanceOf(InstrumentationProcessor.class, processor);
processor = interceptor.getProcessor();
}
-
+
if (processor instanceof SendProcessor) {
assertSendTo(processor, uri);
} else {
Modified: activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/SetPropertyTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/SetPropertyTest.java?rev=697686&r1=697685&r2=697686&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/SetPropertyTest.java (original)
+++ activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/SetPropertyTest.java Sun Sep 21 23:50:06 2008
@@ -36,15 +36,15 @@
// make sure we got the message
assertMockEndpointsSatisfied();
-
+
// lets get the property value
List<Exchange> exchanges = end.getExchanges();
- Exchange exchange = exchanges.get(0);
+ Exchange exchange = exchanges.get(0);
String actualPropertyValue = exchange.getProperty(propertyName, String.class);
-
+
assertEquals(expectedPropertyValue, actualPropertyValue);
}
-
+
@Override
protected void setUp() throws Exception {
super.setUp();
@@ -55,8 +55,8 @@
return new RouteBuilder() {
public void configure() {
from("direct:start").
- setProperty(propertyName).constant(expectedPropertyValue).
- to("mock:end");
+ setProperty(propertyName).constant(expectedPropertyValue).
+ to("mock:end");
}
};
}
Modified: activemq/camel/trunk/examples/camel-example-cxf/src/main/resources/org/apache/camel/example/camel/transport/CamelDestination.xml
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/examples/camel-example-cxf/src/main/resources/org/apache/camel/example/camel/transport/CamelDestination.xml?rev=697686&r1=697685&r2=697686&view=diff
==============================================================================
--- activemq/camel/trunk/examples/camel-example-cxf/src/main/resources/org/apache/camel/example/camel/transport/CamelDestination.xml (original)
+++ activemq/camel/trunk/examples/camel-example-cxf/src/main/resources/org/apache/camel/example/camel/transport/CamelDestination.xml Sun Sep 21 23:50:06 2008
@@ -40,6 +40,7 @@
</route>
</camelContext>
+ <!-- Inject the camel context to the Camel transport's destination -->
<camel:destination name="{http://apache.org/hello_world_soap_http}CamelPort.camel-destination">
<camel:camelContextRef>dest_context</camel:camelContextRef>
</camel:destination>