mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-10-08 14:51:49 +00:00
Merged V2.9 to HEAD
9018: MT: system-wide jobs should run across all stores/indexes
9204: Merged V2.2 to V2.9
8633: Merged V2.1 to V2.2
8629: Merged V2.1-A to V2.1
8493: Fixed ADB-51: ImporterBootstrap doesn't use transaction retrying
8494: EHCache and JGroup patches and upgrades
8546: ACT-1650: performance optimization
8550: Fixes to transactional cache handling
8553: Fixed tests: MLText is a Map, but will always have at least one entry, even that entry is null.
8583: ACT-954: IndexInfo files now reopen when they close (for whatever reason)
8640: Merged V2.1 to V2.2
8638: Used correct exception type for IO channel reopen logic
9102: Unit test to check that transactional cache size overrun is handled
9106: Merged V2.1 to V2.2
9043: Fixed AR-2291: SchemaBootstrap lock is only required before first SQL execution
9045: Fix AR-2291: SchemaBootstrap lock is only required before first SQL execution
9047: Fixed AR-2305: Index tracking in AUTO mode doesn't report anything on bootstrap
9048: Fixed AR-2300: Random-based GUID instead of time-based GUIDs
9049: Fix patches to only run once
9050 <Defered>: Changed getString() method to use the available buffer length rather than a hard coded value.
9060: Fixed ETWOONE-109 and ETWOONE-128: RetryingTransactionHelper fixes and improvements
9061: Fixed NodeRefPropertyMethodInterceptorTest
9075 <Defered>: Added delete permission check when marking a file for delete on close. ETWOONE-141/ACT-2416.
9080: Fixed EHCache source zip
9081: Fixed ETWOONE-118: Tomcat failed bootstrap doesn't clean up EHCache cluster structures
9085: Fixed ETWOONE-154: Added JSR107 Jar to WAR
9115: Fixed test: TransactionalCache uses LRU so repeatedly checking if a entry is there keeps it in the cache.
9206: Merged V2.2 to V2.9
8857: Improvements to ACL performance for large ACLs
8951: Always check permission entry changes are made at position 0
9219 <No change>: Made NTLMLogonDetails class Serializable, port of r8973.
9220: Added delete permission check when marking a file for delete on close. Port of r9075.
9222: Merged V2.1 to V2.9
8683: Early warning for nodes indexed in the wrong store (ACT-964)
8684: Enhanced tests
8685: Enhanced tests
8686: Additional tests
9223: Merged V2.2 to V2.9
9120: Merged V2.1 to V2.2
8740: Fix for AR-2173 - do no recheck case of the user name when validating tickets (it has been done)
9122: Additional unit test from support case.
9224: Merged V2.2 to V2.9
9076: Fixed ETWOTWO-426: Upgrading alfresco from 2.1.1 to 2.2 throws errors with Mysql 5.0.51
9104: Merged V2.1 to V2.2
9025: Fixed AR-2314, AR-2299: Optimizations after profiling
9105: Merged V2.1 to V2.2
8745: Fix AR-2233 (regression introduced by fix for AR-2221)
9121: Merged V2.1 to V2.2
9017: Fix index back up failing due to background index merge/deletions (inlcudes back port of CHK-2588)
9137: Incorporated additions from Will into AVM console (ETWOTWO-439)
9225: Merged V2.1 to V2.9
8641: Merged V2.1-A to V2.1
7729: Fix to Repository Web Service (queryAssociated) to allow reverse association lookup (ie. given target, get the source)
8673: Fix for AR-2098 - shorter URL form now has NTLM filter mapping example in web.xml
8682: Fix for AR-2005
8695: AR-2054.
8696: Improved sort test to include prefix form of field name
9226: Fix ALFCOM-994 (see also earlier change in r9223)
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@9233 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Derek Hulley
@@ -39,13 +39,12 @@ import java.util.Locale;
|
||||
import java.util.Properties;
|
||||
import java.util.ResourceBundle;
|
||||
|
||||
import javax.transaction.UserTransaction;
|
||||
|
||||
import net.sf.acegisecurity.Authentication;
|
||||
|
||||
import org.alfresco.error.AlfrescoRuntimeException;
|
||||
import org.alfresco.i18n.I18NUtil;
|
||||
import org.alfresco.repo.security.authentication.AuthenticationComponent;
|
||||
import org.alfresco.repo.transaction.RetryingTransactionHelper.RetryingTransactionCallback;
|
||||
import org.alfresco.service.cmr.repository.NodeService;
|
||||
import org.alfresco.service.cmr.repository.StoreRef;
|
||||
import org.alfresco.service.cmr.view.ImporterBinding;
|
||||
@@ -58,6 +57,7 @@ import org.alfresco.service.namespace.NamespaceService;
|
||||
import org.alfresco.service.namespace.QName;
|
||||
import org.alfresco.service.transaction.TransactionService;
|
||||
import org.alfresco.util.AbstractLifecycleBean;
|
||||
import org.alfresco.util.PropertyCheck;
|
||||
import org.alfresco.util.TempFileProvider;
|
||||
import org.apache.commons.logging.Log;
|
||||
import org.apache.commons.logging.LogFactory;
|
||||
@@ -298,161 +298,29 @@ public class ImporterBootstrap extends AbstractLifecycleBean
|
||||
*/
|
||||
public void bootstrap()
|
||||
{
|
||||
if (transactionService == null)
|
||||
{
|
||||
throw new ImporterException("Transaction Service must be provided");
|
||||
}
|
||||
if (namespaceService == null)
|
||||
{
|
||||
throw new ImporterException("Namespace Service must be provided");
|
||||
}
|
||||
if (nodeService == null)
|
||||
{
|
||||
throw new ImporterException("Node Service must be provided");
|
||||
}
|
||||
if (importerService == null)
|
||||
{
|
||||
throw new ImporterException("Importer Service must be provided");
|
||||
}
|
||||
if (storeRef == null)
|
||||
{
|
||||
if (logger.isDebugEnabled())
|
||||
{
|
||||
logger.debug("No Store URL - bootstrap import ignored");
|
||||
}
|
||||
return;
|
||||
}
|
||||
PropertyCheck.mandatory(this, "transactionService", transactionService);
|
||||
PropertyCheck.mandatory(this, "namespaceService", namespaceService);
|
||||
PropertyCheck.mandatory(this, "nodeService", nodeService);
|
||||
PropertyCheck.mandatory(this, "importerService", importerService);
|
||||
PropertyCheck.mandatory(this, "storeRef", storeRef);
|
||||
|
||||
UserTransaction userTransaction = transactionService.getUserTransaction();
|
||||
Authentication authentication = authenticationComponent.getCurrentAuthentication();
|
||||
|
||||
if (authenticationComponent.getCurrentUserName() == null)
|
||||
Authentication authentication = authenticationComponent.setSystemUserAsCurrentUser();
|
||||
|
||||
RetryingTransactionCallback<Object> doImportCallback = new RetryingTransactionCallback<Object>()
|
||||
{
|
||||
authenticationComponent.setCurrentUser(authenticationComponent.getSystemUserName());
|
||||
}
|
||||
|
||||
public Object execute() throws Throwable
|
||||
{
|
||||
doImport();
|
||||
return null;
|
||||
}
|
||||
};
|
||||
try
|
||||
{
|
||||
userTransaction.begin();
|
||||
|
||||
// check the repository exists, create if it doesn't
|
||||
if (!performBootstrap())
|
||||
{
|
||||
if (logger.isDebugEnabled())
|
||||
logger.debug("Store exists - bootstrap ignored: " + storeRef);
|
||||
}
|
||||
else if (!allowWrite)
|
||||
{
|
||||
// we're in read-only node
|
||||
logger.warn("Store does not exist, but mode is read-only: " + storeRef);
|
||||
}
|
||||
else
|
||||
{
|
||||
// create the store if necessary
|
||||
if (!nodeService.exists(storeRef))
|
||||
{
|
||||
storeRef = nodeService.createStore(storeRef.getProtocol(), storeRef.getIdentifier());
|
||||
if (logger.isDebugEnabled())
|
||||
logger.debug("Created store: " + storeRef);
|
||||
}
|
||||
|
||||
// bootstrap the store contents
|
||||
if (bootstrapViews != null)
|
||||
{
|
||||
// add-in any extended views
|
||||
if (extensionBootstrapViews != null)
|
||||
{
|
||||
bootstrapViews.addAll(extensionBootstrapViews);
|
||||
}
|
||||
|
||||
for (Properties bootstrapView : bootstrapViews)
|
||||
{
|
||||
String view = bootstrapView.getProperty(VIEW_LOCATION_VIEW);
|
||||
if (view == null || view.length() == 0)
|
||||
{
|
||||
throw new ImporterException("View file location must be provided");
|
||||
}
|
||||
String encoding = bootstrapView.getProperty(VIEW_ENCODING);
|
||||
|
||||
// Create appropriate view reader
|
||||
Reader viewReader = null;
|
||||
ACPImportPackageHandler acpHandler = null;
|
||||
if (view.endsWith(".acp"))
|
||||
{
|
||||
File viewFile = getFile(view);
|
||||
acpHandler = new ACPImportPackageHandler(viewFile, encoding);
|
||||
}
|
||||
else
|
||||
{
|
||||
viewReader = getReader(view, encoding);
|
||||
}
|
||||
|
||||
// Create import location
|
||||
Location importLocation = new Location(storeRef);
|
||||
String path = bootstrapView.getProperty(VIEW_PATH_PROPERTY);
|
||||
if (path != null && path.length() > 0)
|
||||
{
|
||||
importLocation.setPath(path);
|
||||
}
|
||||
String childAssocType = bootstrapView.getProperty(VIEW_CHILDASSOCTYPE_PROPERTY);
|
||||
if (childAssocType != null && childAssocType.length() > 0)
|
||||
{
|
||||
importLocation.setChildAssocType(QName.createQName(childAssocType, namespaceService));
|
||||
}
|
||||
|
||||
// Create import binding
|
||||
BootstrapBinding binding = new BootstrapBinding();
|
||||
binding.setConfiguration(configuration);
|
||||
binding.setLocation(importLocation);
|
||||
String messages = bootstrapView.getProperty(VIEW_MESSAGES_PROPERTY);
|
||||
if (messages != null && messages.length() > 0)
|
||||
{
|
||||
Locale bindingLocale = (locale == null) ? I18NUtil.getLocale() : locale;
|
||||
ResourceBundle bundle = ResourceBundle.getBundle(messages, bindingLocale);
|
||||
binding.setResourceBundle(bundle);
|
||||
}
|
||||
|
||||
String uuidBinding = bootstrapView.getProperty(VIEW_UUID_BINDING);
|
||||
if (uuidBinding != null && uuidBinding.length() > 0)
|
||||
{
|
||||
try
|
||||
{
|
||||
binding.setUUIDBinding(UUID_BINDING.valueOf(UUID_BINDING.class, uuidBinding));
|
||||
}
|
||||
catch(IllegalArgumentException e)
|
||||
{
|
||||
throw new ImporterException("The value " + uuidBinding + " is an invalid uuidBinding");
|
||||
}
|
||||
}
|
||||
|
||||
// Now import...
|
||||
ImporterProgress importProgress = null;
|
||||
if (logger.isDebugEnabled())
|
||||
{
|
||||
importProgress = new ImportTimerProgress(logger);
|
||||
logger.debug("Importing " + view);
|
||||
}
|
||||
|
||||
if (viewReader != null)
|
||||
{
|
||||
importerService.importView(viewReader, importLocation, binding, importProgress);
|
||||
}
|
||||
else
|
||||
{
|
||||
importerService.importView(acpHandler, importLocation, binding, importProgress);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// a bootstrap was performed
|
||||
bootstrapPerformed = !useExistingStore;
|
||||
}
|
||||
userTransaction.commit();
|
||||
transactionService.getRetryingTransactionHelper().doInTransaction(doImportCallback);
|
||||
}
|
||||
catch(Throwable e)
|
||||
{
|
||||
// rollback the transaction
|
||||
try { if (userTransaction != null) {userTransaction.rollback();} } catch (Throwable ex) {}
|
||||
throw new AlfrescoRuntimeException("Bootstrap failed", e);
|
||||
}
|
||||
finally
|
||||
@@ -461,6 +329,125 @@ public class ImporterBootstrap extends AbstractLifecycleBean
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Perform the actual import work. This is just separated to allow for simpler TXN demarcation.
|
||||
*/
|
||||
private void doImport() throws Throwable
|
||||
{
|
||||
// check the repository exists, create if it doesn't
|
||||
if (!performBootstrap())
|
||||
{
|
||||
if (logger.isDebugEnabled())
|
||||
logger.debug("Store exists - bootstrap ignored: " + storeRef);
|
||||
}
|
||||
else if (!allowWrite)
|
||||
{
|
||||
// we're in read-only node
|
||||
logger.warn("Store does not exist, but mode is read-only: " + storeRef);
|
||||
}
|
||||
else
|
||||
{
|
||||
// create the store if necessary
|
||||
if (!nodeService.exists(storeRef))
|
||||
{
|
||||
storeRef = nodeService.createStore(storeRef.getProtocol(), storeRef.getIdentifier());
|
||||
if (logger.isDebugEnabled())
|
||||
logger.debug("Created store: " + storeRef);
|
||||
}
|
||||
|
||||
// bootstrap the store contents
|
||||
if (bootstrapViews != null)
|
||||
{
|
||||
// add-in any extended views
|
||||
if (extensionBootstrapViews != null)
|
||||
{
|
||||
bootstrapViews.addAll(extensionBootstrapViews);
|
||||
}
|
||||
|
||||
for (Properties bootstrapView : bootstrapViews)
|
||||
{
|
||||
String view = bootstrapView.getProperty(VIEW_LOCATION_VIEW);
|
||||
if (view == null || view.length() == 0)
|
||||
{
|
||||
throw new ImporterException("View file location must be provided");
|
||||
}
|
||||
String encoding = bootstrapView.getProperty(VIEW_ENCODING);
|
||||
|
||||
// Create appropriate view reader
|
||||
Reader viewReader = null;
|
||||
ACPImportPackageHandler acpHandler = null;
|
||||
if (view.endsWith(".acp"))
|
||||
{
|
||||
File viewFile = getFile(view);
|
||||
acpHandler = new ACPImportPackageHandler(viewFile, encoding);
|
||||
}
|
||||
else
|
||||
{
|
||||
viewReader = getReader(view, encoding);
|
||||
}
|
||||
|
||||
// Create import location
|
||||
Location importLocation = new Location(storeRef);
|
||||
String path = bootstrapView.getProperty(VIEW_PATH_PROPERTY);
|
||||
if (path != null && path.length() > 0)
|
||||
{
|
||||
importLocation.setPath(path);
|
||||
}
|
||||
String childAssocType = bootstrapView.getProperty(VIEW_CHILDASSOCTYPE_PROPERTY);
|
||||
if (childAssocType != null && childAssocType.length() > 0)
|
||||
{
|
||||
importLocation.setChildAssocType(QName.createQName(childAssocType, namespaceService));
|
||||
}
|
||||
|
||||
// Create import binding
|
||||
BootstrapBinding binding = new BootstrapBinding();
|
||||
binding.setConfiguration(configuration);
|
||||
binding.setLocation(importLocation);
|
||||
String messages = bootstrapView.getProperty(VIEW_MESSAGES_PROPERTY);
|
||||
if (messages != null && messages.length() > 0)
|
||||
{
|
||||
Locale bindingLocale = (locale == null) ? I18NUtil.getLocale() : locale;
|
||||
ResourceBundle bundle = ResourceBundle.getBundle(messages, bindingLocale);
|
||||
binding.setResourceBundle(bundle);
|
||||
}
|
||||
|
||||
String uuidBinding = bootstrapView.getProperty(VIEW_UUID_BINDING);
|
||||
if (uuidBinding != null && uuidBinding.length() > 0)
|
||||
{
|
||||
try
|
||||
{
|
||||
binding.setUUIDBinding(UUID_BINDING.valueOf(UUID_BINDING.class, uuidBinding));
|
||||
}
|
||||
catch(IllegalArgumentException e)
|
||||
{
|
||||
throw new ImporterException("The value " + uuidBinding + " is an invalid uuidBinding");
|
||||
}
|
||||
}
|
||||
|
||||
// Now import...
|
||||
ImporterProgress importProgress = null;
|
||||
if (logger.isDebugEnabled())
|
||||
{
|
||||
importProgress = new ImportTimerProgress(logger);
|
||||
logger.debug("Importing " + view);
|
||||
}
|
||||
|
||||
if (viewReader != null)
|
||||
{
|
||||
importerService.importView(viewReader, importLocation, binding, importProgress);
|
||||
}
|
||||
else
|
||||
{
|
||||
importerService.importView(acpHandler, importLocation, binding, importProgress);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// a bootstrap was performed
|
||||
bootstrapPerformed = !useExistingStore;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Get a Reader onto an XML view
|
||||
*
|
||||
|
||||
Reference in New Issue
Block a user