[exo-jcr-commits] exo-jcr SVN: r486 - in jcr/trunk/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav: command and 1 other directories.

do-not-reply at jboss.org do-not-reply at jboss.org
Fri Nov 6 09:57:07 EST 2009 

Author: dkatayev
Date: 2009-11-06 09:57:07 -0500 (Fri, 06 Nov 2009)
New Revision: 486

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/CopyCommand.java
   jcr/trunk/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/command/DeleteCommand.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/command/HeadCommand.java
   jcr/trunk/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/command/LockCommand.java
   jcr/trunk/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/command/MkColCommand.java
   jcr/trunk/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/command/MoveCommand.java
   jcr/trunk/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/command/OrderPatchCommand.java
   jcr/trunk/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/command/PropFindCommand.java
   jcr/trunk/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/command/PropPatchCommand.java
   jcr/trunk/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/command/PutCommand.java
   jcr/trunk/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/command/SearchCommand.java
   jcr/trunk/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/command/UnLockCommand.java
   jcr/trunk/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/command/deltav/CheckInCommand.java
   jcr/trunk/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/command/deltav/CheckOutCommand.java
   jcr/trunk/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/command/deltav/ReportCommand.java
   jcr/trunk/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/command/deltav/UnCheckOutCommand.java
   jcr/trunk/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/command/deltav/VersionControlCommand.java
Log:
EXOJCR-220 Status messages added

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	2009-11-06 14:49:54 UTC (rev 485)
+++ jcr/trunk/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/WebDavServiceImpl.java	2009-11-06 14:57:07 UTC (rev 486)
@@ -310,7 +310,7 @@
       catch (Exception exc)
       {
          log.error(exc.getMessage(), exc);
-         return Response.serverError().build();
+         return Response.serverError().entity(exc.getMessage()).build();
       }
    }
 
@@ -339,7 +339,7 @@
       catch (Exception exc)
       {
          log.error(exc.getMessage(), exc);
-         return Response.serverError().build();
+         return Response.serverError().entity(exc.getMessage()).build();
       }
    }
 
@@ -370,7 +370,7 @@
 
          if (!destinationHeader.startsWith(serverURI))
          {
-            return Response.status(HTTPStatus.BAD_GATEWAY).build();
+            return Response.status(HTTPStatus.BAD_GATEWAY).entity("Bad Gateway").build();
          }
 
          String srcWorkspace = workspaceName(repoPath);
@@ -397,8 +397,7 @@
             Response prpfind = new PropFindCommand().propfind(session, destNodePath, body, depth.getIntValue(), uri);
             if (prpfind.getStatus() != HTTPStatus.NOT_FOUND)
             {
-
-               return Response.status(HTTPStatus.PRECON_FAILED).build();
+               return Response.status(HTTPStatus.PRECON_FAILED).entity("Not Found").build();
             }
          }
 
@@ -429,18 +428,18 @@
          }
          else
          {
-            return Response.status(HTTPStatus.BAD_REQUEST).build();
+            return Response.status(HTTPStatus.BAD_REQUEST).entity("Bad Request").build();
          }
 
       }
       catch (PreconditionException exc)
       {
-         return Response.status(HTTPStatus.BAD_REQUEST).build();
+         return Response.status(HTTPStatus.BAD_REQUEST).entity(exc.getMessage()).build();
       }
       catch (Exception exc)
       {
          log.error(exc.getMessage(), exc);
-         return Response.serverError().build();
+         return Response.serverError().entity(exc.getMessage()).build();
       }
    }
 
@@ -472,12 +471,12 @@
       catch (NoSuchWorkspaceException exc)
       {
          log.error("NoSuchWorkspaceException " + exc.getMessage(), exc);
-         return Response.status(HTTPStatus.NOT_FOUND).build();
+         return Response.status(HTTPStatus.NOT_FOUND).entity(exc.getMessage()).build();
       }
       catch (Exception exc)
       {
          log.error(exc.getMessage(), exc);
-         return Response.serverError().build();
+         return Response.serverError().entity(exc.getMessage()).build();
       }
    }
 
@@ -525,7 +524,7 @@
                   int dash = token.indexOf("-");
                   if (dash == -1)
                   {
-                     return Response.status(HTTPStatus.REQUESTED_RANGE_NOT_SATISFIABLE).build();
+                     return Response.status(HTTPStatus.REQUESTED_RANGE_NOT_SATISFIABLE).entity("Requested Range Not Satisfiable").build();
                   }
                   else if (dash == 0)
                   {
@@ -553,12 +552,12 @@
       catch (PathNotFoundException exc)
       {
          log.error("NoSuchWorkspaceException " + exc.getMessage(), exc);
-         return Response.status(HTTPStatus.NOT_FOUND).build();
+         return Response.status(HTTPStatus.NOT_FOUND).entity(exc.getMessage()).build();
       }
       catch (Exception exc)
       {
          log.error(exc.getMessage(), exc);
-         return Response.serverError().build();
+         return Response.serverError().entity(exc.getMessage()).build();
       }
    }
 
@@ -589,12 +588,12 @@
       catch (NoSuchWorkspaceException exc)
       {
          log.error("NoSuchWorkspaceException " + exc.getMessage(), exc);
-         return Response.status(HTTPStatus.NOT_FOUND).build();
+         return Response.status(HTTPStatus.NOT_FOUND).entity(exc.getMessage()).build();
       }
       catch (Exception exc)
       {
          log.error(exc.getMessage(), exc);
-         return Response.serverError().build();
+         return Response.serverError().entity(exc.getMessage()).build();
       }
    }
 
@@ -624,19 +623,19 @@
       catch (PreconditionException exc)
       {
          log.error("PreconditionException " + exc.getMessage(), exc);
-         return Response.status(HTTPStatus.PRECON_FAILED).build();
+         return Response.status(HTTPStatus.PRECON_FAILED).entity(exc.getMessage()).build();
 
       }
       catch (NoSuchWorkspaceException exc)
       {
          log.error("NoSuchWorkspaceException " + exc.getMessage(), exc);
-         return Response.status(HTTPStatus.NOT_FOUND).build();
+         return Response.status(HTTPStatus.NOT_FOUND).entity(exc.getMessage()).build();
 
       }
       catch (Exception exc)
       {
          log.error(exc.getMessage(), exc);
-         return Response.serverError().build();
+         return Response.serverError().entity(exc.getMessage()).build();
       }
    }
 
@@ -667,12 +666,12 @@
       catch (NoSuchWorkspaceException exc)
       {
          log.error("NoSuchWorkspaceException " + exc.getMessage(), exc);
-         return Response.status(HTTPStatus.NOT_FOUND).build();
+         return Response.status(HTTPStatus.NOT_FOUND).entity(exc.getMessage()).build();
       }
       catch (Exception exc)
       {
          log.error(exc.getMessage(), exc);
-         return Response.serverError().build();
+         return Response.serverError().entity(exc.getMessage()).build();
       }
    }
 
@@ -709,12 +708,12 @@
       catch (NoSuchWorkspaceException exc)
       {
          log.error("NoSuchWorkspaceException " + exc.getMessage(), exc);
-         return Response.status(HTTPStatus.NOT_FOUND).build();
+         return Response.status(HTTPStatus.NOT_FOUND).entity(exc.getMessage()).build();
       }
       catch (Exception exc)
       {
          log.error(exc.getMessage(), exc);
-         return Response.serverError().build();
+         return Response.serverError().entity(exc.getMessage()).build();
       }
    }
 
@@ -745,7 +744,7 @@
 
          if (!destinationHeader.startsWith(serverURI))
          {
-            return Response.status(HTTPStatus.BAD_GATEWAY).build();
+            return Response.status(HTTPStatus.BAD_GATEWAY).entity("Bad Gateway").build();
          }
 
          String destPath = destinationHeader.substring(serverURI.length() + 1);
@@ -774,7 +773,7 @@
             Response prpfind = new PropFindCommand().propfind(session, destNodePath, body, depth.getIntValue(), uri);
             if (prpfind.getStatus() != HTTPStatus.NOT_FOUND)
             {
-               return Response.status(HTTPStatus.PRECON_FAILED).build();
+               return Response.status(HTTPStatus.PRECON_FAILED).entity("Preconditions Failed").build();
             }
          }
 
@@ -792,14 +791,14 @@
          }
          else
          {
-            return Response.status(HTTPStatus.BAD_REQUEST).build();
+            return Response.status(HTTPStatus.BAD_REQUEST).entity("Bad Request").build();
          }
 
       }
       catch (Exception exc)
       {
          log.error(exc.getMessage(), exc);
-         return Response.serverError().build();
+         return Response.serverError().entity(exc.getMessage()).build();
       }
 
    }
@@ -855,7 +854,7 @@
       catch (Exception exc)
       {
          log.error(exc.getMessage(), exc);
-         return Response.serverError().build();
+         return Response.serverError().entity(exc.getMessage()).build();
       }
    }
 
@@ -885,16 +884,16 @@
       }
       catch (NoSuchWorkspaceException exc)
       {
-         return Response.status(HTTPStatus.NOT_FOUND).build();
+         return Response.status(HTTPStatus.NOT_FOUND).entity(exc.getMessage()).build();
       }
       catch (PreconditionException exc)
       {
-         return Response.status(HTTPStatus.BAD_REQUEST).build();
+         return Response.status(HTTPStatus.BAD_REQUEST).entity(exc.getMessage()).build();
       }
       catch (Exception exc)
       {
          log.error(exc.getMessage(), exc);
-         return Response.serverError().build();
+         return Response.serverError().entity(exc.getMessage()).build();
       }
    }
 
@@ -926,12 +925,12 @@
       catch (NoSuchWorkspaceException exc)
       {
          log.error("NoSuchWorkspace. " + exc.getMessage());
-         return Response.status(HTTPStatus.NOT_FOUND).build();
+         return Response.status(HTTPStatus.NOT_FOUND).entity(exc.getMessage()).build();
       }
       catch (Exception exc)
       {
          log.error(exc.getMessage(), exc);
-         return Response.serverError().build();
+         return Response.serverError().entity(exc.getMessage()).build();
       }
    }
 
@@ -994,18 +993,18 @@
       catch (NoSuchWorkspaceException exc)
       {
          log.error("NoSuchWorkspaceException " + exc.getMessage(), exc);
-         return Response.status(HTTPStatus.NOT_FOUND).build();
+         return Response.status(HTTPStatus.NOT_FOUND).entity(exc.getMessage()).build();
 
       }
       catch (NoSuchNodeTypeException exc)
       {
          log.error("NoSuchNodeTypeException " + exc.getMessage(), exc);
-         return Response.status(HTTPStatus.BAD_REQUEST).build();
+         return Response.status(HTTPStatus.BAD_REQUEST).entity(exc.getMessage()).build();
       }
       catch (Exception exc)
       {
          log.error(exc.getMessage(), exc);
-         return Response.serverError().build();
+         return Response.serverError().entity(exc.getMessage()).build();
       }
    }
 
@@ -1037,12 +1036,12 @@
       catch (NoSuchWorkspaceException exc)
       {
          log.error("NoSuchWorkspaceException " + exc.getMessage(), exc);
-         return Response.status(HTTPStatus.NOT_FOUND).build();
+         return Response.status(HTTPStatus.NOT_FOUND).entity(exc.getMessage()).build();
       }
       catch (Exception exc)
       {
          log.error(exc.getMessage(), exc);
-         return Response.serverError().build();
+         return Response.serverError().entity(exc.getMessage()).build();
       }
    }
 
@@ -1074,12 +1073,12 @@
       catch (NoSuchWorkspaceException exc)
       {
          log.error("NoSuchWorkspaceException " + exc.getMessage(), exc);
-         return Response.status(HTTPStatus.NOT_FOUND).build();
+         return Response.status(HTTPStatus.NOT_FOUND).entity(exc.getMessage()).build();
       }
       catch (Exception exc)
       {
          log.error(exc.getMessage(), exc);
-         return Response.serverError().build();
+         return Response.serverError().entity(exc.getMessage()).build();
       }
    }
 
@@ -1108,13 +1107,13 @@
       catch (NoSuchWorkspaceException exc)
       {
          log.error("NoSuchWorkspaceException " + exc.getMessage(), exc);
-         return Response.status(HTTPStatus.NOT_FOUND).build();
+         return Response.status(HTTPStatus.NOT_FOUND).entity(exc.getMessage()).build();
 
       }
       catch (Exception exc)
       {
          log.error(exc.getMessage(), exc);
-         return Response.serverError().build();
+         return Response.serverError().entity(exc.getMessage()).build();
       }
    }
 

Modified: jcr/trunk/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/command/CopyCommand.java
===================================================================
--- jcr/trunk/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/command/CopyCommand.java	2009-11-06 14:49:54 UTC (rev 485)
+++ jcr/trunk/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/command/CopyCommand.java	2009-11-06 14:57:07 UTC (rev 486)
@@ -62,24 +62,24 @@
       }
       catch (ItemExistsException e)
       {
-         return Response.status(HTTPStatus.METHOD_NOT_ALLOWED).build();
+         return Response.status(HTTPStatus.METHOD_NOT_ALLOWED).entity(e.getMessage()).build();
       }
       catch (PathNotFoundException e)
       {
-         return Response.status(HTTPStatus.CONFLICT).build();
+         return Response.status(HTTPStatus.CONFLICT).entity(e.getMessage()).build();
       }
       catch (AccessDeniedException e)
       {
-         return Response.status(HTTPStatus.FORBIDDEN).build();
+         return Response.status(HTTPStatus.FORBIDDEN).entity(e.getMessage()).build();
       }
       catch (LockException e)
       {
-         return Response.status(HTTPStatus.LOCKED).build();
+         return Response.status(HTTPStatus.LOCKED).entity(e.getMessage()).build();
       }
       catch (RepositoryException e)
       {
          log.error(e.getMessage(), e);
-         return Response.serverError().build();
+         return Response.serverError().entity(e.getMessage()).build();
       }
    }
 
@@ -101,23 +101,23 @@
       }
       catch (ItemExistsException e)
       {
-         return Response.status(HTTPStatus.METHOD_NOT_ALLOWED).build();
+         return Response.status(HTTPStatus.METHOD_NOT_ALLOWED).entity(e.getMessage()).build();
       }
       catch (PathNotFoundException e)
       {
-         return Response.status(HTTPStatus.CONFLICT).build();
+         return Response.status(HTTPStatus.CONFLICT).entity(e.getMessage()).build();
       }
       catch (AccessDeniedException e)
       {
-         return Response.status(HTTPStatus.FORBIDDEN).build();
+         return Response.status(HTTPStatus.FORBIDDEN).entity(e.getMessage()).build();
       }
       catch (LockException e)
       {
-         return Response.status(HTTPStatus.LOCKED).build();
+         return Response.status(HTTPStatus.LOCKED).entity(e.getMessage()).build();
       }
       catch (RepositoryException e)
       {
-         return Response.serverError().build();
+         return Response.serverError().entity(e.getMessage()).build();
       }
    }
 }

Modified: jcr/trunk/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/command/DeleteCommand.java
===================================================================
--- jcr/trunk/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/command/DeleteCommand.java	2009-11-06 14:49:54 UTC (rev 485)
+++ jcr/trunk/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/command/DeleteCommand.java	2009-11-06 14:57:07 UTC (rev 486)
@@ -76,12 +76,12 @@
       }
       catch (PathNotFoundException exc)
       {
-         return Response.status(HTTPStatus.NOT_FOUND).build();
+         return Response.status(HTTPStatus.NOT_FOUND).entity(exc.getMessage()).build();
 
       }
       catch (RepositoryException exc)
       {
-         return Response.status(HTTPStatus.FORBIDDEN).build();
+         return Response.status(HTTPStatus.FORBIDDEN).entity(exc.getMessage()).build();
       }
    }
 

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	2009-11-06 14:49:54 UTC (rev 485)
+++ jcr/trunk/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/command/GetCommand.java	2009-11-06 14:57:07 UTC (rev 486)
@@ -129,7 +129,7 @@
             HierarchicalProperty lastModifiedProperty = fileResource.getProperty(FileResource.GETLASTMODIFIED);
             
             if((ifModifiedSince != null) && (ifModifiedSince.equals(lastModifiedProperty.getValue()))){
-               return Response.notModified().build();
+               return Response.notModified().entity("Not Modified").build();
             }
 
             // content length is not present
@@ -202,16 +202,16 @@
       }
       catch (PathNotFoundException exc)
       {
-         return Response.status(HTTPStatus.NOT_FOUND).build();
+         return Response.status(HTTPStatus.NOT_FOUND).entity(exc.getMessage()).build();
       }
       catch (RepositoryException exc)
       {
-         return Response.serverError().build();
+         return Response.serverError().entity(exc.getMessage()).build();
       }
       catch (Exception exc)
       {
          log.error(exc.getMessage(), exc);
-         return Response.serverError().build();
+         return Response.serverError().entity(exc.getMessage()).build();
       }
    }
 

Modified: jcr/trunk/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/command/HeadCommand.java
===================================================================
--- jcr/trunk/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/command/HeadCommand.java	2009-11-06 14:49:54 UTC (rev 485)
+++ jcr/trunk/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/command/HeadCommand.java	2009-11-06 14:57:07 UTC (rev 486)
@@ -84,12 +84,12 @@
       }
       catch (PathNotFoundException exc)
       {
-         return Response.status(HTTPStatus.NOT_FOUND).build();
+         return Response.status(HTTPStatus.NOT_FOUND).entity(exc.getMessage()).build();
       }
       catch (Exception exc)
       {
          log.error(exc.getMessage(), exc);
-         return Response.serverError().build();
+         return Response.serverError().entity(exc.getMessage()).build();
       }
    }
 

Modified: jcr/trunk/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/command/LockCommand.java
===================================================================
--- jcr/trunk/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/command/LockCommand.java	2009-11-06 14:49:54 UTC (rev 485)
+++ jcr/trunk/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/command/LockCommand.java	2009-11-06 14:57:07 UTC (rev 486)
@@ -125,16 +125,16 @@
       }
       catch (LockException exc)
       {
-         return Response.status(HTTPStatus.LOCKED).build();
+         return Response.status(HTTPStatus.LOCKED).entity(exc.getMessage()).build();
       }
       catch (AccessDeniedException exc)
       {
-         return Response.status(HTTPStatus.FORBIDDEN).build();
+         return Response.status(HTTPStatus.FORBIDDEN).entity(exc.getMessage()).build();
       }
       catch (Exception exc)
       {
          log.error(exc.getMessage(), exc);
-         return Response.serverError().build();
+         return Response.serverError().entity(exc.getMessage()).build();
       }
 
    }

Modified: jcr/trunk/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/command/MkColCommand.java
===================================================================
--- jcr/trunk/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/command/MkColCommand.java	2009-11-06 14:49:54 UTC (rev 485)
+++ jcr/trunk/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/command/MkColCommand.java	2009-11-06 14:57:07 UTC (rev 486)
@@ -92,27 +92,27 @@
       }
       catch (ItemExistsException exc)
       {
-         return Response.status(HTTPStatus.METHOD_NOT_ALLOWED).build();
+         return Response.status(HTTPStatus.METHOD_NOT_ALLOWED).entity(exc.getMessage()).build();
 
       }
       catch (PathNotFoundException exc)
       {
-         return Response.status(HTTPStatus.CONFLICT).build();
+         return Response.status(HTTPStatus.CONFLICT).entity(exc.getMessage()).build();
 
       }
       catch (AccessDeniedException exc)
       {
-         return Response.status(HTTPStatus.FORBIDDEN).build();
+         return Response.status(HTTPStatus.FORBIDDEN).entity(exc.getMessage()).build();
 
       }
       catch (LockException exc)
       {
-         return Response.status(HTTPStatus.LOCKED).build();
+         return Response.status(HTTPStatus.LOCKED).entity(exc.getMessage()).build();
 
       }
       catch (RepositoryException exc)
       {
-         return Response.serverError().build();
+         return Response.serverError().entity(exc.getMessage()).build();
       }
 
       return Response.status(HTTPStatus.CREATED).build();

Modified: jcr/trunk/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/command/MoveCommand.java
===================================================================
--- jcr/trunk/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/command/MoveCommand.java	2009-11-06 14:49:54 UTC (rev 485)
+++ jcr/trunk/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/command/MoveCommand.java	2009-11-06 14:57:07 UTC (rev 486)
@@ -88,18 +88,18 @@
       }
       catch (LockException exc)
       {
-         return Response.status(HTTPStatus.LOCKED).build();
+         return Response.status(HTTPStatus.LOCKED).entity(exc.getMessage()).build();
 
       }
       catch (PathNotFoundException exc)
       {
-         return Response.status(HTTPStatus.CONFLICT).build();
+         return Response.status(HTTPStatus.CONFLICT).entity(exc.getMessage()).build();
 
       }
       catch (RepositoryException exc)
       {
          log.error(exc.getMessage(), exc);
-         return Response.serverError().build();
+         return Response.serverError().entity(exc.getMessage()).build();
       }
 
    }
@@ -127,18 +127,18 @@
       }
       catch (LockException exc)
       {
-         return Response.status(HTTPStatus.LOCKED).build();
+         return Response.status(HTTPStatus.LOCKED).entity(exc.getMessage()).build();
 
       }
       catch (PathNotFoundException exc)
       {
-         return Response.status(HTTPStatus.CONFLICT).build();
+         return Response.status(HTTPStatus.CONFLICT).entity(exc.getMessage()).build();
 
       }
       catch (RepositoryException exc)
       {
          log.error(exc.getMessage(), exc);
-         return Response.serverError().build();
+         return Response.serverError().entity(exc.getMessage()).build();
       }
 
    }

Modified: jcr/trunk/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/command/OrderPatchCommand.java
===================================================================
--- jcr/trunk/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/command/OrderPatchCommand.java	2009-11-06 14:49:54 UTC (rev 485)
+++ jcr/trunk/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/command/OrderPatchCommand.java	2009-11-06 14:57:07 UTC (rev 486)
@@ -92,16 +92,16 @@
       }
       catch (PathNotFoundException exc)
       {
-         return Response.status(HTTPStatus.NOT_FOUND).build();
+         return Response.status(HTTPStatus.NOT_FOUND).entity(exc.getMessage()).build();
       }
       catch (LockException exc)
       {
-         return Response.status(HTTPStatus.LOCKED).build();
+         return Response.status(HTTPStatus.LOCKED).entity(exc.getMessage()).build();
       }
       catch (Exception exc)
       {
          log.error(exc.getMessage(), exc);
-         return Response.serverError().build();
+         return Response.serverError().entity(exc.getMessage()).build();
       }
 
    }

Modified: jcr/trunk/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/command/PropFindCommand.java
===================================================================
--- jcr/trunk/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/command/PropFindCommand.java	2009-11-06 14:49:54 UTC (rev 485)
+++ jcr/trunk/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/command/PropFindCommand.java	2009-11-06 14:57:07 UTC (rev 486)
@@ -82,12 +82,12 @@
       }
       catch (PathNotFoundException e)
       {
-         return Response.status(HTTPStatus.NOT_FOUND).build();
+         return Response.status(HTTPStatus.NOT_FOUND).entity(e.getMessage()).build();
       }
       catch (RepositoryException exc)
       {
          log.error(exc.getMessage(), exc);
-         return Response.serverError().build();
+         return Response.serverError().entity(exc.getMessage()).build();
       }
 
       WebDavNamespaceContext nsContext;
@@ -154,7 +154,7 @@
       }
       else
       {
-         return Response.status(HTTPStatus.BAD_REQUEST).build();
+         return Response.status(HTTPStatus.BAD_REQUEST).entity("Bad Request").build();
       }
 
       return Response.status(HTTPStatus.MULTISTATUS).entity(response).header(ExtHttpHeaders.CONTENT_TYPE,

Modified: jcr/trunk/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/command/PropPatchCommand.java
===================================================================
--- jcr/trunk/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/command/PropPatchCommand.java	2009-11-06 14:49:54 UTC (rev 485)
+++ jcr/trunk/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/command/PropPatchCommand.java	2009-11-06 14:57:07 UTC (rev 486)
@@ -111,16 +111,16 @@
       }
       catch (PathNotFoundException exc)
       {
-         return Response.status(HTTPStatus.NOT_FOUND).build();
+         return Response.status(HTTPStatus.NOT_FOUND).entity(exc.getMessage()).build();
       }
       catch (LockException exc)
       {
-         return Response.status(HTTPStatus.LOCKED).build();
+         return Response.status(HTTPStatus.LOCKED).entity(exc.getMessage()).build();
       }
       catch (Exception exc)
       {
          log.error(exc.getMessage(), exc);
-         return Response.serverError().build();
+         return Response.serverError().entity(exc.getMessage()).build();
       }
 
    }

Modified: jcr/trunk/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/command/PutCommand.java
===================================================================
--- jcr/trunk/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/command/PutCommand.java	2009-11-06 14:49:54 UTC (rev 485)
+++ jcr/trunk/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/command/PutCommand.java	2009-11-06 14:57:07 UTC (rev 486)
@@ -139,17 +139,17 @@
       }
       catch (LockException exc)
       {
-         return Response.status(HTTPStatus.LOCKED).build();
+         return Response.status(HTTPStatus.LOCKED).entity(exc.getMessage()).build();
 
       }
-      catch (AccessDeniedException e)
+      catch (AccessDeniedException exc)
       {
-         return Response.status(HTTPStatus.FORBIDDEN).build();
+         return Response.status(HTTPStatus.FORBIDDEN).entity(exc.getMessage()).build();
 
       }
       catch (RepositoryException exc)
       {
-         return Response.status(HTTPStatus.CONFLICT).build();
+         return Response.status(HTTPStatus.CONFLICT).entity(exc.getMessage()).build();
       }
 
       return Response.status(HTTPStatus.CREATED).build();

Modified: jcr/trunk/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/command/SearchCommand.java
===================================================================
--- jcr/trunk/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/command/SearchCommand.java	2009-11-06 14:49:54 UTC (rev 485)
+++ jcr/trunk/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/command/SearchCommand.java	2009-11-06 14:57:07 UTC (rev 486)
@@ -74,18 +74,18 @@
       }
       catch (PathNotFoundException exc)
       {
-         return Response.status(HTTPStatus.NOT_FOUND).build();
+         return Response.status(HTTPStatus.NOT_FOUND).entity(exc.getMessage()).build();
 
       }
       catch (UnsupportedQueryException exc)
       {
-         return Response.status(HTTPStatus.BAD_REQUEST).build();
+         return Response.status(HTTPStatus.BAD_REQUEST).entity(exc.getMessage()).build();
 
       }
       catch (Exception exc)
       {
          log.error(exc.getMessage(), exc);
-         return Response.serverError().build();
+         return Response.serverError().entity(exc.getMessage()).build();
       }
 
    }

Modified: jcr/trunk/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/command/UnLockCommand.java
===================================================================
--- jcr/trunk/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/command/UnLockCommand.java	2009-11-06 14:49:54 UTC (rev 485)
+++ jcr/trunk/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/command/UnLockCommand.java	2009-11-06 14:57:07 UTC (rev 486)
@@ -94,18 +94,18 @@
                return Response.status(HTTPStatus.NO_CONTENT).build();
             }
 
-            return Response.status(HTTPStatus.NOT_FOUND).build();
+            return Response.status(HTTPStatus.NOT_FOUND).entity(exc.getMessage()).build();
          }
 
       }
       catch (LockException exc)
       {
-         return Response.status(HTTPStatus.LOCKED).build();
+         return Response.status(HTTPStatus.LOCKED).entity(exc.getMessage()).build();
       }
       catch (Exception exc)
       {
          log.error(exc.getMessage(), exc);
-         return Response.serverError().build();
+         return Response.serverError().entity(exc.getMessage()).build();
       }
 
    }

Modified: jcr/trunk/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/command/deltav/CheckInCommand.java
===================================================================
--- jcr/trunk/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/command/deltav/CheckInCommand.java	2009-11-06 14:49:54 UTC (rev 485)
+++ jcr/trunk/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/command/deltav/CheckInCommand.java	2009-11-06 14:57:07 UTC (rev 486)
@@ -63,25 +63,25 @@
          return Response.ok().header(HttpHeaders.CACHE_CONTROL, "no-cache").build();
 
       }
-      catch (UnsupportedRepositoryOperationException e)
+      catch (UnsupportedRepositoryOperationException exc)
       {
-         return Response.status(HTTPStatus.CONFLICT).build();
+         return Response.status(HTTPStatus.CONFLICT).entity(exc.getMessage()).build();
 
       }
       catch (LockException exc)
       {
-         return Response.status(HTTPStatus.LOCKED).build();
+         return Response.status(HTTPStatus.LOCKED).entity(exc.getMessage()).build();
 
       }
       catch (PathNotFoundException exc)
       {
-         return Response.status(HTTPStatus.NOT_FOUND).build();
+         return Response.status(HTTPStatus.NOT_FOUND).entity(exc.getMessage()).build();
 
       }
       catch (RepositoryException exc)
       {
          log.error(exc.getMessage(), exc);
-         return Response.serverError().build();
+         return Response.serverError().entity(exc.getMessage()).build();
       }
 
    }

Modified: jcr/trunk/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/command/deltav/CheckOutCommand.java
===================================================================
--- jcr/trunk/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/command/deltav/CheckOutCommand.java	2009-11-06 14:49:54 UTC (rev 485)
+++ jcr/trunk/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/command/deltav/CheckOutCommand.java	2009-11-06 14:57:07 UTC (rev 486)
@@ -62,25 +62,25 @@
          node.checkout();
          return Response.ok().header(HttpHeaders.CACHE_CONTROL, "no-cache").build();
       }
-      catch (UnsupportedRepositoryOperationException e)
+      catch (UnsupportedRepositoryOperationException exc)
       {
-         return Response.status(HTTPStatus.CONFLICT).build();
+         return Response.status(HTTPStatus.CONFLICT).entity(exc.getMessage()).build();
 
       }
       catch (PathNotFoundException exc)
       {
-         return Response.status(HTTPStatus.NOT_FOUND).build();
+         return Response.status(HTTPStatus.NOT_FOUND).entity(exc.getMessage()).build();
 
       }
       catch (LockException exc)
       {
-         return Response.status(HTTPStatus.LOCKED).build();
+         return Response.status(HTTPStatus.LOCKED).entity(exc.getMessage()).build();
 
       }
       catch (RepositoryException exc)
       {
          log.error(exc.getMessage(), exc);
-         return Response.serverError().build();
+         return Response.serverError().entity(exc.getMessage()).build();
       }
    }
 

Modified: jcr/trunk/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/command/deltav/ReportCommand.java
===================================================================
--- jcr/trunk/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/command/deltav/ReportCommand.java	2009-11-06 14:49:54 UTC (rev 485)
+++ jcr/trunk/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/command/deltav/ReportCommand.java	2009-11-06 14:57:07 UTC (rev 486)
@@ -100,17 +100,17 @@
       }
       catch (PathNotFoundException exc)
       {
-         return Response.status(HTTPStatus.NOT_FOUND).build();
+         return Response.status(HTTPStatus.NOT_FOUND).entity(exc.getMessage()).build();
       }
       catch (RepositoryException exc)
       {
          log.error(exc.getMessage(), exc);
-         return Response.serverError().build();
+         return Response.serverError().entity(exc.getMessage()).build();
       }
       catch (Exception exc)
       {
          log.error(exc.getMessage(), exc);
-         return Response.serverError().build();
+         return Response.serverError().entity(exc.getMessage()).build();
       }
    }
 

Modified: jcr/trunk/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/command/deltav/UnCheckOutCommand.java
===================================================================
--- jcr/trunk/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/command/deltav/UnCheckOutCommand.java	2009-11-06 14:49:54 UTC (rev 485)
+++ jcr/trunk/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/command/deltav/UnCheckOutCommand.java	2009-11-06 14:57:07 UTC (rev 486)
@@ -68,25 +68,25 @@
          return Response.ok().header(HttpHeaders.CACHE_CONTROL, "no-cache").build();
 
       }
-      catch (UnsupportedRepositoryOperationException e)
+      catch (UnsupportedRepositoryOperationException exc)
       {
-         return Response.status(HTTPStatus.CONFLICT).build();
+         return Response.status(HTTPStatus.CONFLICT).entity(exc.getMessage()).build();
 
       }
       catch (LockException exc)
       {
-         return Response.status(HTTPStatus.LOCKED).build();
+         return Response.status(HTTPStatus.LOCKED).entity(exc.getMessage()).build();
 
       }
       catch (PathNotFoundException exc)
       {
-         return Response.status(HTTPStatus.NOT_FOUND).build();
+         return Response.status(HTTPStatus.NOT_FOUND).entity(exc.getMessage()).build();
 
       }
       catch (RepositoryException exc)
       {
          log.error(exc.getMessage(), exc);
-         return Response.serverError().build();
+         return Response.serverError().entity(exc.getMessage()).build();
       }
 
    }

Modified: jcr/trunk/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/command/deltav/VersionControlCommand.java
===================================================================
--- jcr/trunk/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/command/deltav/VersionControlCommand.java	2009-11-06 14:49:54 UTC (rev 485)
+++ jcr/trunk/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/command/deltav/VersionControlCommand.java	2009-11-06 14:57:07 UTC (rev 486)
@@ -66,12 +66,12 @@
       }
       catch (LockException exc)
       {
-         return Response.status(HTTPStatus.LOCKED).build();
+         return Response.status(HTTPStatus.LOCKED).entity(exc.getMessage()).build();
 
       }
       catch (PathNotFoundException exc)
       {
-         return Response.status(HTTPStatus.NOT_FOUND).build();
+         return Response.status(HTTPStatus.NOT_FOUND).entity(exc.getMessage()).build();
 
       }
       catch (Exception exc)

More information about the exo-jcr-commits mailing list