Merge branch 'ehsavoie-feature-4609'

Author: NicolasEYSSERIC

config-core/src/main/config/properties/org/silverpeas/util/attachment/multilang/attachment.properties

@@ -45,7 +45,7 @@ confirm.checkin.message=Voulez vous enregistrer vos modifications ?
 
 CopyLink = Pour copier le lien vers ce fichier : Clique droit puis 'Copier le raccourci'
 
-# A mettre \u00e0 jour dans le multilang general  
+# A mettre \u00e0 jour dans le multilang general
 type = Type
 zip = Zipper
 uploadDate = T\u00e9l\u00e9charg\u00e9 le
@@ -68,7 +68,7 @@ attachment.warning.checkin.locked=Le fichier est encore ouvert en mode d'\u00e9d
 
 attachment.xmlForm.Edit = Editer les informations compl\u00e9mentaires
 attachment.xmlForm.View = Plus...
-attachment.xmlForm.ToolTip = Informations compl\u00e9mentaires sur 
+attachment.xmlForm.ToolTip = Informations compl\u00e9mentaires sur
 attachment.share = Partager ce fichier
 
 attachment.checkOutAndDownload = R\u00e9server et t\u00e9l\u00e9charger
@@ -86,4 +86,14 @@ attachment.dialog.button.deleteAll = Tout supprimer
 
 attachment.add = Ajouter un fichier...
 attachment.version.new = Nouvelle version
-attachment.version.actual = Derni\u00e8re version
+attachment.version.actual = Derni\u00e8re version
+
+attachment.dialog.switch=Changer d'\u00e9tat
+attachment.switchState.toSimple=D\u00e9sactiver le suivi de versions
+attachment.switchState.toVersioned=Activer le suivi de versions
+attachment.switch.warning.simple=Voulez-vous d\u00e9sactiver le suivi de versions sur ce fichier ? Attention! Les versions pr\u00e9c\u00e9dentes seront d\u00e9finitivement supprim\u00e9es.
+attachment.switch.warning.versioned=Voulez-vous activer le suivi de versions sur ce fichier ?
+
+attachment.switch.version.major=Utiliser la derni\u00e8re version publique
+attachment.switch.version.last=Utiliser la derni\u00e8re version
+switch-version-comment=Commentaires sur la version

config-core/src/main/config/properties/org/silverpeas/util/attachment/multilang/attachment_de.properties

@@ -50,21 +50,21 @@ confirm.checkin.message=Wollen Sie die \u00c4nderungen speichern?
 
 CopyLink = Zum Kopieren des Links in diese Datei: Rechtsklick, dann 'Verkn\u00fcpfung kopieren'
 
-# A mettre \u00e0 jour dans le multilang general 
-modifier = \u00c4ndern 
-supprimer = L\u00f6schen 
+# A mettre \u00e0 jour dans le multilang general
+modifier = \u00c4ndern
+supprimer = L\u00f6schen
 fermer = Schliessen
-description = Beschreibung 
+description = Beschreibung
 valider = OK
-annuler = Abbrechen 
+annuler = Abbrechen
 retour = Zur\u00fcck
 type = Typ
 fichier = Datei
 ajouter = Hinzuf\u00fcgen
 zip = Zippen
 uploadDate = Heruntergeladen am
 
-erreur = Fehler 
+erreur = Fehler
 
 lier = Verbinden
 
@@ -78,7 +78,7 @@ attachment.notifUserLib = ist abgelaufen und wurde freigegeben
 
 attachment.suppressionWhichTranslations = Die Datei Die Sie l\u00f6schen wollen hat mehrere \u00dcbersetzungen.<br/>Was m\u00f6chten Sie l\u00f6schen ?
 
-attachment.suppressionConfirmation = Sind Sie sicher die Datei l\u00f6schen zu wollen 
+attachment.suppressionConfirmation = Sind Sie sicher die Datei l\u00f6schen zu wollen
 
 attachment.warning.checkin.locked=Die Datei ist noch im on-line Bearbeitungsmodus. <br/>Bitte schlie\u00dfen Sie sie bevor Sie diese freigeben k\u00f6nnen.
 
@@ -94,4 +94,14 @@ attachment.dialog.button.deleteAll = Delete all
 
 attachment.add = Add a file...
 attachment.version.new = Neue version
-attachment.version.actual = Neueste version
+attachment.version.actual = Neueste version
+
+attachment.dialog.switch=Change state
+attachment.switchState.toSimple=Disable version tracking
+attachment.switchState.toVersioned=Enable version tracking
+attachment.switch.warning.simple=Do you want to disable version tracking on this file ? Caution! Previous versions will be permanently deleted.
+attachment.switch.warning.versioned=Do you want to enable version tracking on this file ?
+
+attachment.switch.version.major=Use last public version
+attachment.switch.version.last=Use last version
+switch-version-comment=Version comments

config-core/src/main/config/properties/org/silverpeas/util/attachment/multilang/attachment_en.properties

@@ -35,7 +35,7 @@ Up = Move up
 Down = Move down
 checkIn = Unlock
 checkOut = Lock
-readOnly = Locked by 
+readOnly = Locked by
 at = at
 until = until
 
@@ -65,13 +65,13 @@ attachment.notifUserLib = has expired and was unlocked
 
 attachment.suppressionWhichTranslations = The file you want to remove has several translations.<br/>Which translation(s) do you want to remove?
 
-attachment.suppressionConfirmation = Are you sure to want to remove the file 
+attachment.suppressionConfirmation = Are you sure to want to remove the file
 
 attachment.warning.checkin.locked=The file is being edited online.<br/>Close it before releasing it.
 
 attachment.xmlForm.Edit = Edit additional informations
 attachment.xmlForm.View = More...
-attachment.xmlForm.ToolTip = Additional informations about  
+attachment.xmlForm.ToolTip = Additional informations about
 attachment.share = Share this file
 attachment.checkOutAndDownload = Lock and download
 attachment.checkOutAndEditOnline = Edit online
@@ -88,4 +88,14 @@ attachment.dialog.button.deleteAll = Delete all
 
 attachment.add = Add a file...
 attachment.version.new = New version
-attachment.version.actual = Latest version
+attachment.version.actual = Latest version
+
+attachment.dialog.switch=Change state
+attachment.switchState.toSimple=Disable version tracking
+attachment.switchState.toVersioned=Enable version tracking
+attachment.switch.warning.simple=Do you want to disable version tracking on this file ? Caution! Previous versions will be permanently deleted.
+attachment.switch.warning.versioned=Do you want to enable version tracking on this file ?
+
+attachment.switch.version.major=Use last public version
+attachment.switch.version.last=Use last version
+switch-version-comment=Version comments

config-core/src/main/config/properties/org/silverpeas/util/attachment/multilang/attachment_fr.properties

@@ -45,7 +45,7 @@ confirm.checkin.message=Voulez vous enregistrer vos modifications ?
 
 CopyLink = Pour copier le lien vers ce fichier : Clique droit puis 'Copier le raccourci'
 
-# A mettre \u00e0 jour dans le multilang general  
+# A mettre \u00e0 jour dans le multilang general
 type = Type
 zip = Zipper
 uploadDate = T\u00e9l\u00e9charg\u00e9 le
@@ -68,7 +68,7 @@ attachment.warning.checkin.locked=Le fichier est encore ouvert en mode d'\u00e9d
 
 attachment.xmlForm.Edit = Editer les informations compl\u00e9mentaires
 attachment.xmlForm.View = Plus...
-attachment.xmlForm.ToolTip = Informations compl\u00e9mentaires sur 
+attachment.xmlForm.ToolTip = Informations compl\u00e9mentaires sur
 attachment.share = Partager ce fichier
 
 attachment.checkOutAndDownload = R\u00e9server et t\u00e9l\u00e9charger
@@ -86,4 +86,14 @@ attachment.dialog.button.deleteAll = Tout supprimer
 
 attachment.add = Ajouter un fichier...
 attachment.version.new = Nouvelle version
-attachment.version.actual = Derni\u00e8re version
+attachment.version.actual = Derni\u00e8re version
+
+attachment.dialog.switch=Changer d'\u00e9tat
+attachment.switchState.toSimple=D\u00e9sactiver le suivi de versions
+attachment.switchState.toVersioned=Activer le suivi de versions
+attachment.switch.warning.simple=Voulez-vous d\u00e9sactiver le suivi de versions sur ce fichier ? Attention! Les versions pr\u00e9c\u00e9dentes seront d\u00e9finitivement supprim\u00e9es.
+attachment.switch.warning.versioned=Voulez-vous activer le suivi de versions sur ce fichier ?
+
+attachment.switch.version.major=Utiliser la derni\u00e8re version publique
+attachment.switch.version.last=Utiliser la derni\u00e8re version
+switch-version-comment=Commentaires sur la version

lib-core/src/main/java/org/silverpeas/attachment/AttachmentService.java

@@ -23,21 +23,23 @@
  */
 package org.silverpeas.attachment;
 
-import com.silverpeas.util.ForeignPK;
-import com.stratelia.webactiv.util.WAPrimaryKey;
-import org.silverpeas.attachment.model.DocumentType;
-import org.silverpeas.attachment.model.SimpleDocument;
-import org.silverpeas.attachment.model.SimpleDocumentPK;
-import org.silverpeas.attachment.model.UnlockContext;
-import org.silverpeas.search.indexEngine.model.FullIndexEntry;
-
 import java.io.File;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
+import org.silverpeas.attachment.model.DocumentType;
+import org.silverpeas.attachment.model.SimpleDocument;
+import org.silverpeas.attachment.model.SimpleDocumentPK;
+import org.silverpeas.attachment.model.UnlockContext;
+import org.silverpeas.search.indexEngine.model.FullIndexEntry;
+
+import com.silverpeas.util.ForeignPK;
+
+import com.stratelia.webactiv.util.WAPrimaryKey;
+
 /**
  *
  * @author ehugonnet
@@ -366,8 +368,11 @@ void updateAttachment(SimpleDocument document, InputStream content, boolean inde
    * created and the document becomes a document with a version history management. F
    *
    * @param pk the id of the document.
+   * @param comment the comment of the versioned documetn if we are switching from simple to
+   * versioned.
+   * @return the pk to the document after is state change.
    */
-  public void changeVersionState(SimpleDocumentPK pk);
+  public SimpleDocumentPK changeVersionState(SimpleDocumentPK pk, String comment);
 
   /**
    * Find documents with the same name attached to the specified foreign id.

lib-core/src/main/java/org/silverpeas/attachment/SimpleDocumentService.java

@@ -382,13 +382,15 @@ public void updateAttachment(SimpleDocument document, boolean indexIt, boolean i
           document.getLanguage());
       repository.fillNodeName(session, document);
       repository.updateDocument(session, document);
-      if (document.isOpenOfficeCompatible() && document.isReadOnly()) {
-        // le fichier est renommé
-        if (!oldAttachment.getFilename().equals(document.getFilename())) {
-          webdavRepository.deleteAttachmentNode(session, oldAttachment);
-          webdavRepository.createAttachmentNode(session, document);
-        } else {
-          webdavRepository.updateNodeAttachment(session, document);
+      if (!oldAttachment.isVersioned()) {
+        if (document.isOpenOfficeCompatible() && document.isReadOnly()) {
+          // le fichier est renommé
+          if (!oldAttachment.getFilename().equals(document.getFilename())) {
+            webdavRepository.deleteAttachmentNode(session, oldAttachment);
+            webdavRepository.createAttachmentNode(session, document);
+          } else {
+            webdavRepository.updateAttachment(session, document);
+          }
         }
       }
       String userId = document.getUpdatedBy();
@@ -840,12 +842,13 @@ private void updateAttachment(Session session, SimpleDocument document, boolean
   }
 
   @Override
-  public void changeVersionState(SimpleDocumentPK pk) {
+  public SimpleDocumentPK changeVersionState(SimpleDocumentPK pk, String comment) {
     Session session = null;
     try {
       session = BasicDaoFactory.getSystemSession();
-      repository.changeVersionState(session, pk);
+      SimpleDocumentPK updatedPk = repository.changeVersionState(session, pk, comment);
       session.save();
+      return updatedPk;
     } catch (RepositoryException ex) {
       throw new AttachmentException(this.getClass().getName(), SilverpeasException.ERROR, "", ex);
     } catch (IOException ex) {

lib-core/src/main/java/org/silverpeas/attachment/repository/DocumentRepository.java

@@ -23,22 +23,16 @@
  */
 package org.silverpeas.attachment.repository;
 
-import com.silverpeas.jcrutil.BasicDaoFactory;
-import com.silverpeas.util.FileUtil;
-import com.silverpeas.util.StringUtil;
-import com.silverpeas.util.i18n.I18NHelper;
-import com.stratelia.silverpeas.silvertrace.SilverTrace;
-import com.stratelia.webactiv.util.DateUtil;
-import com.stratelia.webactiv.util.FileRepositoryManager;
-import com.stratelia.webactiv.util.WAPrimaryKey;
-import org.apache.commons.io.FileUtils;
-import org.silverpeas.attachment.model.DocumentType;
-import org.silverpeas.attachment.model.HistorisedDocument;
-import org.silverpeas.attachment.model.SimpleAttachment;
-import org.silverpeas.attachment.model.SimpleDocument;
-import org.silverpeas.attachment.model.SimpleDocumentPK;
-import org.silverpeas.util.jcr.NodeIterable;
-import org.silverpeas.util.jcr.PropertyIterable;
+import java.io.BufferedInputStream;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Calendar;
+import java.util.Collections;
+import java.util.Date;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
 
 import javax.inject.Named;
 import javax.jcr.ItemNotFoundException;
@@ -60,16 +54,26 @@
 import javax.jcr.version.VersionHistory;
 import javax.jcr.version.VersionIterator;
 import javax.jcr.version.VersionManager;
-import java.io.BufferedInputStream;
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.Calendar;
-import java.util.Collections;
-import java.util.Date;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
+
+import org.silverpeas.attachment.model.DocumentType;
+import org.silverpeas.attachment.model.HistorisedDocument;
+import org.silverpeas.attachment.model.SimpleAttachment;
+import org.silverpeas.attachment.model.SimpleDocument;
+import org.silverpeas.attachment.model.SimpleDocumentPK;
+import org.silverpeas.util.jcr.NodeIterable;
+import org.silverpeas.util.jcr.PropertyIterable;
+
+import com.silverpeas.jcrutil.BasicDaoFactory;
+import com.silverpeas.util.FileUtil;
+import com.silverpeas.util.StringUtil;
+import com.silverpeas.util.i18n.I18NHelper;
+
+import com.stratelia.silverpeas.silvertrace.SilverTrace;
+import com.stratelia.webactiv.util.DateUtil;
+import com.stratelia.webactiv.util.FileRepositoryManager;
+import com.stratelia.webactiv.util.WAPrimaryKey;
+
+import org.apache.commons.io.FileUtils;
 
 import static com.silverpeas.jcrutil.JcrConstants.*;
 import static javax.jcr.nodetype.NodeType.MIX_SIMPLE_VERSIONABLE;
@@ -323,22 +327,48 @@ public void deleteDocument(Session session, SimpleDocumentPK documentPk) throws
    *
    * @param session
    * @param documentPk the id of the document.
+   * @param comment
    * @throws RepositoryException
    * @throws IOException
    */
-  public void changeVersionState(Session session, SimpleDocumentPK documentPk) throws
-      RepositoryException, IOException {
+  public SimpleDocumentPK changeVersionState(Session session, SimpleDocumentPK documentPk,
+      String comment) throws RepositoryException, IOException {
     try {
       Node documentNode = session.getNodeByIdentifier(documentPk.getId());
+      boolean versionedNode = documentNode.getParent() instanceof Version || converter.isVersioned(
+          documentNode);
+      Node parent = documentNode.getParent();
+      if (parent instanceof Version) {
+        Version selectedVersion = (Version) parent;
+        VersionManager versionManager = documentNode.getSession().getWorkspace().getVersionManager();
+        versionManager.restore(selectedVersion, true);
+        documentNode = session.getNodeByIdentifier(selectedVersion.getContainingHistory()
+            .getVersionableIdentifier());
+      }
       if (!documentNode.isCheckedOut()) {
         checkoutNode(documentNode, null);
       }
-      if (converter.isVersioned(documentNode)) {
+      if (StringUtil.isDefined(comment)) {
+        documentNode.setProperty(SLV_PROPERTY_COMMENT, comment);
+      }
+      SimpleDocument origin = converter.fillDocument(documentNode, I18NHelper.defaultLanguage);
+      if (versionedNode) {
         removeHistory(documentNode);
         documentNode.removeMixin(MIX_SIMPLE_VERSIONABLE);
         documentNode.setProperty(SLV_PROPERTY_VERSIONED, false);
+        documentNode.setProperty(SLV_PROPERTY_MAJOR, 0);
+        documentNode.setProperty(SLV_PROPERTY_MINOR, 0);
+        SimpleDocument target = converter.fillDocument(documentNode, I18NHelper.defaultLanguage);
+        moveMultilangContent(origin, target);
+        File currentDocumentDir = new File(target.getDirectoryPath(I18NHelper.defaultLanguage))
+            .getParentFile();
+        File[] contents = currentDocumentDir.getParentFile().listFiles();
+        for (File versionDirectory : contents) {
+          if (!versionDirectory.equals(currentDocumentDir)) {
+            FileUtils.deleteDirectory(versionDirectory);
+          }
+        }
       } else {
-        SimpleDocument origin = converter.fillDocument(documentNode, I18NHelper.defaultLanguage);
         documentNode.setProperty(SLV_PROPERTY_VERSIONED, true);
         documentNode.setProperty(SLV_PROPERTY_MAJOR, 1);
         documentNode.setProperty(SLV_PROPERTY_MINOR, 0);
@@ -349,8 +379,10 @@ public void changeVersionState(Session session, SimpleDocumentPK documentPk) thr
         moveMultilangContent(origin, target);
         versionManager.checkin(documentNode.getPath());
       }
+      return new SimpleDocumentPK(documentNode.getIdentifier(), documentPk);
     } catch (ItemNotFoundException infex) {
       SilverTrace.info("attachment", "DocumentRepository.deleteDocument()", "", infex);
+      return documentPk;
     }
   }