You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tamaya.apache.org by po...@apache.org on 2016/12/29 20:44:45 UTC
incubator-tamaya-sandbox git commit: TAMAYA-154: Fix javadoc issues
Repository: incubator-tamaya-sandbox
Updated Branches:
refs/heads/master 9e1cd74c9 -> e0c570068
TAMAYA-154: Fix javadoc issues
Project: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/commit/e0c57006
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/tree/e0c57006
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/diff/e0c57006
Branch: refs/heads/master
Commit: e0c5700683d98cf7345b8b50b495434feadc4c3a
Parents: 9e1cd74
Author: Phil Ottlinger <po...@apache.org>
Authored: Thu Dec 29 21:44:16 2016 +0100
Committer: Phil Ottlinger <po...@apache.org>
Committed: Thu Dec 29 21:44:16 2016 +0100
----------------------------------------------------------------------
.../java/org/apache/tamaya/metamodel/MetaConfiguration.java | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/e0c57006/metamodel/src/main/java/org/apache/tamaya/metamodel/MetaConfiguration.java
----------------------------------------------------------------------
diff --git a/metamodel/src/main/java/org/apache/tamaya/metamodel/MetaConfiguration.java b/metamodel/src/main/java/org/apache/tamaya/metamodel/MetaConfiguration.java
index 601c851..76172a6 100644
--- a/metamodel/src/main/java/org/apache/tamaya/metamodel/MetaConfiguration.java
+++ b/metamodel/src/main/java/org/apache/tamaya/metamodel/MetaConfiguration.java
@@ -55,13 +55,12 @@ public final class MetaConfiguration {
/**
* Creates a new {@link Configuration} using {@link #createConfiguration(URL)}
* and applies it as default configuration using {@link ConfigurationProvider#setConfiguration(Configuration)}.
- * @return the new configuration instance.
*/
public static void configure(){
LOG.info("TAMAYA: Checking for meta-configuration...");
URL configFile = getDefaultMetaConfig();
if(configFile==null){
- LOG.warning("TAMAYA: No tamaya-config.xml found, using defaults.");
+ LOG.warning("TAMAYA: No " + CONFIG_RESOURCE + " found, using defaults.");
}
configure(configFile);
}
@@ -70,7 +69,6 @@ public final class MetaConfiguration {
* Creates a new {@link Configuration} using {@link #createConfiguration(URL)}
* and applies it as default configuration using {@link ConfigurationProvider#setConfiguration(Configuration)}.
* @param metaConfig URL for loading the {@code tamaya-config.xml} meta-configuration.
- * @return the new configuration instance.
*/
public static void configure(URL metaConfig){
try {
@@ -120,7 +118,7 @@ public final class MetaConfiguration {
for(MetaConfigurationReader reader: ServiceContextManager.getServiceContext().getServices(
MetaConfigurationReader.class
)){
- LOG.fine("TAMAYA: Executing MetaConfig-Reader: " + reader.getClass().getName()+"...");
+ LOG.fine("TAMAYA: Executing MetaConfig-Reader: " + reader.getClass().getName() + "...");
reader.read(document, builder);
}
return builder;