Salome HOME
Fix for generating a description for version relation during checkin.
[tools/siman.git] / Workspace / Siman-Common / src / org / splat / service / ScenarioServiceImpl.java
index 98949f13770e2d751b7ec81c53ef0a2023fa0752..d1a7f1b555ebdeadbb3ffbd50dd4adfd5d7391f7 100644 (file)
@@ -19,8 +19,11 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
+import org.hibernate.criterion.DetachedCriteria;
 import org.hibernate.criterion.Order;
+import org.hibernate.criterion.Projections;
 import org.hibernate.criterion.Restrictions;
+import org.hibernate.transform.Transformers;
 import org.splat.common.properties.MessageKeyEnum;
 import org.splat.dal.bo.kernel.Relation;
 import org.splat.dal.bo.kernel.Role;
@@ -32,18 +35,25 @@ import org.splat.dal.bo.som.File;
 import org.splat.dal.bo.som.KnowledgeElement;
 import org.splat.dal.bo.som.KnowledgeElementType;
 import org.splat.dal.bo.som.ProgressState;
+import org.splat.dal.bo.som.ProjectElement;
 import org.splat.dal.bo.som.Publication;
 import org.splat.dal.bo.som.Scenario;
 import org.splat.dal.bo.som.SimulationContext;
+import org.splat.dal.bo.som.SimulationContextType;
 import org.splat.dal.bo.som.Study;
 import org.splat.dal.bo.som.UsedByRelation;
 import org.splat.dal.bo.som.UsesRelation;
+import org.splat.dal.bo.som.ValidationCycle;
+import org.splat.dal.bo.som.Document.Properties;
 import org.splat.dal.dao.kernel.RoleDAO;
 import org.splat.dal.dao.kernel.UserDAO;
 import org.splat.dal.dao.som.KnowledgeElementDAO;
 import org.splat.dal.dao.som.KnowledgeElementTypeDAO;
 import org.splat.dal.dao.som.ScenarioDAO;
 import org.splat.dal.dao.som.StudyDAO;
+import org.splat.dal.dao.som.ValidationCycleDAO;
+import org.splat.exception.InvalidParameterException;
+import org.splat.i18n.I18nUtils;
 import org.splat.kernel.InvalidPropertyException;
 import org.splat.kernel.MismatchException;
 import org.splat.kernel.MissedPropertyException;
@@ -52,11 +62,15 @@ import org.splat.kernel.NotApplicableException;
 import org.splat.log.AppLogger;
 import org.splat.service.dto.DocumentDTO;
 import org.splat.service.dto.FileDTO;
+import org.splat.service.dto.ScenarioDTO;
 import org.splat.service.dto.StepDTO;
 import org.splat.service.technical.IndexService;
 import org.splat.service.technical.ProjectSettingsService;
+import org.splat.service.technical.RepositoryService;
+import org.splat.service.technical.StepsConfigService;
 import org.splat.som.Step;
 import org.splat.util.BeanHelper;
+import org.splat.util.IOUtils;
 import org.springframework.transaction.annotation.Transactional;
 
 /**
@@ -72,6 +86,10 @@ public class ScenarioServiceImpl implements ScenarioService {
        public final static AppLogger LOG = AppLogger
                        .getLogger(ScenarioServiceImpl.class);
 
+       /**
+        * " to " literal.
+        */
+       private static final String TO = " to ";
        /**
         * Injected index service.
         */
@@ -136,6 +154,11 @@ public class ScenarioServiceImpl implements ScenarioService {
         */
        private SimulationContextService _simulationContextService;
 
+       /**
+        * Injected simulation context type service.
+        */
+       private SimulationContextTypeService _simulationContextTypeService;
+
        /**
         * Injected project service.
         */
@@ -146,6 +169,21 @@ public class ScenarioServiceImpl implements ScenarioService {
         */
        private DocumentTypeService _documentTypeService;
 
+       /**
+        * Injected validation cycle DAO.
+        */
+       private ValidationCycleDAO _validationCycleDAO;
+
+       /**
+        * Injected project settings service.
+        */
+       private StepsConfigService _stepsConfigService;
+
+       /**
+        * Injected repository service.
+        */
+       private RepositoryService _repositoryService;
+
        /**
         * Get the projectElementService.
         * 
@@ -205,6 +243,262 @@ public class ScenarioServiceImpl implements ScenarioService {
                _stepService = stepService;
        }
 
+       /**
+        * {@inheritDoc}
+        * 
+        * @see org.splat.service.ScenarioService#getStudyScenarios(java.lang.Long)
+        */
+       @Override
+       @Transactional(readOnly = true)
+       public List<ScenarioDTO> getStudyScenarios(final Long studyId) {
+               DetachedCriteria query = DetachedCriteria
+                               .forClass(Scenario.class, "scen")
+                               .add(Restrictions.eq("owner.rid", studyId))
+                               .setProjection(
+                                               Projections.projectionList().add(
+                                                               Projections.property("scen.title"), "title")
+                                                               .add(Projections.property("scen.rid"), "index"))
+                               .setResultTransformer(
+                                               Transformers.aliasToBean(ScenarioDTO.class));
+               return getScenarioDAO().getFilteredDTOList(query);
+       }
+
+       /**
+        * {@inheritDoc}
+        * 
+        * @see org.splat.service.ScenarioService#copyStudyContent(long, long, int, long)
+        */
+       @Override
+       @Transactional
+       public void copyStudyContent(final long fromStudyId, final long fromScenId,
+                       final int finalStepNum, final long toStudyId)
+                       throws InvalidParameterException, MissedPropertyException,
+                       InvalidPropertyException, MultiplyDefinedException,
+                       NotApplicableException, IOException {
+               Study fromStudy = getStudyService().selectStudy(fromStudyId);
+               if (fromStudy == null) {
+                       throw new InvalidParameterException(MessageKeyEnum.STD_000002
+                                       .toString(), String.valueOf(fromStudyId));
+               }
+               Scenario fromScen = null;
+               for (Scenario scen : fromStudy.getScenariiList()) {
+                       if (scen.getIndex() == fromScenId) {
+                               fromScen = scen;
+                               break;
+                       }
+               }
+
+               Study toStudy = getStudyService().selectStudy(toStudyId);
+               if (toStudy == null) {
+                       throw new InvalidParameterException(MessageKeyEnum.STD_000002
+                                       .toString(), String.valueOf(toStudy));
+               }
+
+               // Check if the step is applied to a scenario and scenario is defined
+               if (fromScen == null
+                               && getStepsConfigService().stepInvolves(finalStepNum,
+                                               Scenario.class)) {
+                       throw new InvalidParameterException(MessageKeyEnum.SCN_000006
+                                       .toString(), String.valueOf(fromScenId));
+               }
+
+               // Copy validation cycles
+               copyValidationCycles(fromStudy, toStudy);
+
+               // Copy content of the study up to the given step
+               Map<Publication, Publication> oldToNewPub = new HashMap<Publication, Publication>();
+               copyDocs(fromStudy, toStudy, finalStepNum, oldToNewPub);
+               if (fromScen != null) {
+                       copyDocs(fromScen, toStudy.getScenariiList().get(0), finalStepNum,
+                                       oldToNewPub);
+               }
+               copyDependencies(fromStudy, finalStepNum, oldToNewPub);
+               if (fromScen != null) {
+                       copyDependencies(fromScen, finalStepNum, oldToNewPub);
+               }
+       }
+
+       /**
+        * Copy validation cycles from study to study.
+        * 
+        * @param fromStudy
+        *            the source study
+        * @param toStudy
+        *            the destination study
+        */
+       private void copyValidationCycles(final Study fromStudy, final Study toStudy) {
+               for (ValidationCycle fromCycle : fromStudy.getValidationCycles()
+                               .values()) {
+                       if (fromCycle.isAssigned()) {
+                               ValidationCycle cycle = fromCycle.clone(toStudy);
+                               getValidationCycleDAO().create(cycle);
+                               toStudy.addRelation(cycle.getContext());
+                               toStudy.getValidationCycles().put(
+                                               cycle.getDocumentType().getName(), cycle); // Replaces the cycle if exists as default,
+                       }
+               }
+       }
+
+       /**
+        * Copy dependencies between documents from the given project element up to <BR>
+        * the given step according to the given map of old publications to new publications.
+        * 
+        * @param from
+        *            the source project element
+        * @param finalStepNum
+        *            the final step for copy processing
+        * @param oldToNewPub
+        *            the old to new publications map
+        */
+       private void copyDependencies(final ProjectElement from,
+                       final int finalStepNum,
+                       final Map<Publication, Publication> oldToNewPub) {
+               // Copy dependencies between copied documents
+               for (Publication pub : from.getDocums()) {
+                       // If the document in the step before the final one
+                       if (pub.value().getStep() <= finalStepNum) {
+                               Publication newPub = oldToNewPub.get(pub);
+                               for (Publication used : pub.getRelations(UsesRelation.class)) {
+                                       newPub.addDependency(oldToNewPub.get(used));
+                               }
+                       }
+               }
+       }
+
+       /**
+        * Copy documents with dependencies up to the given step.
+        * 
+        * @param from
+        *            the source project element
+        * @param to
+        *            the destination project element
+        * @param finalStepNum
+        *            the final step for copy process
+        * @param oldToNewPub2
+        * @throws MissedPropertyException
+        *             if document creation is failed
+        * @throws InvalidPropertyException
+        *             if document creation is failed
+        * @throws MultiplyDefinedException
+        *             if document creation is failed
+        * @throws IOException
+        *             if document file creation is failed
+        * @throws NotApplicableException
+        *             if document state is not applicable
+        * @param oldToNewPub
+        *            the old to new publications map
+        * 
+        */
+       private void copyDocs(final ProjectElement from, final ProjectElement to,
+                       final int finalStepNum,
+                       final Map<Publication, Publication> oldToNewPub)
+                       throws MissedPropertyException, InvalidPropertyException,
+                       MultiplyDefinedException, NotApplicableException, IOException {
+               Map<Integer, Step> steps = getProjectElementService().getStepsMap(to);
+               // Copy publications without old versions and relations to not copied steps documents
+               for (Publication pub : from.getDocums()) {
+                       // If the document in the step before the final one
+                       if (pub.value().getStep() <= finalStepNum) {
+                               // Copy the document
+                               oldToNewPub.put(pub, createDoc(pub.value(), steps.get(pub
+                                               .value().getStep())));
+                       }
+               }
+       }
+
+       /**
+        * Create a copy of the given document and publish it in the given step.
+        * 
+        * @param fromDoc
+        *            the source document
+        * @param step
+        *            the destination step
+        * @return the created publication
+        * @throws MissedPropertyException
+        *             if document creation is failed
+        * @throws InvalidPropertyException
+        *             if document creation is failed
+        * @throws MultiplyDefinedException
+        *             if document creation is failed
+        * @throws IOException
+        *             if document file creation is failed
+        * @throws NotApplicableException
+        *             if document state is not applicable
+        */
+       private Publication createDoc(final Document fromDoc, final Step step)
+                       throws MissedPropertyException, InvalidPropertyException,
+                       MultiplyDefinedException, IOException, NotApplicableException {
+
+               java.io.File srcFile = fromDoc.getSourceFile().asFile();
+               // Creation of the document
+               Document.Properties dprop = new Document.Properties().setName(
+                               fromDoc.getTitle()).setType(fromDoc.getType()).setFormat(
+                               fromDoc.getFormat()).setAuthor(fromDoc.getAuthor());
+
+               java.io.File tmpDir = getRepositoryService().getDownloadDirectory(
+                               step.getOwnerStudy().getAuthor());
+
+               // Remove local file index prefix to get original filename.
+               java.io.File upfile = new java.io.File(tmpDir.getPath()
+                               + "/"
+                               + srcFile.getName().substring(
+                                               srcFile.getName().indexOf('_') + 1));
+               // Copy the source file into the temporary folder with original filename.
+               copyFile(srcFile, upfile);
+
+               dprop.setLocalPath(upfile.getPath());
+               Publication addoc = getStepService().createDocument(step, dprop);
+
+               // Move the temporary file into the repository
+               moveFile(upfile, addoc.getSourceFile().asFile());
+
+               getPublicationService().saveAs(addoc, fromDoc.getProgressState());
+
+               // Copy attached files
+               for (Relation rel : fromDoc.getRelations(ConvertsRelation.class)) {
+                       File attach = ((ConvertsRelation) rel).getTo();
+                       ConvertsRelation export = getPublicationService().attach(addoc,
+                                       attach.getFormat());
+                       // Copy the source document attachment file to the new study vault
+                       copyFile(attach.asFile(), export.getTo().asFile());
+               }
+               return addoc;
+       }
+
+       /**
+        * Copy a file. Print info message.
+        * 
+        * @param upfile
+        *            the source file.
+        * @param file
+        *            the target file
+        * @throws IOException
+        *             if failed
+        */
+       private void copyFile(final java.io.File upfile, final java.io.File file)
+                       throws IOException {
+               if (LOG.isInfoEnabled()) {
+                       LOG.info("Copy " + upfile.getAbsolutePath() + TO + file.getPath());
+               }
+               IOUtils.copy(upfile, file);
+       }
+
+       /**
+        * Copy a file. Print info message.
+        * 
+        * @param upfile
+        *            the source file.
+        * @param file
+        *            the target file
+        * @return true if renamed otherwise return false
+        */
+       private boolean moveFile(final java.io.File upfile, final java.io.File file) {
+               if (LOG.isInfoEnabled()) {
+                       LOG.info("Move " + upfile.getAbsolutePath() + TO + file.getPath());
+               }
+               return upfile.renameTo(file);
+       }
+
        /**
         * {@inheritDoc}
         * 
@@ -274,6 +568,53 @@ public class ScenarioServiceImpl implements ScenarioService {
                return res;
        }
 
+       /**
+        * {@inheritDoc}
+        * 
+        * @see org.splat.service.ScenarioService#createStudy(java.lang.String, java.lang.String, java.lang.String, java.lang.String)
+        */
+       @Transactional
+       public long createStudy(final String username, final String title,
+                       final String productName, final String description)
+                       throws InvalidPropertyException, MissedPropertyException,
+                       MultiplyDefinedException {
+               long id = 0;
+
+               // Find the author
+               User author = getUserService().selectUser(username);
+               if (author == null) {
+                       // User is not found
+                       throw new InvalidPropertyException(MessageKeyEnum.USR_000001
+                                       .toString(), username);
+               }
+
+               // Set the study properties
+               Study.Properties sprop = new Study.Properties();
+               sprop.setTitle(title).setManager(author);
+               sprop.setDescription(description);
+
+               // Find the product simulation context
+               SimulationContextType productContextType = getSimulationContextService()
+                               .selectType("product");
+               SimulationContext.Properties cprop = new SimulationContext.Properties();
+               cprop.setType(productContextType).setValue(productName);
+               SimulationContext productCtx = getSimulationContextService()
+                               .selectSimulationContext(productContextType, productName);
+               if (productCtx != null) {
+                       cprop.setIndex(productCtx.getIndex());
+               }
+
+               // Set a first scenario properties
+               Scenario.Properties oprop = new Scenario.Properties();
+               oprop.setTitle(I18nUtils.getMessageLocaleDefault("label.scenario")
+                               + " 1");
+
+               Study study = createStudy(sprop, oprop, cprop);
+               id = study.getIndex();
+
+               return id;
+       }
+
        /**
         * Create a new study with one scenario and "product" simulation context.
         * 
@@ -311,6 +652,41 @@ public class ScenarioServiceImpl implements ScenarioService {
                return study;
        }
 
+       /**
+        * {@inheritDoc}
+        * 
+        * @see org.splat.service.ScenarioService#assignStudyContext(java.lang.Long, java.lang.String, java.lang.String)
+        */
+       @Transactional
+       public void assignStudyContext(final Long studyId, final String ctxType,
+                       final String ctxValue) throws MissedPropertyException,
+                       InvalidPropertyException, MultiplyDefinedException {
+               // Find the study by the given id
+               Study study = getStudyDAO().get(studyId);
+               if (study == null) {
+                       throw new InvalidPropertyException(MessageKeyEnum.STD_000002
+                                       .toString(), studyId);
+               }
+               // Find the context type by its name
+               SimulationContextType celt = getSimulationContextService().selectType(
+                               ctxType);
+               if (celt == null) {
+                       // Creation of a new context type
+                       celt = getSimulationContextTypeService().createType(ctxType,
+                                       getProjectElementService().getFirstStep(study).getStep());
+               }
+               // Find the given context value of the given type
+               SimulationContext context = getSimulationContextService()
+                               .selectSimulationContext(celt, ctxValue);
+               if (context == null) { // Input of a new project context
+                       SimulationContext.Properties cprop = new SimulationContext.Properties();
+                       cprop.setType(celt).setValue(ctxValue);
+                       getStudyService().addProjectContext(study, cprop);
+               } else { // Selection of existing project context
+                       getStudyService().addProjectContext(study, context);
+               }
+       }
+
        /**
         * {@inheritDoc}
         * 
@@ -323,70 +699,49 @@ public class ScenarioServiceImpl implements ScenarioService {
                        throws MissedPropertyException, InvalidPropertyException,
                        MultiplyDefinedException {
                KnowledgeElement kelm = null;
-               try {
-                       long aScenarioId = aScenarioDTO.getIndex();
-                       if (LOG.isDebugEnabled()) {
-                               LOG.debug("Add a knowledge element to the scenario #"
-                                               + aScenarioId);
-                       }
-                       // Get the persistent scenario.
-                       Scenario aScenario = getScenarioDAO().get(aScenarioId);
-                       // Get persistent objects for creating a new knowledge.
-                       // TODO: Actions must use DTO instead of persistent objects.
-                       getUserDAO().merge(kprop.getAuthor());
-                       getKnowledgeElementTypeDAO().merge(kprop.getType());
-                       // Create a transient knowledge element related to the given scenario.
-                       kelm = new KnowledgeElement(kprop.setOwnerScenario(aScenario));
-                       // Save the new knowledge in the database.
-                       getKnowledgeElementDAO().create(kelm);
-                       // Update scenario transient data.
-                       if (kelm.getType().equals("usecase")) {
-                               aScenarioDTO.setUcase(kelm);
-                       } else if (aScenarioDTO.getKnowledgeElementsList() != null) { // If null, knowl will be initialized when needed
-                               aScenarioDTO.getKnowledgeElementsList().add(kelm);
-                       }
+               // try {
+               long aScenarioId = aScenarioDTO.getIndex();
+               if (LOG.isDebugEnabled()) {
+                       LOG
+                                       .debug("Add a knowledge element to the scenario #"
+                                                       + aScenarioId);
+               }
+               // Get the persistent scenario.
+               Scenario aScenario = getScenarioDAO().get(aScenarioId);
+               // Get persistent objects for creating a new knowledge.
+               // TODO: Actions must use DTO instead of persistent objects.
+               getUserDAO().merge(kprop.getAuthor());
+               getKnowledgeElementTypeDAO().merge(kprop.getType());
+               // Create a transient knowledge element related to the given scenario.
+               kelm = new KnowledgeElement(kprop.setOwnerScenario(aScenario));
+               // Save the new knowledge in the database.
+               getKnowledgeElementDAO().create(kelm);
+               // Update scenario transient data.
+               if (kelm.getType().equals("usecase")) {
+                       aScenarioDTO.setUcase(kelm);
+               } else if (aScenarioDTO.getKnowledgeElementsList() != null) { // If null, knowl will be initialized when needed
+                       aScenarioDTO.getKnowledgeElementsList().add(kelm);
+               }
 
-                       // Load the workflow for the parent study to take into account
-                       // all study actors durng reindexing.
-                       getStudyService().loadWorkflow(aScenario.getOwnerStudy());
+               // Load the workflow for the parent study to take into account
+               // all study actors durng reindexing.
+               getStudyService().loadWorkflow(aScenario.getOwnerStudy());
 
-                       // Update the lucene index of knowledge elements.
-                       getIndexService().add(kelm);
-                       if (LOG.isDebugEnabled()) {
-                               LOG.debug("A knowledge element #" + kelm.getIndex()
-                                               + " is added to the scenario #" + aScenario.getIndex());
-                       }
-               } catch (IOException error) {
-                       LOG.error(
-                                       "Unable to index the knowedge element '" + kelm.getIndex()
-                                                       + "', reason:", error);
-                       kelm = null;
+               // // Update the lucene index of knowledge elements.
+               // getIndexService().add(kelm);
+               if (LOG.isDebugEnabled()) {
+                       LOG.debug("A knowledge element #" + kelm.getIndex()
+                                       + " is added to the scenario #" + aScenario.getIndex());
                }
+               // } catch (IOException error) {
+               // LOG.error("Unable to index the knowedge element '"
+               // + kelm.getIndex() + "', reason:", error);
+               // kelm = null;
+               // }
 
                return kelm;
        }
 
-       /**
-        * Update the scenario in the database.
-        * 
-        * @param aScenario
-        *            the scenario to update
-        * @return true if updating succeeded
-        */
-       @Transactional
-       private boolean update(final Scenario aScenario) {
-               boolean isOk = false;
-               try {
-                       getScenarioDAO().update(aScenario); // Update of relational base
-                       isOk = true;
-               } catch (Exception error) {
-                       LOG.error(
-                                       "Unable to re-index the knowledge element '"
-                                                       + aScenario.getIndex() + "', reason:", error);
-               }
-               return isOk;
-       }
-
        /**
         * {@inheritDoc}
         * 
@@ -565,33 +920,25 @@ public class ScenarioServiceImpl implements ScenarioService {
                        Document.Properties dprop = new Document.Properties();
                        // NOTE: Process only the first attached file for each document
                        FileDTO file = doc.getFiles().get(0);
+                       dprop.setLocalPath(file.getPath());
 
                        // Get document title as the file name
                        java.io.File upfile = new java.io.File(file.getPath());
                        String fileFormat = upfile.getName().substring(
                                        upfile.getName().lastIndexOf('.') + 1);
 
-                       // Create a new document or a new version of the document
-                       dprop.setAuthor(aUser).setDate(aDate);
-                       Publication pub, newPub;
+                       // Attach the file via ConvertsRelation, create a new document or
+                       // create a new version of the document
+                       dprop.setAuthor(aUser).setDate(aDate).setFormat(fileFormat);
+                       String authorName = I18nUtils.getMessageLocaleDefault(aUser
+                                       .getDisplayName());
+                       String summary = I18nUtils.getMessageLocaleDefault(
+                                       MessageKeyEnum.DCT_000005.toString(), authorName);
+                       dprop.setDescription(summary);
 
                        if (doc.getId() > 0) {
-                               // If the document already exists then create a new version of it
-                               // Find the document publication
-                               pub = step.getDocument(doc.getId());
-                               if (pub == null) {
-                                       throw new InvalidPropertyException(
-                                                       MessageKeyEnum.SCN_000002.toString(), doc.getId());
-                               }
-                               if (pub.value() == null) {
-                                       throw new MismatchException(
-                                                       MessageKeyEnum.SCN_000002.toString(), doc.getId());
-                               }
-                               newPub = getStepService().versionDocument(step, pub, dprop);
-                               // Remeber the link from the old document to the new document version
-                               newVersion.put(pub.value(), newPub.value());
-                               // Remember the new version publication
-                               newVers.add(newPub);
+                               checkinExistingDoc(step, doc, dprop, fileFormat, upfile,
+                                               newVersion, newVers);
                        } else {
 
                                // Otherwise create a new document of the result type
@@ -612,40 +959,146 @@ public class ScenarioServiceImpl implements ScenarioService {
                                }
                                docname += "_" + i; // The generated new document title
 
-                               dprop.setDescription("Checked in").setName(docname)
-                                               .setFormat(fileFormat);
-                               newPub = getStepService().createDocument(step, dprop);
+                               dprop.setName(docname);
+                               Publication newPub = getStepService().createDocument(step,
+                                               dprop);
 
-                               // Remeber the new document
+                               // Remember the new document
                                newDocs.add(newPub);
+
+                               saveFile(newPub, step, upfile);
                        }
+               }
+       }
 
-                       // Attach the file to the created document
-                       java.io.File updir = newPub.getSourceFile().asFile();
+       /**
+        * Check in existing document.
+        * 
+        * @param step
+        *            study step to check in
+        * @param doc
+        *            document DTO to check in
+        * @param dprop
+        *            document properties
+        * @param fileFormat
+        *            checked in file format
+        * @param upfile
+        *            the file to check in
+        * @param newVersion
+        *            the map of created versions during this check in
+        * @param newVers
+        *            the list of new versions created during this check in
+        * @throws InvalidPropertyException
+        *             if publication of the document is not found in the step
+        * @throws MismatchException
+        *             if the found publication does not point to a document
+        * @throws IOException
+        *             if can not move the file into the vault
+        * @throws MultiplyDefinedException
+        *             thrown by versionDocument
+        * @throws MissedPropertyException
+        *             thrown by versionDocument
+        * @throws NotApplicableException
+        *             if failed saving of a new publication with a given state
+        */
+       private void checkinExistingDoc(final Step step, final DocumentDTO doc,
+                       final Properties dprop, final String fileFormat,
+                       final java.io.File upfile,
+                       final Map<Document, Document> newVersion,
+                       final List<Publication> newVers) throws InvalidPropertyException,
+                       MismatchException, MissedPropertyException,
+                       MultiplyDefinedException, IOException, NotApplicableException {
+               // If the document already exists then
+               // Attach the file via ConvertsRelation if the extension of the
+               // new file differs from the old one.
+               // If file format (i.e. extension) is the same then create a new
+               // version of the document.
+               // Find the document publication
+               Publication pub = step.getDocument(doc.getId());
+               if (pub == null) {
+                       throw new InvalidPropertyException(MessageKeyEnum.SCN_000002
+                                       .toString(), doc.getId());
+               }
+               if (pub.value() == null) {
+                       throw new MismatchException(MessageKeyEnum.SCN_000002.toString(),
+                                       doc.getId());
+               }
+               if (LOG.isDebugEnabled()) {
+                       LOG.debug("Old format: " + pub.value().getFormat()
+                                       + " => New format: " + fileFormat);
+               }
+               // If formats are same then create a new document version
+               if (pub.value().getFormat() != null
+                               && pub.value().getFormat().equals(fileFormat)) {
+                       Publication newPub = getStepService().versionDocument(step, pub,
+                                       dprop);
                        if (LOG.isDebugEnabled()) {
-                               LOG.debug("Moving \"" + upfile.getName() + "\" to \""
-                                               + updir.getPath() + "\".");
+                               LOG.debug("Created document type: "
+                                               + newPub.value().getType().getName() + ", format: "
+                                               + newPub.value().getFormat());
                        }
-                       if (updir.exists()) {
-                               if (updir.delete()) {
-                                       LOG.info(MessageKeyEnum.SCN_000003.toString(),
-                                                       updir.getAbsoluteFile(), step.getOwner().getIndex());
-                               } else {
-                                       throw new IOException(
-                                                       "Can't delete the existing destination file to move file from "
-                                                                       + file.getPath() + " to "
-                                                                       + updir.getAbsolutePath());
-                               }
+                       // Remeber the link from the old document to the new document version
+                       newVersion.put(pub.value(), newPub.value());
+                       // Remember the new version publication
+                       newVers.add(newPub);
+
+                       saveFile(newPub, step, upfile);
+
+               } else { // If formats are different then attach the new file via ConvertsRelation
+                       File attach = pub.value().getAttachedFile(fileFormat);
+                       if (attach == null) {
+                               // If there is no attachment with this extension then attach the new one
+                               ConvertsRelation export = getPublicationService().attach(pub,
+                                               fileFormat);
+                               moveFile(upfile, export.getTo().asFile());
+                       } else {
+                               // If an attachment with this extension already exists then
+                               // replace it by the new one
+                               moveFile(upfile, attach.asFile());
+                               // Update attached file modification date
+                               attach.setDate(new Date());
                        }
-                       if (upfile.renameTo(updir)) {
-                               // Save the new publication in the scenario.
-                               // The old publication is removed from the scenario here.
-                               getPublicationService().saveAs(newPub, ProgressState.inWORK); // May throw FileNotFound if rename was not done
+               }
+       }
+
+       /**
+        * Save the file in the vault and create its publication in the step.
+        * 
+        * @param newPub
+        *            the new publication to save
+        * @param step
+        *            the study step to publish the document
+        * @param upfile
+        *            the downloaded file
+        * @throws IOException
+        *             if a file can't be moved into the vault
+        * @throws NotApplicableException
+        *             if failed saving of a new publication with a given state
+        */
+       private void saveFile(final Publication newPub, final Step step,
+                       final java.io.File upfile) throws IOException,
+                       NotApplicableException {
+               // Attach the file to the created document
+               java.io.File updir = newPub.getSourceFile().asFile();
+               if (updir.exists()) {
+                       if (updir.delete()) {
+                               LOG.info(MessageKeyEnum.SCN_000003.toString(), updir
+                                               .getAbsoluteFile(), step.getOwner().getIndex());
                        } else {
-                               throw new IOException("Can't move file from " + file.getPath()
-                                               + " to " + updir.getAbsolutePath());
+                               throw new IOException(
+                                               "Can't delete the existing destination file to move file from "
+                                                               + upfile.getAbsolutePath() + TO
+                                                               + updir.getAbsolutePath());
                        }
                }
+               if (moveFile(upfile, updir)) {
+                       // Save the new publication in the scenario.
+                       // The old publication is removed from the scenario here.
+                       getPublicationService().saveAs(newPub, ProgressState.inWORK); // May throw FileNotFound if rename was not done
+               } else {
+                       throw new IOException("Can't move file from "
+                                       + upfile.getAbsolutePath() + TO + updir.getAbsolutePath());
+               }
        }
 
        /**
@@ -671,8 +1124,8 @@ public class ScenarioServiceImpl implements ScenarioService {
                } while ((step == null) && (i < steps.length));
 
                if (step == null) {
-                       throw new InvalidPropertyException(
-                                       MessageKeyEnum.SCN_000001.toString(), stepDTO.getNumber());
+                       throw new InvalidPropertyException(MessageKeyEnum.SCN_000001
+                                       .toString(), stepDTO.getNumber());
                }
                return step;
        }
@@ -680,12 +1133,29 @@ public class ScenarioServiceImpl implements ScenarioService {
        /**
         * {@inheritDoc}
         * 
-        * @see org.splat.service.ScenarioService#checkin(org.splat.dal.bo.som.Scenario)
+        * @see org.splat.service.ScenarioService#checkin(long)
+        */
+       @Transactional
+       public void checkin(final long scenarioId) throws InvalidPropertyException {
+               Scenario aScenario = getScenarioDAO().get(scenarioId);
+               if (aScenario == null) {
+                       // Scenario not found
+                       throw new InvalidPropertyException(MessageKeyEnum.SCN_000006
+                                       .toString(), scenarioId);
+               }
+               checkin(aScenario);
+       }
+
+       /**
+        * Mark the scenario as checked in.
+        * 
+        * @param aScenario
+        *            the scenario to check in.
         */
-       public void checkin(final Scenario aScenario) {
+       private void checkin(final Scenario aScenario) {
                aScenario.setUser(null);
                aScenario.setLastModificationDate(Calendar.getInstance().getTime());
-               getScenarioDAO().update(aScenario);
+               // getScenarioDAO().update(aScenario);
        }
 
        /**
@@ -709,43 +1179,44 @@ public class ScenarioServiceImpl implements ScenarioService {
         * 
         * @param scenarioId
         *            the scenario id
-        * @param username
-        *            the username of the user performing the check out
+        * @param userId
+        *            the id of the user performing the check out
         * @throws InvalidPropertyException
         *             if the user or the scenario is not found in the database
         * @throws NotApplicableException
         *             if the given user can not check out the scenario
         */
        @Transactional
-       public void checkout(final long scenarioId, final String username)
+       public void checkout(final long scenarioId, final long userId)
                        throws InvalidPropertyException, NotApplicableException {
-               User aUser = getUserService().selectUser(username);
+               User aUser = getUserService().selectUser(userId);
                if (aUser == null) {
                        // User not found
-                       throw new InvalidPropertyException(
-                                       MessageKeyEnum.USR_000001.toString(), username);
+                       throw new InvalidPropertyException(MessageKeyEnum.USR_000001
+                                       .toString(), userId);
                }
                Scenario aScenario = getScenarioDAO().get(scenarioId);
                if (aScenario == null) {
                        // Scenario not found
-                       throw new InvalidPropertyException(
-                                       MessageKeyEnum.SCN_000006.toString(), scenarioId);
+                       throw new InvalidPropertyException(MessageKeyEnum.SCN_000006
+                                       .toString(), scenarioId);
                }
                boolean res = getStudyService().isStaffedBy(aScenario.getOwnerStudy(),
                                aUser);
                if (res) {
                        if (aScenario.isCheckedout()
-                                       && (!aScenario.getUser().getUsername().equals(username))) {
-                               throw new NotApplicableException(
-                                               MessageKeyEnum.SCN_000008.toString(), scenarioId,
-                                               aScenario.getUser().getUsername());
+                                       && (!aScenario.getUser().getUsername().equals(
+                                                       aUser.getUsername()))) {
+                               throw new NotApplicableException(MessageKeyEnum.SCN_000008
+                                               .toString(), scenarioId, aScenario.getUser()
+                                               .getUsername());
                        }
                        aScenario.setUser(aUser);
                        aScenario.setLastModificationDate(Calendar.getInstance().getTime());
                } else {
                        // User doesn't participate in the scenario
-                       throw new NotApplicableException(
-                                       MessageKeyEnum.SCN_000007.toString(), username, scenarioId);
+                       throw new NotApplicableException(MessageKeyEnum.SCN_000007
+                                       .toString(), aUser.getUsername(), scenarioId);
                }
        }
 
@@ -855,8 +1326,8 @@ public class ScenarioServiceImpl implements ScenarioService {
                User admin = getUserDAO().getFilteredList(
                                Restrictions.eq("role", adminRole), Order.asc("rid")).get(0); // First sysadmin in the database
 
-               kprop.setType(ucase).setTitle(aStudy.getTitle())
-                               .setValue(scenario.getTitle()).setAuthor(admin); // Internal Knowledge Element required by the validation process of
+               kprop.setType(ucase).setTitle(aStudy.getTitle()).setValue(
+                               scenario.getTitle()).setAuthor(admin); // Internal Knowledge Element required by the validation process of
                // knowledges
                addKnowledgeElement(scenario, kprop);
                return scenario;
@@ -871,28 +1342,38 @@ public class ScenarioServiceImpl implements ScenarioService {
         *            the knowledge element to remove
         * @return true if removal succeeded
         */
+       @Transactional
        public boolean removeKnowledgeElement(final Scenario scenario,
                        final KnowledgeElement kelm) {
                KnowledgeElement torem = scenario.getKnowledgeElement(kelm.getIndex());
-               if (torem == null) {
-                       return false;
-               }
-               boolean done = scenario.getKnowledgeElements().remove(torem);
-               if (done) {
-                       // Update of my transient data
-                       // RKV: These transient data are not used indeed.
-                       // RKV: List<KnowledgeElement> kelms = scenario.getKnowledgeByType().get(
-                       // RKV: kelm.getType().getIndex());
-                       // RKV: kelms.remove(torem);
-                       if (scenario.getKnowledgeElementsList() != null) {
-                               scenario.getKnowledgeElementsList().remove(torem);
+               boolean isOk = (torem != null);
+               if (isOk) {
+                       isOk = scenario.getKnowledgeElements().remove(torem);
+                       if (isOk) {
+                               getScenarioDAO().merge(scenario);
+                               // Update of my transient data
+                               // RKV: These transient data are not used indeed.
+                               // RKV: List<KnowledgeElement> kelms = scenario.getKnowledgeByType().get(
+                               // RKV: kelm.getType().getIndex());
+                               // RKV: kelms.remove(torem);
+                               if (scenario.getKnowledgeElementsList() != null) {
+                                       scenario.getKnowledgeElementsList().remove(torem);
+                               }
+                               // TODO: If the owner study is not private, remove the knowledge from the Lucene index
                        }
-                       getScenarioDAO().update(scenario);
-                       // TODO: If the owner study is not private, remove the knowledge from the Lucene index
-                       return true;
-               } else {
-                       return false;
                }
+               return isOk;
+       }
+
+       /**
+        * 
+        * {@inheritDoc}
+        * 
+        * @see org.splat.service.ScenarioService#renameScenario(java.lang.String)
+        */
+       @Transactional
+       public void renameScenario(final Scenario scenario) {
+               getScenarioDAO().merge(scenario);
        }
 
        /**
@@ -1148,4 +1629,83 @@ public class ScenarioServiceImpl implements ScenarioService {
                _roleDAO = roleDAO;
        }
 
+       /**
+        * Get the simulationContextTypeService.
+        * 
+        * @return the simulationContextTypeService
+        */
+       public SimulationContextTypeService getSimulationContextTypeService() {
+               return _simulationContextTypeService;
+       }
+
+       /**
+        * Set the simulationContextTypeService.
+        * 
+        * @param simulationContextTypeService
+        *            the simulationContextTypeService to set
+        */
+       public void setSimulationContextTypeService(
+                       final SimulationContextTypeService simulationContextTypeService) {
+               _simulationContextTypeService = simulationContextTypeService;
+       }
+
+       /**
+        * Get the validationCycleDAO.
+        * 
+        * @return the validationCycleDAO
+        */
+       public ValidationCycleDAO getValidationCycleDAO() {
+               return _validationCycleDAO;
+       }
+
+       /**
+        * Set the validationCycleDAO.
+        * 
+        * @param validationCycleDAO
+        *            the validationCycleDAO to set
+        */
+       public void setValidationCycleDAO(
+                       final ValidationCycleDAO validationCycleDAO) {
+               _validationCycleDAO = validationCycleDAO;
+       }
+
+       /**
+        * Get steps config.
+        * 
+        * @return steps config service
+        */
+       private StepsConfigService getStepsConfigService() {
+               return _stepsConfigService;
+       }
+
+       /**
+        * Set steps config service.
+        * 
+        * @param stepsConfigService
+        *            steps config service
+        */
+       public void setStepsConfigService(
+                       final StepsConfigService stepsConfigService) {
+               _stepsConfigService = stepsConfigService;
+       }
+
+       /**
+        * Get the repositoryService.
+        * 
+        * @return the repositoryService
+        */
+       public RepositoryService getRepositoryService() {
+               return _repositoryService;
+       }
+
+       /**
+        * Set the repositoryService.
+        * 
+        * @param repositoryService
+        *            the repositoryService to set
+        */
+       public void setRepositoryService(final RepositoryService repositoryService) {
+               _repositoryService = repositoryService;
+       }
+
 }