Mercurial > hg > release > thermostat-1.2
changeset 1612:000037cb4b9d
Mark ConfigurationInfoSource as experimental
PR2045
Reviewed-by: omajid, jerboaa
Review-thread: http://icedtea.classpath.org/pipermail/thermostat/2014-December/012180.html
| author | Jie Kang <jkang@redhat.com> |
|---|---|
| date | Wed, 10 Dec 2014 14:10:54 -0500 |
| parents | 6fdbaf0d7f7e |
| children | b7cf43343de2 |
| files | common/core/src/main/java/com/redhat/thermostat/common/config/ConfigurationInfoSource.java common/core/src/main/java/com/redhat/thermostat/common/config/experimental/ConfigurationInfoSource.java launcher/src/main/java/com/redhat/thermostat/launcher/internal/Activator.java launcher/src/main/java/com/redhat/thermostat/launcher/internal/PluginInfoSource.java |
| diffstat | 4 files changed, 61 insertions(+), 61 deletions(-) [+] |
line wrap: on
line diff
--- a/common/core/src/main/java/com/redhat/thermostat/common/config/ConfigurationInfoSource.java Wed Dec 10 17:22:22 2014 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,59 +0,0 @@ -/* - * Copyright 2012-2014 Red Hat, Inc. - * - * This file is part of Thermostat. - * - * Thermostat is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published - * by the Free Software Foundation; either version 2, or (at your - * option) any later version. - * - * Thermostat is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with Thermostat; see the file COPYING. If not see - * <http://www.gnu.org/licenses/>. - * - * Linking this code with other modules is making a combined work - * based on this code. Thus, the terms and conditions of the GNU - * General Public License cover the whole combination. - * - * As a special exception, the copyright holders of this code give - * you permission to link this code with independent modules to - * produce an executable, regardless of the license terms of these - * independent modules, and to copy and distribute the resulting - * executable under terms of your choice, provided that you also - * meet, for each linked independent module, the terms and conditions - * of the license of that module. An independent module is a module - * which is not derived from or based on this code. If you modify - * this code, you may extend this exception to your version of the - * library, but you are not obligated to do so. If you do not wish - * to do so, delete this exception statement from your version. - */ - -package com.redhat.thermostat.common.config; - -import java.io.IOException; -import java.util.Map; - -import com.redhat.thermostat.annotations.Service; - -/** - * Provides plugins with access to their config files through the use of their plugin ID and config filenames - * defined in their thermostat-plugin.xml file. Plugins may request this service through their Activator's - * BundleContext. If no {@code configurations} tag is specified, config files by default are searched for in - * $THERMOSTAT_HOME/etc/plugins.d/$PLUGIN_ID/ and/or $USER_THERMOSTAT_HOME/etc/plugins.d/$PLUGIN_ID/. - * Users may provide custom locations through the {@code configurations} tag in their thermostat-plugin.xml. - * The tag expects absolute paths - * - * Note: The configuration files here are visible to other plugins and is not appropriate for storing - * confidential information. - */ - -@Service -public interface ConfigurationInfoSource { - public Map<String, String> getConfiguration(String pluginID, String fileName) throws IOException; -}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/common/core/src/main/java/com/redhat/thermostat/common/config/experimental/ConfigurationInfoSource.java Wed Dec 10 14:10:54 2014 -0500 @@ -0,0 +1,59 @@ +/* + * Copyright 2012-2014 Red Hat, Inc. + * + * This file is part of Thermostat. + * + * Thermostat is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published + * by the Free Software Foundation; either version 2, or (at your + * option) any later version. + * + * Thermostat is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with Thermostat; see the file COPYING. If not see + * <http://www.gnu.org/licenses/>. + * + * Linking this code with other modules is making a combined work + * based on this code. Thus, the terms and conditions of the GNU + * General Public License cover the whole combination. + * + * As a special exception, the copyright holders of this code give + * you permission to link this code with independent modules to + * produce an executable, regardless of the license terms of these + * independent modules, and to copy and distribute the resulting + * executable under terms of your choice, provided that you also + * meet, for each linked independent module, the terms and conditions + * of the license of that module. An independent module is a module + * which is not derived from or based on this code. If you modify + * this code, you may extend this exception to your version of the + * library, but you are not obligated to do so. If you do not wish + * to do so, delete this exception statement from your version. + */ + +package com.redhat.thermostat.common.config.experimental; + +import java.io.IOException; +import java.util.Map; + +import com.redhat.thermostat.annotations.Service; + +/** + * Provides plugins with access to their config files through the use of their plugin ID and config filenames + * defined in their thermostat-plugin.xml file. Plugins may request this service through their Activator's + * BundleContext. If no {@code configurations} tag is specified, config files by default are searched for in + * $THERMOSTAT_HOME/etc/plugins.d/$PLUGIN_ID/ and/or $USER_THERMOSTAT_HOME/etc/plugins.d/$PLUGIN_ID/. + * Users may provide custom locations through the {@code configurations} tag in their thermostat-plugin.xml. + * The tag expects absolute paths + * + * Note: The configuration files here are visible to other plugins and is not appropriate for storing + * confidential information. + */ + +@Service +public interface ConfigurationInfoSource { + public Map<String, String> getConfiguration(String pluginID, String fileName) throws IOException; +}
--- a/launcher/src/main/java/com/redhat/thermostat/launcher/internal/Activator.java Wed Dec 10 17:22:22 2014 +0100 +++ b/launcher/src/main/java/com/redhat/thermostat/launcher/internal/Activator.java Wed Dec 10 14:10:54 2014 -0500 @@ -53,7 +53,7 @@ import com.redhat.thermostat.common.cli.CommandRegistry; import com.redhat.thermostat.common.cli.CommandRegistryImpl; import com.redhat.thermostat.common.config.ClientPreferences; -import com.redhat.thermostat.common.config.ConfigurationInfoSource; +import com.redhat.thermostat.common.config.experimental.ConfigurationInfoSource; import com.redhat.thermostat.launcher.BundleManager; import com.redhat.thermostat.launcher.Launcher; import com.redhat.thermostat.launcher.internal.CurrentEnvironment.CurrentEnvironmentChangeListener;
--- a/launcher/src/main/java/com/redhat/thermostat/launcher/internal/PluginInfoSource.java Wed Dec 10 17:22:22 2014 +0100 +++ b/launcher/src/main/java/com/redhat/thermostat/launcher/internal/PluginInfoSource.java Wed Dec 10 14:10:54 2014 -0500 @@ -54,7 +54,7 @@ import java.util.logging.Level; import java.util.logging.Logger; -import com.redhat.thermostat.common.config.ConfigurationInfoSource; +import com.redhat.thermostat.common.config.experimental.ConfigurationInfoSource; import com.redhat.thermostat.common.utils.LoggingUtils; import com.redhat.thermostat.launcher.BundleInformation; import com.redhat.thermostat.launcher.internal.PluginConfiguration.CommandExtensions;