jackrabbit-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ang...@apache.org
Subject svn commit: r732740 - in /jackrabbit/trunk/jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/webdav: jcr/JCRWebdavServerServlet.java jcr/property/LengthsProperty.java simple/DavResourceImpl.java simple/SimpleWebdavServlet.java
Date Thu, 08 Jan 2009 16:12:44 GMT
Author: angela
Date: Thu Jan  8 08:12:44 2009
New Revision: 732740

URL: http://svn.apache.org/viewvc?rev=732740&view=rev
Log:
unused imports, javadoc, minor improvements

Modified:
    jackrabbit/trunk/jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/webdav/jcr/JCRWebdavServerServlet.java
    jackrabbit/trunk/jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/webdav/jcr/property/LengthsProperty.java
    jackrabbit/trunk/jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/webdav/simple/DavResourceImpl.java
    jackrabbit/trunk/jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/webdav/simple/SimpleWebdavServlet.java

Modified: jackrabbit/trunk/jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/webdav/jcr/JCRWebdavServerServlet.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/webdav/jcr/JCRWebdavServerServlet.java?rev=732740&r1=732739&r2=732740&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/webdav/jcr/JCRWebdavServerServlet.java
(original)
+++ jackrabbit/trunk/jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/webdav/jcr/JCRWebdavServerServlet.java
Thu Jan  8 08:12:44 2009
@@ -25,9 +25,6 @@
 import org.apache.jackrabbit.webdav.DavResourceFactory;
 import org.apache.jackrabbit.webdav.DavSessionProvider;
 import org.apache.jackrabbit.webdav.WebdavRequest;
-import org.apache.jackrabbit.webdav.jcr.DavLocatorFactoryImpl;
-import org.apache.jackrabbit.webdav.jcr.DavResourceFactoryImpl;
-import org.apache.jackrabbit.webdav.jcr.JcrDavSession;
 import org.apache.jackrabbit.webdav.jcr.observation.SubscriptionManagerImpl;
 import org.apache.jackrabbit.webdav.jcr.transaction.TxLockManagerImpl;
 import org.apache.jackrabbit.webdav.observation.SubscriptionManager;

Modified: jackrabbit/trunk/jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/webdav/jcr/property/LengthsProperty.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/webdav/jcr/property/LengthsProperty.java?rev=732740&r1=732739&r2=732740&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/webdav/jcr/property/LengthsProperty.java
(original)
+++ jackrabbit/trunk/jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/webdav/jcr/property/LengthsProperty.java
Thu Jan  8 08:12:44 2009
@@ -18,7 +18,6 @@
 
 import org.apache.jackrabbit.webdav.jcr.ItemResourceConstants;
 import org.apache.jackrabbit.webdav.property.AbstractDavProperty;
-import org.apache.jackrabbit.webdav.property.DavProperty;
 import org.apache.jackrabbit.webdav.xml.DomUtil;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;

Modified: jackrabbit/trunk/jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/webdav/simple/DavResourceImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/webdav/simple/DavResourceImpl.java?rev=732740&r1=732739&r2=732740&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/webdav/simple/DavResourceImpl.java
(original)
+++ jackrabbit/trunk/jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/webdav/simple/DavResourceImpl.java
Thu Jan  8 08:12:44 2009
@@ -145,7 +145,7 @@
                     node = (Node) item;
                     // define what is a collection in webdav
                     isCollection = config.isCollectionResource(node);
-                    this.initRfc4122Uri();
+                    initRfc4122Uri();
                 }
             } catch (PathNotFoundException e) {
                 // ignore: exists field evaluates to false
@@ -201,7 +201,7 @@
                 this.node = node;
                 // define what is a collection in webdav
                 isCollection = config.isCollectionResource(node);
-                this.initRfc4122Uri();
+                initRfc4122Uri();
             }
         } else {
             throw new DavException(DavServletResponse.SC_NOT_FOUND);
@@ -219,7 +219,7 @@
                 String uuid = node.getUUID();
                 try {
                     UUID.fromString(uuid);
-                    this.rfc4122Uri = "urn:uuid:" + uuid;
+                    rfc4122Uri = "urn:uuid:" + uuid;
                 } catch (IllegalArgumentException e) {
                     //no, this is not a UUID
                 }
@@ -390,7 +390,7 @@
             properties.add(new HrefProperty(BindConstants.RESOURCEID, rfc4122Uri, true));
         }
 
-        Set parentElements = this.getParentElements();
+        Set parentElements = getParentElements();
         if (!parentElements.isEmpty()) {
             properties.add(new ParentSet(parentElements));
         }
@@ -883,16 +883,16 @@
         }
         checkSameWorkspace(collection.getLocator());
         try {
-            if (!this.node.isNodeType(MIX_SHAREABLE)) {
-                if (!this.node.canAddMixin(MIX_SHAREABLE)) {
+            if (!node.isNodeType(MIX_SHAREABLE)) {
+                if (!node.canAddMixin(MIX_SHAREABLE)) {
                     //DAV:binding-allowed
                     throw new DavException(DavServletResponse.SC_PRECONDITION_FAILED);
                 }
-                this.node.addMixin(MIX_SHAREABLE);
-                this.node.save();
+                node.addMixin(MIX_SHAREABLE);
+                node.save();
             }
-            Workspace workspace = this.session.getRepositorySession().getWorkspace();
-            workspace.clone(workspace.getName(), this.node.getPath(), newBinding.getLocator().getRepositoryPath(),
false);
+            Workspace workspace = session.getRepositorySession().getWorkspace();
+            workspace.clone(workspace.getName(), node.getPath(), newBinding.getLocator().getRepositoryPath(),
false);
 
         } catch (RepositoryException e) {
             throw new JcrDavException(e);
@@ -921,8 +921,8 @@
         }
         checkSameWorkspace(collection.getLocator());
         try {
-            if (!this.node.isNodeType(MIX_REFERENCEABLE)) {
-                throw new DavException(this.node.canAddMixin(MIX_REFERENCEABLE)?
+            if (!node.isNodeType(MIX_REFERENCEABLE)) {
+                throw new DavException(node.canAddMixin(MIX_REFERENCEABLE)?
                                        DavServletResponse.SC_CONFLICT : DavServletResponse.SC_METHOD_NOT_ALLOWED);
             }
             getJcrSession().getWorkspace().move(locator.getRepositoryPath(), newBinding.getLocator().getRepositoryPath());
@@ -936,19 +936,19 @@
      */
     public Set getParentElements() {
         try {
-            if (this.node.getDepth() > 0) {
+            if (node.getDepth() > 0) {
                 //TODO remove this check once jcr2 is out
-                if (!(this.node instanceof org.apache.jackrabbit.api.jsr283.Node)) {
-                    DavResourceLocator loc = this.locator.getFactory().createResourceLocator(
-                            this.locator.getPrefix(), this.locator.getWorkspacePath(), this.node.getParent().getPath(),
false);
-                    return Collections.singleton(new ParentElement(loc.getHref(true), this.node.getName()));
+                if (!(node instanceof org.apache.jackrabbit.api.jsr283.Node)) {
+                    DavResourceLocator loc = locator.getFactory().createResourceLocator(
+                            locator.getPrefix(), locator.getWorkspacePath(), node.getParent().getPath(),
false);
+                    return Collections.singleton(new ParentElement(loc.getHref(true), node.getName()));
                 }
                 Set ps = new HashSet();
-                NodeIterator sharedSetIterator = ((org.apache.jackrabbit.api.jsr283.Node)
this.node).getSharedSet();
+                NodeIterator sharedSetIterator = ((org.apache.jackrabbit.api.jsr283.Node)
node).getSharedSet();
                 while (sharedSetIterator.hasNext()) {
                     Node sharednode = sharedSetIterator.nextNode();
-                    DavResourceLocator loc = this.locator.getFactory().createResourceLocator(
-                            this.locator.getPrefix(), this.locator.getWorkspacePath(), sharednode.getParent().getPath(),
false);
+                    DavResourceLocator loc = locator.getFactory().createResourceLocator(
+                            locator.getPrefix(), locator.getWorkspacePath(), sharednode.getParent().getPath(),
false);
                     ps.add(new ParentElement(loc.getHref(true), sharednode.getName()));
                 }
                 return ps;
@@ -973,7 +973,7 @@
      *
      * @param inputCtx
      * @param systemId
-     * @return
+     * @return a new <code>ImportContext</code>
      * @throws IOException
      */
     protected ImportContext getImportContext(InputContext inputCtx, String systemId) throws
IOException {
@@ -984,7 +984,7 @@
      * Returns a new <code>ExportContext</code>
      *
      * @param outputCtx
-     * @return
+     * @return a new <code>ExportContext</code>
      * @throws IOException
      */
     protected ExportContext getExportContext(OutputContext outputCtx) throws IOException
{
@@ -1004,7 +1004,7 @@
     /**
      * Returns a new <code>PropertyExportContext</code>.
      *
-     * @return
+     * @return a new <code>PropertyExportContext</code>
      */
     protected PropertyExportContext getPropertyExportContext() {
         return new PropertyExportCtx();

Modified: jackrabbit/trunk/jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/webdav/simple/SimpleWebdavServlet.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/webdav/simple/SimpleWebdavServlet.java?rev=732740&r1=732739&r2=732740&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/webdav/simple/SimpleWebdavServlet.java
(original)
+++ jackrabbit/trunk/jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/webdav/simple/SimpleWebdavServlet.java
Thu Jan  8 08:12:44 2009
@@ -28,10 +28,6 @@
 import org.apache.jackrabbit.webdav.lock.LockManager;
 import org.apache.jackrabbit.webdav.lock.SimpleLockManager;
 import org.apache.jackrabbit.webdav.server.AbstractWebdavServlet;
-import org.apache.jackrabbit.webdav.simple.DavSessionProviderImpl;
-import org.apache.jackrabbit.webdav.simple.LocatorFactoryImplEx;
-import org.apache.jackrabbit.webdav.simple.ResourceConfig;
-import org.apache.jackrabbit.webdav.simple.ResourceFactoryImpl;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 



Mime
View raw message