CAMEL-6467: Added new mustache component to kit. Fixed CS.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/5ec63db9 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/5ec63db9 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/5ec63db9 Branch: refs/heads/master Commit: 5ec63db9426d768145c281e6a83227e88eaaeac5 Parents: 50eb726 Author: Claus Ibsen <davscl...@apache.org> Authored: Thu Jun 20 11:26:28 2013 +0200 Committer: Claus Ibsen <davscl...@apache.org> Committed: Thu Jun 20 11:26:28 2013 +0200 ---------------------------------------------------------------------- apache-camel/pom.xml | 4 + .../src/main/descriptors/common-bin.xml | 1 + components/camel-mustache/pom.xml | 83 ++++++++++---------- .../component/mustache/MustacheComponent.java | 13 ++- .../component/mustache/MustacheConstants.java | 6 +- .../component/mustache/MustacheEndpoint.java | 62 +++++++-------- .../org/apache/camel/component/mustache | 17 ++++ .../mustache/MustacheComponentTest.java | 58 +++++++------- .../component/mustache/MustacheLetterTest.java | 4 +- .../src/test/resources/log4j.properties | 5 +- parent/pom.xml | 6 ++ 11 files changed, 145 insertions(+), 114 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/5ec63db9/apache-camel/pom.xml ---------------------------------------------------------------------- diff --git a/apache-camel/pom.xml b/apache-camel/pom.xml index eb784ab..919f899 100644 --- a/apache-camel/pom.xml +++ b/apache-camel/pom.xml @@ -372,6 +372,10 @@ </dependency> <dependency> <groupId>org.apache.camel</groupId> + <artifactId>camel-mustache</artifactId> + </dependency> + <dependency> + <groupId>org.apache.camel</groupId> <artifactId>camel-mvel</artifactId> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/camel/blob/5ec63db9/apache-camel/src/main/descriptors/common-bin.xml ---------------------------------------------------------------------- diff --git a/apache-camel/src/main/descriptors/common-bin.xml b/apache-camel/src/main/descriptors/common-bin.xml index b941198..110c694 100644 --- a/apache-camel/src/main/descriptors/common-bin.xml +++ b/apache-camel/src/main/descriptors/common-bin.xml @@ -104,6 +104,7 @@ <include>org.apache.camel:camel-mongodb</include> <include>org.apache.camel:camel-mqtt</include> <include>org.apache.camel:camel-msv</include> + <include>org.apache.camel:camel-mustache</include> <include>org.apache.camel:camel-mvel</include> <include>org.apache.camel:camel-mybatis</include> <include>org.apache.camel:camel-nagios</include> http://git-wip-us.apache.org/repos/asf/camel/blob/5ec63db9/components/camel-mustache/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-mustache/pom.xml b/components/camel-mustache/pom.xml index f6be585..05a1537 100644 --- a/components/camel-mustache/pom.xml +++ b/components/camel-mustache/pom.xml @@ -15,50 +15,49 @@ See the License for the specific language governing permissions and limitations under the License. --> -<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> - <modelVersion>4.0.0</modelVersion> +<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> + <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.apache.camel</groupId> - <artifactId>components</artifactId> - <version>2.12-SNAPSHOT</version> - </parent> - <artifactId>camel-mustache</artifactId> - <packaging>bundle</packaging> - <name>Camel :: Mustache</name> - <description>Camel Mustache support</description> - <properties> - <camel.osgi.export.pkg>org.apache.camel.component.mustache.*</camel.osgi.export.pkg> - <camel.osgi.export.service>org.apache.camel.spi.ComponentResolver;component=mustache</camel.osgi.export.service> - </properties> + <parent> + <groupId>org.apache.camel</groupId> + <artifactId>components</artifactId> + <version>2.12-SNAPSHOT</version> + </parent> - <dependencies> + <artifactId>camel-mustache</artifactId> + <packaging>bundle</packaging> + <name>Camel :: Mustache</name> + <description>Camel Mustache support</description> - <dependency> - <groupId>org.apache.camel</groupId> - <artifactId>camel-core</artifactId> - </dependency> - <dependency> - <groupId>com.github.spullara.mustache.java</groupId> - <artifactId>compiler</artifactId> - <version>0.8.12</version> - </dependency> + <properties> + <camel.osgi.export.pkg>org.apache.camel.component.mustache.*</camel.osgi.export.pkg> + <camel.osgi.export.service>org.apache.camel.spi.ComponentResolver;component=mustache</camel.osgi.export.service> + </properties> + + <dependencies> + + <dependency> + <groupId>org.apache.camel</groupId> + <artifactId>camel-core</artifactId> + </dependency> + <dependency> + <groupId>com.github.spullara.mustache.java</groupId> + <artifactId>compiler</artifactId> + <version>${mustache-java-version}</version> + </dependency> + + <!-- testing --> + <dependency> + <groupId>org.apache.camel</groupId> + <artifactId>camel-test</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + <scope>test</scope> + </dependency> + </dependencies> - <!-- testing --> - <dependency> - <groupId>org.apache.camel</groupId> - <artifactId>camel-test</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <scope>test</scope> - </dependency> - </dependencies> </project> http://git-wip-us.apache.org/repos/asf/camel/blob/5ec63db9/components/camel-mustache/src/main/java/org/apache/camel/component/mustache/MustacheComponent.java ---------------------------------------------------------------------- diff --git a/components/camel-mustache/src/main/java/org/apache/camel/component/mustache/MustacheComponent.java b/components/camel-mustache/src/main/java/org/apache/camel/component/mustache/MustacheComponent.java index 8777b38..e97f46f 100644 --- a/components/camel-mustache/src/main/java/org/apache/camel/component/mustache/MustacheComponent.java +++ b/components/camel-mustache/src/main/java/org/apache/camel/component/mustache/MustacheComponent.java @@ -16,10 +16,10 @@ */ package org.apache.camel.component.mustache; -import com.github.mustachejava.DefaultMustacheFactory; -import com.github.mustachejava.MustacheFactory; import java.util.Map; +import com.github.mustachejava.DefaultMustacheFactory; +import com.github.mustachejava.MustacheFactory; import org.apache.camel.Endpoint; import org.apache.camel.impl.DefaultComponent; import org.apache.camel.util.ObjectHelper; @@ -35,10 +35,9 @@ import org.apache.camel.util.ObjectHelper; * </li> */ public class MustacheComponent extends DefaultComponent { - /** - * Mustache factory - */ - private MustacheFactory mustacheFactory = new DefaultMustacheFactory(); + + private MustacheFactory mustacheFactory = new DefaultMustacheFactory(); + @Override protected Endpoint createEndpoint(String uri, String remaining, Map<String, Object> parameters) throws Exception { MustacheEndpoint endpoint = new MustacheEndpoint(uri, this, remaining); @@ -66,5 +65,5 @@ public class MustacheComponent extends DefaultComponent { public void setMustacheFactory(MustacheFactory mustacheFactory) { this.mustacheFactory = mustacheFactory; } - + } http://git-wip-us.apache.org/repos/asf/camel/blob/5ec63db9/components/camel-mustache/src/main/java/org/apache/camel/component/mustache/MustacheConstants.java ---------------------------------------------------------------------- diff --git a/components/camel-mustache/src/main/java/org/apache/camel/component/mustache/MustacheConstants.java b/components/camel-mustache/src/main/java/org/apache/camel/component/mustache/MustacheConstants.java index a3f3966..e21318d 100644 --- a/components/camel-mustache/src/main/java/org/apache/camel/component/mustache/MustacheConstants.java +++ b/components/camel-mustache/src/main/java/org/apache/camel/component/mustache/MustacheConstants.java @@ -20,18 +20,22 @@ package org.apache.camel.component.mustache; * Mustache component constants */ public final class MustacheConstants { + /** * Header containing a Mustache template location */ public static final String MUSTACHE_RESOURCE_URI = "MustacheResourceUri"; + /** * Header containing the Mustache template code */ public static final String MUSTACHE_TEMPLATE = "MustacheTemplate"; + /** * Mustache endpoint URI prefix */ - public static final String MUSTACHE_ENDPOINT_URI_PREFIX="mustache:"; + public static final String MUSTACHE_ENDPOINT_URI_PREFIX = "mustache:"; + private MustacheConstants() { // Utility class } http://git-wip-us.apache.org/repos/asf/camel/blob/5ec63db9/components/camel-mustache/src/main/java/org/apache/camel/component/mustache/MustacheEndpoint.java ---------------------------------------------------------------------- diff --git a/components/camel-mustache/src/main/java/org/apache/camel/component/mustache/MustacheEndpoint.java b/components/camel-mustache/src/main/java/org/apache/camel/component/mustache/MustacheEndpoint.java index 4f00026..a82fdd2 100644 --- a/components/camel-mustache/src/main/java/org/apache/camel/component/mustache/MustacheEndpoint.java +++ b/components/camel-mustache/src/main/java/org/apache/camel/component/mustache/MustacheEndpoint.java @@ -16,53 +16,45 @@ */ package org.apache.camel.component.mustache; -import com.github.mustachejava.DefaultMustacheFactory; -import com.github.mustachejava.Mustache; -import com.github.mustachejava.MustacheFactory; import java.io.IOException; import java.io.InputStreamReader; import java.io.Reader; import java.io.StringReader; import java.io.StringWriter; import java.util.Map; + +import com.github.mustachejava.DefaultMustacheFactory; +import com.github.mustachejava.Mustache; +import com.github.mustachejava.MustacheFactory; import org.apache.camel.Component; import org.apache.camel.Exchange; import org.apache.camel.ExchangePattern; import org.apache.camel.Message; import org.apache.camel.component.ResourceEndpoint; import org.apache.camel.util.ExchangeHelper; -import static org.apache.camel.component.mustache.MustacheConstants.*; + +import static org.apache.camel.component.mustache.MustacheConstants.MUSTACHE_ENDPOINT_URI_PREFIX; +import static org.apache.camel.component.mustache.MustacheConstants.MUSTACHE_RESOURCE_URI; +import static org.apache.camel.component.mustache.MustacheConstants.MUSTACHE_TEMPLATE; + /** * Represents a Camel Mustache endpoint. */ public class MustacheEndpoint extends ResourceEndpoint { - /** - * Mustache factory - */ + private MustacheFactory mustacheFactory; - /** - * Mustache template - */ private Mustache mustache; - /** - * Encoding - */ private String encoding; - /** - * Start delimiter, usually {{ - */ private String startDelimiter; - /** - * End delimiter, usually }} - */ private String endDelimiter; - + public MustacheEndpoint() { } public MustacheEndpoint(String endpointUri, Component component, String resourceUri) { super(endpointUri, component, resourceUri); } + @Override public boolean isSingleton() { return true; @@ -91,41 +83,44 @@ public class MustacheEndpoint extends ResourceEndpoint { // Get Mustache String newTemplate = exchange.getIn().getHeader(MUSTACHE_TEMPLATE, String.class); Mustache newMustache; - if (newTemplate==null) { + if (newTemplate == null) { newMustache = getOrCreateMustache(); } else { - newMustache = createMustache(new StringReader(newTemplate), "mustache:temp#"+newTemplate.hashCode()); + newMustache = createMustache(new StringReader(newTemplate), "mustache:temp#" + newTemplate.hashCode()); exchange.getIn().removeHeader(MUSTACHE_TEMPLATE); } + // Execute Mustache Map<String, Object> variableMap = ExchangeHelper.createVariableMap(exchange); StringWriter writer = new StringWriter(); newMustache.execute(writer, variableMap); writer.flush(); + // Fill out message Message out = exchange.getOut(); out.setBody(writer.toString()); out.setHeaders(exchange.getIn().getHeaders()); - out.setAttachments(exchange.getIn().getAttachments()); + out.setAttachments(exchange.getIn().getAttachments()); } else { exchange.getIn().removeHeader(MustacheConstants.MUSTACHE_RESOURCE_URI); - MustacheEndpoint newEndpoint = getCamelContext() - .getEndpoint(MUSTACHE_ENDPOINT_URI_PREFIX+newResourceUri, MustacheEndpoint.class); + MustacheEndpoint newEndpoint = getCamelContext().getEndpoint(MUSTACHE_ENDPOINT_URI_PREFIX + newResourceUri, MustacheEndpoint.class); newEndpoint.onExchange(exchange); } } + /** * Read and compile a Mustache template + * * @param resourceReader Reader used to get template - * @param resourceUri Template Id + * @param resourceUri Template Id * @return Template */ private Mustache createMustache(Reader resourceReader, String resourceUri) throws IOException { try { Mustache newMustache; - if (startDelimiter!=null && endDelimiter!=null && mustacheFactory instanceof DefaultMustacheFactory) { + if (startDelimiter != null && endDelimiter != null && mustacheFactory instanceof DefaultMustacheFactory) { DefaultMustacheFactory defaultMustacheFactory = (DefaultMustacheFactory) mustacheFactory; - newMustache= defaultMustacheFactory.compile(resourceReader, resourceUri, startDelimiter, endDelimiter); + newMustache = defaultMustacheFactory.compile(resourceReader, resourceUri, startDelimiter, endDelimiter); } else { newMustache = mustacheFactory.compile(resourceReader, resourceUri); } @@ -134,12 +129,14 @@ public class MustacheEndpoint extends ResourceEndpoint { resourceReader.close(); } } - private Mustache getOrCreateMustache() throws IOException{ + + private Mustache getOrCreateMustache() throws IOException { if (mustache == null) { mustache = createMustache(getResourceAsReader(), getResourceUri()); } return mustache; } + public MustacheFactory getMustacheFactory() { return mustacheFactory; } @@ -155,10 +152,11 @@ public class MustacheEndpoint extends ResourceEndpoint { public void setEncoding(String encoding) { this.encoding = encoding; } + private Reader getResourceAsReader() throws IOException { return encoding == null - ? new InputStreamReader(getResourceAsInputStream()) - : new InputStreamReader(getResourceAsInputStream(), encoding); + ? new InputStreamReader(getResourceAsInputStream()) + : new InputStreamReader(getResourceAsInputStream(), encoding); } public String getStartDelimiter() { @@ -176,5 +174,5 @@ public class MustacheEndpoint extends ResourceEndpoint { public void setEndDelimiter(String endDelimiter) { this.endDelimiter = endDelimiter; } - + } http://git-wip-us.apache.org/repos/asf/camel/blob/5ec63db9/components/camel-mustache/src/main/resources/META-INF/services/org/apache/camel/component/mustache ---------------------------------------------------------------------- diff --git a/components/camel-mustache/src/main/resources/META-INF/services/org/apache/camel/component/mustache b/components/camel-mustache/src/main/resources/META-INF/services/org/apache/camel/component/mustache index 4205166..f782276 100644 --- a/components/camel-mustache/src/main/resources/META-INF/services/org/apache/camel/component/mustache +++ b/components/camel-mustache/src/main/resources/META-INF/services/org/apache/camel/component/mustache @@ -1 +1,18 @@ +# +# 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. +# + class=org.apache.camel.component.mustache.MustacheComponent http://git-wip-us.apache.org/repos/asf/camel/blob/5ec63db9/components/camel-mustache/src/test/java/org/apache/camel/component/mustache/MustacheComponentTest.java ---------------------------------------------------------------------- diff --git a/components/camel-mustache/src/test/java/org/apache/camel/component/mustache/MustacheComponentTest.java b/components/camel-mustache/src/test/java/org/apache/camel/component/mustache/MustacheComponentTest.java index 7dae863..8fb2c51 100644 --- a/components/camel-mustache/src/test/java/org/apache/camel/component/mustache/MustacheComponentTest.java +++ b/components/camel-mustache/src/test/java/org/apache/camel/component/mustache/MustacheComponentTest.java @@ -16,7 +16,6 @@ */ package org.apache.camel.component.mustache; -import org.apache.camel.component.mustache.MustacheConstants; import org.apache.camel.EndpointInject; import org.apache.camel.Exchange; import org.apache.camel.Produce; @@ -27,6 +26,7 @@ import org.apache.camel.test.junit4.CamelTestSupport; import org.apache.camel.util.StopWatch; import org.junit.Test; import org.slf4j.LoggerFactory; + /** * Unit test for {@link MustacheComponent} and {@link MustacheEndpoint} */ @@ -37,6 +37,7 @@ public class MustacheComponentTest extends CamelTestSupport { @Produce(uri = "direct:startSimple") protected ProducerTemplate startSimpleProducerTemplate; + /** * Main test */ @@ -44,7 +45,7 @@ public class MustacheComponentTest extends CamelTestSupport { public void testMustache() throws Exception { // Prepare endSimpleMock.expectedMessageCount(1); - endSimpleMock.expectedBodiesReceived("Message with body 'The Body' and some header 'Some Header'"); + endSimpleMock.expectedBodiesReceived("Message with body 'The Body' and some header 'Some Header'"); // Act startSimpleProducerTemplate.sendBodyAndHeader("The Body", "someHeader", "Some Header"); // Verify @@ -57,11 +58,11 @@ public class MustacheComponentTest extends CamelTestSupport { @Test public void testMustacheWithTemplateHeader() throws Exception { // Prepare - Exchange exchange=createExchangeWithBody("The Body"); + Exchange exchange = createExchangeWithBody("The Body"); exchange.getIn().setHeader("someHeader", "Some Header"); exchange.getIn().setHeader(MustacheConstants.MUSTACHE_TEMPLATE, "Body='{{body}}'|SomeHeader='{{headers.someHeader}}'"); endSimpleMock.expectedMessageCount(1); - endSimpleMock.expectedBodiesReceived("Body='The Body'|SomeHeader='Some Header'"); + endSimpleMock.expectedBodiesReceived("Body='The Body'|SomeHeader='Some Header'"); // Act startSimpleProducerTemplate.send(exchange); // Verify @@ -74,63 +75,66 @@ public class MustacheComponentTest extends CamelTestSupport { @Test public void testMustacheWithResourceUriHeader() throws Exception { // Prepare - Exchange exchange=createExchangeWithBody("The Body"); + Exchange exchange = createExchangeWithBody("The Body"); exchange.getIn().setHeader("someHeader", "Some Header"); exchange.getIn().setHeader(MustacheConstants.MUSTACHE_RESOURCE_URI, "/another.mustache"); endSimpleMock.expectedMessageCount(1); - endSimpleMock.expectedBodiesReceived("Yet another Mustache with body:\n" + - " 'The Body'\n" + - "and some header:\n" + - " 'Some Header'\n"); + endSimpleMock.expectedBodiesReceived("Yet another Mustache with body:\n" + + " 'The Body'\n" + + "and some header:\n" + + " 'Some Header'\n"); // Act startSimpleProducerTemplate.send(exchange); // Verify assertMockEndpointsSatisfied(); } + @Test public void testMustacheWithInheritance() throws Exception { // Prepare - Exchange exchange=createExchangeWithBody("The Body"); + Exchange exchange = createExchangeWithBody("The Body"); exchange.getIn().setHeader(MustacheConstants.MUSTACHE_RESOURCE_URI, "/child.mustache"); endSimpleMock.expectedMessageCount(1); - endSimpleMock.expectedBodiesReceived("Start\n" + -"Content 1: Child 1\n" + -"Middle\n" + -"Content 2: Child 2\n" + -"End"); + endSimpleMock.expectedBodiesReceived("Start\n" + + "Content 1: Child 1\n" + + "Middle\n" + + "Content 2: Child 2\n" + + "End"); // Act startSimpleProducerTemplate.send(exchange); // Verify assertMockEndpointsSatisfied(); } + @Test public void testMustacheWithPartials() throws Exception { // Prepare - Exchange exchange=createExchangeWithBody("The Body"); + Exchange exchange = createExchangeWithBody("The Body"); exchange.getIn().setHeader(MustacheConstants.MUSTACHE_RESOURCE_URI, "/includer.mustache"); endSimpleMock.expectedMessageCount(1); - endSimpleMock.expectedBodiesReceived("Start\n" + -"Included\n" + -"End"); + endSimpleMock.expectedBodiesReceived("Start\n" + + "Included\n" + + "End"); // Act startSimpleProducerTemplate.send(exchange); // Verify assertMockEndpointsSatisfied(); } + /** * Main test */ @Test public void testMustachePerformance() throws Exception { - int messageCount=10000; + int messageCount = 10000; endSimpleMock.expectedMessageCount(messageCount); - StopWatch stopwatch=new StopWatch(true); - for(int i=0;i<messageCount;i++) { - startSimpleProducerTemplate.sendBodyAndHeader("The Body", "someHeader", "Some Header"); + StopWatch stopwatch = new StopWatch(true); + for (int i = 0; i < messageCount; i++) { + startSimpleProducerTemplate.sendBodyAndHeader("The Body", "someHeader", "Some Header"); } assertMockEndpointsSatisfied(); - LoggerFactory.getLogger(getClass()).info("Mustache performance: "+stopwatch.stop()+"ms for "+messageCount+" messages"); - + LoggerFactory.getLogger(getClass()).info("Mustache performance: " + stopwatch.stop() + "ms for " + messageCount + " messages"); + } @Override @@ -139,8 +143,8 @@ public class MustacheComponentTest extends CamelTestSupport { @Override public void configure() { from("direct:startSimple") - .to("mustache://simple.mustache") - .to("mock:endSimple"); + .to("mustache://simple.mustache") + .to("mock:endSimple"); } }; } http://git-wip-us.apache.org/repos/asf/camel/blob/5ec63db9/components/camel-mustache/src/test/java/org/apache/camel/component/mustache/MustacheLetterTest.java ---------------------------------------------------------------------- diff --git a/components/camel-mustache/src/test/java/org/apache/camel/component/mustache/MustacheLetterTest.java b/components/camel-mustache/src/test/java/org/apache/camel/component/mustache/MustacheLetterTest.java index 9d02afb..fa5c255 100644 --- a/components/camel-mustache/src/test/java/org/apache/camel/component/mustache/MustacheLetterTest.java +++ b/components/camel-mustache/src/test/java/org/apache/camel/component/mustache/MustacheLetterTest.java @@ -57,8 +57,8 @@ public class MustacheLetterTest extends CamelTestSupport { return new RouteBuilder() { public void configure() throws Exception { from("direct:a") - .to("mustache:letter.mustache") - .to("mock:result"); + .to("mustache:letter.mustache") + .to("mock:result"); } }; } http://git-wip-us.apache.org/repos/asf/camel/blob/5ec63db9/components/camel-mustache/src/test/resources/log4j.properties ---------------------------------------------------------------------- diff --git a/components/camel-mustache/src/test/resources/log4j.properties b/components/camel-mustache/src/test/resources/log4j.properties index 99a4f38..6aaf75e 100644 --- a/components/camel-mustache/src/test/resources/log4j.properties +++ b/components/camel-mustache/src/test/resources/log4j.properties @@ -20,8 +20,7 @@ # log4j.rootLogger=INFO, out -log4j.logger.org.apache.activemq.spring=WARN -log4j.logger.org.apache.camel.component.freemarker=DEBUG +#log4j.logger.org.apache.camel.component.mustache=DEBUG # CONSOLE appender not used by default log4j.appender.stdout=org.apache.log4j.ConsoleAppender @@ -32,5 +31,5 @@ log4j.appender.stdout.layout.ConversionPattern=%d [%-15.15t] %-5p %-30.30c{1} - log4j.appender.out=org.apache.log4j.FileAppender log4j.appender.out.layout=org.apache.log4j.PatternLayout log4j.appender.out.layout.ConversionPattern=%d [%-15.15t] %-5p %-30.30c{1} - %m%n -log4j.appender.out.file=target/camel-freemarker-test.log +log4j.appender.out.file=target/camel-mustache-test.log log4j.appender.out.append=true http://git-wip-us.apache.org/repos/asf/camel/blob/5ec63db9/parent/pom.xml ---------------------------------------------------------------------- diff --git a/parent/pom.xml b/parent/pom.xml index a5fd6e5..000662d 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -282,6 +282,7 @@ <mongo-java-driver-version>2.9.1</mongo-java-driver-version> <mqtt-client-version>1.5</mqtt-client-version> <msv-version>20050913</msv-version> + <mustache-java-version>0.8.12</mustache-java-version> <mvel-version>2.1.3.Final</mvel-version> <mybatis-version>3.2.2</mybatis-version> <neethi-bundle-version>3.0.1</neethi-bundle-version> @@ -879,6 +880,11 @@ </dependency> <dependency> <groupId>org.apache.camel</groupId> + <artifactId>camel-mustache</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.camel</groupId> <artifactId>camel-mvel</artifactId> <version>${project.version}</version> </dependency>
