You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by cz...@apache.org on 2020/01/10 13:02:38 UTC
svn commit: r1872594 -
/felix/trunk/configadmin-plugins/interpolation/src/main/java/org/apache/felix/configadmin/plugin/interpolation/Activator.java
Author: cziegeler
Date: Fri Jan 10 13:02:38 2020
New Revision: 1872594
URL: http://svn.apache.org/viewvc?rev=1872594&view=rev
Log:
FELIX-6165 : Rename org.apache.felix.configadmin.plugin.interpolation.dir
Modified:
felix/trunk/configadmin-plugins/interpolation/src/main/java/org/apache/felix/configadmin/plugin/interpolation/Activator.java
Modified: felix/trunk/configadmin-plugins/interpolation/src/main/java/org/apache/felix/configadmin/plugin/interpolation/Activator.java
URL: http://svn.apache.org/viewvc/felix/trunk/configadmin-plugins/interpolation/src/main/java/org/apache/felix/configadmin/plugin/interpolation/Activator.java?rev=1872594&r1=1872593&r2=1872594&view=diff
==============================================================================
--- felix/trunk/configadmin-plugins/interpolation/src/main/java/org/apache/felix/configadmin/plugin/interpolation/Activator.java (original)
+++ felix/trunk/configadmin-plugins/interpolation/src/main/java/org/apache/felix/configadmin/plugin/interpolation/Activator.java Fri Jan 10 13:02:38 2020
@@ -29,7 +29,8 @@ import org.slf4j.LoggerFactory;
@Header(name=Constants.BUNDLE_ACTIVATOR, value="${@class}")
public class Activator implements BundleActivator {
- static final String DIR_PROPERTY = "org.apache.felix.configadmin.plugin.interpolation.dir";
+ static final String DEPRECATED_DIR_PROPERTY = "org.apache.felix.configadmin.plugin.interpolation.dir";
+ static final String DIR_PROPERTY = "org.apache.felix.configadmin.plugin.interpolation.secretsdir";
static final String ENCODING_PROPERTY = "org.apache.felix.configadmin.plugin.interpolation.file.encoding";
static final String PLUGIN_ID = "org.apache.felix.configadmin.plugin.interpolation";
@@ -41,6 +42,13 @@ public class Activator implements Bundle
@Override
public void start(BundleContext context) throws Exception {
String directory = context.getProperty(DIR_PROPERTY);
+ if (directory == null) {
+ directory = context.getProperty(DEPRECATED_DIR_PROPERTY);
+ if (directory != null) {
+ LOG.warn("Deprecated property is used for configuration, switch from using '" + DEPRECATED_DIR_PROPERTY
+ + "' to the new '" + DIR_PROPERTY + "'.");
+ }
+ }
String encoding = context.getProperty(ENCODING_PROPERTY);
ConfigurationPlugin plugin = new InterpolationConfigurationPlugin(context, directory, encoding);