[Exist-commits] eXist-1.0/src/org/exist/http/webdav/methods Lock.java,1.1,1.2

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Update of /cvsroot/exist/eXist-1.0/src/org/exist/http/webdav/methods
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11713/src/org/exist/http/webdav/methods

Modified Files:
	Lock.java 
Log Message:
Modified WebDAV implementation classes to have better control over collection and resource locks.

Index: Lock.java
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/src/org/exist/http/webdav/methods/Lock.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Lock.java	25 May 2004 09:26:04 -0000	1.1
--- Lock.java	6 Aug 2004 17:40:39 -0000	1.2
***************
*** 10,26 ****
  import javax.xml.parsers.ParserConfigurationException;

  import org.exist.collections.Collection;
  import org.exist.dom.DocumentImpl;
  import org.exist.http.webdav.WebDAV;
- import org.exist.http.webdav.WebDAVMethod;
  import org.exist.http.webdav.WebDAVUtil;
- import org.exist.security.Permission;
  import org.exist.security.User;
  import org.exist.storage.BrokerPool;
  import org.w3c.dom.Document;
  import org.w3c.dom.Element;
  import org.w3c.dom.Node;

! public class Lock implements WebDAVMethod {

      private final static int SCOPE_EXCLUSIVE = 0;
--- 10,26 ----
  import javax.xml.parsers.ParserConfigurationException;

+ import org.exist.EXistException;
  import org.exist.collections.Collection;
  import org.exist.dom.DocumentImpl;
  import org.exist.http.webdav.WebDAV;
  import org.exist.http.webdav.WebDAVUtil;
  import org.exist.security.User;
  import org.exist.storage.BrokerPool;
+ import org.exist.storage.DBBroker;
  import org.w3c.dom.Document;
  import org.w3c.dom.Element;
  import org.w3c.dom.Node;

! public class Lock extends AbstractWebDAVMethod {

      private final static int SCOPE_EXCLUSIVE = 0;
***************
*** 31,35 ****

  	public Lock(BrokerPool pool) {
! 	    this.pool = pool;
  	    docFactory = DocumentBuilderFactory.newInstance();
  		docFactory.setNamespaceAware(true);
--- 31,35 ----

  	public Lock(BrokerPool pool) {
! 	    super(pool);
  	    docFactory = DocumentBuilderFactory.newInstance();
  		docFactory.setNamespaceAware(true);
***************
*** 40,108 ****
       */
      public void process(User user, HttpServletRequest request,
!             HttpServletResponse response, Collection collection,
!             DocumentImpl resource) throws ServletException, IOException {
!         if(collection == null) {
! 			LOG.debug("No resource or collection found");
! 			response.sendError(HttpServletResponse.SC_NOT_FOUND, "No resource or collection found");
! 			return;
! 		}
! 		if(!collection.getPermissions().validate(user, Permission.READ)) {
! 			response.sendError(HttpServletResponse.SC_FORBIDDEN);
! 			return;
! 		}
! 		if(resource == null) {
! 		    response.sendError(HttpServletResponse.SC_BAD_REQUEST, "Lock on collections is not supported yet");
! 		    return;
! 		}
! 		DocumentBuilderFactory docFactory = DocumentBuilderFactory.newInstance();
! 		docFactory.setNamespaceAware(true);
! 		DocumentBuilder docBuilder;
!         try {
!             docBuilder = docFactory.newDocumentBuilder();
!         } catch (ParserConfigurationException e1) {
!             throw new ServletException(WebDAVUtil.XML_CONFIGURATION_ERR, e1);
!         }
! 		Document doc = WebDAVUtil.parseRequestContent(request, response, docBuilder);
! 		Element lockinfo = doc.getDocumentElement();
! 		if(!(lockinfo.getLocalName().equals("lockinfo") && 
! 				lockinfo.getNamespaceURI().equals(WebDAV.DAV_NS))) {
! 			LOG.debug(WebDAVUtil.UNEXPECTED_ELEMENT_ERR + lockinfo.getNodeName());
! 			response.sendError(HttpServletResponse.SC_BAD_REQUEST,
! 					WebDAVUtil.UNEXPECTED_ELEMENT_ERR + lockinfo.getNodeName());
! 			return;
! 		}
! 		int scope = SCOPE_EXCLUSIVE;
! 		String owner = null;
! 		
! 		Node node = lockinfo.getFirstChild();
! 		while(node != null) {
! 		    if(node.getNodeType() == Node.ELEMENT_NODE) {
! 		        if(node.getNamespaceURI().equals(WebDAV.DAV_NS)) {
! 		            if("lockscope".equals(node.getLocalName())) {
! 		                Node scopeNode = WebDAVUtil.firstElementNode(node);
! 		                if("exclusive".equals(scopeNode.getLocalName()))
! 		                    scope = SCOPE_EXCLUSIVE;
! 		                else if("shared".equals(scopeNode.getLocalName()))
! 		                    scope = SCOPE_SHARED;
! 		            }
! 		            if("locktype".equals(node.getLocalName())) {
! 		                Node typeNode = WebDAVUtil.firstElementNode(node);
! 		                if(!"write".equals(typeNode.getLocalName())) {
! 		                     response.sendError(HttpServletResponse.SC_BAD_REQUEST,
! 		                             WebDAVUtil.UNEXPECTED_ELEMENT_ERR + typeNode.getNodeName());
! 		                     return;
! 		                }
! 		            }
! 		            if("owner".equals(node.getLocalName())) {
! 		                Node href = WebDAVUtil.firstElementNode(node);
! 		                owner = WebDAVUtil.getElementContent(href);
! 		            }
! 		        }
! 		    }
! 		    node = node.getNextSibling();
  		}
- 		LOG.debug("Received lock request [" + scope + "] for owner " + owner);
- 		if(resource != null)
- 		    lockResource(request, response, resource, scope);
      }

--- 40,128 ----
       */
      public void process(User user, HttpServletRequest request,
!             HttpServletResponse response, String path) throws ServletException, IOException {
!     	DBBroker broker = null;
! 		Collection collection = null;
! 		DocumentImpl resource = null;
! 		try {
! 			broker = pool.get(user);
! 			collection = broker.openCollection(path, org.exist.util.Lock.WRITE_LOCK);
! 			if(collection == null) {
! 				int pos = path.lastIndexOf('/');
! 				String collName = path.substring(0, pos);
! 				String docName = path.substring(pos + 1);
! 				LOG.debug("collection = " + collName + "; doc = " + docName);
! 				collection = broker.openCollection(collName, org.exist.util.Lock.WRITE_LOCK);
! 				if(collection == null) {
! 					LOG.debug("No resource or collection found for path: " + path);
! 					response.sendError(HttpServletResponse.SC_NOT_FOUND, NOT_FOUND_ERR);
! 					return;
! 				}
! 				resource = collection.getDocument(broker, docName);
! 				if(resource == null) {
! 					LOG.debug("No resource found for path: " + path);
! 					response.sendError(HttpServletResponse.SC_NOT_FOUND, NOT_FOUND_ERR);
! 					return;
! 				}
! 			}
! 			if(resource == null) {
! 			    response.sendError(HttpServletResponse.SC_BAD_REQUEST, "Lock on collections is not supported yet");
! 			    return;
! 			}
! 			DocumentBuilderFactory docFactory = DocumentBuilderFactory.newInstance();
! 			docFactory.setNamespaceAware(true);
! 			DocumentBuilder docBuilder;
! 	        try {
! 	            docBuilder = docFactory.newDocumentBuilder();
! 	        } catch (ParserConfigurationException e1) {
! 	            throw new ServletException(WebDAVUtil.XML_CONFIGURATION_ERR, e1);
! 	        }
! 			Document doc = WebDAVUtil.parseRequestContent(request, response, docBuilder);
! 			Element lockinfo = doc.getDocumentElement();
! 			if(!(lockinfo.getLocalName().equals("lockinfo") && 
! 					lockinfo.getNamespaceURI().equals(WebDAV.DAV_NS))) {
! 				LOG.debug(WebDAVUtil.UNEXPECTED_ELEMENT_ERR + lockinfo.getNodeName());
! 				response.sendError(HttpServletResponse.SC_BAD_REQUEST,
! 						WebDAVUtil.UNEXPECTED_ELEMENT_ERR + lockinfo.getNodeName());
! 				return;
! 			}
! 			int scope = SCOPE_EXCLUSIVE;
! 			String owner = null;
! 			
! 			Node node = lockinfo.getFirstChild();
! 			while(node != null) {
! 			    if(node.getNodeType() == Node.ELEMENT_NODE) {
! 			        if(node.getNamespaceURI().equals(WebDAV.DAV_NS)) {
! 			            if("lockscope".equals(node.getLocalName())) {
! 			                Node scopeNode = WebDAVUtil.firstElementNode(node);
! 			                if("exclusive".equals(scopeNode.getLocalName()))
! 			                    scope = SCOPE_EXCLUSIVE;
! 			                else if("shared".equals(scopeNode.getLocalName()))
! 			                    scope = SCOPE_SHARED;
! 			            }
! 			            if("locktype".equals(node.getLocalName())) {
! 			                Node typeNode = WebDAVUtil.firstElementNode(node);
! 			                if(!"write".equals(typeNode.getLocalName())) {
! 			                     response.sendError(HttpServletResponse.SC_BAD_REQUEST,
! 			                             WebDAVUtil.UNEXPECTED_ELEMENT_ERR + typeNode.getNodeName());
! 			                     return;
! 			                }
! 			            }
! 			            if("owner".equals(node.getLocalName())) {
! 			                Node href = WebDAVUtil.firstElementNode(node);
! 			                owner = WebDAVUtil.getElementContent(href);
! 			            }
! 			        }
! 			    }
! 			    node = node.getNextSibling();
! 			}
! 			LOG.debug("Received lock request [" + scope + "] for owner " + owner);
! 			if(resource != null)
! 			    lockResource(request, response, resource, scope);
! 		} catch (EXistException e) {
! 			throw new ServletException(e);
! 		} finally {
! 			if(collection != null)
! 				collection.release();
  		}
      }

[Exist-commits] eXist-1.0/src/org/exist/http/webdav/methods Lock.java,1.1,1.2

eXist-db is a feature rich Open Source native XML database

[Exist-commits] eXist-1.0/src/org/exist/http/webdav/methods Lock.java,1.1,1.2