You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@shindig.apache.org by et...@apache.org on 2009/01/06 01:19:09 UTC
svn commit: r731782 -
/incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/common/PropertiesModule.java
Author: etnu
Date: Mon Jan 5 16:19:09 2009
New Revision: 731782
URL: http://svn.apache.org/viewvc?rev=731782&view=rev
Log:
Applied SHINDIG-797 from Mathias Bogaert.
Modified:
incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/common/PropertiesModule.java
Modified: incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/common/PropertiesModule.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/common/PropertiesModule.java?rev=731782&r1=731781&r2=731782&view=diff
==============================================================================
--- incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/common/PropertiesModule.java (original)
+++ incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/common/PropertiesModule.java Mon Jan 5 16:19:09 2009
@@ -42,7 +42,7 @@
private final Properties properties;
public PropertiesModule() {
- this.properties = readPropertyFile(DEFAULT_PROPERTIES);
+ this.properties = readPropertyFile(getDefaultPropertiesPath());
}
public PropertiesModule(String propertyFile) {
@@ -55,9 +55,17 @@
@Override
protected void configure() {
- Names.bindProperties(this.binder(), properties);
+ Names.bindProperties(this.binder(), getProperties());
}
-
+
+ protected static String getDefaultPropertiesPath() {
+ return DEFAULT_PROPERTIES;
+ }
+
+ protected Properties getProperties() {
+ return properties;
+ }
+
private Properties readPropertyFile(String propertyFile) {
Properties properties = new Properties();
InputStream is = null;