Author: gk
Date: Fri Jul 31 10:49:40 2015
New Revision: 1693565
URL: http://svn.apache.org/r1693565
Log:
- Correct XML Loader Example in HowTo
- added tests
Modified:
turbine/core/trunk/src/java/org/apache/turbine/Turbine.java
turbine/core/trunk/src/test/org/apache/turbine/ConfigurationTest.java
turbine/core/trunk/src/test/org/apache/turbine/services/schedule/TurbineNonPersistentSchedulerServiceTest.java
turbine/core/trunk/xdocs/howto/configuration-howto.xml
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=1693565&r1=1693564&r2=1693565&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/Turbine.java (original)
+++ turbine/core/trunk/src/java/org/apache/turbine/Turbine.java Fri Jul 31
10:49:40 2015
@@ -347,7 +347,7 @@ public class Turbine
configureLogging();
// Now report our successful configuration to the world
- log.info("Loaded configuration (" + confStyle + ") from " + confFile
+ " (" + confPath + ") style: "+ configuration.toString());
+ log.info("Loaded configuration (" + confStyle + ") from " + confFile +
" (" + confPath + ") style: "+ configuration.toString());
setTurbineServletConfig(config);
setTurbineServletContext(context);
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=1693565&r1=1693564&r2=1693565&view=diff
==============================================================================
--- turbine/core/trunk/src/test/org/apache/turbine/ConfigurationTest.java
(original)
+++ turbine/core/trunk/src/test/org/apache/turbine/ConfigurationTest.java Fri
Jul 31 10:49:40 2015
@@ -31,6 +31,7 @@ import java.net.URL;
import org.apache.commons.configuration.Configuration;
import org.apache.commons.configuration.FileSystem;
+import org.apache.commons.configuration.PropertiesConfiguration;
import org.apache.turbine.test.BaseTestCase;
import org.apache.turbine.util.TurbineConfig;
import org.apache.turbine.util.TurbineXmlConfig;
@@ -113,6 +114,27 @@ public class ConfigurationTest extends B
}
}
+ @Test
+ public void testCreateTurbineWithIncludedConfiguration() throws Exception
+ {
+ String confPath = Turbine.getRealPath(
"/conf/test/usersettings.properties" );
+ try
+ {
+ Configuration configuration = new
PropertiesConfiguration(confPath);;
+ assertNotNull("No Configuration Object found!", configuration);
+ assertFalse("Make sure we have values", configuration.isEmpty());
+
+ String key = "scheduledjob.cache.size";
+ assertEquals("Read a config value " + key + ", received:" +
configuration.getString(key), "100", configuration.getString(key));
+ String key2 ="module.cache";
+ assertEquals("Read a config value " + key2 + ", received:" +
configuration.getString(key2), "false", configuration.getString(key2));
+ }
+ catch (Exception e)
+ {
+ throw e;
+ }
+ }
+
@Test
public void testCreateTurbineWithXMLBuilderConfiguration() throws Exception
{
Modified:
turbine/core/trunk/src/test/org/apache/turbine/services/schedule/TurbineNonPersistentSchedulerServiceTest.java
URL:
http://svn.apache.org/viewvc/turbine/core/trunk/src/test/org/apache/turbine/services/schedule/TurbineNonPersistentSchedulerServiceTest.java?rev=1693565&r1=1693564&r2=1693565&view=diff
==============================================================================
---
turbine/core/trunk/src/test/org/apache/turbine/services/schedule/TurbineNonPersistentSchedulerServiceTest.java
(original)
+++
turbine/core/trunk/src/test/org/apache/turbine/services/schedule/TurbineNonPersistentSchedulerServiceTest.java
Fri Jul 31 10:49:40 2015
@@ -96,12 +96,14 @@ public class TurbineNonPersistentSchedul
int jobCount = TurbineScheduler.listJobs().size();
// Add a new job entry
- JobEntry je = TurbineScheduler.newJob(0, 1, -1, -1, -1,
"SimpleJob");
+ JobEntry je = TurbineScheduler.newJob(0, 1, -1, -1, -1,
"SimpleJob");
TurbineScheduler.addJob(je);
assertEquals(jobCount + 1, TurbineScheduler.listJobs().size());
-
+
+ assertTrue(TurbineScheduler.listJobs().contains( je ));
TurbineScheduler.removeJob(je);
+ assertTrue(!TurbineScheduler.listJobs().contains( je ));
assertEquals(jobCount, TurbineScheduler.listJobs().size());
}
Modified: turbine/core/trunk/xdocs/howto/configuration-howto.xml
URL:
http://svn.apache.org/viewvc/turbine/core/trunk/xdocs/howto/configuration-howto.xml?rev=1693565&r1=1693564&r2=1693565&view=diff
==============================================================================
--- turbine/core/trunk/xdocs/howto/configuration-howto.xml (original)
+++ turbine/core/trunk/xdocs/howto/configuration-howto.xml Fri Jul 31 10:49:40
2015
@@ -78,7 +78,8 @@ web.xml file:
<p>
This works well, but if you want to customize the various settings that
Turbine uses to
-control it's behavior, then you need to provide a TurbineConfiguration.xml
file!
+control it's behavior, then you need to provide a TurbineConfiguration.xml
file!
+Reading from /WEB-INF/conf/TurbineResources.properties is actually the default
fall back - if no init parameter is provided.
</p>
</section>
@@ -118,8 +119,9 @@ This file will contain lines like this:
<source test=""><![CDATA[
<configuration>
<jndi className="org.apache.commons.configuration.JNDIConfiguration"
prefix="java:comp/env"/>
- <dom4j className="org.apache.commons.configuration.DOM4JConfiguration"
fileName="/WEB-INF/conf/OtherProperties.xml"/>
- <properties
className="org.apache.commons.configuration.PropertiesConfiguration"
fileName="/WEB-INF/conf/TurbineResources.properties"/>
+ <!-- CHANGE! As fileName is converted to URL internally now and
applicationpath is prefixed fileName has to be a relative path, cft. RFC2396.
-->
+ <dom4j className="org.apache.commons.configuration.DOM4JConfiguration"
fileName="WEB-INF/conf/OtherProperties.xml"/>
+ <properties
className="org.apache.commons.configuration.PropertiesConfiguration"
fileName="WEB-INF/conf/TurbineResources.properties"/>
</configuration>
]]></source>
