knguyen 2005/04/07 18:19:06 CEST
Modified files:
. build.xml
etc JahiaUpdate.properties jahia.properties
src/java/org/jahia/update JahiaUpdate.java
Log:
- last change for migrating from 404 top 405
Revision Changes Path
1.8 +8 -5 jahia_update/build.xml
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia_update/build.xml.diff?r1=1.7&r2=1.8&f=h
1.9 +12 -7 jahia_update/etc/JahiaUpdate.properties
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia_update/etc/JahiaUpdate.properties.diff?r1=1.8&r2=1.9&f=h
1.3 +151 -35 jahia_update/etc/jahia.properties
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia_update/etc/jahia.properties.diff?r1=1.2&r2=1.3&f=h
1.8 +2 -2 jahia_update/src/java/org/jahia/update/JahiaUpdate.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia_update/src/java/org/jahia/update/JahiaUpdate.java.diff?r1=1.7&r2=1.8&f=h
Index: build.xml
===================================================================
RCS file: /home/cvs/repository/jahia_update/build.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- build.xml 17 Nov 2003 12:54:51 -0000 1.7
+++ build.xml 7 Apr 2005 16:19:05 -0000 1.8
@@ -28,14 +28,14 @@
<property name="version" value="1.0"/>
<!-- 1) Give here the jahia deployment dir for the tests !!! -->
- <property name="deploy.webappsroot"
value="d:\devel\_cvs_checkout\deployed_jahia4\tomcat\webapps"/>
+ <property name="deploy.webappsroot"
value="c:\jahia405_build6020\tomcat\webapps"/>
<!-- 2) Give here the jahia build dir (from the dev dir) -->
- <property name="jahia" value="d:/devel/jahia_32"/>
+ <property name="jahia" value="d:/devel/_cvc_checkout\jahia_4_0_5"/>
<property name="jahia.classes" value="${jahia}/build/classes"/>
<!-- 3) Give here the jahia build number -->
<property name="buildNb" value="-1"/>
<!-- 4) Give here the jahia update package name -->
- <property name="packageName" value="JahiaUpdate_4_0_1.jar"/>
+ <property name="packageName" value="JahiaUpdate_4_0_5.jar"/>
<!-- 5) Give here the jahia resource package name -->
<property name="resourceName" value="jahiaResources.jar"/>
@@ -92,14 +92,13 @@
deprecation="${deprecation}"
optimize="${optimize}">
</javac>
-
<!-- copy resources bundle properties files -->
<copy todir="${build.classes}">
<fileset dir="${src.java}" excludes="*.java">
<include name="*.properties"/>
</fileset>
</copy>
-
+
</target>
@@ -168,6 +167,7 @@
<!-- ===================================================================
-->
<target name="package" depends="prepare">
<mkdir dir="${build.classes}/${resources}" />
+ <!--
<jar basedir="${jahia.classes}"
jarfile="${build.classes}/${resources}/jahia.jar">
<exclude name="*.properties"/>
@@ -176,6 +176,7 @@
<exclude name="**/*MakeJEF.class*"/>
<exclude name="**/*MakeLicense.class*"/>
</jar>
+ -->
<!-- Alas, don't work very well... any other idea ?
<exec executable="cvs" output="lastdiff1.txt">
<arg line="diff -r JAHIA_3_1_0_FINAL C:/java/jahia_31"/>
@@ -183,6 +184,7 @@
<exec executable="cat" output="lastdiff2.txt">
<arg line="lastdiff.txt | grep Index:"/>
</exec> -->
+ <!--
<exec executable="java">
<arg line="-classpath ${jahia.classes}
org.jahia.license.MakeLicense"/>
<arg line="-licenseType 2 -pageLimit 200 -templateLimit 30
-userLimit 20 -siteLimit 2 -licenseID -1 -build ${buildNb} -release -1.0"/>
@@ -192,6 +194,7 @@
<include name="jahia.license"/>
</fileset>
</copy>
+ -->
<!--
<exec executable="java">
<arg line="-classpath build/classes org.jahia.preupdate.PreUpdate"/>
Index: JahiaUpdate.properties
===================================================================
RCS file: /home/cvs/repository/jahia_update/etc/JahiaUpdate.properties,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- JahiaUpdate.properties 17 Nov 2003 12:54:51 -0000 1.8
+++ JahiaUpdate.properties 7 Apr 2005 16:19:05 -0000 1.9
@@ -16,23 +16,22 @@
#
# Here some keywords that permit the administrator to identify the update
-synopsis = MSSQL Server support is back again.\nAuto-resize the
textarea.\nInfo icons in workflow page tree now flash also when there are
warnings.\nMade all popup windows resizable and adjust window sizes so that
most of the content will fit in the popups.\nReduced the rights select input
element to 24 instead of 25 to fit in a height of 768 pixels.\nUsers with write
permission are now allowed to change application roles.\nCorrect page count SQL
request to really return only the number of live pages.\nAdded a display of the
expiration date in the license information page in Jahia
administration..\nPreview and compare mode allowed for admin
access.\nVersioning allowed if user has write access.\nModified size of window
for user/group selection in application roles.\nAdded missing i18n resource
keys for application field.\nOptimizations of tree display in the
filemanager.\nIntroducing new jahia properties to control encoding.\nAdd a
category to debug the templates.\nChanged
method for initializing context path and servlet path static variables in
Jahia servlet init() method.\nWe now use web.xml init parameters.\nResize user
and group field in ACL display.\nCleaner implementation of default servlet
mapping handling configured in the web.xml deployment descriptor.\nRemoving
' from TextHtml encoder because it is not supported in HTML 4, only in
XHTML 1.0.\nHandle case insentivity in attribute names for categories
management.\nAdding Slide code to Jahia source code for better dependency
management and removing JARs.\nImproved support for LDAP groups.\nUpdated COS
Library to latest version that hopefully supports I18N file names.\nAdded tests
when displaying hardcoded links in delete container engine so that versioned
and deleted content is never displayed.\nChange absolute URLs to relative for
Jahia startup page.
-
+synopsis = Load balancing.\n HtmlArea.\n
# Here the Bugzilla IDs list of bugs/changes this patch/upgrade
-bugFixed = WebLogic compatibility changes and performance improvements.\nFix
to get WebLogic to handle content type changes correctly.\nBugfix in group and
user manager provider priorities.\nIf no priority was set we use the ordering
of the XML file.\nMS Word file indexing should work again now.\nVersioning
issues: when restoring a page or container, do not restore content page fields;
restoring moved pages take care of infinite loop in acl reparenting ACL;
ContentObject copyEntry bugfix Sharedlang.\nAdded 250 byte limit check in page
field title that checks the length in byte instead of characters because some
databases like Oracle seem to store bytes instead of characters for VARCHAR2
types.\n32-bit overflow corrected in expiration date calculation.\nPermission
check for Html Editors and Versioning access.\nBugfix page link ACL.\nCorrected
algorithm to retrieve users that have read and write admins to only retrieve
user list from the local ACL instead of request all the
users in all the providers which was causing huge slowdowns on some LDAP
installations.\nCorrected method to accept a "null" parameter value for the
getUsernameListAlsoGroupUsers method.\nUpload files / create directory
operations are now only available where allowed.\nFields in a container that
contains a page field should now all be properly activated when the page
contained in the field is activated.\nFix in application engine that should
work with new user and group selection popups.\nCorrected small problem in
Administration that was adding an UTF-8 too much in the content type
string.\nDuring WebDAV migration, the field title is now properly inserted into
the file's DAV displayname property.\nWebDAV migration changes to remove "+"
characters (replaced by spaces), and also to support decoding of character
entity ' (single quote).\nContainer filtering handle null container.\nPage
output cache is now flushed when an engine acquires a lock so that the other
user's usin
g the system properly see the locks displayed on the page.\nCheck if
shutdown.sh script exist befor running it.
+bugFixed = See history.txt
# This update will grant Jahia to this version
-updateVersion = 4.0.1
+updateVersion = 4.0.5
# The Jahia CVS status date when this update was build.
-date = November/03/2003
+date = December/14/2004
# Kind of update [patch | upgrade | plugin]
updateType = patch
# Floor release allowing to apply this update
-releaseBase = 4.0
-buildNumberBase = 5085
+releaseBase = 4.0.4
+buildNumberBase = 5822
# Current Jahia Edition
jahiaEdition = 4
@@ -45,3 +44,9 @@
# the new jahia.properties skeleton file
newJahiaPropertiesFile = jahia.properties
+
+# jahia.properties key to remove
+jahiaProperties.key.to.remove =
+
+# jahia.properties key to update ( the value defined in the jahia.skeleton
will override the existing value in old jahia.properties )
+jahiaProperties.key.to.update =
Index: jahia.properties
===================================================================
RCS file: /home/cvs/repository/jahia_update/etc/jahia.properties,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- jahia.properties 17 Nov 2003 12:54:51 -0000 1.2
+++ jahia.properties 7 Apr 2005 16:19:05 -0000 1.3
@@ -19,6 +19,8 @@
jahiaEtcDiskPath =
jahiaVarDiskPath =
jahiaFilesBigTextDiskPath =
+slideContentDiskPath =
$context/WEB-INF/var/content/slide/
+tmpContentDiskPath =
$context/WEB-INF/var/content/tmp/
jahiaFilesTemplatesDiskPath =
jahiaNewTemplatesDiskPath =
@@ -47,7 +49,7 @@
siteIDInURL = false
-### Jahia Mail ######################
+### Mail Service Configuration #######
mail_server =
mail_administrator =
@@ -63,20 +65,39 @@
db_username = sa
db_password =
db_transactions = false
+db_support_embedded_select_statement =
true
+# The settings below are no longer used, please use the dbpool.properties
+# file to configure the connection pool.
db_min_connections = 10
db_max_connections = 50
db_waitIfBusy = true
db_verbose = false
db_veryVerbose = false
-### Characters encoding ##############
+### Datasource ########################
+# this parameter will allow Jahia to seek for a Datasource defined
+# in the appserver context before using direct connection pooling.
+# leave it blank to use standard Jahia behavior
+
+datasource.name =
+### Characters encoding ##############
+# Global encoding parameter, used to encode content to/from the database
utf8Encoding = false
# You may need to change the following values depending on the servlet
# container you are using. The default values here are designed to work
# with Tomcat.
+#
+# Default encoding for the output generated by Jahia :
+defaultResponseBodyEncoding = ISO-8859-1
+# Default encoding for URI and URLs send to Jahia :
+defaultURIEncoding = UTF-8
+
+# You may need to change the following values depending on the servlet
+# container you are using. The default values here are designed to work
+# with Tomcat.
defaultResponseBodyEncoding = ISO-8859-1
defaultURIEncoding = UTF-8
@@ -84,17 +105,29 @@
# Must be leave to true. If you want to deactivate locks,
# Make the LockService using DummyLockService
locksActivated = true
+fileLockOnPublication = false
-### Output cache #####################
-
-outputCacheActivated = true
-# the following value is in milliseconds, set to -1 for no time expiration
-outputCacheDefaultExpirationDelay = 120000
### Cache settings ###################
-# these are all commented out. The values here are the default values
-
+#
+# By default cache have no limits. If you want to set a size
+# limit for a cache, use the following syntax :
+#
+# max_cached_CACHENAME = LIMIT
+#
+# where CACHENAME is the name of the cache that corresponds
+# to the "Server and Cache Status" name in parenthesis, and
+# LIMIT is a number that corresponds to the max number of
+# entries we want to allow in the cache.
+#
+# Here below we present some example, but note that these are not
+# the complete number of caches in Jahia.
+#
+# For the meantime there are some caches you should leave unlimited,
+# such as the ACL caches, otherwise Jahia will not behave properly
+# (it assumes the whole content of the DB table is in memory).
+#
#max_cached_ContentFieldCache = 20000
#max_cached_FieldCache = 20000
#max_cached_PageChildCache = 10000
@@ -105,37 +138,51 @@
#max_cached_LDAPUsersCache = 20000
#max_cached_PortletsOutputCache = 10000
#max_cached_PortletsRequestCache = 10000
+#
+# Usually the only cache we recommend that you limit is the output (HTML)
+# cache, which can be configured like this :
+#
+#max_cached_HTMLCache = 2000
+
+### Output cache #####################
+# The output (HTML) cache may also be controlled in more detail with the
+# following parameters.
+outputCacheActivated = true
+# the following value is in milliseconds, set to -1 for no time expiration
+outputCacheDefaultExpirationDelay = -1
### JMS Cache Settings ###############
-org.jahia.cache.jmsCacheActivated = false
-org.jahia.cache.jmsCacheInitialContextFactory =
org.exolab.jms.jndi.InitialContextFactory
-org.jahia.cache.jmsCacheContextProviderURL =
rmi\://localhost\:1099/
-org.jahia.cache.jmsCacheTopicConnectionFactoryName =
JmsTopicConnectionFactory
-org.jahia.cache.jmsCacheTopicName = jahiaCache
+org.jahia.cache.jmsCacheActivated = false
+org.jahia.cache.jmsCacheInitialContextFactory =
org.exolab.jms.jndi.InitialContextFactory
+org.jahia.cache.jmsCacheContextProviderURL =
rmi://localhost:1099/
+org.jahia.cache.jmsCacheTopicConnectionFactoryName =
JmsTopicConnectionFactory
+org.jahia.cache.jmsCacheTopicName = jahiaCache
+org.jahia.cache.jmsCacheMaxMessagesInPackage = 2000
org.jahia.cache.jmsServerLookupSleepTime = 10000
### JMX Settings #####################
-org.jahia.jmx.httpAdaptorActivated = true
-org.jahia.jmx.xslProcessorActivated = true
-org.jahia.jmx.rmiAdaptorActivated = false
-org.jahia.jmx.httpHostName = localhost
-org.jahia.jmx.httpPort = 8082
-org.jahia.jmx.httpAuthorizationMode = basic
-org.jahia.jmx.httpAuthorizationUser = jmx
-org.jahia.jmx.httpAuthorizationPassword = jahiajmx
-org.jahia.jmx.httpProcessorNameString =
Server\:name=XSLTProcessor
+org.jahia.jmx.activated = false
+org.jahia.jmx.httpAdaptorActivated = false
+org.jahia.jmx.xslProcessorActivated = false
+org.jahia.jmx.rmiAdaptorActivated = false
+org.jahia.jmx.httpHostName = localhost
+org.jahia.jmx.httpPort = 8082
+org.jahia.jmx.httpAuthorizationMode = basic
+org.jahia.jmx.httpAuthorizationUser = jmx
+org.jahia.jmx.httpAuthorizationPassword = jahiajmx
+org.jahia.jmx.httpProcessorNameString =
Server:name=XSLTProcessor
# org.jahia.jmx.httpSocketFactoryNameString =
-org.jahia.jmx.rmiSSLServerSocketFactoryActivated = false;
-org.jahia.jmx.rmiSSLServerSocketFactoryKeyStoreName =
-org.jahia.jmx.rmiSSLServerSocketFactoryKeyStorePassword =
-org.jahia.jmx.rmiSSLServerSocketFactoryKeyManagerPassword =
+org.jahia.jmx.rmiSSLServerSocketFactoryActivated = false
+org.jahia.jmx.rmiSSLServerSocketFactoryKeyStoreName =
+org.jahia.jmx.rmiSSLServerSocketFactoryKeyStorePassword =
+org.jahia.jmx.rmiSSLServerSocketFactoryKeyManagerPassword =
### Template set #####################
-default_templates_set =
corporate_portal_templates
+default_templates_set =
corporate_portal_templates
### Filemanager #####################
@@ -147,19 +194,22 @@
### Templates Observer ##############
jahiaTemplatesAutoDeploy = 1
-templates.observer.interval = 3000
+# Time in milliseconds between checks in the new_templates directory for new
+# templates to deploy. Set to -1 to deactivate file watching completely.
+templates.observer.interval = 5000
templates.observer.checkmode = ALL
### WebApps Observer ################
jahiaWebAppsAutoDeploy = 1
-webapps.observer.interval = 3000
+# Time in milliseconds between checks in the new_webapps directory for new
+# webapps to deploy. Set to -1 to deactivate file watching completely.
+webapps.observer.interval = 5000
webapps.observer.checkmode = ALL
### WebApps Dispatcher ##############
-webapps.dispatcher.debug = false
webapps.dispatcher.inheritJahiaSessionAttributes = false
### Audit log #######################
@@ -174,14 +224,79 @@
org.jahia.acl.preload_count = 10000
-### Tidy Configuration file ###################
-# this file must be located in <jahia>/web-inf/etc/config dir.
+### Page properties ##################
+
+org.jahia.pages.properties.preload_count = 2000
+### Tidy Configuration file ##########
+# this file must be located in <jahia>/web-inf/etc/config dir.
tidyConfig = tidy.properties
+### WebDAV processing options ########
+# Specifies whether we should transform file names because of compatibility
+# problems with Windows WebDAV implementation.
+transformFilenames = false
+# Same option for directories, set to true by default because there are
+# serious bugs in Windows' WebDAV implementation when using non ISO-8859-1
+# characters.
+transformDirnames = true
+
+### Authentification pipeline ###################
+#
+# Jahia now uses a pipeline mechanism to process user authentification, which
+# allows developers to extend the system for custom authentification
back-ends.
+#
+# You might want to modify the pipeline if you want to extend Jahia's
+# authentification system, for example by adding a JAASAuthValve or something
+# else.
+#
+# Name of the file containing the valve configuration for the
authentification
+# pipeline
+authPipelineFileName =
/WEB-INF/etc/config/auth-pipeline.xml
+# Class name for the pipeline implementation to use when creating the
+# authorization pipeline.
+authPipelineClassName =
org.jahia.pipelines.impl.GenericPipeline
+
+### Cookie authentification valve config ########
+#
+# The cookie authentification valve is a system that uses cookies to store
+# an identifier corresponding to a specific Jahia user, when he selects the
+# "remember me" option in the login engine.
+#
+# Should we use cookie authentification for login ?
+cookieAuthActivated = true
+#
+# length of cookie identifier key for user. This is the actual value
+# stored in the cookie, so make sure it is long enough to improve security.
+cookieAuthIDLength = 40
+# name of user property under which we store the cookie identifier key in
+# Jahia's database, for matching with the value coming from the cookie.
+cookieAuthUserPropertyName =
org.jahia.user.cookieauth.id
+# cookie name. It is a good idea to keep this name a bit cryptic so that
+# even if someone steals the cookie he doesn't necessarily understand it.
+cookieAuthCookieName = jid
+# age of cookie in seconds. So basically a value of 2592000 is 30 days
+# expiration, which means that if the user doesn't come back to the site
during
+# 30 days he will then have to login again. The way the cookie is renewed
+# depends how the cookieAuthRenewalActivated setting is set.
+cookieAuthMaxAgeInSeconds = 2592000
+# Cookie renewal means that if a user is recognized using a cookie, the age
in
+# seconds will be reset. So it means that every time the user comes in and is
+# recognized using a cookie, the cookie age will be reset to the value
defined
+# in cookieAuthMaxAgeInSeconds. If this setting is false, cookies will not be
+# renewed, and after the cookie expires the user will have to login again.
+# For a more natural behavior, it is best to set this setting to true and
leave
+# the age in seconds to a value in days.
+cookieAuthRenewalActivated = true
+
+### Scheduler config ################
+# Path to scheduler configuration
+schedulerConfigFile =
$context/WEB-INF/etc/config/quartz.properties
+tidyConfig = tidy.properties
### Jahia Services ##################
-
+# You should never need to change these unless you are doing some
customizations
+# to Jahia and want to replace a default service implementation.
JahiaIncrementorsDBService =
org.jahia.services.database.JahiaIncrementorsDBBaseService
JahiaFileTransferService =
org.jahia.services.files.JahiaFileTransferBaseService
JahiaTextFileService =
org.jahia.services.files.JahiaTextFileBaseService
@@ -213,7 +328,6 @@
JahiaSiteUserManagerService =
org.jahia.services.usermanager.JahiaSiteUserManagerDBService
JahiaSiteGroupManagerService =
org.jahia.services.usermanager.JahiaSiteGroupManagerDBService
AppsShareService =
org.jahia.services.shares.AppsShareBaseService
-CacheServerService =
org.jahia.services.htmlcache.CacheServerMemoryService
JahiaHomepagesService =
org.jahia.services.homepages.JahiaHomepagesBaseService
JahiaVersionService =
org.jahia.services.version.JahiaVersionDBService
JahiaCacheService =
org.jahia.services.cache.CacheFactory
@@ -222,8 +336,10 @@
JahiaResourceBundleService =
org.jahia.resourcebundle.ResourceBundleBaseService
MailService =
org.jahia.services.mail.MailService
LockService =
org.jahia.services.lock.LockRegistry
+#LockService =
org.jahia.services.lock.DummyLockRegistry
CategoryService =
org.jahia.services.categories.CategoryServiceImpl
HtmlParserService =
org.jahia.services.htmlparser.HtmlParserBaseService
URLRewritingService =
org.jahia.services.urlrewriting.URLRewritingService
+SchedulerService =
org.jahia.services.scheduler.SchedulerServiceImpl
Index: JahiaUpdate.java
===================================================================
RCS file:
/home/cvs/repository/jahia_update/src/java/org/jahia/update/JahiaUpdate.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- JahiaUpdate.java 17 Nov 2003 12:54:51 -0000 1.7
+++ JahiaUpdate.java 7 Apr 2005 16:19:05 -0000 1.8
@@ -102,7 +102,7 @@
msg.append("\n");
msg.append(" . . . j a h i a u p d a t e " +
UPDATE_VERSION + " . . .\n");
msg.append("\n\n");
- msg.append(" Copyright 2002 - Jahia http://www.jahia.org - all
rights reserved\n");
+ msg.append(" Copyright 2003 - Jahia http://www.jahia.org - all
rights reserved\n");
msg.append("\n\n");
System.out.println(msg.toString());
}
@@ -143,7 +143,7 @@
msg.append("2) Jahia database system should be in function.\n");
msg.append(" If you are using Hypersonic SQL, please restart it
manually\n");
msg.append("3) Please ensure that you have made an appropriate
backup.\n");
- msg.append("4) INSTALL THIS PATCH ONLY IF THE FULL 4.0.0 JAHIA
VERSION \n");
+ msg.append("4) INSTALL THIS PATCH ONLY IF THE FULL 4.0.4 JAHIA
VERSION \n");
msg.append(" HAVE BEEN INSTALLED.\n");
System.out.println(msg.toString());
String str = " ";
