Author: pvollenweider
Date: Tue Jan 8 13:49:59 2008
New Revision: 19468
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D19468&repname=
=3Djahia
Log:
Test commit
Modified:
trunk/core/src/webapp/WEB-INF/etc/config/jahia.skeleton
Modified: trunk/core/src/webapp/WEB-INF/etc/config/jahia.skeleton
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/webapp=
/WEB-INF/etc/config/jahia.skeleton&rev=3D19468&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/core/src/webapp/WEB-INF/etc/config/jahia.skeleton (original)
+++ trunk/core/src/webapp/WEB-INF/etc/config/jahia.skeleton Tue Jan 8 13:4=
9:59 2008
@@ -1,18 +1,18 @@
#
# Copyright 2002-2006 Jahia Ltd
#
-# Licensed under the JAHIA COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (JC=
DDL), =
-# Version 1.0 (the "License"), or (at your option) any later version; you =
may =
-# not use this file except in compliance with the License. You should have =
-# received a copy of the License along with this program; if not, you may =
obtain =
-# a copy of the License at =
+# Licensed under the JAHIA COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (JC=
DDL),
+# Version 1.0 (the "License"), or (at your option) any later version; you =
may
+# not use this file except in compliance with the License. You should have
+# received a copy of the License along with this program; if not, you may =
obtain
+# a copy of the License at
#
# http://www.jahia.org/license/
#
-# Unless required by applicable law or agreed to in writing, software =
-# distributed under the License is distributed on an "AS IS" BASIS, =
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. =
-# See the License for the specific language governing permissions and =
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
# limitations under the License.
#
=
@@ -20,10 +20,10 @@
# | Jahia main configuration file. =
|
# +-----------------------------------------------------------------------=
----+
#
-# This file contains some of the most important settings for configuratio=
n =
-# it's behavior. =
=
-# Other interesting files can be found elsewhere in the WEB-INF/etc =
=
-# directory, such as WEB-INF/etc/ldap for LDAP connection properties, =
=
+# This file contains some of the most important settings for configuration
+# it's behavior.
+# Other interesting files can be found elsewhere in the WEB-INF/etc
+# directory, such as WEB-INF/etc/ldap for LDAP connection properties,
# or WEB-INF/etc/spring for LDAP connector activation, cache implementati=
on
# configuration, Hibernate configuration, etc.
=
@@ -36,8 +36,8 @@
release =3D
server =3D
# The server home disk path is application server specific, and is used
-# to deploy and configure new portlets, as well as other specific =
-# adjusments such as Tomcat's in-memory realm automatic updating =
+# to deploy and configure new portlets, as well as other specific
+# adjusments such as Tomcat's in-memory realm automatic updating
# (tomcat-users.xml files).
serverHomeDiskPath =3D
=
@@ -46,7 +46,7 @@
### Disk Paths ######################################################
######################################################################
# The following disk paths configure where Jahia will store data on disk,
-# such as temporary files or content files, or even in some cases where =
+# such as temporary files or content files, or even in some cases where
# it will retrieve additionnal configuration from.
=
jahiaJspDiskPath =3D /jsp/jahia/
@@ -96,7 +96,7 @@
######################################################################
### Mail Service Configuration #######################################
######################################################################
-# These settings configure how Jahia will send messages for =
+# These settings configure how Jahia will send messages for
# error reports.
mail_service_activated =3D false
mail_server =3D
@@ -112,10 +112,10 @@
######################################################################
### Database ########################################################
######################################################################
-# Database connection configuration is no longer configured through =
+# Database connection configuration is no longer configured through
# the following settings, but rather through container-managed
-# datasource connection. In Tomcat these can be found in the =
-# following file : =
+# datasource connection. In Tomcat these can be found in the
+# following file :
# tomcat/conf/Catalina/localhost/jahia.xml
db_script =3D hypersonic.sc=
ript
db_driver =3D org.hsqldb.jd=
bcDriver
@@ -168,9 +168,9 @@
# this limit must be express in MB size
freeMemoryLimit =3D 64MB
=
-# The following setting allows to select the underlying cache implementati=
on used =
-# in the Jahia's cluster cache implementations. Possible values are : =
-# - jahiaReferenceCache : a cache implementation that uses SoftReferences =
to =
+# The following setting allows to select the underlying cache implementati=
on used
+# in the Jahia's cluster cache implementations. Possible values are :
+# - jahiaReferenceCache : a cache implementation that uses SoftReferences =
to
# hold references to the cached objects. This cache will free memory in =
order
# to avoid OutOfMemory errors.
# - jahiaSimpleCache : an LRU cache implementation that uses the freeMemor=
yLimit
@@ -499,23 +499,23 @@
### Concurrent processing options ####################################
######################################################################
#
-# This variable controls how many threads are allowed to do heavy weight =
+# This variable controls how many threads are allowed to do heavy weight
# processing (page creation not served from the cache)
maxParallelProcessings =3D 40
# This variable controls how long threads are waiting to be able to start
# generating pages in heavy load situations (value in milliseconds)
pageGenerationWaitTime =3D 30000
# This variable controls the setting of the HTTP Retry-After header, which=
is sent
-# back to the client with a HTTP status code 503 (Service temporarily unav=
ailable). =
+# back to the client with a HTTP status code 503 (Service temporarily unav=
ailable).
# It could be used also to trigger an automatic reload (value in seconds).
suggestedRetryTimeAfterTimeout =3D 60
# This variable controls how long threads are waiting to be able to start
-# generating pages, when load is coming during server startup =
+# generating pages, when load is coming during server startup
# (value in milliseconds)
pageGenerationWaitTimeOnStartup =3D 10000
# This variable controls the setting of the HTTP Retry-After header, which=
is sent
-# back to the client with a HTTP status code 503 (Service temporarily unav=
ailable), =
-# when it was triggered during server startup. It could be used also to tr=
igger =
+# back to the client with a HTTP status code 503 (Service temporarily unav=
ailable),
+# when it was triggered during server startup. It could be used also to tr=
igger
# an automatic reload (value in seconds).
suggestedRetryTimeAfterTimeoutOnStartup =3D 15
=
@@ -824,7 +824,7 @@
######################################################################
### Wizard-inserted properties ######################################
######################################################################
-# The following settings were inserted into this file by the =
+# The following settings were inserted into this file by the
# configuration wizard and therefore are not documented.
=
######################################################################
@@ -848,7 +848,7 @@
### hibernate batch loading #######################################
######################################################################
# These parameters are used to enable or disable batch loading with hibern=
ate.
-# =
+#
batchLoadingEnabled =3D true
batchLoadingSize =3D 20
=
@@ -856,7 +856,7 @@
### search max hits limit #######################################
######################################################################
# These parameters are used to limit the search max hits.
-# =
+#
=
#max lucene documents allowed to evaluate for computing hits. Unlimited =
=3D -1.
searchMaxLuceneDocs =3D 200000
@@ -908,4 +908,4 @@
# Pattern for the group name validation. The new group name will be
# tested against this regular expression (see java.util.regex.Pattern)
# pattern.
-userManagementGroupNamePattern =3D [0-9a-z_A-Z\\-=
\\{\\}]+
\ No newline at end of file
+userManagementGroupNamePattern =3D [0-9a-z_A-Z\\-=
\\{\\}]+
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
