Preparing the release of the 5.12

Adding humanReadable function to format sizes
Using the same code as in silverpeas to manage attachedFiles thus avoiding NPE

Author: Emmanuel Hugonnet

src/main/java/com/silverpeas/tags/almanach/AlmanachTagUtil.java

@@ -20,7 +20,6 @@
  */
 package com.silverpeas.tags.almanach;
 
-import java.util.Calendar;
 import java.util.Collection;
 
 import com.silverpeas.tags.ComponentTagUtil;
@@ -45,11 +44,6 @@ public AlmanachTagUtil(String componentId, String userId) {
     this.componentId = componentId;
   }
 
-  public Collection<EventDetail> getMonthEvents() {
-    return getAlmanachBm().getMonthEvents(new EventPK("", spaceId, componentId),
-        Calendar.getInstance().getTime());
-  }
-
   public Collection<EventDetail> getAllEvents() {
     return getAlmanachBm().getAllEvents(new EventPK("", spaceId, componentId));
   }

src/main/java/com/silverpeas/tags/servlets/OnlineAttachment.java

@@ -0,0 +1,48 @@
+/*
+ * Copyright (C) 2000 - 2012 Silverpeas
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * As a special exception to the terms and conditions of version 3.0 of
+ * the GPL, you may redistribute this Program in connection withWriter Free/Libre
+ * Open Source Software ("FLOSS") applications as described in Silverpeas's
+ * FLOSS exception.  You should have recieved a copy of the text describing
+ * the FLOSS exception, and it is also available here:
+ * "http://www.silverpeas.org/docs/core/legal/floss_exception.html"
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.silverpeas.tags.servlets;
+
+import java.io.File;
+import java.io.IOException;
+
+import org.silverpeas.attachment.model.SimpleDocument;
+
+/**
+ * @author ehugonnet
+ */
+public class OnlineAttachment extends OnlineFile {
+
+  private SimpleDocument document;
+
+  public OnlineAttachment(SimpleDocument document) {
+    super(document.getContentType(), document.getFilename(), document.getAttachmentPath(), document.
+        getInstanceId());
+    this.document = document;
+  }
+
+  @Override
+  public File getContentFile() throws IOException {
+    return new File(document.getAttachmentPath());
+  }
+}

src/main/java/com/silverpeas/tags/servlets/OnlineFile.java

@@ -1,39 +1,44 @@
 /**
  * Copyright (C) 2000 - 2012 Silverpeas
  *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
+ * This program is free software: you can redistribute it and/or modify it under the terms of the
+ * GNU Affero General Public License as published by the Free Software Foundation, either version 3
+ * of the License, or (at your option) any later version.
  *
- * As a special exception to the terms and conditions of version 3.0 of
- * the GPL, you may redistribute this Program in connection with Free/Libre
- * Open Source Software ("FLOSS") applications as described in Silverpeas's
- * FLOSS exception.  You should have received a copy of the text describing
- * the FLOSS exception, and it is also available here:
- * "http://www.silverpeas.org/legal/licensing"
+ * As a special exception to the terms and conditions of version 3.0 of the GPL, you may
+ * redistribute this Program in connection with Free/Libre Open Source Software ("FLOSS")
+ * applications as described in Silverpeas's FLOSS exception. You should have received a copy of the
+ * text describing the FLOSS exception, and it is also available here:
+ * "http://www.silverpeas.org/docs/core/legal/floss_exception.html"
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
+ * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
+ * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Affero General Public License for more details.
  *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the GNU Affero General Public License along with this program.
+ * If not, see <http://www.gnu.org/licenses/>.
  */
-
 package com.silverpeas.tags.servlets;
 
+import com.stratelia.silverpeas.silvertrace.SilverTrace;
+import com.stratelia.webactiv.util.FileRepositoryManager;
+
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+
 public class OnlineFile {
+
   private String mimeType;
   private String sourceFile;
   private String directory;
   private String componentId;
 
-  public OnlineFile(String mimeType, String sourceFile, String directory) {
+  public OnlineFile(String mimeType, String sourceFile, String directory, String componentId) {
     this.mimeType = mimeType;
     this.sourceFile = sourceFile;
     this.directory = directory;
+    this.componentId = componentId;
   }
 
   public String getMimeType() {
@@ -44,16 +49,18 @@ public String getSourceFile() {
     return sourceFile;
   }
 
-  public String getDirectory() {
-    return directory;
-  }
-
   public String getComponentId() {
     return componentId;
   }
-
-  public void setComponentId(String componentId) {
-    this.componentId = componentId;
+  public File getContentFile() throws IOException {
+    String filePath = FileRepositoryManager.getAbsolutePath(componentId) + directory
+        + File.separator + sourceFile;
+    File realFile = new File(filePath);
+    if (!realFile.exists() && !realFile.isFile()) {
+      throw new FileNotFoundException("File " + filePath + "not found!");
+    }
+    SilverTrace.info("peasUtil", "OnlineFile.write()", "root.MSG_GEN_ENTER_METHOD", " file "
+        + filePath);
+   return realFile;
   }
-
 }

src/main/java/com/silverpeas/tags/servlets/WebFileServer.java

@@ -23,7 +23,6 @@
 import java.io.File;
 import java.io.IOException;
 import java.io.OutputStream;
-import java.io.PrintWriter;
 import java.io.StringReader;
 import java.rmi.RemoteException;
 
@@ -44,12 +43,12 @@
 import com.silverpeas.gallery.model.PhotoPK;
 import com.silverpeas.tags.authentication.AuthenticationManager;
 import com.silverpeas.tags.util.Admin;
+import com.silverpeas.util.FileUtil;
 import com.silverpeas.util.StringUtil;
 import com.silverpeas.util.web.servlet.RestRequest;
 
 import com.stratelia.silverpeas.silvertrace.SilverTrace;
 import com.stratelia.webactiv.util.EJBUtilitaire;
-import com.stratelia.webactiv.util.FileRepositoryManager;
 import com.stratelia.webactiv.util.JNDINames;
 import com.stratelia.webactiv.util.ResourceLocator;
 import com.stratelia.webactiv.util.exception.SilverpeasRuntimeException;
@@ -59,7 +58,7 @@
 
 public class WebFileServer extends HttpServlet {
 
-  PrintWriter out;
+  private static final long serialVersionUID = 1L;
   private Admin admin = null;
 
   @Override
@@ -72,8 +71,8 @@ public void init(ServletConfig config) {
   }
 
   @Override
-  public void service(HttpServletRequest req, HttpServletResponse res)
-      throws ServletException, IOException {
+  public void service(HttpServletRequest req, HttpServletResponse res) throws ServletException,
+      IOException {
     SilverTrace.info("peasUtil", "OnlineFileServer.doPost", "root.MSG_GEN_ENTER_METHOD");
     RestRequest restRequest = new RestRequest(req, "");
     String userId = AuthenticationManager.getUserId(req);
@@ -105,14 +104,11 @@ public OnlineFile getFileFromOldURL(RestRequest restRequest) throws RemoteExcept
 
     String attachmentId = restRequest.getWebRequest().getParameter("attachmentId");
     if (StringUtil.isDefined(attachmentId)) {
-      SimpleDocument attachment = AttachmentServiceFactory.getAttachmentService().searchDocumentById(
+      SimpleDocument attachment = AttachmentServiceFactory.getAttachmentService().
+          searchDocumentById(
           new SimpleDocumentPK(attachmentId), null);
       if (attachment != null) {
-        mimeType = attachment.getContentType();
-        sourceFile = attachment.getFilename();
-        directory = attachment.getAttachmentPath();
-        file = new OnlineFile(mimeType, sourceFile, directory);
-        file.setComponentId(componentId);
+        file = new OnlineAttachment(attachment);
       }
     } else if (StringUtil.isDefined(imageId)) {
       PhotoDetail image = getGalleryBm().getPhoto(new PhotoPK(imageId, componentId));
@@ -124,11 +120,9 @@ public OnlineFile getFileFromOldURL(RestRequest restRequest) throws RemoteExcept
         sourceFile = image.getId() + "_preview.jpg";
       }
       directory = "image" + image.getId();
-      file = new OnlineFile(mimeType, sourceFile, directory);
-      file.setComponentId(componentId);
+      file = new OnlineFile(mimeType, sourceFile, directory, componentId);
     } else {
-      file = new OnlineFile(mimeType, sourceFile, directory);
-      file.setComponentId(componentId);
+      file = new OnlineFile(mimeType, sourceFile, directory, componentId);
     }
     return file;
   }
@@ -151,13 +145,16 @@ protected OnlineFile getWantedAttachment(RestRequest restRequest) {
     String attachmentId = restRequest.getElementValue("attachmentId");
     String language = restRequest.getElementValue("lang");
     if (StringUtil.isDefined(attachmentId)) {
-      SimpleDocument attachment =
-          AttachmentServiceFactory.getAttachmentService().searchDocumentById(new SimpleDocumentPK(
-          attachmentId), language);
+      SimpleDocumentPK pk;
+      if (StringUtil.isDefined(componentId)) {
+        pk = new SimpleDocumentPK(attachmentId, componentId);
+      } else {
+        pk = new SimpleDocumentPK(attachmentId);
+      }
+      SimpleDocument attachment = AttachmentServiceFactory.getAttachmentService().
+          searchDocumentById(pk, language);
       if (attachment != null) {
-        file = new OnlineFile(attachment.getContentType(), attachment.getFilename(), attachment.
-            getAttachmentPath());
-        file.setComponentId(componentId);
+        file = new OnlineAttachment(attachment);
       }
     }
     return file;
@@ -171,27 +168,22 @@ protected OnlineFile getWantedAttachment(RestRequest restRequest) {
    * this String is null that an exception had been catched the html document generated is empty !!
    * also, we display a warning html page
    */
-  private void display(HttpServletResponse res, OnlineFile file) throws IOException {
-    String filePath = FileRepositoryManager.getAbsolutePath(file.getComponentId())
-        + file.getDirectory() + File.separator + file.getSourceFile();
-
-    File realFile = new File(filePath);
+  private void display(HttpServletResponse response, OnlineFile file) throws IOException {
+    File realFile = file.getContentFile();
     if (!realFile.exists() && !realFile.isFile()) {
-      realFile = new File(file.getDirectory());
-    }
-    if (!realFile.exists() && !realFile.isFile()) {
-      displayWarningHtmlCode(res);
+      displayWarningHtmlCode(response);
       return;
     }
     SilverTrace.info("peasUtil", "OnlineFileServer.display()", "root.MSG_GEN_ENTER_METHOD",
-        " htmlFilePath " + filePath);
+        " htmlFilePath " + realFile.getPath());
     try {
-      res.setContentType(file.getMimeType());
-      FileUtils.copyFile(realFile, res.getOutputStream());
+      response.setContentType(FileUtil.getMimeType(realFile.getName()));
+      response.setHeader("Content-Length", String.valueOf(realFile.length()));
+      FileUtils.copyFile(realFile, response.getOutputStream());
     } catch (Exception e) {
       SilverTrace.warn("peasUtil", "OnlineFileServer.doPost", "root.EX_CANT_READ_FILE", "file name="
-          + filePath);
-      displayWarningHtmlCode(res);
+          + realFile.getPath());
+      displayWarningHtmlCode(response);
     }
   }