mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-08-07 17:49:17 +00:00
Point checkin.
Support for notification to virt server on dialog-driven revert operations. No support yet for workflow-diriven revert notification (coming soon). Details ------- root/projects/catalina-virtual/source/java/org/alfresco/catalina/host/AVMHostConfig.java Minor logging cleanup root/projects/core/source/java/org/alfresco/util/VirtServerUtils.java Trigger notification on submits of entire dirs: WEB-INF, WEB-INF/classes, WEB-INF/lib (not just files within them) root/projects/web-client/source/java/org/alfresco/web/bean/wcm/AVMBrowseBean.java notify virt server on revert root/projects/web-client/source/java/org/alfresco/web/bean/wcm/RevertAllDialog.java notify virt server on revert all root/projects/web-client/source/java/org/alfresco/web/bean/wcm/RevertSelectedDialog.java notify virt server on revert selected root/projects/web-client/source/java/org/alfresco/web/bean/wcm/SubmitDialog.java minor cleanup root/projects/web-client/source/web/WEB-INF/faces-config-beans.xml Injecting AVMSyncService into AVMBrowseBean to allow virt server notification to occur only when a comparison between reverted versions shows it's absolutely necessary git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5030 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
@@ -326,9 +326,6 @@ public class SubmitDialog extends BaseDialogBean
|
||||
String stagingPath = AVMConstants.buildSandboxRootPath(this.avmBrowseBean.getStagingStore());
|
||||
List<AVMDifference> diffs = new ArrayList<AVMDifference>(items.size());
|
||||
|
||||
// flag indicating if virt server update is already implied
|
||||
boolean updateVserver = false;
|
||||
|
||||
for (ItemWrapper wrapper : items)
|
||||
{
|
||||
String srcPath = sandboxPath + wrapper.getPath();
|
||||
@@ -339,17 +336,12 @@ public class SubmitDialog extends BaseDialogBean
|
||||
// If nothing has required notifying the virtualization server
|
||||
// so far, check to see if destPath forces a notification
|
||||
// (e.g.: it might be a path to a jar file within WEB-INF/lib).
|
||||
if (!updateVserver)
|
||||
|
||||
if ( (this.virtUpdatePath == null) &&
|
||||
VirtServerUtils.requiresUpdateNotification( destPath )
|
||||
)
|
||||
{
|
||||
// Examples of destPath that require virt server notification:
|
||||
//
|
||||
// mysite:/www/avm_webapps/ROOT/WEB-INF/web.xml
|
||||
// mysite:/www/avm_webapps/ROOT/WEB-INF/lib/moo.jar
|
||||
updateVserver = VirtServerUtils.requiresUpdateNotification( destPath );
|
||||
if (updateVserver)
|
||||
{
|
||||
this.virtUpdatePath = destPath;
|
||||
}
|
||||
this.virtUpdatePath = destPath;
|
||||
}
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user