You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ak...@apache.org on 2010/09/03 15:57:06 UTC
svn commit: r992299 - in /camel/trunk/camel-core/src:
main/java/org/apache/camel/component/properties/PropertiesParser.java
test/java/org/apache/camel/component/properties/PropertiesEnvironmentVariableOverrideTest.java
Author: akarpe
Date: Fri Sep 3 13:57:06 2010
New Revision: 992299
URL: http://svn.apache.org/viewvc?rev=992299&view=rev
Log:
CAMEL-2791 - Properties component - Add option to let it look first/last for JVM system property
Added:
camel/trunk/camel-core/src/test/java/org/apache/camel/component/properties/PropertiesEnvironmentVariableOverrideTest.java (with props)
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/component/properties/PropertiesParser.java
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/component/properties/PropertiesParser.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/component/properties/PropertiesParser.java?rev=992299&r1=992298&r2=992299&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/component/properties/PropertiesParser.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/component/properties/PropertiesParser.java Fri Sep 3 13:57:06 2010
@@ -20,13 +20,18 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Properties;
+import org.apache.camel.impl.DefaultCamelContext;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
/**
* A parser to parse a string which contains property placeholders
*
* @version $Revision$
*/
public final class PropertiesParser {
-
+ private static final transient Log LOG = LogFactory.getLog(PropertiesParser.class);
+
private PropertiesParser() {
}
@@ -103,8 +108,17 @@ public final class PropertiesParser {
}
private static String createPlaceholderPart(String placeholderPart, Properties properties, List<String> replaced) {
- replaced.add(placeholderPart);
- return properties.getProperty(placeholderPart);
+ String propertyValue;
+
+ propertyValue = System.getProperty(placeholderPart);
+ if (propertyValue != null) {
+ LOG.info("Found a JVM system property: " + placeholderPart + ". Overriding property set via Property Location");
+ } else {
+ replaced.add(placeholderPart);
+ propertyValue = properties.getProperty(placeholderPart);
+ }
+
+ return propertyValue;
}
}
Added: camel/trunk/camel-core/src/test/java/org/apache/camel/component/properties/PropertiesEnvironmentVariableOverrideTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/properties/PropertiesEnvironmentVariableOverrideTest.java?rev=992299&view=auto
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/component/properties/PropertiesEnvironmentVariableOverrideTest.java (added)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/component/properties/PropertiesEnvironmentVariableOverrideTest.java Fri Sep 3 13:57:06 2010
@@ -0,0 +1,219 @@
+/**
+ * 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.component.properties;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.ContextTestSupport;
+import org.apache.camel.builder.RouteBuilder;
+
+/**
+ * @version $Revision: 930255 $
+ */
+public class PropertiesEnvironmentVariableOverrideTest extends ContextTestSupport {
+
+
+ @Override
+ public boolean isUseRouteBuilder() {
+ return false;
+ }
+
+ public void testPropertiesComponentCacheDisabled() throws Exception {
+ PropertiesComponent pc = context.getComponent("properties", PropertiesComponent.class);
+ pc.setCache(false);
+
+ System.setProperty("cool.end", "mock:override");
+ System.setProperty("cool.result", "override");
+
+ context.addRoutes(new RouteBuilder() {
+ @Override
+ public void configure() throws Exception {
+ from("direct:start").to("properties:cool.end");
+ from("direct:foo").to("properties:mock:{{cool.result}}");
+ }
+ });
+ context.start();
+
+ getMockEndpoint("mock:override").expectedMessageCount(2);
+
+ template.sendBody("direct:start", "Hello World");
+ template.sendBody("direct:foo", "Hello Foo");
+
+ System.clearProperty("cool.end");
+ System.clearProperty("cool.result");
+
+ assertMockEndpointsSatisfied();
+ }
+
+ @Override
+ protected CamelContext createCamelContext() throws Exception {
+ CamelContext context = super.createCamelContext();
+
+ PropertiesComponent pc = new PropertiesComponent();
+ pc.setCamelContext(context);
+ pc.setLocations(new String[]{"classpath:org/apache/camel/component/properties/myproperties.properties"});
+ context.addComponent("properties", pc);
+
+ return context;
+ }
+
+}
+/**
+ * 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.component.properties;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.ContextTestSupport;
+import org.apache.camel.builder.RouteBuilder;
+
+/**
+ * @version $Revision: 930255 $
+ */
+public class PropertiesEnvironmentVariableOverrideTest extends ContextTestSupport {
+
+
+ @Override
+ public boolean isUseRouteBuilder() {
+ return false;
+ }
+
+ public void testPropertiesComponentCacheDisabled() throws Exception {
+ PropertiesComponent pc = context.getComponent("properties", PropertiesComponent.class);
+ pc.setCache(false);
+
+ System.setProperty("cool.end", "mock:override");
+ System.setProperty("cool.result", "override");
+
+ context.addRoutes(new RouteBuilder() {
+ @Override
+ public void configure() throws Exception {
+ from("direct:start").to("properties:cool.end");
+ from("direct:foo").to("properties:mock:{{cool.result}}");
+ }
+ });
+ context.start();
+
+ getMockEndpoint("mock:override").expectedMessageCount(2);
+
+ template.sendBody("direct:start", "Hello World");
+ template.sendBody("direct:foo", "Hello Foo");
+
+ System.clearProperty("cool.end");
+ System.clearProperty("cool.result");
+
+ assertMockEndpointsSatisfied();
+ }
+
+ @Override
+ protected CamelContext createCamelContext() throws Exception {
+ CamelContext context = super.createCamelContext();
+
+ PropertiesComponent pc = new PropertiesComponent();
+ pc.setCamelContext(context);
+ pc.setLocations(new String[]{"classpath:org/apache/camel/component/properties/myproperties.properties"});
+ context.addComponent("properties", pc);
+
+ return context;
+ }
+
+}
+/**
+ * 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.component.properties;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.ContextTestSupport;
+import org.apache.camel.builder.RouteBuilder;
+
+/**
+ * @version $Revision: 930255 $
+ */
+public class PropertiesEnvironmentVariableOverrideTest extends ContextTestSupport {
+
+
+ @Override
+ public boolean isUseRouteBuilder() {
+ return false;
+ }
+
+ public void testPropertiesComponentCacheDisabled() throws Exception {
+ PropertiesComponent pc = context.getComponent("properties", PropertiesComponent.class);
+ pc.setCache(false);
+
+ System.setProperty("cool.end", "mock:override");
+ System.setProperty("cool.result", "override");
+
+ context.addRoutes(new RouteBuilder() {
+ @Override
+ public void configure() throws Exception {
+ from("direct:start").to("properties:cool.end");
+ from("direct:foo").to("properties:mock:{{cool.result}}");
+ }
+ });
+ context.start();
+
+ getMockEndpoint("mock:override").expectedMessageCount(2);
+
+ template.sendBody("direct:start", "Hello World");
+ template.sendBody("direct:foo", "Hello Foo");
+
+ System.clearProperty("cool.end");
+ System.clearProperty("cool.result");
+
+ assertMockEndpointsSatisfied();
+ }
+
+ @Override
+ protected CamelContext createCamelContext() throws Exception {
+ CamelContext context = super.createCamelContext();
+
+ PropertiesComponent pc = new PropertiesComponent();
+ pc.setCamelContext(context);
+ pc.setLocations(new String[]{"classpath:org/apache/camel/component/properties/myproperties.properties"});
+ context.addComponent("properties", pc);
+
+ return context;
+ }
+
+}
Propchange: camel/trunk/camel-core/src/test/java/org/apache/camel/component/properties/PropertiesEnvironmentVariableOverrideTest.java
------------------------------------------------------------------------------
svn:eol-style = native