More fine-grained exception handling in configure(), disable JMX for test, skip archetype integration test when fastinstall
Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/5ef3ce57 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/5ef3ce57 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/5ef3ce57 Branch: refs/heads/master Commit: 5ef3ce57ef5b372777fd4bfd2217f4a9347ea8fb Parents: dc24362 Author: Jyrki Ruuskanen <yur...@kotikone.fi> Authored: Wed Nov 12 15:52:59 2014 +0200 Committer: Claus Ibsen <davscl...@apache.org> Committed: Mon Nov 17 14:16:16 2014 +0100 ---------------------------------------------------------------------- .../org/apache/camel/scr/AbstractCamelRunner.java | 14 ++++++++++---- .../org/apache/camel/scr/ConcreteCamelRunner.java | 1 + tooling/archetypes/camel-archetype-scr/pom.xml | 3 +++ 3 files changed, 14 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/5ef3ce57/components/camel-scr/src/main/java/org/apache/camel/scr/AbstractCamelRunner.java ---------------------------------------------------------------------- diff --git a/components/camel-scr/src/main/java/org/apache/camel/scr/AbstractCamelRunner.java b/components/camel-scr/src/main/java/org/apache/camel/scr/AbstractCamelRunner.java index 7b4610c..cadeaa4 100644 --- a/components/camel-scr/src/main/java/org/apache/camel/scr/AbstractCamelRunner.java +++ b/components/camel-scr/src/main/java/org/apache/camel/scr/AbstractCamelRunner.java @@ -248,16 +248,22 @@ public abstract class AbstractCamelRunner implements Runnable { fields.addAll(Arrays.asList(clazz.getSuperclass().getDeclaredFields())); } for (Field field : fields) { + String propertyValue; + try { + propertyValue = context.resolvePropertyPlaceholders("{{" + field.getName() + "}}"); + } catch (Exception e) { + log.debug("Skipped field {}", field.getName()); + continue; + } try { - String propertyValue = context.resolvePropertyPlaceholders("{{" + field.getName() + "}}"); if (!propertyValue.isEmpty()) { // Try to convert the value and set the field Object convertedValue = convertValue(propertyValue, field.getGenericType()); ReflectionHelper.setField(field, target, convertedValue); - log.debug("Set field {} with value {}", field.getName(), propertyValue); + log.debug("Configured field {} with value {}", field.getName(), propertyValue); } } catch (Exception e) { - log.debug("Error setting field " + field.getName() + " due: " + e.getMessage() + ". This exception is ignored."); + log.error("Error setting field " + field.getName() + " due: " + e.getMessage() + ". This exception is ignored.", e); } } return target; @@ -290,7 +296,7 @@ public abstract class AbstractCamelRunner implements Runnable { } else if (clazz == URL.class) { return new URL(value); } else { - throw new IllegalArgumentException("Unknown type: " + (clazz != null ? clazz.getName() : null)); + throw new IllegalArgumentException("Unsupported type: " + (clazz != null ? clazz.getName() : null)); } } else { return null; http://git-wip-us.apache.org/repos/asf/camel/blob/5ef3ce57/components/camel-scr/src/test/java/org/apache/camel/scr/ConcreteCamelRunner.java ---------------------------------------------------------------------- diff --git a/components/camel-scr/src/test/java/org/apache/camel/scr/ConcreteCamelRunner.java b/components/camel-scr/src/test/java/org/apache/camel/scr/ConcreteCamelRunner.java index a591a2e..0ad1123 100644 --- a/components/camel-scr/src/test/java/org/apache/camel/scr/ConcreteCamelRunner.java +++ b/components/camel-scr/src/test/java/org/apache/camel/scr/ConcreteCamelRunner.java @@ -62,6 +62,7 @@ public class ConcreteCamelRunner extends AbstractCamelRunner implements Lifecycl @Override protected void createCamelContext(BundleContext bundleContext, Map<String, String> props) { super.createCamelContext(bundleContext, props); + context.disableJMX(); context.addLifecycleStrategy(this); } http://git-wip-us.apache.org/repos/asf/camel/blob/5ef3ce57/tooling/archetypes/camel-archetype-scr/pom.xml ---------------------------------------------------------------------- diff --git a/tooling/archetypes/camel-archetype-scr/pom.xml b/tooling/archetypes/camel-archetype-scr/pom.xml index cb47dec..cba3734 100644 --- a/tooling/archetypes/camel-archetype-scr/pom.xml +++ b/tooling/archetypes/camel-archetype-scr/pom.xml @@ -67,6 +67,9 @@ <plugin> <artifactId>maven-archetype-plugin</artifactId> <version>2.2</version> + <configuration> + <skip>${maven.test.skip.exec}</skip> + </configuration> </plugin> </plugins> </pluginManagement>
