rave-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jc...@apache.org
Subject svn commit: r1228366 - in /incubator/rave/trunk/rave-shindig/src: main/java/org/apache/rave/commoncontainer/ConfigurablePropertiesModule.java test/resources/rave.shindig.properties
Date Fri, 06 Jan 2012 19:46:20 GMT
Author: jcian
Date: Fri Jan  6 19:46:20 2012
New Revision: 1228366

URL: http://svn.apache.org/viewvc?rev=1228366&view=rev
Log:
Updating ConfigurablePropertiesModule to load properties from rave.shindig.properties instead
of shindig.properties.  This allows us to change the default shindig properties in rave.shindig.properties
and have those changes reflected in shindig at runtime as one would expect.

Modified:
    incubator/rave/trunk/rave-shindig/src/main/java/org/apache/rave/commoncontainer/ConfigurablePropertiesModule.java
    incubator/rave/trunk/rave-shindig/src/test/resources/rave.shindig.properties

Modified: incubator/rave/trunk/rave-shindig/src/main/java/org/apache/rave/commoncontainer/ConfigurablePropertiesModule.java
URL: http://svn.apache.org/viewvc/incubator/rave/trunk/rave-shindig/src/main/java/org/apache/rave/commoncontainer/ConfigurablePropertiesModule.java?rev=1228366&r1=1228365&r2=1228366&view=diff
==============================================================================
--- incubator/rave/trunk/rave-shindig/src/main/java/org/apache/rave/commoncontainer/ConfigurablePropertiesModule.java
(original)
+++ incubator/rave/trunk/rave-shindig/src/main/java/org/apache/rave/commoncontainer/ConfigurablePropertiesModule.java
Fri Jan  6 19:46:20 2012
@@ -42,7 +42,7 @@ import java.util.Properties;
  */
 public class ConfigurablePropertiesModule extends AbstractModule {
 
-    private static final String DEFAULT_PROPERTIES = "shindig.properties";
+    private static final String DEFAULT_PROPERTIES = "rave.shindig.properties";
     private static final String SHINDIG_OVERRIDE_PROPERTIES = "shindig.override.properties";
 
     private static final String CLASSPATH = "classpath:";

Modified: incubator/rave/trunk/rave-shindig/src/test/resources/rave.shindig.properties
URL: http://svn.apache.org/viewvc/incubator/rave/trunk/rave-shindig/src/test/resources/rave.shindig.properties?rev=1228366&r1=1228365&r2=1228366&view=diff
==============================================================================
--- incubator/rave/trunk/rave-shindig/src/test/resources/rave.shindig.properties (original)
+++ incubator/rave/trunk/rave-shindig/src/test/resources/rave.shindig.properties Fri Jan 
6 19:46:20 2012
@@ -17,10 +17,16 @@
 # under the License.
 #
 
-###################################################################################
-## These are the properties which are specific for the Rave extension of Shindig ##
-###################################################################################
+#####################################################################################
+## These are the properties which are specific for the Rave extension of Shindig   ##
+## All of the properties in this file end up being read and made available to      ##
+## both Spring and Guice.  Note that in a Rave installation this file replaces     ##
+## the regular shindig.properties file - so if you need to make changes to shindig ##
+## properties, make them here.                                                     ##
+#####################################################################################
 
+# The three properties below can either be changed here or can be set via environmental variables.
+# If set as environmental variables, those values will take precedence.
 shindig.host=localhost
 shindig.port=8080
 shindig.contextroot=



Mime
View raw message