Author: pnedonosko Date: 2010-02-23 17:56:03 -0500 (Tue, 23 Feb 2010) New Revision: 1947 Modified: jcr/trunk/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/WebDavServiceImpl.java jcr/trunk/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/command/GetCommand.java jcr/trunk/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/resource/CollectionResource.java jcr/trunk/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/resource/FileResource.java jcr/trunk/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/resource/VersionedCollectionResource.java jcr/trunk/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/resource/VersionedFileResource.java Log: EXOJCR-533 cleanup Modified: jcr/trunk/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/WebDavServiceImpl.java =================================================================== --- jcr/trunk/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/WebDavServiceImpl.java 2010-02-23 16:23:17 UTC (rev 1946) +++ jcr/trunk/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/WebDavServiceImpl.java 2010-02-23 22:56:03 UTC (rev 1947) @@ -490,10 +490,6 @@ @HeaderParam(ExtHttpHeaders.IF_MODIFIED_SINCE) String ifModifiedSince, @QueryParam("version") String version, @Context UriInfo uriInfo) { - // TODO EXOJCR-533 - // long startGet = System.currentTimeMillis(); - // try { - if (log.isDebugEnabled()) { log.debug("GET " + repoName + "/" + repoPath); @@ -562,11 +558,6 @@ log.error(exc.getMessage(), exc); return Response.serverError().entity(exc.getMessage()).build(); } - - // TODO EXOJCR-533 - // } finally { - // System.out.println(System.currentTimeMillis() + ":Get:" + repoPath + ":" + (System.currentTimeMillis() - startGet)); - // } } /** Property changes on: jcr/trunk/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/WebDavServiceImpl.java ___________________________________________________________________ Name: svn:keywords + Id Modified: jcr/trunk/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/command/GetCommand.java =================================================================== --- jcr/trunk/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/command/GetCommand.java 2010-02-23 16:23:17 UTC (rev 1946) +++ jcr/trunk/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/command/GetCommand.java 2010-02-23 22:56:03 UTC (rev 1947) @@ -84,10 +84,6 @@ public Response get(Session session, String path, String version, String baseURI, List<Range> ranges, String ifModifiedSince, HashMap<MediaType, String> cahceControls) { - // TODO EXOJCR-533 - // long startGet = System.currentTimeMillis(); - // try { - if (version == null) { if (path.indexOf("?version=") > 0) @@ -122,11 +118,7 @@ istream = ((FileResource)resource).getContentAsStream(); } - // TODO EXOJCR-533 why we need fileResource if we have resource? - // FileResource fileResource = new FileResource(uri, node, nsContext); - // HierarchicalProperty lastModifiedProperty = fileResource.getProperty(FileResource.GETLASTMODIFIED); HierarchicalProperty lastModifiedProperty = resource.getProperty(FileResource.GETLASTMODIFIED); - // check before any other reads if ((ifModifiedSince != null) && (ifModifiedSince.equals(lastModifiedProperty.getValue()))) { @@ -216,11 +208,6 @@ log.error(exc.getMessage(), exc); return Response.serverError().entity(exc.getMessage()).build(); } - - // TODO EXOJCR-533 - // } finally { - // System.out.println(System.currentTimeMillis() + ":GetCommand:" + path + ":" + (System.currentTimeMillis() - startGet)); - // } } /** Property changes on: jcr/trunk/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/command/GetCommand.java ___________________________________________________________________ Name: svn:keywords + Id Modified: jcr/trunk/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/resource/CollectionResource.java =================================================================== --- jcr/trunk/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/resource/CollectionResource.java 2010-02-23 16:23:17 UTC (rev 1946) +++ jcr/trunk/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/resource/CollectionResource.java 2010-02-23 22:56:03 UTC (rev 1947) @@ -153,9 +153,6 @@ final WebDavNamespaceContext namespaceContext) throws IllegalResourceTypeException, RepositoryException { super(type, identifier, new WebDavNamespaceContext(node.getSession())); - // TODO EXOJCR-533 - //if (ResourceUtil.isFile(node)) - // throw new IllegalResourceTypeException("Node type is not applicable for COLLECTION resource " + node.getPath()); this.node = node; } Modified: jcr/trunk/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/resource/FileResource.java =================================================================== --- jcr/trunk/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/resource/FileResource.java 2010-02-23 16:23:17 UTC (rev 1946) +++ jcr/trunk/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/resource/FileResource.java 2010-02-23 22:56:03 UTC (rev 1947) @@ -122,9 +122,6 @@ throws IllegalResourceTypeException, RepositoryException { super(type, identifier, namespaceContext); - // TODO EXOJCR-533 - //if (!ResourceUtil.isFile(node)) - // throw new IllegalResourceTypeException("Node type is not applicable for FILE resource " + node.getPath()); this.node = node; } Property changes on: jcr/trunk/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/resource/FileResource.java ___________________________________________________________________ Name: svn:keywords + Id Modified: jcr/trunk/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/resource/VersionedCollectionResource.java =================================================================== --- jcr/trunk/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/resource/VersionedCollectionResource.java 2010-02-23 16:23:17 UTC (rev 1946) +++ jcr/trunk/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/resource/VersionedCollectionResource.java 2010-02-23 22:56:03 UTC (rev 1947) @@ -51,10 +51,6 @@ throws IllegalResourceTypeException, RepositoryException { super(VERSIONED_COLLECTION, identifier, node, namespaceContext); - // TODO EXOJCR-533 - // if (!node.isNodeType("mix:versionable")) - // throw new IllegalResourceTypeException("Node type is not applicable for Versioned FILE resource " - // + node.getPath()); } /** Modified: jcr/trunk/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/resource/VersionedFileResource.java =================================================================== --- jcr/trunk/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/resource/VersionedFileResource.java 2010-02-23 16:23:17 UTC (rev 1946) +++ jcr/trunk/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/resource/VersionedFileResource.java 2010-02-23 22:56:03 UTC (rev 1947) @@ -60,10 +60,6 @@ throws IllegalResourceTypeException, RepositoryException { super(VERSIONED_FILE, identifier, node, namespaceContext); - // TODO EXOJCR-533 - // if (!node.isNodeType("mix:versionable")) - // throw new IllegalResourceTypeException("Node type is not applicable for Versioned FILE resource " - // + node.getPath()); } /**