Afternoon merge.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@2915 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Britt Park
2006-05-17 22:42:03 +00:00
parent 8818e8daba
commit bfd0d2a337
17 changed files with 445 additions and 85 deletions

View File

@@ -2,7 +2,7 @@
# Hibernate configuration
#
hibernate.jdbc.use_streams_for_binary=true
hibernate.dialect=org.hibernate.dialect.MySQLDialect
hibernate.dialect=org.hibernate.dialect.MySQLInnoDBDialect
hibernate.show_sql=false
hibernate.hbm2ddl.auto=update
hibernate.cache.use_query_cache=true

View File

@@ -1,5 +1,10 @@
# 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
#
#

View File

@@ -279,8 +279,8 @@
<property name="id"><value>patch.forumsIcons</value></property>
<property name="description"><value>patch.forumsIcons.description</value></property>
<property name="fixesFromSchema"><value>0</value></property>
<property name="fixesToSchema"><value>7</value></property>
<property name="targetSchema"><value>8</value></property>
<property name="fixesToSchema"><value>12</value></property>
<property name="targetSchema"><value>13</value></property>
<property name="importerBootstrap">
<ref bean="spacesBootstrap" />
</property>
@@ -289,8 +289,8 @@
<property name="id"><value>patch.emailTemplatesFolder</value></property>
<property name="description"><value>patch.emailTemplatesFolder.description</value></property>
<property name="fixesFromSchema"><value>0</value></property>
<property name="fixesToSchema"><value>8</value></property>
<property name="targetSchema"><value>9</value></property>
<property name="fixesToSchema"><value>12</value></property>
<property name="targetSchema"><value>13</value></property>
<!-- helper beans for execution -->
<property name="importerBootstrap">
<ref bean="spacesBootstrap" />
@@ -303,8 +303,8 @@
<property name="id"><value>patch.emailTemplatesContent</value></property>
<property name="description"><value>patch.emailTemplatesContent.description</value></property>
<property name="fixesFromSchema"><value>0</value></property>
<property name="fixesToSchema"><value>9</value></property>
<property name="targetSchema"><value>10</value></property>
<property name="fixesToSchema"><value>12</value></property>
<property name="targetSchema"><value>13</value></property>
<property name="templatesACP"><value>alfresco/templates/email_templates.acp</value></property>
<!-- helper beans for execution -->
<property name="importerBootstrap">

View File

@@ -134,7 +134,7 @@
</property>
</bean>
<!-- enable DEBUG for 'org.alfresco.repo.cache.EhCacheTracerJob' to activate -->
<!-- enable DEBUG for 'org.alfresco.repo.cache.EhCacheTracerJob' and enable scheduler property to activate -->
<bean id="ehCacheTracerJob" class="org.alfresco.util.TriggerBean">
<property name="jobDetail">
<bean id="ehCacheTracerJobDetail" class="org.springframework.scheduling.quartz.JobDetailBean">
@@ -143,6 +143,11 @@
</property>
</bean>
</property>
<!-- enable this to activate bean
<property name="scheduler">
<ref bean="schedulerFactory" />
</property>
-->
<property name="startDelay">
<value>3600000</value><!-- start after an hour -->
</property>