From 529c4840e94374cc3f7e22451d251e081ff88a2d Mon Sep 17 00:00:00 2001 From: Derek Hulley Date: Wed, 11 Apr 2007 19:05:40 +0000 Subject: [PATCH] Merged V2.0 to HEAD 5297: PostgreSQL upgrade support 5347: (From 1.4) EHCache configuration fixes and sample 5380, 5381: AWC-1143 5398: AWC-966 git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5479 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- config/alfresco/application-context.xml | 1 + config/alfresco/bootstrap-context.xml | 1 + config/alfresco/cache-context.xml | 45 +- ...escoSchemaUpdate-1.4-PostgresFKIndexes.sql | 15 + ...escoSchemaUpdate-1.4-PostgresFKIndexes.sql | 42 ++ config/alfresco/ehcache-default.xml | 34 +- config/alfresco/ehcache-transactional.xml | 1 + .../ehcache-custom.xml.sample.cluster | 507 ++++++++++++++++++ .../alfresco/patch/patch-services-context.xml | 16 + .../public-services-security-context.xml | 4 - .../action/executer/MailActionExecuter.java | 18 +- 11 files changed, 636 insertions(+), 48 deletions(-) create mode 100644 config/alfresco/dbscripts/upgrade/1.4/org.hibernate.dialect.Dialect/AlfrescoSchemaUpdate-1.4-PostgresFKIndexes.sql create mode 100644 config/alfresco/dbscripts/upgrade/1.4/org.hibernate.dialect.PostgreSQLDialect/AlfrescoSchemaUpdate-1.4-PostgresFKIndexes.sql create mode 100644 config/alfresco/extension/ehcache-custom.xml.sample.cluster diff --git a/config/alfresco/application-context.xml b/config/alfresco/application-context.xml index 0b7a896325..f3b1452f39 100644 --- a/config/alfresco/application-context.xml +++ b/config/alfresco/application-context.xml @@ -4,6 +4,7 @@ + diff --git a/config/alfresco/bootstrap-context.xml b/config/alfresco/bootstrap-context.xml index 85e5678033..e27523c9a2 100644 --- a/config/alfresco/bootstrap-context.xml +++ b/config/alfresco/bootstrap-context.xml @@ -46,6 +46,7 @@ + diff --git a/config/alfresco/cache-context.xml b/config/alfresco/cache-context.xml index 1b1f3f6540..e8f332438f 100644 --- a/config/alfresco/cache-context.xml +++ b/config/alfresco/cache-context.xml @@ -11,6 +11,7 @@ + @@ -39,16 +40,7 @@ - org.alfresco.userToAuthorityCache - - - 10000 - - - true - - - false + org.alfresco.cache.userToAuthorityCache @@ -84,16 +76,7 @@ - org.alfresco.permissionsAccessCache - - - 50000 - - - true - - - false + org.alfresco.cache.permissionsAccessCache @@ -130,16 +113,7 @@ - org.alfresco.nodeOwnerCache - - - 20000 - - - true - - - false + org.alfresco.cache.nodeOwnerCache @@ -175,16 +149,7 @@ - org.alfresco.ticketsCache - - - 1000 - - - true - - - false + org.alfresco.cache.ticketsCache diff --git a/config/alfresco/dbscripts/upgrade/1.4/org.hibernate.dialect.Dialect/AlfrescoSchemaUpdate-1.4-PostgresFKIndexes.sql b/config/alfresco/dbscripts/upgrade/1.4/org.hibernate.dialect.Dialect/AlfrescoSchemaUpdate-1.4-PostgresFKIndexes.sql new file mode 100644 index 0000000000..427cee8419 --- /dev/null +++ b/config/alfresco/dbscripts/upgrade/1.4/org.hibernate.dialect.Dialect/AlfrescoSchemaUpdate-1.4-PostgresFKIndexes.sql @@ -0,0 +1,15 @@ +-- +-- Foreign Key Indexes for PostgreSQL databases. (Generic Schema 1.4) +-- + +-- +-- Record script finish +-- +delete from alf_applied_patch where id = 'patch.db-V1.4-PostgresFKIndexes'; +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-V1.4-PostgresFKIndexes', 'Manually execute script AlfrescoSchemaUpdate-1.4-PostgresFKIndexes.sql', + 21, 24, -1, 25, null, 'UNKOWN', 1, 1, 'Script completed' + ); \ No newline at end of file diff --git a/config/alfresco/dbscripts/upgrade/1.4/org.hibernate.dialect.PostgreSQLDialect/AlfrescoSchemaUpdate-1.4-PostgresFKIndexes.sql b/config/alfresco/dbscripts/upgrade/1.4/org.hibernate.dialect.PostgreSQLDialect/AlfrescoSchemaUpdate-1.4-PostgresFKIndexes.sql new file mode 100644 index 0000000000..8fbc02d686 --- /dev/null +++ b/config/alfresco/dbscripts/upgrade/1.4/org.hibernate.dialect.PostgreSQLDialect/AlfrescoSchemaUpdate-1.4-PostgresFKIndexes.sql @@ -0,0 +1,42 @@ +-- +-- Foreign Key Indexes for PostgreSQL databases. (PostgreSQL Schema 1.4) +-- +CREATE INDEX FKFFF41F9960601995 ON alf_access_control_entry (permission_id); +CREATE INDEX FKFFF41F99B25A50BF ON alf_access_control_entry (authority_id); +CREATE INDEX FKFFF41F99B9553F6C ON alf_access_control_entry (acl_id); +CREATE INDEX FK8A749A657B7FDE43 ON alf_auth_ext_keys (id); +CREATE INDEX FKFFC5468E74173FF4 ON alf_child_assoc (child_node_id); +CREATE INDEX FKFFC5468E8E50E582 ON alf_child_assoc (parent_node_id); +CREATE INDEX FK60EFB626B9553F6C ON alf_node (acl_id); +CREATE INDEX FK60EFB626D24ADD25 ON alf_node (protocol, identifier); +CREATE INDEX FK7D4CF8EC7F2C8017 ON alf_node_properties (node_id); +CREATE INDEX FKD654E027F2C8017 ON alf_node_aspects (node_id); +CREATE INDEX FKE1A550BCB69C43F3 ON alf_node_assoc (source_node_id); +CREATE INDEX FKE1A550BCA8FC7769 ON alf_node_assoc (target_node_id); +CREATE INDEX FK71C2002B7F2C8017 ON alf_node_status (node_id); +CREATE INDEX FKBD4FF53D22DBA5BA ON alf_store (root_node_id); + +-- +-- Transaction tables +-- +CREATE INDEX FK71C2002B9E57C13D ON alf_node_status (transaction_id); +CREATE INDEX FKB8761A3A9AE340B7 ON alf_transaction (server_id); + +-- +-- New audit tables +-- +CREATE INDEX FKEAD1817484342E39 ON alf_audit_fact (audit_date_id); +CREATE INDEX FKEAD18174A0F9B8D9 ON alf_audit_fact (audit_source_id); +CREATE INDEX FKEAD18174F524CFD7 ON alf_audit_fact (audit_conf_id); + +-- +-- Record script finish +-- +delete from alf_applied_patch where id = 'patch.db-V1.4-PostgresFKIndexes'; +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-V1.4-PostgresFKIndexes', 'Manually execute script AlfrescoSchemaUpdate-1.4-PostgresFKIndexes.sql', + 21, 24, -1, 25, null, 'UNKOWN', TRUE, TRUE, 'Script completed' + ); \ No newline at end of file diff --git a/config/alfresco/ehcache-default.xml b/config/alfresco/ehcache-default.xml index 1cb0c4b776..cc54b27fc2 100644 --- a/config/alfresco/ehcache-default.xml +++ b/config/alfresco/ehcache-default.xml @@ -162,24 +162,25 @@ overflowToDisk="false" /> - - - + + + + + + + + \ No newline at end of file diff --git a/config/alfresco/ehcache-transactional.xml b/config/alfresco/ehcache-transactional.xml index 4d92925923..4a9e25ec15 100644 --- a/config/alfresco/ehcache-transactional.xml +++ b/config/alfresco/ehcache-transactional.xml @@ -1,5 +1,6 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/config/alfresco/patch/patch-services-context.xml b/config/alfresco/patch/patch-services-context.xml index ebb467ad29..70f68ddfeb 100644 --- a/config/alfresco/patch/patch-services-context.xml +++ b/config/alfresco/patch/patch-services-context.xml @@ -527,6 +527,22 @@ + + patch.db-V1.4-PostgresFKIndexes + patch.schemaUpgradeScript.description + 21 + 24 + 25 + + classpath:alfresco/dbscripts/upgrade/1.4/${db.script.dialect}/AlfrescoSchemaUpdate-1.4-PostgresFKIndexes.sql + + + + + + + + patch.multilingualBootstrap patch.multilingualBootstrap.description diff --git a/config/alfresco/public-services-security-context.xml b/config/alfresco/public-services-security-context.xml index 65e75022b6..54ef7379d7 100644 --- a/config/alfresco/public-services-security-context.xml +++ b/config/alfresco/public-services-security-context.xml @@ -14,10 +14,6 @@ - - - - diff --git a/source/java/org/alfresco/repo/action/executer/MailActionExecuter.java b/source/java/org/alfresco/repo/action/executer/MailActionExecuter.java index 788ce132c6..9be9e5fab5 100644 --- a/source/java/org/alfresco/repo/action/executer/MailActionExecuter.java +++ b/source/java/org/alfresco/repo/action/executer/MailActionExecuter.java @@ -34,6 +34,7 @@ import java.util.Set; import javax.mail.MessagingException; import javax.mail.internet.MimeMessage; +import org.alfresco.error.AlfrescoRuntimeException; import org.alfresco.model.ContentModel; import org.alfresco.repo.action.ParameterDefinitionImpl; import org.alfresco.repo.template.DateCompareMethod; @@ -225,6 +226,11 @@ public class MailActionExecuter extends ActionExecuterAbstractBase { public void prepare(MimeMessage mimeMessage) throws MessagingException { + if (logger.isDebugEnabled()) + { + logger.debug(ruleAction.getParameterValues()); + } + MimeMessageHelper message = new MimeMessageHelper(mimeMessage); // set header encoding if one has been supplied @@ -332,7 +338,17 @@ public class MailActionExecuter extends ActionExecuterAbstractBase catch (Throwable e) { // don't stop the action but let admins know email is not getting sent - logger.error("Failed to send email to " + (String)ruleAction.getParameterValue(PARAM_TO), e); + String to = (String)ruleAction.getParameterValue(PARAM_TO); + if (to == null) + { + Object obj = ruleAction.getParameterValue(PARAM_TO_MANY); + if (obj != null) + { + to = obj.toString(); + } + } + + logger.error("Failed to send email to " + to, e); } }