inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-07 17:49:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged V2.1 to HEAD

Browse Source 
6309: Fixed AWC-1195 - Email space users.
   6311: AWC-1378
   6319: Fixed minor caching bug
   6320, 6326: Some fixes to the raw content download servlet available on /dr
   6324: Fix for AWC-1444 (workflow history issue)
   6325: Exceptions that occur in NavigatorPluginBean now correctly logged to the console


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@6720 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Derek Hulley
2007-09-10 12:58:48 +00:00
parent bf4349d64d
commit f9bad97b04
9 changed files with 74 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
source/java/org/alfresco/web/app/servlet/DownloadRawContentServlet.java
View File

@@ -28,6 +28,7 @@ import java.io.IOException;
import java.io.OutputStream;
import java.net.SocketException;
import java.util.Date;
import java.util.Locale;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
@@ -39,7 +40,7 @@ import org.alfresco.service.ServiceRegistry;
import org.alfresco.service.cmr.repository.ContentIOException;
import org.alfresco.service.cmr.repository.ContentReader;
import org.alfresco.service.cmr.repository.ContentService;
import org.alfresco.util.ISO8601DateFormat;
import org.alfresco.service.cmr.repository.datatype.DefaultTypeConverter;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -67,7 +68,12 @@ import org.apache.commons.logging.LogFactory;
* <ul>
* <li><b>alfresco.dr.size:</b> The content size</li>
* <li><b>alfresco.dr.lastModified:</b> The last modified date</li>
* <li><b>alfresco.dr.mimetype:</b> The content mimetype</li>
* <li><b>alfresco.dr.encoding:</b> The content encoding</li>
* <li><b>alfresco.dr.locale:</b> The content locale</li>
* </ul>
* Note that the mimetype, encoding and locale generally fallback to the default
* as implemented by the {@linkplain ContentService#getRawReader(String) raw reader}.
*
* @since 2.1
* @author Derek Hulley
@@ -84,9 +90,6 @@ public class DownloadRawContentServlet extends BaseServlet
private static final String ARG_CONTENT_URL = "contentUrl";
private static final String ARG_INFO_ONLY = "infoOnly";
private static final String HEADER_SIZE = "alfresco.dr.size";
private static final String HEADER_LAST_MODIFIED = "alfresco.dr.lastModified";
protected void service(HttpServletRequest req, HttpServletResponse res) throws ServletException, IOException
{
if (logger.isDebugEnabled())
@@ -154,19 +157,31 @@ public class DownloadRawContentServlet extends BaseServlet
return;
}
// Fill response details
res.setContentType(DEFAULT_MIMETYPE);
res.setCharacterEncoding(DEFAULT_ENCODING);
long readerSize = reader.getSize();
Date readerLastModified = new Date(reader.getLastModified());
String readerMimetype = reader.getMimetype();
String readerEncoding = reader.getEncoding();
Locale readerLocale = reader.getLocale();
// Set the content info
res.setIntHeader(HEADER_SIZE, (int) readerSize);
res.setHeader(HEADER_LAST_MODIFIED, ISO8601DateFormat.format(readerLastModified));
res.setHeader("alfresco.dr.size", DefaultTypeConverter.INSTANCE.convert(String.class, readerSize));
res.setHeader("alfresco.dr.lastModified", DefaultTypeConverter.INSTANCE.convert(String.class, readerLastModified));
res.setHeader("alfresco.dr.mimetype", readerMimetype);
res.setHeader("alfresco.dr.encoding", readerEncoding);
res.setHeader("alfresco.dr.locale", DefaultTypeConverter.INSTANCE.convert(String.class, readerLocale));
// Pass the stream to the response, unless only the content info was requested
if (!infoOnly)
if (infoOnly)
{
// Fill response details
res.setContentType(DEFAULT_MIMETYPE);
res.setCharacterEncoding(DEFAULT_ENCODING);
}
else
{
// Fill response details
res.setContentType(readerMimetype);
res.setCharacterEncoding(readerEncoding);
try
{
OutputStream clientOs = res.getOutputStream();