Author: agilliland
Date: Fri Jun 8 10:09:54 2007
New Revision: 545562
URL: http://svn.apache.org/viewvc?view=rev&rev=545562
Log:
move roller.properties and runtime config defs xml file into the src tree so
that they are packaged with the business jar file. these config files are
required for the business jar to function and are not intended to be hand
edited by users deploying the webapp so it is more fitting that they be
packaged directly in the jar file as part of the business layer.
Added:
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/config/roller.properties
- copied unchanged from r545559,
roller/trunk/apps/weblogger/web/WEB-INF/classes/roller.properties
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/config/runtimeConfigDefs.xml
- copied unchanged from r545559,
roller/trunk/apps/weblogger/web/WEB-INF/classes/rollerRuntimeConfigDefs.xml
Removed:
roller/trunk/apps/weblogger/web/WEB-INF/classes/roller.properties
roller/trunk/apps/weblogger/web/WEB-INF/classes/rollerRuntimeConfigDefs.xml
Modified:
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/config/RollerConfig.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/config/RollerRuntimeConfig.java
Modified:
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/config/RollerConfig.java
URL:
http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/config/RollerConfig.java?view=diff&rev=545562&r1=545561&r2=545562
==============================================================================
---
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/config/RollerConfig.java
(original)
+++
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/config/RollerConfig.java
Fri Jun 8 10:09:54 2007
@@ -33,7 +33,7 @@
*/
public class RollerConfig {
- private static String default_config = "/roller.properties";
+ private static String default_config =
"/org/apache/roller/weblogger/config/roller.properties";
private static String custom_config = "/roller-custom.properties";
private static String custom_jvm_param = "roller.custom.config";
private static File custom_config_file = null;
Modified:
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/config/RollerRuntimeConfig.java
URL:
http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/config/RollerRuntimeConfig.java?view=diff&rev=545562&r1=545561&r2=545562
==============================================================================
---
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/config/RollerRuntimeConfig.java
(original)
+++
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/config/RollerRuntimeConfig.java
Fri Jun 8 10:09:54 2007
@@ -42,7 +42,7 @@
private static Log log = LogFactory.getLog(RollerRuntimeConfig.class);
- private static String runtime_config = "/rollerRuntimeConfigDefs.xml";
+ private static String runtime_config =
"/org/apache/roller/weblogger/config/runtimeConfigDefs.xml";
private static RuntimeConfigDefs configDefs = null;
// special case for our context urls
