[4/4] camel git commit: Polished. This closes #1123

[davsclaus]

Polished. This closes #1123


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/a2eb47e1
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/a2eb47e1
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/a2eb47e1

Branch: refs/heads/camel-2.17.x
Commit: a2eb47e1eb2c306c90bd47ec77891a07e7231278
Parents: 4615952
Author: Claus Ibsen 
Authored: Mon Aug 15 17:07:01 2016 +0200
Committer: Claus Ibsen 
Committed: Mon Aug 15 17:39:58 2016 +0200

--
 .../org/apache/camel/component/schematron/SchematronEndpoint.java | 3 +--
 .../org/apache/camel/component/schematron/SchematronProducer.java | 2 --
 2 files changed, 1 insertion(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/a2eb47e1/components/camel-schematron/src/main/java/org/apache/camel/component/schematron/SchematronEndpoint.java
--
diff --git 
a/components/camel-schematron/src/main/java/org/apache/camel/component/schematron/SchematronEndpoint.java
 
b/components/camel-schematron/src/main/java/org/apache/camel/component/schematron/SchematronEndpoint.java
index 17e1414..13f652c 100644
--- 
a/components/camel-schematron/src/main/java/org/apache/camel/component/schematron/SchematronEndpoint.java
+++ 
b/components/camel-schematron/src/main/java/org/apache/camel/component/schematron/SchematronEndpoint.java
@@ -59,8 +59,7 @@ public class SchematronEndpoint extends DefaultEndpoint {
 private boolean abort;
 @UriParam
 private Templates rules;
-
-@UriParam
+@UriParam(label = "advanced")
 private URIResolver uriResolver;
 
 public SchematronEndpoint() {

http://git-wip-us.apache.org/repos/asf/camel/blob/a2eb47e1/components/camel-schematron/src/main/java/org/apache/camel/component/schematron/SchematronProducer.java
--
diff --git 
a/components/camel-schematron/src/main/java/org/apache/camel/component/schematron/SchematronProducer.java
 
b/components/camel-schematron/src/main/java/org/apache/camel/component/schematron/SchematronProducer.java
index 9b3f354..2873003 100644
--- 
a/components/camel-schematron/src/main/java/org/apache/camel/component/schematron/SchematronProducer.java
+++ 
b/components/camel-schematron/src/main/java/org/apache/camel/component/schematron/SchematronProducer.java
@@ -50,7 +50,6 @@ public class SchematronProducer extends DefaultProducer {
  * @throws Exception
  */
 public void process(Exchange exchange) throws Exception {
-
 String payload = exchange.getIn().getBody(String.class);
 logger.debug("Applying schematron validation on payload: {}", payload);
 String report = 
SchematronProcessorFactory.newScehamtronEngine(endpoint.getRules()).validate(payload);
@@ -87,7 +86,6 @@ public class SchematronProducer extends DefaultProducer {
  * @return
  */
 private String getValidationStatus(final String report) {
-
 String status = report.contains(Constants.FAILED_ASSERT) ? 
Constants.FAILED : Constants.SUCCESS;
 if (this.endpoint.isAbort() && Constants.FAILED.equals(status)) {
 throw new SchematronValidationException("Schematron validation 
failure \n" + report);

[4/4] camel git commit: Polished and added needed method after a change in camel-spring-boot

[davsclaus]

Polished and added needed method after a change in camel-spring-boot


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/17e222db
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/17e222db
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/17e222db

Branch: refs/heads/master
Commit: 17e222db0912b7c119133c2be26875f546ec9f57
Parents: 51cf54f
Author: Claus Ibsen 
Authored: Sat Nov 28 08:56:28 2015 +0100
Committer: Claus Ibsen 
Committed: Sat Nov 28 08:56:28 2015 +0100

--
 .../example/springboot/metrics/Application.java| 17 +
 1 file changed, 9 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/17e222db/examples/camel-example-spring-boot-metrics/src/main/java/org/apache/camel/example/springboot/metrics/Application.java
--
diff --git 
a/examples/camel-example-spring-boot-metrics/src/main/java/org/apache/camel/example/springboot/metrics/Application.java
 
b/examples/camel-example-spring-boot-metrics/src/main/java/org/apache/camel/example/springboot/metrics/Application.java
index 9873a54..bbeb2fd 100644
--- 
a/examples/camel-example-spring-boot-metrics/src/main/java/org/apache/camel/example/springboot/metrics/Application.java
+++ 
b/examples/camel-example-spring-boot-metrics/src/main/java/org/apache/camel/example/springboot/metrics/Application.java
@@ -53,9 +53,8 @@ public class Application {
  * @param args no command line args required
  */
 public static void main(String[] args) {
-LOG.info(" *** STARTING CAMEL METRICS EXAMPLE APPLICATION ***");
+LOG.info(" *** Starting Camel Metrics Example Application ***");
 SpringApplication.run(Application.class, args);
-
 }
 
 /**
@@ -79,10 +78,9 @@ public class Application {
 @Bean
 public RouteBuilder slowRoute() {
 return new RouteBuilder() {
-
 @Override
 public void configure() throws Exception {
-
from("timer://foo?period=6000=false").routeId("slow-route").setBody().constant("Slow
 hello world!").log("${body}");
+
from("timer://foo?period=6000").routeId("slow-route").setBody().constant("Slow 
hello world!").log("${body}");
 }
 };
 }
@@ -93,10 +91,9 @@ public class Application {
 @Bean
 public RouteBuilder fastRoute() {
 return new RouteBuilder() {
-
 @Override
 public void configure() throws Exception {
-
from("timer://foo?period=2000=false").routeId("fast-route").setBody().constant("Fast
 hello world!").log("${body}");
+
from("timer://foo?period=2000").routeId("fast-route").setBody().constant("Fast 
hello world!").log("${body}");
 }
 };
 }
@@ -104,14 +101,18 @@ public class Application {
 @Bean
 CamelContextConfiguration contextConfiguration() {
 return new CamelContextConfiguration() {
-
 @Override
 public void beforeApplicationStart(CamelContext context) {
-LOG.info("Configuring camel metrics on all routes");
+LOG.info("Configuring Camel metrics on all routes");
 MetricsRoutePolicyFactory fac = new 
MetricsRoutePolicyFactory();
 fac.setMetricsRegistry(metricRegistry);
 context.addRoutePolicyFactory(fac);
 }
+
+@Override
+public void afterApplicationStart(CamelContext camelContext) {
+// noop
+}
 };
 }
 

[4/4] camel git commit: Polished

[davsclaus]

Polished


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/af94e783
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/af94e783
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/af94e783

Branch: refs/heads/camel-2.16.x
Commit: af94e78392e587b05fb991a2bf11273bae4fbf9c
Parents: 7e41e83
Author: Claus Ibsen 
Authored: Wed Nov 11 10:36:10 2015 +0100
Committer: Claus Ibsen 
Committed: Wed Nov 11 10:36:38 2015 +0100

--
 .../main/java/org/apache/camel/util/UnsafeUriCharactersEncoder.java | 1 -
 1 file changed, 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/af94e783/camel-core/src/main/java/org/apache/camel/util/UnsafeUriCharactersEncoder.java
--
diff --git 
a/camel-core/src/main/java/org/apache/camel/util/UnsafeUriCharactersEncoder.java
 
b/camel-core/src/main/java/org/apache/camel/util/UnsafeUriCharactersEncoder.java
index e0775a0..783af6c 100644
--- 
a/camel-core/src/main/java/org/apache/camel/util/UnsafeUriCharactersEncoder.java
+++ 
b/camel-core/src/main/java/org/apache/camel/util/UnsafeUriCharactersEncoder.java
@@ -22,7 +22,6 @@ import java.util.List;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-
 /**
  * Encoder for unsafe URI characters.
  *