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 DEV/JASONH to HEAD

Browse Source 
12241: WebDAV - Make execute() not final, so it can be overridden
  12243: WebDAV - PropFindMethod - change private to protected
  12629: WebDAV - fix SPP (follow-on from r12243) (note: resolved from .../vti/method/VtiPropfindMethod to .../vti/web/fp/PropfindMethod)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@12656 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Jan Vonka
2009-01-09 13:24:14 +00:00
parent 6fa0967c05
commit 9f8f35c063
2 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
source/java/org/alfresco/repo/webdav/PropFindMethod.java
View File

@@ -64,19 +64,19 @@ import org.xml.sax.helpers.AttributesImpl;
public class PropFindMethod extends WebDAVMethod public class PropFindMethod extends WebDAVMethod
{ {
// Request types // Request types
private static final int GET_ALL_PROPS = 0; protected static final int GET_ALL_PROPS = 0;
private static final int GET_NAMED_PROPS = 1; protected static final int GET_NAMED_PROPS = 1;
private static final int FIND_PROPS = 2; protected static final int FIND_PROPS = 2;
// Find depth and request type // Find depth and request type
private int m_depth = WebDAV.DEPTH_INFINITY; private int m_depth = WebDAV.DEPTH_INFINITY;
private int m_mode = GET_ALL_PROPS; protected int m_mode = GET_ALL_PROPS;
// Requested properties // Requested properties
private ArrayList<WebDAVProperty> m_properties = null; protected ArrayList<WebDAVProperty> m_properties = null;
// Available namespaces list // Available namespaces list
private HashMap<String, String> m_namespaces = null; protected HashMap<String, String> m_namespaces = null;
/** /**
* Default constructor * Default constructor
@@ -390,7 +390,7 @@ public class PropFindMethod extends WebDAVMethod
* @param node NodeRef * @param node NodeRef
* @param path String * @param path String
*/ */
private void generateResponseForNode(XMLWriter xml, FileInfo nodeInfo, String path) throws Exception protected void generateResponseForNode(XMLWriter xml, FileInfo nodeInfo, String path) throws Exception
{ {
NodeRef nodeRef = nodeInfo.getNodeRef(); NodeRef nodeRef = nodeInfo.getNodeRef();
boolean isFolder = nodeInfo.isFolder(); boolean isFolder = nodeInfo.isFolder();
@@ -683,7 +683,7 @@ public class PropFindMethod extends WebDAVMethod
* @param node NodeRef * @param node NodeRef
* @param isDir boolean * @param isDir boolean
*/ */
private void generateAllPropertiesResponse(XMLWriter xml, NodeRef node, boolean isDir) throws Exception protected void generateAllPropertiesResponse(XMLWriter xml, NodeRef node, boolean isDir) throws Exception
{ {
// Get the properties for the node // Get the properties for the node
@@ -834,7 +834,7 @@ public class PropFindMethod extends WebDAVMethod
* @param node NodeRef * @param node NodeRef
* @param isDir boolean * @param isDir boolean
*/ */
private void generateFindPropertiesResponse(XMLWriter xml, NodeRef node, boolean isDir) protected void generateFindPropertiesResponse(XMLWriter xml, NodeRef node, boolean isDir)
{ {
try try
{ {
@@ -892,7 +892,7 @@ public class PropFindMethod extends WebDAVMethod
* @param node NodeRef * @param node NodeRef
* @param isDir boolean * @param isDir boolean
*/ */
private void generateLockDiscoveryResponse(XMLWriter xml, NodeRef node, boolean isDir) throws Exception protected void generateLockDiscoveryResponse(XMLWriter xml, NodeRef node, boolean isDir) throws Exception
{ {
// Get the lock status for the node // Get the lock status for the node
@@ -910,7 +910,7 @@ public class PropFindMethod extends WebDAVMethod
* *
* @param xml XMLWriter * @param xml XMLWriter
*/ */
private void writeLockTypes(XMLWriter xml) protected void writeLockTypes(XMLWriter xml)
{ {
try try
{ {

2
source/java/org/alfresco/repo/webdav/WebDAVMethod.java
View File

@@ -129,7 +129,7 @@ public abstract class WebDAVMethod
* Executes the method, wrapping the call to {@link #executeImpl()} in an appropriate transaction * Executes the method, wrapping the call to {@link #executeImpl()} in an appropriate transaction
* and handling the error conditions. * and handling the error conditions.
*/ */
public final void execute() throws WebDAVServerException public void execute() throws WebDAVServerException
{ {
// Parse the HTTP headers // Parse the HTTP headers
parseRequestHeaders(); parseRequestHeaders();