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

Dynamic Models - fix AR-1953

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@8015 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Jan Vonka
2008-01-18 12:25:24 +00:00
parent b4b6f0181c
commit 087b2a1b2a
10 changed files with 135 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
source/java/org/alfresco/repo/importer/ImporterBootstrap.java
View File

@@ -53,6 +53,7 @@ import org.alfresco.service.cmr.view.ImporterException;
import org.alfresco.service.cmr.view.ImporterProgress;
import org.alfresco.service.cmr.view.ImporterService;
import org.alfresco.service.cmr.view.Location;
import org.alfresco.service.cmr.view.ImporterBinding.UUID_BINDING;
import org.alfresco.service.namespace.NamespaceService;
import org.alfresco.service.namespace.QName;
import org.alfresco.service.transaction.TransactionService;
@@ -60,9 +61,6 @@ import org.alfresco.util.AbstractLifecycleBean;
import org.alfresco.util.TempFileProvider;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.commons.logging.impl.Log4JLogger;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.springframework.context.ApplicationEvent;
import org.springframework.util.FileCopyUtils;
@@ -79,6 +77,7 @@ public class ImporterBootstrap extends AbstractLifecycleBean
public static final String VIEW_MESSAGES_PROPERTY = "messages";
public static final String VIEW_LOCATION_VIEW = "location";
public static final String VIEW_ENCODING = "encoding";
public static final String VIEW_UUID_BINDING = "uuidBinding";
// Logger
private static final Log logger = LogFactory.getLog(ImporterBootstrap.class);
@@ -317,10 +316,13 @@ public class ImporterBootstrap extends AbstractLifecycleBean
}
if (storeRef == null)
{
throw new ImporterException("Store URL must be provided");
if (logger.isDebugEnabled())
{
logger.debug("No Store URL - bootstrap import ignored");
}
return;
}
UserTransaction userTransaction = transactionService.getUserTransaction();
Authentication authentication = authenticationComponent.getCurrentAuthentication();
@@ -409,6 +411,19 @@ public class ImporterBootstrap extends AbstractLifecycleBean
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;
@@ -522,6 +537,8 @@ public class ImporterBootstrap extends AbstractLifecycleBean
private static final String IMPORT_LOCATION_NODEREF = "bootstrap.location.noderef";
private static final String IMPORT_LOCATION_PATH = "bootstrap.location.path";
// by default, use create new strategy for bootstrap import
private UUID_BINDING uuidBinding = UUID_BINDING.CREATE_NEW_WITH_UUID;
/**
* Set Import Configuration
@@ -602,8 +619,17 @@ public class ImporterBootstrap extends AbstractLifecycleBean
*/
public UUID_BINDING getUUIDBinding()
{
// always use create new strategy for bootstrap import
return UUID_BINDING.CREATE_NEW_WITH_UUID;
return uuidBinding;
}
/**
* Allow bootstrap to override default Node UUID Binding
*
* @param uuidBinding UUID_BINDING
*/
private void setUUIDBinding(UUID_BINDING uuidBinding)
{
this.uuidBinding = uuidBinding;
}
/*