You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@turbine.apache.org by gk...@apache.org on 2014/09/08 17:07:31 UTC
svn commit: r1623420 - in /turbine/core/trunk/conf/test:
ConfigurationBuilder.xml testinclude.properties usersettings.properties
Author: gk
Date: Mon Sep 8 15:07:31 2014
New Revision: 1623420
URL: http://svn.apache.org/r1623420
Log:
- Adding test files
Added:
turbine/core/trunk/conf/test/ConfigurationBuilder.xml (with props)
turbine/core/trunk/conf/test/testinclude.properties (with props)
turbine/core/trunk/conf/test/usersettings.properties (with props)
Added: turbine/core/trunk/conf/test/ConfigurationBuilder.xml
URL: http://svn.apache.org/viewvc/turbine/core/trunk/conf/test/ConfigurationBuilder.xml?rev=1623420&view=auto
==============================================================================
--- turbine/core/trunk/conf/test/ConfigurationBuilder.xml (added)
+++ turbine/core/trunk/conf/test/ConfigurationBuilder.xml Mon Sep 8 15:07:31 2014
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="ISO-8859-1" ?>
+
+<configuration>
+ <header>
+ <!-- Meta data about the resulting combined configuration -->
+ </header>
+ <override><!-- only allowed configurations are user and turbine, realtive paths -->
+ <properties config-name="user" fileName="conf/test/usersettings.properties" config-optional="true" config-forceCreate="true"/>
+ <xml fileName="conf/test/TurbineResources.xml"/>
+ <properties config-name="turbine" fileName="conf/test/TemplateService.properties" throwExceptionOnMissing="true"/>
+ </override>
+ <additional>
+ <!-- Configuration declarations that form a union configuration, always provide a unique config-name attribute -->
+ </additional>
+</configuration>
\ No newline at end of file
Propchange: turbine/core/trunk/conf/test/ConfigurationBuilder.xml
------------------------------------------------------------------------------
svn:eol-style = native
Added: turbine/core/trunk/conf/test/testinclude.properties
URL: http://svn.apache.org/viewvc/turbine/core/trunk/conf/test/testinclude.properties?rev=1623420&view=auto
==============================================================================
--- turbine/core/trunk/conf/test/testinclude.properties (added)
+++ turbine/core/trunk/conf/test/testinclude.properties Mon Sep 8 15:07:31 2014
@@ -0,0 +1,3 @@
+scheduledjob.cache.size= 100
+tests.test2= 25
+
Propchange: turbine/core/trunk/conf/test/testinclude.properties
------------------------------------------------------------------------------
svn:eol-style = native
Added: turbine/core/trunk/conf/test/usersettings.properties
URL: http://svn.apache.org/viewvc/turbine/core/trunk/conf/test/usersettings.properties?rev=1623420&view=auto
==============================================================================
--- turbine/core/trunk/conf/test/usersettings.properties (added)
+++ turbine/core/trunk/conf/test/usersettings.properties Mon Sep 8 15:07:31 2014
@@ -0,0 +1,3 @@
+module.cache=false
+include = testinclude.properties
+
Propchange: turbine/core/trunk/conf/test/usersettings.properties
------------------------------------------------------------------------------
svn:eol-style = native