Author: davsclaus
Date: Thu Sep 11 10:34:18 2008
New Revision: 694374
URL: http://svn.apache.org/viewvc?rev=694374&view=rev
Log:
CAMEL-700: Formatting of tracer can now be configued in spring xml. Just add a
bean with the id traceFormatter and set the options.
Added:
activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TraceFormatterTest.java
(with props)
activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/interceptor/traceFormatterTest.xml
(contents, props changed)
- copied, changed from r694311,
activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/interceptor/streamCachingOnRoute.xml
Modified:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/TraceFormatter.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/TraceInterceptor.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/Tracer.java
activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/CamelContextFactoryBean.java
Modified:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java?rev=694374&r1=694373&r2=694374&view=diff
==============================================================================
---
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
(original)
+++
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
Thu Sep 11 10:34:18 2008
@@ -43,6 +43,7 @@
import org.apache.camel.management.InstrumentationLifecycleStrategy;
import org.apache.camel.management.JmxSystemPropertyKeys;
import org.apache.camel.model.RouteType;
+import org.apache.camel.processor.interceptor.TraceFormatter;
import org.apache.camel.processor.interceptor.Tracer;
import org.apache.camel.spi.ComponentResolver;
import org.apache.camel.spi.ExchangeConverter;
@@ -529,7 +530,13 @@
}
}
if (!found) {
- addInterceptStrategy(new Tracer());
+ Tracer tracer = new Tracer();
+ // lets see if we have a formatter if so use it
+ TraceFormatter formatter =
this.getRegistry().lookup("traceFormatter", TraceFormatter.class);
+ if (formatter != null) {
+ tracer.setFormatter(formatter);
+ }
+ addInterceptStrategy(tracer);
}
}
lifecycleStrategy.onContextStart(this);
Modified:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/TraceFormatter.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/TraceFormatter.java?rev=694374&r1=694373&r2=694374&view=diff
==============================================================================
---
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/TraceFormatter.java
(original)
+++
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/TraceFormatter.java
Thu Sep 11 10:34:18 2008
@@ -116,7 +116,6 @@
}
protected Object getBodyAsString(Message in) {
-
StreamCache newBody = in.getBody(StreamCache.class);
if (newBody != null) {
in.setBody(newBody);
Modified:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/TraceInterceptor.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/TraceInterceptor.java?rev=694374&r1=694373&r2=694374&view=diff
==============================================================================
---
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/TraceInterceptor.java
(original)
+++
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/TraceInterceptor.java
Thu Sep 11 10:34:18 2008
@@ -145,7 +145,6 @@
logger.process(exchange, throwable);
}
-
/**
* Returns true if the given exchange should be logged in the trace list
*/
Modified:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/Tracer.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/Tracer.java?rev=694374&r1=694373&r2=694374&view=diff
==============================================================================
---
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/Tracer.java
(original)
+++
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/Tracer.java
Thu Sep 11 10:34:18 2008
@@ -33,6 +33,7 @@
private TraceFormatter formatter = new TraceFormatter();
private boolean enabled = true;
+
/**
* A helper method to return the Tracer instance for a given [EMAIL
PROTECTED] CamelContext} if one is enabled
*
Modified:
activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/CamelContextFactoryBean.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/CamelContextFactoryBean.java?rev=694374&r1=694373&r2=694374&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/CamelContextFactoryBean.java
(original)
+++
activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/CamelContextFactoryBean.java
Thu Sep 11 10:34:18 2008
@@ -46,6 +46,7 @@
import org.apache.camel.model.RouteType;
import org.apache.camel.model.dataformat.DataFormatType;
import org.apache.camel.processor.interceptor.Debugger;
+import org.apache.camel.processor.interceptor.TraceFormatter;
import org.apache.camel.processor.interceptor.Tracer;
import org.apache.camel.spi.LifecycleStrategy;
import org.apache.camel.spi.Registry;
@@ -141,6 +142,11 @@
}
Tracer tracer = getBeanForType(Tracer.class);
if (tracer != null) {
+ // use formatter if there is a TraceFormatter bean defined
+ TraceFormatter formatter = getBeanForType(TraceFormatter.class);
+ if (formatter != null) {
+ tracer.setFormatter(formatter);
+ }
getContext().addInterceptStrategy(tracer);
}
Added:
activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TraceFormatterTest.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TraceFormatterTest.java?rev=694374&view=auto
==============================================================================
---
activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TraceFormatterTest.java
(added)
+++
activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TraceFormatterTest.java
Thu Sep 11 10:34:18 2008
@@ -0,0 +1,43 @@
+/**
+ * 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.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (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
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.spring.interceptor;
+
+import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.spring.SpringTestSupport;
+import org.springframework.context.support.AbstractXmlApplicationContext;
+import org.springframework.context.support.ClassPathXmlApplicationContext;
+
+/**
+ * Unit test for trace formatter configurd in spring XML.
+ */
+public class TraceFormatterTest extends SpringTestSupport {
+
+ protected AbstractXmlApplicationContext createApplicationContext() {
+ return new ClassPathXmlApplicationContext(
+ "/org/apache/camel/spring/interceptor/traceFormatterTest.xml");
+ }
+
+ public void testTraceFormatter() throws Exception {
+ MockEndpoint mock = getMockEndpoint("mock:result");
+ mock.expectedMessageCount(1);
+
+ template.sendBody("direct:start", "Hello World");
+
+ assertMockEndpointsSatisfied();
+ }
+
+}
Propchange:
activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TraceFormatterTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TraceFormatterTest.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Copied:
activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/interceptor/traceFormatterTest.xml
(from r694311,
activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/interceptor/streamCachingOnRoute.xml)
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/interceptor/traceFormatterTest.xml?p2=activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/interceptor/traceFormatterTest.xml&p1=activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/interceptor/streamCachingOnRoute.xml&r1=694311&r2=694374&rev=694374&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/interceptor/streamCachingOnRoute.xml
(original)
+++
activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/interceptor/traceFormatterTest.xml
Thu Sep 11 10:34:18 2008
@@ -22,13 +22,19 @@
http://activemq.apache.org/camel/schema/spring
http://activemq.apache.org/camel/schema/spring/camel-spring.xsd
">
- <camelContext id="camel"
xmlns="http://activemq.apache.org/camel/schema/spring";>
- <!-- START SNIPPET: streamCache -->
- <route streamCaching="true">
- <from uri="direct:a"/>
- <to uri="mock:a"/>
- </route>
- <!-- END SNIPPET: streamCache -->
- </camelContext>
+ <!-- SNIPPET START: e1 -->
+ <bean id="traceFormatter"
class="org.apache.camel.processor.interceptor.TraceFormatter">
+ <property name="showBody" value="true"/>
+ <property name="showBodyType" value="false"/>
+ <property name="showBreadCrumb" value="false"/>
+ </bean>
+
+ <camelContext id="camel" trace="true"
xmlns="http://activemq.apache.org/camel/schema/spring";>
+ <route>
+ <from uri="direct:start"/>
+ <to uri="mock:result"/>
+ </route>
+ </camelContext>
+ <!-- SNIPPET END: e1 -->
</beans>
Propchange:
activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/interceptor/traceFormatterTest.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/interceptor/traceFormatterTest.xml
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange:
activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/interceptor/traceFormatterTest.xml
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange:
activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/interceptor/traceFormatterTest.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
