Repository: camel Updated Branches: refs/heads/master 20de42cfa -> c54065a78
CAMEL-11819:camel-velocity - Upgrade to 2.x Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/952f08bd Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/952f08bd Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/952f08bd Branch: refs/heads/master Commit: 952f08bd1ecd3acbfd0db4e9bb876159321b745a Parents: 20de42c Author: Ramu <kkaka...@redhat.com> Authored: Tue Sep 26 21:36:45 2017 +0530 Committer: Claus Ibsen <davscl...@apache.org> Committed: Thu Sep 28 09:13:44 2017 +0200 ---------------------------------------------------------------------- .../camel-salesforce-maven-plugin/pom.xml | 2 +- .../apache/camel/maven/CamelSalesforceMojo.java | 8 +++---- components/camel-velocity/pom.xml | 2 +- .../CamelVelocityClasspathResourceLoader.java | 14 +++++++------ .../component/velocity/VelocityEndpoint.java | 10 ++++++--- .../pom.xml | 2 +- parent/pom.xml | 2 +- .../camel-api-component-maven-plugin/pom.xml | 10 +++++++-- .../src/it/all-it/pom.xml | 4 ++-- .../camel/maven/AbstractGeneratorMojo.java | 22 +++++++++++++------- 10 files changed, 47 insertions(+), 29 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/952f08bd/components/camel-salesforce/camel-salesforce-maven-plugin/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-salesforce/camel-salesforce-maven-plugin/pom.xml b/components/camel-salesforce/camel-salesforce-maven-plugin/pom.xml index c55e326..9bc4f45 100644 --- a/components/camel-salesforce/camel-salesforce-maven-plugin/pom.xml +++ b/components/camel-salesforce/camel-salesforce-maven-plugin/pom.xml @@ -117,7 +117,7 @@ </dependency> <dependency> <groupId>org.apache.velocity</groupId> - <artifactId>velocity</artifactId> + <artifactId>velocity-engine-core</artifactId> <version>${velocity-version}</version> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/camel/blob/952f08bd/components/camel-salesforce/camel-salesforce-maven-plugin/src/main/java/org/apache/camel/maven/CamelSalesforceMojo.java ---------------------------------------------------------------------- diff --git a/components/camel-salesforce/camel-salesforce-maven-plugin/src/main/java/org/apache/camel/maven/CamelSalesforceMojo.java b/components/camel-salesforce/camel-salesforce-maven-plugin/src/main/java/org/apache/camel/maven/CamelSalesforceMojo.java index b554579..3b46f7f 100644 --- a/components/camel-salesforce/camel-salesforce-maven-plugin/src/main/java/org/apache/camel/maven/CamelSalesforceMojo.java +++ b/components/camel-salesforce/camel-salesforce-maven-plugin/src/main/java/org/apache/camel/maven/CamelSalesforceMojo.java @@ -68,7 +68,7 @@ import org.apache.camel.impl.DefaultCamelContext; import org.apache.camel.util.IntrospectionSupport; import org.apache.camel.util.ObjectHelper; import org.apache.camel.util.jsse.SSLContextParameters; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringEscapeUtils; import org.apache.log4j.Logger; import org.apache.maven.plugin.AbstractMojo; @@ -80,7 +80,6 @@ import org.apache.velocity.Template; import org.apache.velocity.VelocityContext; import org.apache.velocity.app.VelocityEngine; import org.apache.velocity.runtime.RuntimeConstants; -import org.apache.velocity.runtime.log.Log4JLogChute; import org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader; import org.eclipse.jetty.client.HttpProxy; import org.eclipse.jetty.client.Origin; @@ -90,6 +89,7 @@ import org.eclipse.jetty.client.api.Authentication; import org.eclipse.jetty.client.util.BasicAuthentication; import org.eclipse.jetty.client.util.DigestAuthentication; import org.eclipse.jetty.util.ssl.SslContextFactory; +import org.slf4j.LoggerFactory; /** * Goal to generate DTOs for Salesforce SObjects @@ -496,9 +496,7 @@ public class CamelSalesforceMojo extends AbstractMojo { final Properties velocityProperties = new Properties(); velocityProperties.setProperty(RuntimeConstants.RESOURCE_LOADER, "cloader"); velocityProperties.setProperty("cloader.resource.loader.class", ClasspathResourceLoader.class.getName()); - velocityProperties.setProperty(RuntimeConstants.RUNTIME_LOG_LOGSYSTEM_CLASS, Log4JLogChute.class.getName()); - velocityProperties.setProperty(RuntimeConstants.RUNTIME_LOG_LOGSYSTEM + ".log4j.logger", LOG.getName()); - + velocityProperties.setProperty(RuntimeConstants.RUNTIME_LOG_NAME, LOG.getName()); final VelocityEngine engine = new VelocityEngine(velocityProperties); return engine; http://git-wip-us.apache.org/repos/asf/camel/blob/952f08bd/components/camel-velocity/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-velocity/pom.xml b/components/camel-velocity/pom.xml index f22fd17..8eb71a7 100644 --- a/components/camel-velocity/pom.xml +++ b/components/camel-velocity/pom.xml @@ -45,7 +45,7 @@ </dependency> <dependency> <groupId>org.apache.velocity</groupId> - <artifactId>velocity</artifactId> + <artifactId>velocity-engine-core</artifactId> <version>${velocity-version}</version> </dependency> http://git-wip-us.apache.org/repos/asf/camel/blob/952f08bd/components/camel-velocity/src/main/java/org/apache/camel/component/velocity/CamelVelocityClasspathResourceLoader.java ---------------------------------------------------------------------- diff --git a/components/camel-velocity/src/main/java/org/apache/camel/component/velocity/CamelVelocityClasspathResourceLoader.java b/components/camel-velocity/src/main/java/org/apache/camel/component/velocity/CamelVelocityClasspathResourceLoader.java index efa5892..92970cf 100644 --- a/components/camel-velocity/src/main/java/org/apache/camel/component/velocity/CamelVelocityClasspathResourceLoader.java +++ b/components/camel-velocity/src/main/java/org/apache/camel/component/velocity/CamelVelocityClasspathResourceLoader.java @@ -17,12 +17,14 @@ package org.apache.camel.component.velocity; import java.io.InputStream; +import java.io.InputStreamReader; +import java.io.Reader; import org.apache.camel.spi.ClassResolver; import org.apache.camel.util.ObjectHelper; -import org.apache.commons.collections.ExtendedProperties; import org.apache.velocity.exception.ResourceNotFoundException; import org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader; +import org.apache.velocity.util.ExtProperties; /** * Camel specific {@link ClasspathResourceLoader} that loads resources using the @@ -33,20 +35,20 @@ public class CamelVelocityClasspathResourceLoader extends ClasspathResourceLoade private ClassResolver resolver; @Override - public void init(ExtendedProperties configuration) { + public void init(ExtProperties configuration) { super.init(configuration); resolver = (ClassResolver) this.rsvc.getProperty("CamelClassResolver"); ObjectHelper.notNull(resolver, "ClassResolver"); } @Override - public InputStream getResourceStream(String name) throws ResourceNotFoundException { + public Reader getResourceReader(String name, String encoding) throws ResourceNotFoundException { InputStream is = resolver.loadResourceAsStream(name); if (is == null) { - return super.getResourceStream(name); + return super.getResourceReader(name, encoding); } else { - return is; + return new InputStreamReader(is); } } -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/camel/blob/952f08bd/components/camel-velocity/src/main/java/org/apache/camel/component/velocity/VelocityEndpoint.java ---------------------------------------------------------------------- diff --git a/components/camel-velocity/src/main/java/org/apache/camel/component/velocity/VelocityEndpoint.java b/components/camel-velocity/src/main/java/org/apache/camel/component/velocity/VelocityEndpoint.java index 7e2c937..7b40f81 100644 --- a/components/camel-velocity/src/main/java/org/apache/camel/component/velocity/VelocityEndpoint.java +++ b/components/camel-velocity/src/main/java/org/apache/camel/component/velocity/VelocityEndpoint.java @@ -38,7 +38,9 @@ import org.apache.velocity.VelocityContext; import org.apache.velocity.app.VelocityEngine; import org.apache.velocity.context.Context; import org.apache.velocity.runtime.RuntimeConstants; -import org.apache.velocity.runtime.log.CommonsLogLogChute; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + /** * Transforms the message using a Velocity template. @@ -90,8 +92,10 @@ public class VelocityEndpoint extends ResourceEndpoint { properties.setProperty(RuntimeConstants.RESOURCE_LOADER, "file, class"); properties.setProperty("class.resource.loader.description", "Camel Velocity Classpath Resource Loader"); properties.setProperty("class.resource.loader.class", CamelVelocityClasspathResourceLoader.class.getName()); - properties.setProperty(RuntimeConstants.RUNTIME_LOG_LOGSYSTEM_CLASS, CommonsLogLogChute.class.getName()); - properties.setProperty(CommonsLogLogChute.LOGCHUTE_COMMONS_LOG_NAME, VelocityEndpoint.class.getName()); + final Logger velocityLogger = LoggerFactory.getLogger("org.apache.camel.maven.Velocity"); + properties.setProperty(RuntimeConstants.RUNTIME_LOG_NAME, velocityLogger.getName()); + + // load the velocity properties from property file which may overrides the default ones if (ObjectHelper.isNotEmpty(getPropertiesFile())) { http://git-wip-us.apache.org/repos/asf/camel/blob/952f08bd/examples/camel-example-reportincident-wssecurity/pom.xml ---------------------------------------------------------------------- diff --git a/examples/camel-example-reportincident-wssecurity/pom.xml b/examples/camel-example-reportincident-wssecurity/pom.xml index 61c227a..a28ef80 100644 --- a/examples/camel-example-reportincident-wssecurity/pom.xml +++ b/examples/camel-example-reportincident-wssecurity/pom.xml @@ -181,7 +181,7 @@ <dependency> <groupId>org.apache.velocity</groupId> - <artifactId>velocity</artifactId> + <artifactId>velocity-engine-core</artifactId> <version>${velocity-version}</version> </dependency> http://git-wip-us.apache.org/repos/asf/camel/blob/952f08bd/parent/pom.xml ---------------------------------------------------------------------- diff --git a/parent/pom.xml b/parent/pom.xml index 35b0514..5b57f0c 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -699,7 +699,7 @@ <validation-api-version>1.1.0.Final</validation-api-version> <velocity-bundle-version>1.7_6</velocity-bundle-version> <velocity-tools-version>2.0</velocity-tools-version> - <velocity-version>1.7</velocity-version> + <velocity-version>2.0</velocity-version> <vertx-version>3.4.2</vertx-version> <vysper-version>0.7</vysper-version> <weld1-version>1.1.28.Final</weld1-version> http://git-wip-us.apache.org/repos/asf/camel/blob/952f08bd/tooling/maven/camel-api-component-maven-plugin/pom.xml ---------------------------------------------------------------------- diff --git a/tooling/maven/camel-api-component-maven-plugin/pom.xml b/tooling/maven/camel-api-component-maven-plugin/pom.xml index 3e22633..35d39a6 100644 --- a/tooling/maven/camel-api-component-maven-plugin/pom.xml +++ b/tooling/maven/camel-api-component-maven-plugin/pom.xml @@ -108,6 +108,12 @@ <groupId>org.apache.maven.doxia</groupId> <artifactId>doxia-site-renderer</artifactId> <version>1.6</version> + <exclusions> + <exclusion> + <groupId>org.apache.velocity</groupId> + <artifactId>velocity</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> @@ -116,7 +122,7 @@ </dependency> <dependency> <groupId>org.apache.velocity</groupId> - <artifactId>velocity</artifactId> + <artifactId>velocity-engine-core</artifactId> <version>${velocity-version}</version> </dependency> @@ -157,7 +163,7 @@ <!-- VelocityEngine javadoc for testing --> <dependency> <groupId>org.apache.velocity</groupId> - <artifactId>velocity</artifactId> + <artifactId>velocity-engine-core</artifactId> <version>${velocity-version}</version> <classifier>javadoc</classifier> <scope>test</scope> http://git-wip-us.apache.org/repos/asf/camel/blob/952f08bd/tooling/maven/camel-api-component-maven-plugin/src/it/all-it/pom.xml ---------------------------------------------------------------------- diff --git a/tooling/maven/camel-api-component-maven-plugin/src/it/all-it/pom.xml b/tooling/maven/camel-api-component-maven-plugin/src/it/all-it/pom.xml index d0b3236..1d790af 100644 --- a/tooling/maven/camel-api-component-maven-plugin/src/it/all-it/pom.xml +++ b/tooling/maven/camel-api-component-maven-plugin/src/it/all-it/pom.xml @@ -43,13 +43,13 @@ </dependency> <dependency> <groupId>org.apache.velocity</groupId> - <artifactId>velocity</artifactId> + <artifactId>velocity-engine-core</artifactId> <version>@velocity-version@</version> </dependency> <!-- VelocityEngine javadoc for generating API classes --> <dependency> <groupId>org.apache.velocity</groupId> - <artifactId>velocity</artifactId> + <artifactId>velocity-engine-core</artifactId> <version>@velocity-version@</version> <classifier>javadoc</classifier> <scope>provided</scope> http://git-wip-us.apache.org/repos/asf/camel/blob/952f08bd/tooling/maven/camel-api-component-maven-plugin/src/main/java/org/apache/camel/maven/AbstractGeneratorMojo.java ---------------------------------------------------------------------- diff --git a/tooling/maven/camel-api-component-maven-plugin/src/main/java/org/apache/camel/maven/AbstractGeneratorMojo.java b/tooling/maven/camel-api-component-maven-plugin/src/main/java/org/apache/camel/maven/AbstractGeneratorMojo.java index 2fff5c0..c8d3fd9 100644 --- a/tooling/maven/camel-api-component-maven-plugin/src/main/java/org/apache/camel/maven/AbstractGeneratorMojo.java +++ b/tooling/maven/camel-api-component-maven-plugin/src/main/java/org/apache/camel/maven/AbstractGeneratorMojo.java @@ -37,7 +37,6 @@ import org.apache.velocity.VelocityContext; import org.apache.velocity.app.VelocityEngine; import org.apache.velocity.exception.VelocityException; import org.apache.velocity.runtime.RuntimeConstants; -import org.apache.velocity.runtime.log.Log4JLogChute; import org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -88,17 +87,21 @@ public abstract class AbstractGeneratorMojo extends AbstractMojo { } } - protected static VelocityEngine getEngine() { + protected static VelocityEngine getEngine() throws MojoExecutionException { if (engine == null) { // initialize velocity to load resources from class loader and use Log4J Properties velocityProperties = new Properties(); velocityProperties.setProperty(RuntimeConstants.RESOURCE_LOADER, "cloader"); velocityProperties.setProperty("cloader.resource.loader.class", ClasspathResourceLoader.class.getName()); - velocityProperties.setProperty(RuntimeConstants.RUNTIME_LOG_LOGSYSTEM_CLASS, Log4JLogChute.class.getName()); final Logger velocityLogger = LoggerFactory.getLogger("org.apache.camel.maven.Velocity"); - velocityProperties.setProperty(Log4JLogChute.RUNTIME_LOG_LOG4J_LOGGER, velocityLogger.getName()); - engine = new VelocityEngine(velocityProperties); - engine.init(); + velocityProperties.setProperty(RuntimeConstants.RUNTIME_LOG_NAME, velocityLogger.getName()); + try { + engine = new VelocityEngine(velocityProperties); + engine.init(); + } catch (Exception e) { + throw new MojoExecutionException(e.getMessage(), e); + } + } return engine; } @@ -141,7 +144,12 @@ public abstract class AbstractGeneratorMojo extends AbstractMojo { context.put("newLine", "\n"); // load velocity template - final Template template = getEngine().getTemplate(templateName, "UTF-8"); + Template template = null; + try { + template = getEngine().getTemplate(templateName, "UTF-8"); + } catch (Exception e) { + throw new MojoExecutionException(e.getMessage(), e); + } // generate file BufferedWriter writer = null;
