Author: tv
Date: Wed Sep 18 12:06:30 2013
New Revision: 1524380
URL: http://svn.apache.org/r1524380
Log:
Make sure that XML configuration works with relative path names
Modified:
turbine/core/trunk/src/java/org/apache/turbine/Turbine.java
turbine/core/trunk/src/test/org/apache/turbine/ConfigurationTest.java
Modified: turbine/core/trunk/src/java/org/apache/turbine/Turbine.java
URL:
http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/Turbine.java?rev=1524380&r1=1524379&r2=1524380&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/Turbine.java (original)
+++ turbine/core/trunk/src/java/org/apache/turbine/Turbine.java Wed Sep 18
12:06:30 2013
@@ -306,7 +306,7 @@ public class Turbine
{
confPath = getRealPath(confFile);
DefaultConfigurationBuilder configurationBuilder = new
DefaultConfigurationBuilder(confFile);
- configurationBuilder.setBasePath(getApplicationRoot());
+
configurationBuilder.setBasePath(getRealPath(getApplicationRoot()));
configuration = configurationBuilder.getConfiguration();
confStyle = "XML";
}
Modified: turbine/core/trunk/src/test/org/apache/turbine/ConfigurationTest.java
URL:
http://svn.apache.org/viewvc/turbine/core/trunk/src/test/org/apache/turbine/ConfigurationTest.java?rev=1524380&r1=1524379&r2=1524380&view=diff
==============================================================================
--- turbine/core/trunk/src/test/org/apache/turbine/ConfigurationTest.java
(original)
+++ turbine/core/trunk/src/test/org/apache/turbine/ConfigurationTest.java Wed
Sep 18 12:06:30 2013
@@ -53,7 +53,7 @@ public class ConfigurationTest extends B
public void testCreateTurbineWithConfigurationXML() throws Exception
{
- txc = new TurbineXmlConfig(".", "/conf/test/TurbineConfiguration.xml");
+ txc = new TurbineXmlConfig(".", "conf/test/TurbineConfiguration.xml");
try
{
