You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@struts.apache.org by mr...@apache.org on 2007/01/29 03:41:08 UTC
svn commit: r500925 -
/struts/struts2/trunk/plugins/sitegraph/src/main/java/org/apache/struts2/sitegraph/StrutsConfigRetriever.java
Author: mrdon
Date: Sun Jan 28 18:41:07 2007
New Revision: 500925
URL: http://svn.apache.org/viewvc?view=rev&rev=500925
Log:
Fixed sitegraph not working due to new default properties provider
WW-1650
Modified:
struts/struts2/trunk/plugins/sitegraph/src/main/java/org/apache/struts2/sitegraph/StrutsConfigRetriever.java
Modified: struts/struts2/trunk/plugins/sitegraph/src/main/java/org/apache/struts2/sitegraph/StrutsConfigRetriever.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/sitegraph/src/main/java/org/apache/struts2/sitegraph/StrutsConfigRetriever.java?view=diff&rev=500925&r1=500924&r2=500925
==============================================================================
--- struts/struts2/trunk/plugins/sitegraph/src/main/java/org/apache/struts2/sitegraph/StrutsConfigRetriever.java (original)
+++ struts/struts2/trunk/plugins/sitegraph/src/main/java/org/apache/struts2/sitegraph/StrutsConfigRetriever.java Sun Jan 28 18:41:07 2007
@@ -13,6 +13,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.struts2.config.BeanSelectionProvider;
+import org.apache.struts2.config.DefaultPropertiesProvider;
import org.apache.struts2.config.LegacyPropertiesConfigurationProvider;
import org.apache.struts2.config.StrutsXmlConfigurationProvider;
import org.apache.struts2.sitegraph.entities.FreeMarkerView;
@@ -54,6 +55,7 @@
try {
ConfigurationProvider configProvider = new StrutsXmlConfigurationProvider(configFile.getCanonicalPath(), true, null);
cm = new ConfigurationManager();
+ cm.addConfigurationProvider(new DefaultPropertiesProvider());
cm.addConfigurationProvider(new StrutsXmlConfigurationProvider("struts-default.xml", false, null));
cm.addConfigurationProvider(configProvider);
cm.addConfigurationProvider(new LegacyPropertiesConfigurationProvider());