Merged 1.4 to HEAD

svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4296 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4301 .
   svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4302 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4303 .


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@4636 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261

config/alfresco/extension/custom-data-location.properties.sample

@@ -1,5 +0,0 @@
-#
-# Sample custom content and index data location
-#
-
-dir.root=/srv/alfresco/data

config/alfresco/extension/custom-hibernate-dialect.properties.sample

@@ -1,7 +1,3 @@
-# Sample Hibernate configuration to disnable Hibernate schema updates
-# Values are "validate" or "update" (default)
-#hibernate.hbm2ddl.auto=validate
-
 #
 # Sample Hibernate configuration for changing Database dialect
 # For a full list: http://www.hibernate.org/hib_docs/v3/reference/en/html_single/#configuration-optional-dialects

config/alfresco/extension/custom-repository-context.xml.sample

@@ -15,15 +15,12 @@
         </property>
         <property name="locations">
             <list>
-                <value>classpath:alfresco/alfresco-shared.properties</value>
                 <value>classpath:alfresco/repository.properties</value>
                 <value>classpath:alfresco/version.properties</value>
                 <value>classpath:alfresco/domain/transaction.properties</value>
 
-                <!-- Override data location properties -->
-                <value>classpath:alfresco/extension/custom-data-location.properties</value>
-                <!-- Override database connection properties -->
-                <value>classpath:alfresco/extension/custom-db-connection.properties</value>
+                <!-- Override basic repository properties -->
+                <value>classpath:alfresco/extension/custom-repository.properties</value>
             </list>
         </property>
     </bean>
@@ -39,4 +36,4 @@
         </property>
     </bean>
     
-</beans>
+</beans>

config/alfresco/extension/custom-repository.properties.sample

@@ -1,13 +1,28 @@
+###############################
+## Common Alfresco Properties #
+###############################
+
+#
+# Sample custom content and index data location
+#
+#dir.root=/srv/alfresco/data
+
 #
 # Sample database connection properties
 #
-
-#db.schema.update=true
 #db.username=alfresco
 #db.password=alfresco
 #db.pool.initial=10
 #db.pool.max=100
 
+#
+# Property to control whether schema updates are performed automatically.
+# Updates must be enabled during upgrades as, apart from the static upgrade scripts,
+# there are also auto-generated update scripts that will need to be executed.  After
+# upgrading to a new version, this can be disabled.
+#
+#db.schema.update=true
+
 #
 # HSQL connection
 #
@@ -41,7 +56,5 @@
 #
 # SQLServer connection using Microsoft JDDB driver
 #
-#db.username=sa
-#db.password=sa
 #db.driver=com.microsoft.sqlserver.jdbc.SQLServerDriver
 #db.url=jdbc:sqlserver://localhost;DatabaseName=alfresco