inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-07-24 17:32:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged V2.2 to HEAD

Browse Source 
8372: Merged V2.1 to V2.2
      8314: Merged V2.0 to V2.1
         7750: Fix for ACT-475: ContentStoreCleaner causes OutOfMemoryError
      8332: Made content URL column larger to accommodate the extra locale info present in 2.1
      8334: Build fix: V2.1 tighter on authentication for getTempWriter
   8376: Merged V2.1 to V2.2
      8325: Fix for AWC-1089
      8361: Workaround for WCM-882: All metadata extracters can now handle zero length files


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@8497 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Derek Hulley
2008-03-11 06:22:28 +00:00
parent ceed05d26f
commit cda4e6105f
33 changed files with 1102 additions and 246 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
config/alfresco/bootstrap-context.xml
View File

@@ -63,6 +63,7 @@
<ref bean="patch.db-V2.2-4-ExtraIndexesAndConstraints" />
<ref bean="patch.db-V2.2-5-MappedFKIndexes" />
<ref bean="patch.db-V1.4-TxnCommitTimeIndex" />
<ref bean="patch.db-V2.0-ContentUrls" />
<ref bean="patch.db-V2.1-JBPMData" />
<ref bean="patch.db-V2.1-VersionColumns2" />
<ref bean="patch.db-V2.1-JBPMProcessKey" />

3
config/alfresco/content-services-context.xml
View File

@@ -34,6 +34,9 @@
<property name="avmNodeDAO">
<ref bean="avmNodeDAO"/>
</property>
<property name="contentUrlDAO">
<ref bean="contentUrlDAO"/>
</property>
<property name="transactionService" >
<ref bean="transactionService" />
</property>

24
config/alfresco/dbscripts/upgrade/2.0/org.hibernate.dialect.Dialect/AlfrescoSchemaUpdate-2.0-ContentUrls.sql Normal file
View File

@@ -0,0 +1,24 @@
--
-- Title: Indexes for alf_content_url table
-- Database: Generic
-- Since: V2.0 Schema 44
-- Author: Derek Hulley
--
-- Please contact support@alfresco.com if you need assistance with the upgrade.
--
-- Content URLs
SELECT COUNT(*) FROM alf_content_url;
CREATE INDEX idx_alf_con_urls ON alf_content_url (content_url);(optional)
--
-- Record script finish
--
DELETE FROM alf_applied_patch WHERE id = 'patch.db-V2.0-ContentUrls';
INSERT INTO alf_applied_patch
(id, description, fixes_from_schema, fixes_to_schema, applied_to_schema, target_schema, applied_on_date, applied_to_server, was_executed, succeeded, report)
VALUES
(
'patch.db-V2.0-ContentUrls', 'Manually executed script upgrade V2.0: Indexes for alf_content_url table',
0, 43, -1, 44, null, 'UNKOWN', 1, 1, 'Script completed'
);

24
config/alfresco/dbscripts/upgrade/2.0/org.hibernate.dialect.PostgreSQLDialect/AlfrescoSchemaUpdate-2.0-ContentUrls.sql Normal file
View File

@@ -0,0 +1,24 @@
--
-- Title: Indexes for alf_content_url table
-- Database: PostgreSQL
-- Since: V2.0 Schema 44
-- Author: Derek Hulley
--
-- Please contact support@alfresco.com if you need assistance with the upgrade.
--
-- Content URLs
SELECT COUNT(*) FROM alf_content_url;
CREATE INDEX idx_alf_con_urls ON alf_content_url (content_url);(optional)
--
-- Record script finish
--
DELETE FROM alf_applied_patch WHERE id = 'patch.db-V2.0-ContentUrls';
INSERT INTO alf_applied_patch
(id, description, fixes_from_schema, fixes_to_schema, applied_to_schema, target_schema, applied_on_date, applied_to_server, was_executed, succeeded, report)
VALUES
(
'patch.db-V2.0-ContentUrls', 'Manually executed script upgrade V2.0: Indexes for alf_content_url table',
0, 43, -1, 44, null, 'UNKOWN', TRUE, TRUE, 'Script completed'
);

24
config/alfresco/hibernate-context.xml
View File

@@ -54,6 +54,9 @@
<!-- TODO: Move into org/alfresco/repo/domain/hibernate/ -->
<value>org/alfresco/repo/audit/hibernate/Audit.hbm.xml</value>
<!-- Content URL config -->
<value>org/alfresco/repo/domain/hibernate/ContentUrl.hbm.xml</value>
<!-- -->
<!-- JBoss jBPM Workflow Engine -->
<!-- -->
@@ -174,6 +177,8 @@
<prop key="org.alfresco.repo.audit.hibernate.AuditConfigImpl">${cache.strategy}</prop>
<prop key="org.alfresco.repo.audit.hibernate.AuditDateImpl">${cache.strategy}</prop>
<prop key="org.alfresco.repo.audit.hibernate.AuditSourceImpl">${cache.strategy}</prop>
<prop key="org.alfresco.repo.domain.hibernate.ContentUrlImpl">${cache.strategy}</prop>
</props>
</property>
<property name="collectionCacheStrategies" >
@@ -342,4 +347,23 @@
</property>
</bean>
<bean id="contentUrlDAO" class="org.springframework.aop.framework.ProxyFactoryBean">
<property name="proxyInterfaces">
<value>org.alfresco.repo.domain.ContentUrlDAO</value>
</property>
<property name="target">
<ref bean="contentUrlDAOImpl" />
</property>
<property name="interceptorNames">
<list>
<value>sessionSizeResourceInterceptor</value>
</list>
</property>
</bean>
<bean id="contentUrlDAOImpl" class="org.alfresco.repo.domain.hibernate.HibernateContentUrlDAOImpl">
<property name="sessionFactory">
<ref bean="sessionFactory"/>
</property>
</bean>
</beans>

16
config/alfresco/patch/patch-services-context.xml
View File

@@ -1407,4 +1407,20 @@
</property>
</bean>
<bean id="patch.db-V2.0-ContentUrls" class="org.alfresco.repo.admin.patch.impl.SchemaUpgradeScriptPatch" parent="basePatch">
<property name="id"><value>patch.db-V2.0-ContentUrls</value></property>
<property name="description"><value>patch.schemaUpgradeScript.description</value></property>
<property name="fixesFromSchema"><value>0</value></property>
<property name="fixesToSchema"><value>123</value></property>
<property name="targetSchema"><value>124</value></property>
<property name="scriptUrl">
<value>classpath:alfresco/dbscripts/upgrade/2.0/${db.script.dialect}/AlfrescoSchemaUpdate-2.0-ContentUrls.sql</value>
</property>
<property name="dependsOn" >
<list>
<ref bean="patch.db-V2.2-4-ExtraIndexesAndConstraints" />
</list>
</property>
</bean>
</beans>

2
config/alfresco/version.properties
View File

@@ -19,4 +19,4 @@ version.build=@build-number@
# Schema number
version.schema=123
version.schema=124