mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-10-08 14:51:49 +00:00
Merged 5.2.N (5.2.1) to HEAD (5.2)
125783 rmunteanu: Merged 5.1.N (5.1.2) to 5.2.N (5.2.1) 125605 rmunteanu: Merged 5.1.1 (5.1.1) to 5.1.N (5.1.2) 125498 slanglois: MNT-16155 Update source headers - remove svn:eol-style property on Java and JSP source files git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@127809 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
@@ -1,100 +1,100 @@
|
||||
package org.alfresco.repo.admin.patch;
|
||||
|
||||
import org.alfresco.service.descriptor.Descriptor;
|
||||
import org.alfresco.service.descriptor.DescriptorService;
|
||||
import org.springframework.context.ApplicationEvent;
|
||||
import org.springframework.extensions.surf.util.AbstractLifecycleBean;
|
||||
|
||||
/**
|
||||
* @author Andy
|
||||
*/
|
||||
public class OptionalPatchApplicationCheckBootstrapBean extends AbstractLifecycleBean
|
||||
{
|
||||
PatchService patchService;
|
||||
|
||||
Patch patch;
|
||||
|
||||
DescriptorService descriptorService;
|
||||
|
||||
volatile boolean patchApplied = false;
|
||||
|
||||
/**
|
||||
* @param patchService
|
||||
* the patchService to set
|
||||
*/
|
||||
public void setPatchService(PatchService patchService)
|
||||
{
|
||||
this.patchService = patchService;
|
||||
}
|
||||
|
||||
/**
|
||||
* @param patch
|
||||
* the patch to set
|
||||
*/
|
||||
public void setPatch(Patch patch)
|
||||
{
|
||||
this.patch = patch;
|
||||
}
|
||||
|
||||
/**
|
||||
* @param descriptorService
|
||||
* the descriptorService to set
|
||||
*/
|
||||
public void setDescriptorService(DescriptorService descriptorService)
|
||||
{
|
||||
this.descriptorService = descriptorService;
|
||||
}
|
||||
|
||||
/*
|
||||
* (non-Javadoc)
|
||||
* @see org.springframework.extensions.surf.util.AbstractLifecycleBean#onBootstrap(org.springframework.context.
|
||||
* ApplicationEvent)
|
||||
*/
|
||||
@Override
|
||||
protected void onBootstrap(ApplicationEvent event)
|
||||
{
|
||||
Descriptor descriptor = descriptorService.getInstalledRepositoryDescriptor();
|
||||
if (patch == null)
|
||||
{
|
||||
patchApplied = true;
|
||||
}
|
||||
else
|
||||
{
|
||||
AppliedPatch appliedPatch = patchService.getPatch(patch.getId());
|
||||
if (appliedPatch == null)
|
||||
{
|
||||
patchApplied = patch.getFixesToSchema() < descriptor.getSchema();
|
||||
}
|
||||
else
|
||||
{
|
||||
patchApplied = appliedPatch.getSucceeded();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/*
|
||||
* (non-Javadoc)
|
||||
* @see org.springframework.extensions.surf.util.AbstractLifecycleBean#onShutdown(org.springframework.context.
|
||||
* ApplicationEvent)
|
||||
*/
|
||||
@Override
|
||||
protected void onShutdown(ApplicationEvent event)
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
* Was the patch applied - or was it not applied
|
||||
*
|
||||
* @return boolean
|
||||
*/
|
||||
public boolean getPatchApplied()
|
||||
{
|
||||
return patchApplied;
|
||||
}
|
||||
|
||||
public String getPatchId()
|
||||
{
|
||||
return patch.getId();
|
||||
}
|
||||
}
|
||||
package org.alfresco.repo.admin.patch;
|
||||
|
||||
import org.alfresco.service.descriptor.Descriptor;
|
||||
import org.alfresco.service.descriptor.DescriptorService;
|
||||
import org.springframework.context.ApplicationEvent;
|
||||
import org.springframework.extensions.surf.util.AbstractLifecycleBean;
|
||||
|
||||
/**
|
||||
* @author Andy
|
||||
*/
|
||||
public class OptionalPatchApplicationCheckBootstrapBean extends AbstractLifecycleBean
|
||||
{
|
||||
PatchService patchService;
|
||||
|
||||
Patch patch;
|
||||
|
||||
DescriptorService descriptorService;
|
||||
|
||||
volatile boolean patchApplied = false;
|
||||
|
||||
/**
|
||||
* @param patchService
|
||||
* the patchService to set
|
||||
*/
|
||||
public void setPatchService(PatchService patchService)
|
||||
{
|
||||
this.patchService = patchService;
|
||||
}
|
||||
|
||||
/**
|
||||
* @param patch
|
||||
* the patch to set
|
||||
*/
|
||||
public void setPatch(Patch patch)
|
||||
{
|
||||
this.patch = patch;
|
||||
}
|
||||
|
||||
/**
|
||||
* @param descriptorService
|
||||
* the descriptorService to set
|
||||
*/
|
||||
public void setDescriptorService(DescriptorService descriptorService)
|
||||
{
|
||||
this.descriptorService = descriptorService;
|
||||
}
|
||||
|
||||
/*
|
||||
* (non-Javadoc)
|
||||
* @see org.springframework.extensions.surf.util.AbstractLifecycleBean#onBootstrap(org.springframework.context.
|
||||
* ApplicationEvent)
|
||||
*/
|
||||
@Override
|
||||
protected void onBootstrap(ApplicationEvent event)
|
||||
{
|
||||
Descriptor descriptor = descriptorService.getInstalledRepositoryDescriptor();
|
||||
if (patch == null)
|
||||
{
|
||||
patchApplied = true;
|
||||
}
|
||||
else
|
||||
{
|
||||
AppliedPatch appliedPatch = patchService.getPatch(patch.getId());
|
||||
if (appliedPatch == null)
|
||||
{
|
||||
patchApplied = patch.getFixesToSchema() < descriptor.getSchema();
|
||||
}
|
||||
else
|
||||
{
|
||||
patchApplied = appliedPatch.getSucceeded();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/*
|
||||
* (non-Javadoc)
|
||||
* @see org.springframework.extensions.surf.util.AbstractLifecycleBean#onShutdown(org.springframework.context.
|
||||
* ApplicationEvent)
|
||||
*/
|
||||
@Override
|
||||
protected void onShutdown(ApplicationEvent event)
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
* Was the patch applied - or was it not applied
|
||||
*
|
||||
* @return boolean
|
||||
*/
|
||||
public boolean getPatchApplied()
|
||||
{
|
||||
return patchApplied;
|
||||
}
|
||||
|
||||
public String getPatchId()
|
||||
{
|
||||
return patch.getId();
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user