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

Merged V3.0 to HEAD

Browse Source 
11375: MT - complete fix for ETHREEOH-189
   11378: Supporting changes for license component in 3.0 (but not the license component itself ...)
   11380: Fix for transaction error. ETHREEOH-451.
   11383: Oracle upgrade and create SQL fixes (Can Entperprise-only later)
   11384: Fix truelicense classpath in sdk-projects


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@12424 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Derek Hulley
2008-12-17 05:36:39 +00:00
parent 23af538c1a
commit 37d6a30bd2
28 changed files with 1160 additions and 615 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
source/java/org/alfresco/repo/admin/patch/PatchExecuter.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright (C) 2005-2007 Alfresco Software Limited.
* Copyright (C) 2005-2008 Alfresco Software Limited.
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -18,7 +18,7 @@
* As a special exception to the terms and conditions of version 2.0 of
* the GPL, you may redistribute this Program in connection with Free/Libre
* and Open Source Software ("FLOSS") applications as described in Alfresco's
* FLOSS exception. You should have recieved a copy of the text describing
* FLOSS exception. You should have received a copy of the text describing
* the FLOSS exception, and it is also available here:
* http://www.alfresco.com/legal/licensing"
*/
@@ -77,7 +77,7 @@ public class PatchExecuter extends AbstractLifecycleBean
public void applyOutstandingPatches()
{
// Avoid read-only systems
if (transactionService.isReadOnly())
if (!patchService.validatePatches() || transactionService.isReadOnly())
{
logger.warn(I18NUtil.getMessage(MSG_SYSTEM_READ_ONLY));
return;

39
source/java/org/alfresco/repo/admin/patch/PatchService.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright (C) 2005-2007 Alfresco Software Limited.
* Copyright (C) 2005-2008 Alfresco Software Limited.
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -18,7 +18,7 @@
* As a special exception to the terms and conditions of version 2.0 of
* the GPL, you may redistribute this Program in connection with Free/Libre
* and Open Source Software ("FLOSS") applications as described in Alfresco's
* FLOSS exception. You should have recieved a copy of the text describing
* FLOSS exception. You should have received a copy of the text describing
* the FLOSS exception, and it is also available here:
* http://www.alfresco.com/legal/licensing"
*/
@@ -27,11 +27,12 @@ package org.alfresco.repo.admin.patch;
import java.util.Date;
import java.util.List;
import org.alfresco.error.AlfrescoRuntimeException;
/**
* Manages patches applied against the repository.
* <p>
* Patches are injected into this class and any attempted applications are recorded
* for later auditing.
* Patches are injected into this class and any attempted applications are recorded for later auditing.
*
* @since 1.2
* @author Derek Hulley
@@ -41,25 +42,35 @@ public interface PatchService
/**
* Registers a patch with the service that executes them.
*
* @param patch the patch to register
* @param patch
* the patch to register
*/
public void registerPatch(Patch patch);
/**
* Apply all outstanding patches that are relevant to the repo.
* If there is a failure, then the patches that were applied will remain so,
* but the process will not attempt to apply any further patches.
* Does some up-front validation on the patches, specifically to see if they all apply to the current server version
* and not some future version. This is to prevent tampering with versioning information attached to a license.
*
* @return Returns true if all outstanding patches were applied, or false if the process
* was termintated before all patches could be applied.
* @return true if validation is successful. Outputs errors and returns false otherwise.
*/
public boolean validatePatches();
/**
* Apply all outstanding patches that are relevant to the repo. If there is a failure, then the patches that were
* applied will remain so, but the process will not attempt to apply any further patches.
*
* @return Returns true if all outstanding patches were applied, or false if the process was termintated before all
* patches could be applied.
*/
public boolean applyOutstandingPatches();
/**
* Retrieves all applied patches between two specific times.
*
* @param from the start date of the search, or null to get all patches from the start
* @param to the end date of the search, or null to g
* @param from
* the start date of the search, or null to get all patches from the start
* @param to
* the end date of the search, or null to g
* @return Returns all applied patches (successful or not)
*/
public List<PatchInfo> getPatches(Date fromDate, Date toDate);

30
source/java/org/alfresco/repo/admin/patch/PatchServiceImpl.java
View File

@@ -34,12 +34,12 @@ import java.util.Map;
import org.alfresco.i18n.I18NUtil;
import org.alfresco.repo.domain.AppliedPatch;
import org.alfresco.repo.transaction.TransactionServiceImpl;
import org.alfresco.repo.transaction.RetryingTransactionHelper.RetryingTransactionCallback;
import org.alfresco.service.cmr.admin.PatchException;
import org.alfresco.service.cmr.rule.RuleService;
import org.alfresco.service.descriptor.Descriptor;
import org.alfresco.service.descriptor.DescriptorService;
import org.alfresco.service.transaction.TransactionService;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -58,6 +58,7 @@ public class PatchServiceImpl implements PatchService
private static final String MSG_NOT_RELEVANT = "patch.service.not_relevant";
private static final String MSG_PRECEEDED_BY_ALTERNATIVE = "patch.service.preceeded_by_alternative";
private static final String MSG_APPLYING_PATCH = "patch.service.applying_patch";
private static final String MSG_VALIDATION_FAILED = "patch.validation.failed";
private static final Date ZERO_DATE = new Date(0L);
private static final Date INFINITE_DATE = new Date(Long.MAX_VALUE);
@@ -65,7 +66,7 @@ public class PatchServiceImpl implements PatchService
private static Log logger = LogFactory.getLog(PatchExecuter.class);
private DescriptorService descriptorService;
private TransactionService transactionService;
private TransactionServiceImpl transactionService;
private RuleService ruleService;
private PatchDaoService patchDaoService;
private List<Patch> patches;
@@ -80,7 +81,7 @@ public class PatchServiceImpl implements PatchService
this.descriptorService = descriptorService;
}
public void setTransactionService(TransactionService transactionService)
public void setTransactionService(TransactionServiceImpl transactionService)
{
this.transactionService = transactionService;
}
@@ -100,6 +101,27 @@ public class PatchServiceImpl implements PatchService
patches.add(patch);
}
public boolean validatePatches()
{
boolean success = true;
int serverSchemaVersion = descriptorService.getServerDescriptor().getSchema();
for (Patch patch : patches)
{
if (patch.getFixesToSchema() > serverSchemaVersion)
{
logger.error(I18NUtil.getMessage(MSG_VALIDATION_FAILED, patch.getId(), serverSchemaVersion, patch
.getFixesToSchema(), patch.getTargetSchema()));
success = false;
}
}
if (!success)
{
this.transactionService.setAllowWrite(false);
}
return success;
}
public boolean applyOutstandingPatches()
{
boolean success = true;
@@ -114,7 +136,7 @@ public class PatchServiceImpl implements PatchService
List<Patch> sortedPatches = new ArrayList<Patch>(patches);
Comparator<Patch> comparator = new PatchTargetSchemaComparator();
Collections.sort(sortedPatches, comparator);
// construct a list of executed patches by ID (also check the date)
Map<String, AppliedPatch> appliedPatchesById = new HashMap<String, AppliedPatch>(23);
List<AppliedPatch> appliedPatches = patchDaoService.getAppliedPatches();