You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@deltaspike.apache.org by st...@apache.org on 2012/07/16 10:07:44 UTC
git commit: DELTASPIKE-243 rename misleading method name
Updated Branches:
refs/heads/master 45712e0c7 -> 5083e8e5b
DELTASPIKE-243 rename misleading method name
Project: http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/commit/5083e8e5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/tree/5083e8e5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/diff/5083e8e5
Branch: refs/heads/master
Commit: 5083e8e5b1673b91e34c7e866a39fd16c4c16621
Parents: 45712e0
Author: Mark Struberg <st...@apache.org>
Authored: Mon Jul 16 10:05:03 2012 +0200
Committer: Mark Struberg <st...@apache.org>
Committed: Mon Jul 16 10:05:03 2012 +0200
----------------------------------------------------------------------
.../core/api/config/PropertyFileConfig.java | 7 ++++---
.../core/impl/config/ConfigurationExtension.java | 2 +-
.../MyCustomPropertyFileConfig.java | 2 +-
.../example/config/CustomPropertyFileConfig.java | 2 +-
4 files changed, 7 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/5083e8e5/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/config/PropertyFileConfig.java
----------------------------------------------------------------------
diff --git a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/config/PropertyFileConfig.java b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/config/PropertyFileConfig.java
index e036e50..0d0a883 100644
--- a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/config/PropertyFileConfig.java
+++ b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/config/PropertyFileConfig.java
@@ -41,9 +41,10 @@ public interface PropertyFileConfig extends DeltaSpikeConfig
{
/**
* All the property files on the classpath which have this
- * name will get picked up and registered as {@link org.apache.deltaspike.core.spi.config.ConfigSource}s.
+ * name will get picked up and registered as
+ * {@link org.apache.deltaspike.core.spi.config.ConfigSource}s.
*
- * @return the full path name of the property files to pick up.
+ * @return the full file name (including path) of the property files to pick up.
*/
- String getFilePath();
+ String getPropertyFileName();
}
http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/5083e8e5/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/config/ConfigurationExtension.java
----------------------------------------------------------------------
diff --git a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/config/ConfigurationExtension.java b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/config/ConfigurationExtension.java
index 6df7e07..49fd4fa 100644
--- a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/config/ConfigurationExtension.java
+++ b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/config/ConfigurationExtension.java
@@ -114,7 +114,7 @@ public class ConfigurationExtension implements Extension, Deactivatable
{
PropertyFileConfig propertyFileConfig = propertyFileConfigClass.newInstance();
EnvironmentPropertyConfigSourceProvider environmentPropertyConfigSourceProvider
- = new EnvironmentPropertyConfigSourceProvider(propertyFileConfig.getFilePath());
+ = new EnvironmentPropertyConfigSourceProvider(propertyFileConfig.getPropertyFileName());
return environmentPropertyConfigSourceProvider.getConfigSources();
}
http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/5083e8e5/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/config/propertyconfigsource/MyCustomPropertyFileConfig.java
----------------------------------------------------------------------
diff --git a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/config/propertyconfigsource/MyCustomPropertyFileConfig.java b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/config/propertyconfigsource/MyCustomPropertyFileConfig.java
index c4c8b48..8d3e832 100644
--- a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/config/propertyconfigsource/MyCustomPropertyFileConfig.java
+++ b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/config/propertyconfigsource/MyCustomPropertyFileConfig.java
@@ -26,7 +26,7 @@ import org.apache.deltaspike.core.api.config.PropertyFileConfig;
public class MyCustomPropertyFileConfig implements PropertyFileConfig
{
@Override
- public String getFilePath()
+ public String getPropertyFileName()
{
return "myconfig.properties";
}
http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/5083e8e5/deltaspike/examples/jse-examples/src/main/java/org/apache/deltaspike/example/config/CustomPropertyFileConfig.java
----------------------------------------------------------------------
diff --git a/deltaspike/examples/jse-examples/src/main/java/org/apache/deltaspike/example/config/CustomPropertyFileConfig.java b/deltaspike/examples/jse-examples/src/main/java/org/apache/deltaspike/example/config/CustomPropertyFileConfig.java
index f7dd404..2e72834 100644
--- a/deltaspike/examples/jse-examples/src/main/java/org/apache/deltaspike/example/config/CustomPropertyFileConfig.java
+++ b/deltaspike/examples/jse-examples/src/main/java/org/apache/deltaspike/example/config/CustomPropertyFileConfig.java
@@ -29,7 +29,7 @@ import javax.enterprise.context.ApplicationScoped;
public class CustomPropertyFileConfig implements PropertyFileConfig
{
@Override
- public String getFilePath()
+ public String getPropertyFileName()
{
return "META-INF/location.properties";
}