Merged V2.0 to HEAD

svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V2.0@5093 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V2.0@5094 .
      - Fix AR-1024: AVM workflow submit NPE
   svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V2.0@5188 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V2.0@5189 .
      - PostgreSQL sample
   svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V2.0@5191 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V2.0@5193 .
      - PostgreSQL lurking JDBC driver


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5195 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Derek Hulley
2007-02-20 11:23:11 +00:00
parent 105a35efe7
commit e7c83d8731
6 changed files with 200 additions and 14 deletions

View File

@@ -25,10 +25,8 @@
package org.alfresco.repo.avm.wf;
import java.util.List;
import java.util.Map;
import org.alfresco.repo.avm.AVMNodeConverter;
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.AVMNodeDescriptor;
@@ -36,7 +34,6 @@ import org.alfresco.service.cmr.avm.AVMService;
import org.alfresco.service.cmr.avmsync.AVMDifference;
import org.alfresco.service.cmr.avmsync.AVMSyncService;
import org.alfresco.service.cmr.repository.NodeRef;
import org.alfresco.service.namespace.QName;
import org.alfresco.util.Pair;
import org.jbpm.graph.exe.ExecutionContext;
import org.springframework.beans.factory.BeanFactory;
@@ -106,17 +103,6 @@ public class AVMClearSubmittedHandler extends JBPMSpringActionHandler
String submittedPath = from + diff.getSourcePath().substring(pkgPath.getSecond().length());
fAVMSubmittedAspect.clearSubmitted(-1, submittedPath);
}
// Now delete the stores in the workflow sandbox.
String [] storePath = pkgPath.getSecond().split(":");
// Get the sandbox id for the package.
Map<QName, PropertyValue> matches = fAVMService.queryStorePropertyKey(storePath[0], QName.createQName(null, ".sandbox-id%"));
QName sandboxID = matches.keySet().iterator().next();
// Get all the stores in the sandbox.
Map<String, Map<QName, PropertyValue>> stores = fAVMService.queryStoresPropertyKeys(sandboxID);
for (String storeName : stores.keySet())
{
fAVMService.purgeStore(storeName);
}
}
}