tdraier 2005/11/09 12:18:06 CET
Modified files:
core/src/java/org/jahia/settings SettingsBean.java
core/src/webapp/WEB-INF/etc/config jahia.skeleton
Log:
new settings for processing server
Revision Changes Path
1.25 +2 -2 jahia/core/src/java/org/jahia/settings/SettingsBean.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/settings/SettingsBean.java.diff?r1=1.24&r2=1.25&f=h
1.26 +2 -0 jahia/core/src/webapp/WEB-INF/etc/config/jahia.skeleton
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/webapp/WEB-INF/etc/config/jahia.skeleton.diff?r1=1.25&r2=1.26&f=h
Index: SettingsBean.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/jahia/settings/SettingsBean.java,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- SettingsBean.java 9 Nov 2005 11:09:19 -0000 1.24
+++ SettingsBean.java 9 Nov 2005 11:18:05 -0000 1.25
@@ -1,4 +1,4 @@
-// $Id: SettingsBean.java,v 1.24 2005/11/09 11:09:19 tdraier Exp $
+// $Id: SettingsBean.java,v 1.25 2005/11/09 11:18:05 tdraier Exp $
//
// ____.
// __/\ ______| |__/\. _______
@@ -580,7 +580,7 @@
processPipelineClassName = getString("processPipelineClassName",
"org.jahia.pipelines.impl.GenericPipeline");
schedulerConfigFile = JahiaTools.convertContexted
(getString("schedulerConfigFile",
"$context/WEB-INF/etc/config/quartz.properties"), pathResolver);
ramSchedulerConfigFile = JahiaTools.convertContexted
(getString("ramSchedulerConfigFile",
"$context/WEB-INF/etc/config/quartz-ram.properties"), pathResolver);
- isProcessingServer = getBoolean("processsingServer", true);
+ isProcessingServer = getBoolean("processingServer", true);
siteServerNameTestURLExpr =
getString("siteServerNameTestURLExpr",
"${request.scheme}://${siteServerName}:${request.serverPort}${request.contextPath}/jsp/isjahia.jsp");
siteServerNameTestConnectTimeout =
getInt("siteServerNameTestConnectTimeout", 500);
Index: jahia.skeleton
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/webapp/WEB-INF/etc/config/jahia.skeleton,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- jahia.skeleton 7 Nov 2005 09:55:34 -0000 1.25
+++ jahia.skeleton 9 Nov 2005 11:18:05 -0000 1.26
@@ -346,6 +346,8 @@
### Scheduler config ################
# Path to scheduler configuration
schedulerConfigFile =
$context/WEB-INF/etc/config/quartz.properties
+ramSchedulerConfigFile =
$context/WEB-INF/etc/config/quartz-ram.properties
+processingServer = true
### Site serverName testing config ###
# The following configuration parameters mostly concern the generation of the
