Merged up to HEAD.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@3129 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261

config/alfresco/repository.properties

@@ -17,6 +17,11 @@ dir.indexes.lock=${dir.indexes}/locks
 # Lucene configuration #
 # #################### #
 #
+# Millisecond threshold for text transformations
+# Slower transformers will force the text extraction to be asynchronous
+#
+lucene.maxAtomicTransformationTime=20
+#
 # The maximum number of clauses that are allowed in a lucene query 
 #
 lucene.query.maxClauses=10000
@@ -54,11 +59,8 @@ db.name=alfresco
 db.url=jdbc:mysql:///${db.name}
 db.username=alfresco
 db.password=alfresco
-
-#db.name=alfresco
-#db.url=jdbc:mysql://qasi/${db.name}
-#db.username=alfresco
-#db.password=alfresco
+db.pool.initial=10
+db.pool.max=20
 
 # Email configuration
 
@@ -66,6 +68,8 @@ mail.host=
 mail.port=25
 mail.username=anonymous
 mail.password=
+# Set this value to UTF-8 or similar for encoding of email messages as required
+mail.encoding=
 
 # System Configuration