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.1 to HEAD

Browse Source 
6361: Word 2007 Add-In and Installer - First version, untested
   6362: Adds a scaling test that a number of customers could [use]
   6363: Build fix
   6365: Submit workflow to always clean up virtualized workflow, etc
   6367: Support for wild cards within queries AR-615
            Conflicts with newer Tenant code
            Resolved conflicted state of 'root\projects\repository\source\java\org\alfresco\repo\search\impl\lucene\ADMLuceneSearcherImpl.java'
            Resolved conflicted state of 'root\projects\repository\source\java\org\alfresco\repo\search\impl\lucene\ADMLuceneTest.java'
            Resolved conflicted state of 'root\projects\repository\source\java\org\alfresco\repo\search\impl\lucene\LuceneQueryParser.java'


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@6724 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Derek Hulley
2007-09-10 14:53:20 +00:00
parent b166891218
commit 222a89b0f8
14 changed files with 2130 additions and 986 deletions
Download Patch File Download Diff File Expand all files Collapse all files

112
source/java/org/alfresco/repo/avm/wf/AVMRemoveAllWebappsHandler.java Normal file
View File

@@ -0,0 +1,112 @@
/*-----------------------------------------------------------------------------
* Copyright 2007 Alfresco Inc.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
* or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* for more details.
*
* You should have received a copy of the GNU General Public License along
* with this program; if not, write to the Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. 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 received a copy of the text describing the FLOSS exception,
* and it is also available here: http://www.alfresco.com/legal/licensing
*
*
* Author Jon Cox <jcox@alfresco.com>
* File AVMRemoveAllWebappsHandler.java
*----------------------------------------------------------------------------*/
package org.alfresco.repo.avm.wf;
import java.util.Map;
import org.alfresco.config.JNDIConstants;
import org.alfresco.mbeans.VirtServerRegistry;
import org.alfresco.repo.avm.AVMNodeConverter;
import org.alfresco.repo.avm.util.RawServices;
import org.alfresco.repo.domain.PropertyValue;
import org.alfresco.repo.workflow.jbpm.JBPMNode;
import org.alfresco.repo.workflow.jbpm.JBPMSpringActionHandler;
import org.alfresco.service.cmr.avm.AVMService;
import org.alfresco.service.cmr.repository.NodeRef;
import org.alfresco.service.namespace.QName;
import org.alfresco.util.Pair;
import org.apache.log4j.Logger;
import org.jbpm.graph.exe.ExecutionContext;
import org.springframework.beans.factory.BeanFactory;
import org.springframework.context.ApplicationContext;
/**
* Remove all webapps in a sandbox
*
* @author Jon Cox
*/
public class AVMRemoveAllWebappsHandler extends JBPMSpringActionHandler
{
static final long serialVersionUID = 3004374776252613278L;
private static Logger log =
Logger.getLogger(AVMRemoveAllWebappsHandler.class);
/**
* The AVMService instance.
*/
private AVMService fAVMService;
/**
* Initialize service references.
* @param factory The BeanFactory to get references from.
*/
@Override
protected void initialiseHandler(BeanFactory factory)
{
fAVMService = (AVMService)factory.getBean("AVMService");
}
/**
* Do the actual work.
* @param executionContext The context to get stuff from.
*/
public void execute(ExecutionContext executionContext) throws Exception
{
if (log.isDebugEnabled())
log.debug("AVMRemoveAllWebappsHandler.execute()");
// retrieve submitted package
NodeRef pkg = ((JBPMNode)executionContext.getContextInstance().
getVariable("bpm_package")).getNodeRef();
Pair<Integer, String> pkgPath = AVMNodeConverter.ToAVMVersionPath(pkg);
Integer version = pkgPath.getFirst();
String www_dir = pkgPath.getSecond();
String appbase_dir = www_dir + "/" + JNDIConstants.DIR_DEFAULT_APPBASE;
if (log.isDebugEnabled())
{
log.debug("version: " + version );
log.debug("appbase_dir: " + appbase_dir );
}
ApplicationContext springContext = RawServices.Instance().getContext();
VirtServerRegistry vServerRegistry = (VirtServerRegistry)
springContext.getBean("VirtServerRegistry");
if (log.isDebugEnabled())
log.debug("Sending JMX message to shut down workflow webapps");
vServerRegistry.removeAllWebapps( version, appbase_dir, true );
if (log.isDebugEnabled())
log.debug("Sent JMX message to shut down workflow webapps");
}
}

41
source/java/org/alfresco/repo/avm/wf/AVMSubmitTransactionListener.java
View File

@@ -36,6 +36,7 @@ import org.alfresco.repo.transaction.TransactionListenerAdapter;
import org.alfresco.service.cmr.avmsync.AVMDifference;
import org.alfresco.util.VirtServerUtils;
import org.springframework.context.ApplicationContext;
import org.apache.log4j.Logger;
/**
* Gets callbacks at critical moments within a transaction
@@ -44,8 +45,10 @@ import org.springframework.context.ApplicationContext;
*/
public class AVMSubmitTransactionListener extends TransactionListenerAdapter
{
private static Logger log =
Logger.getLogger(AVMSubmitTransactionListener.class);
public AVMSubmitTransactionListener() { }
/**
* Notify virtualization server that webapps in workflow sandbox
@@ -104,22 +107,31 @@ public class AVMSubmitTransactionListener extends TransactionListenerAdapter
requiresUpdate.getDestinationPath(),
true
);
if (log.isDebugEnabled())
log.debug("JMX update to virt server called after commit");
}
// Remove virtual weapps from workflow sandbox
if ( ! stagingDiffs.isEmpty() )
{
// All the files are from the same workflow sandbox;
// so to remove all the webapps, you just need to
// look at the 1st difference
AVMDifference d = stagingDiffs.iterator().next();
vServerRegistry.removeAllWebapps( d.getSourceVersion(), d.getSourcePath(), true );
}
// Remove virtual webapps from workflow sandbox prior to
// AVMRemoveWFStoreHandler in the "process-end" clause.
// This way, even if the workflow is aborted, the JMX message
// to the virt server is still sent. Therefore, no longer
// doing this here:
//
// if ( ! stagingDiffs.isEmpty() )
// {
// // All the files are from the same workflow sandbox;
// // so to remove all the webapps, you just need to
// // look at the 1st difference
//
// AVMDifference d = stagingDiffs.iterator().next();
// vServerRegistry.removeAllWebapps( d.getSourceVersion(),
// d.getSourcePath(), true );
// }
AlfrescoTransactionSupport.unbindResource("staging_diffs");
if (log.isDebugEnabled())
log.debug("staging_diff resource unbound after commit");
}
@@ -130,5 +142,8 @@ public class AVMSubmitTransactionListener extends TransactionListenerAdapter
public void afterRollback()
{
AlfrescoTransactionSupport.unbindResource("staging_diffs");
if (log.isDebugEnabled())
log.debug("staging_diff resource unbound after rollback");
}
}