[exo-jcr-commits] exo-jcr SVN: r2287 - in jcr/branches/1.14.x/exo.jcr.component.webdav/src: main/java/org/exoplatform/services/jcr/webdav/util and 1 other directories.

[do-not-reply at jboss.org]

Author: dkatayev
Date: 2010-04-16 10:00:27 -0400 (Fri, 16 Apr 2010)
New Revision: 2287

Modified:
   jcr/branches/1.14.x/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/WebDavService.java
   jcr/branches/1.14.x/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/WebDavServiceImpl.java
   jcr/branches/1.14.x/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/util/NodeTypeUtil.java
   jcr/branches/1.14.x/exo.jcr.component.webdav/src/test/java/org/exoplatform/services/jcr/webdav/command/TestPut.java
Log:
EXOJCR-638 problem with setting mixins fixed

Modified: jcr/branches/1.14.x/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/WebDavService.java
===================================================================
--- jcr/branches/1.14.x/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/WebDavService.java	2010-04-16 13:55:00 UTC (rev 2286)
+++ jcr/branches/1.14.x/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/WebDavService.java	2010-04-16 14:00:27 UTC (rev 2287)
@@ -84,7 +84,7 @@
     * @return the instance of javax.ws.rs.core.Response
     */
    Response put(String repoName, String repoPath, String lockTokenHeader, String ifHeader, String fileNodeTypeHeader,
-      String contentNodeTypeHeader, List<String> mixinTypes, MediaType mediatype, InputStream inputStream);
+      String contentNodeTypeHeader, String mixinTypes, MediaType mediatype, InputStream inputStream);
 
    /**
     * @param repoName repository name
@@ -120,7 +120,7 @@
     * @return the instance of javax.ws.rs.core.Response
     */
    Response mkcol(String repoName, String repoPath, String lockTokenHeader, String ifHeader, String nodeTypeHeader,
-      List<String> mixinTypesHeader);
+      String mixinTypesHeader);
 
    /**
     * @param repoName repository name

Modified: jcr/branches/1.14.x/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/WebDavServiceImpl.java
===================================================================
--- jcr/branches/1.14.x/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/WebDavServiceImpl.java	2010-04-16 13:55:00 UTC (rev 2286)
+++ jcr/branches/1.14.x/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/WebDavServiceImpl.java	2010-04-16 14:00:27 UTC (rev 2287)
@@ -682,7 +682,7 @@
    public Response mkcol(@PathParam("repoName") String repoName, @PathParam("repoPath") String repoPath,
       @HeaderParam(ExtHttpHeaders.LOCKTOKEN) String lockTokenHeader, @HeaderParam(ExtHttpHeaders.IF) String ifHeader,
       @HeaderParam(ExtHttpHeaders.CONTENT_NODETYPE) String nodeTypeHeader,
-      @HeaderParam(ExtHttpHeaders.CONTENT_MIXINTYPES) List<String> mixinTypesHeader)
+      @HeaderParam(ExtHttpHeaders.CONTENT_MIXINTYPES) String mixinTypesHeader)
    {
       if (log.isDebugEnabled())
       {
@@ -942,7 +942,7 @@
       @HeaderParam(ExtHttpHeaders.LOCKTOKEN) String lockTokenHeader, @HeaderParam(ExtHttpHeaders.IF) String ifHeader,
       @HeaderParam(ExtHttpHeaders.FILE_NODETYPE) String fileNodeTypeHeader,
       @HeaderParam(ExtHttpHeaders.CONTENT_NODETYPE) String contentNodeTypeHeader,
-      @HeaderParam(ExtHttpHeaders.CONTENT_MIXINTYPES) List<String> mixinTypes,
+      @HeaderParam(ExtHttpHeaders.CONTENT_MIXINTYPES) String mixinTypes,
       @HeaderParam(ExtHttpHeaders.CONTENT_TYPE) MediaType mediatype, InputStream inputStream)
    {
 

Modified: jcr/branches/1.14.x/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/util/NodeTypeUtil.java
===================================================================
--- jcr/branches/1.14.x/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/util/NodeTypeUtil.java	2010-04-16 13:55:00 UTC (rev 2286)
+++ jcr/branches/1.14.x/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/util/NodeTypeUtil.java	2010-04-16 14:00:27 UTC (rev 2287)
@@ -21,6 +21,7 @@
 import org.exoplatform.services.jcr.webdav.WebDavConst;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 
 import javax.jcr.nodetype.NoSuchNodeTypeException;
@@ -87,14 +88,9 @@
     * @param mixinTypes list of mixins or null
     * @return list of mixins
     */
-   public static ArrayList<String> getMixinTypes(List<String> mixinTypes)
+   public static ArrayList<String> getMixinTypes(String mixinTypes)
    {
-      ArrayList<String> mixins = new ArrayList<String>();
-      if (mixinTypes == null)
-      {
-         return mixins;
-      }
-      return mixins;
+      return mixinTypes == null ? new ArrayList<String>() : new ArrayList<String>(Arrays.asList(mixinTypes.split(",")));
    }
 
 }

Modified: jcr/branches/1.14.x/exo.jcr.component.webdav/src/test/java/org/exoplatform/services/jcr/webdav/command/TestPut.java
===================================================================
--- jcr/branches/1.14.x/exo.jcr.component.webdav/src/test/java/org/exoplatform/services/jcr/webdav/command/TestPut.java	2010-04-16 13:55:00 UTC (rev 2286)
+++ jcr/branches/1.14.x/exo.jcr.component.webdav/src/test/java/org/exoplatform/services/jcr/webdav/command/TestPut.java	2010-04-16 14:00:27 UTC (rev 2287)
@@ -117,6 +117,8 @@
       assertEquals(HTTPStatus.CREATED, containerResponse.getStatus());
       NodeType[] mixins = TestUtils.getContentMixins(session, fileName);
 
+      assertEquals(2, mixins.length);
+      
       for (NodeType mixin : mixins)
       {
          assertTrue(mixin.getName().equals("mix:wdTestMixin1") || mixin.getName().equals("mix:wdTestMixin2"));