svn merge -r 2570:2595 svn://www.alfresco.org/alfresco/BRANCHES/V1.2.0/root HEAD/root

svn merge -r 2597:2649 svn://www.alfresco.org/alfresco/BRANCHES/V1.2.0/root HEAD/root


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2650 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Derek Hulley
2006-04-12 14:58:21 +00:00
parent c3adde8ac4
commit 776314da72
17 changed files with 469 additions and 63 deletions

View File

@@ -22,6 +22,8 @@ import java.util.List;
import org.alfresco.i18n.I18NUtil;
import org.alfresco.service.cmr.dictionary.DictionaryException;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
/**
@@ -40,6 +42,10 @@ public class DictionaryBootstrap
// Dictionary DAO
private DictionaryDAO dictionaryDAO = null;
// Logger
private static Log logger = LogFactory.getLog(DictionaryDAO.class);
/**
* Sets the Dictionary DAO
@@ -86,6 +92,9 @@ public class DictionaryBootstrap
}
try
{
if (logger.isInfoEnabled())
logger.info("Loading model from " + bootstrapModel);
M2Model model = M2Model.createModel(modelStream);
dictionaryDAO.putModel(model);
}