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

Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)

Browse Source 
75031: Merged WAT2 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      71715: Removed unused private methods in ContentStreamer


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@75359 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Will Abson
2014-07-01 15:10:11 +00:00
parent 0e56806c87
commit 235802d608
1 changed files with 0 additions and 222 deletions
Download Patch File Download Diff File Expand all files Collapse all files

222
source/java/org/alfresco/repo/web/scripts/content/ContentStreamer.java
View File

@@ -123,105 +123,6 @@ public class ContentStreamer implements ResourceLoaderAware
} }
/**
* Streams content back to client from a given resource path.
*
* @param req The request
* @param res The response
* @param resourcePath The resource path the content is required for
* @param attach Indicates whether the content should be streamed as an attachment or not
* @throws IOException
*/
private void streamContent(WebScriptRequest req,
WebScriptResponse res,
File file,
boolean attach) throws IOException
{
streamContent(req, res, file, attach, null, null);
}
/**
* Streams content back to client from a given resource path.
*
* @param req The request
* @param res The response
* @param resourcePath The resource path the content is required for
* @param attach Indicates whether the content should be streamed as an attachment or not
* @throws IOException
*/
private void streamContent(WebScriptRequest req,
WebScriptResponse res,
File file,
boolean attach,
Map<String, Object> model)
throws IOException
{
streamContent(req, res, file, attach, null, model);
}
/**
* Streams content back to client from a given File. The Last-Modified header will reflect the
* given file's modification timestamp.
*
* @param req The request
* @param res The response
* @param file The file whose content is to be streamed.
* @param attach Indicates whether the content should be streamed as an attachment or not
* @param attachFileName Optional file name to use when attach is <code>true</code>
* @throws IOException
*/
private void streamContent(WebScriptRequest req,
WebScriptResponse res,
File file,
boolean attach,
String attachFileName) throws IOException
{
streamContent(req, res, file, attach, attachFileName, null);
}
/**
* Streams content back to client from a given File. The Last-Modified header will reflect the
* given file's modification timestamp.
*
* @param req The request
* @param res The response
* @param file The file whose content is to be streamed.
* @param attach Indicates whether the content should be streamed as an attachment or not
* @param attachFileName Optional file name to use when attach is <code>true</code>
* @throws IOException
*/
private void streamContent(WebScriptRequest req,
WebScriptResponse res,
File file,
boolean attach,
String attachFileName,
Map<String, Object> model) throws IOException
{
streamContent(req, res, file, null, attach, attachFileName, model);
}
/**
* Streams content back to client from a given File.
*
* @param req The request
* @param res The response
* @param file The file whose content is to be streamed.
* @param modifiedTime The modified datetime to use for the streamed content. If <tt>null</tt> the
* file's timestamp will be used.
* @param attach Indicates whether the content should be streamed as an attachment or not
* @param attachFileName Optional file name to use when attach is <code>true</code>
* @throws IOException
*/
private void streamContent(WebScriptRequest req,
WebScriptResponse res,
File file,
Long modifiedTime,
boolean attach,
String attachFileName) throws IOException
{
streamContent(req, res, file, modifiedTime, attach, attachFileName, null);
}
/** /**
* Streams content back to client from a given File. * Streams content back to client from a given File.
* *
@@ -265,66 +166,6 @@ public class ContentStreamer implements ResourceLoaderAware
streamContentImpl(req, res, reader, null, null, attach, lastModifiedDate, String.valueOf(lastModifiedDate.getTime()), attachFileName, model); streamContentImpl(req, res, reader, null, null, attach, lastModifiedDate, String.valueOf(lastModifiedDate.getTime()), attachFileName, model);
} }
/**
* Streams the content on a given node's content property to the response of the web script.
*
* @param req Request
* @param res Response
* @param nodeRef The node reference
* @param propertyQName The content property name
* @param attach Indicates whether the content should be streamed as an attachment or not
* @throws IOException
*/
private void streamContent(WebScriptRequest req,
WebScriptResponse res,
NodeRef nodeRef,
QName propertyQName,
boolean attach) throws IOException
{
streamContent(req, res, nodeRef, propertyQName, attach, null, null);
}
/**
* Streams the content on a given node's content property to the response of the web script.
*
* @param req Request
* @param res Response
* @param nodeRef The node reference
* @param propertyQName The content property name
* @param attach Indicates whether the content should be streamed as an attachment or not
* @throws IOException
*/
private void streamContent(WebScriptRequest req,
WebScriptResponse res,
NodeRef nodeRef,
QName propertyQName,
boolean attach,
Map<String, Object> model) throws IOException
{
streamContent(req, res, nodeRef, propertyQName, attach, null, model);
}
/**
* Streams the content on a given node's content property to the response of the web script.
*
* @param req Request
* @param res Response
* @param nodeRef The node reference
* @param propertyQName The content property name
* @param attach Indicates whether the content should be streamed as an attachment or not
* @param attachFileName Optional file name to use when attach is <code>true</code>
* @throws IOException
*/
private void streamContent(WebScriptRequest req,
WebScriptResponse res,
NodeRef nodeRef,
QName propertyQName,
boolean attach,
String attachFileName) throws IOException
{
streamContent(req, res, nodeRef, propertyQName, attach, attachFileName, null);
}
/** /**
* Streams the content on a given node's content property to the response of the web script. * Streams the content on a given node's content property to the response of the web script.
* *
@@ -399,23 +240,6 @@ public class ContentStreamer implements ResourceLoaderAware
streamContentImpl(req, res, reader, nodeRef, propertyQName, attach, modified, modified == null ? null : String.valueOf(modified.getTime()), attachFileName, model); streamContentImpl(req, res, reader, nodeRef, propertyQName, attach, modified, modified == null ? null : String.valueOf(modified.getTime()), attachFileName, model);
} }
/**
* Streams content back to client from a given resource path.
*
* @param req The request
* @param res The response
* @param resourcePath The classpath resource path the content is required for
* @param attach Indicates whether the content should be streamed as an attachment or not
* @throws IOException
*/
private void streamContent(WebScriptRequest req,
WebScriptResponse res,
String resourcePath,
boolean attach) throws IOException
{
streamContent(req, res, resourcePath, attach, null, null);
}
/** /**
* Streams content back to client from a given resource path. * Streams content back to client from a given resource path.
* *
@@ -434,25 +258,6 @@ public class ContentStreamer implements ResourceLoaderAware
streamContent(req, res, resourcePath, attach, null, model); streamContent(req, res, resourcePath, attach, null, model);
} }
/**
* Streams content back to client from a given resource path.
*
* @param req The request
* @param res The response
* @param resourcePath The classpath resource path the content is required for.
* @param attach Indicates whether the content should be streamed as an attachment or not
* @param attachFileName Optional file name to use when attach is <code>true</code>
* @throws IOException
*/
private void streamContent(WebScriptRequest req,
WebScriptResponse res,
String resourcePath,
boolean attach,
String attachFileName) throws IOException
{
streamContent(req, res, resourcePath, attach, attachFileName, null);
}
/** /**
* Streams content back to client from a given resource path. * Streams content back to client from a given resource path.
* *
@@ -498,33 +303,6 @@ public class ContentStreamer implements ResourceLoaderAware
streamContent(req, res, file, resourceLastModified, attach, attachFileName, model); streamContent(req, res, file, resourceLastModified, attach, attachFileName, model);
} }
/**
* Stream content implementation
*
* @param req The request
* @param res The response
* @param reader The reader
* @param nodeRef The content nodeRef if applicable
* @param propertyQName The content property if applicable
* @param attach Indicates whether the content should be streamed as an attachment or not
* @param modified Modified date of content
* @param eTag ETag to use
* @param attachFileName Optional file name to use when attach is <code>true</code>
* @throws IOException
*/
private void streamContentImpl(WebScriptRequest req,
WebScriptResponse res,
ContentReader reader,
NodeRef nodeRef,
QName propertyQName,
boolean attach,
Date modified,
String eTag,
String attachFileName) throws IOException
{
streamContentImpl(req, res, reader, nodeRef, propertyQName, attach, modified, eTag, attachFileName, null);
}
/** /**
* Stream content implementation * Stream content implementation
* *