Commit d0afee96 authored by Brian Long's avatar Brian Long
Browse files

Merge branch 'develop-acs6' into stable-acs6

parents de86a1e0 8f4370a5

src/main/java/com/inteligr8/alfresco/acs/api/NodesCxfApi.java

+6 −4
Original line number Diff line number Diff line
@@ -8,8 +8,10 @@ import javax.ws.rs.Path; 
import javax.ws.rs.PathParam;

import javax.ws.rs.Produces;

import javax.ws.rs.QueryParam;

import javax.ws.rs.core.MediaType;



import org.apache.cxf.jaxrs.ext.multipart.Attachment;

import org.apache.cxf.jaxrs.ext.multipart.Multipart;



import com.inteligr8.alfresco.acs.model.Error;

import com.inteligr8.alfresco.acs.model.NodeBodyCreate;
@@ -26,8 +28,8 @@ public interface NodesCxfApi { 


    @POST

    @Path("/nodes/{nodeId}/children")

    @Consumes({ "application/json", "multipart/form-data" })

    @Produces({ "application/json" })

    @Consumes({ MediaType.MULTIPART_FORM_DATA })

    @Produces({ MediaType.APPLICATION_JSON })

    @ApiOperation(value = "Create a node", tags={  })

    @ApiResponses(value = { 

        @ApiResponse(code = 201, message = "Successful response", response = NodeEntry.class),
@@ -43,12 +45,12 @@ public interface NodesCxfApi { 
        @ApiResponse(code = 200, message = "Unexpected error", response = Error.class) })

    public NodeEntry createNode(

    		@PathParam("nodeId") String nodeId,

    		NodeBodyCreate nodeBodyCreate,

    		@Multipart NodeBodyCreate nodeBodyCreate,

    		@QueryParam("autoRename") Boolean autoRename,

    		@QueryParam("majorVersion") Boolean majorVersion,

    		@QueryParam("versioningEnabled") Boolean versioningEnabled,

    		@QueryParam("include") List<String> include,

    		@QueryParam("fields") List<String> fields,

    		List<Attachment> attachments);

    		@Multipart(value = "filedata", required = false) Attachment attachment);



}

src/main/java/com/inteligr8/alfresco/acs/api/NodesJerseyApi.java

+3 −2
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ import javax.ws.rs.Path; 
import javax.ws.rs.PathParam;

import javax.ws.rs.Produces;

import javax.ws.rs.QueryParam;

import javax.ws.rs.core.MediaType;



import org.glassfish.jersey.media.multipart.FormDataContentDisposition;

import org.glassfish.jersey.media.multipart.FormDataParam;
@@ -28,8 +29,8 @@ public interface NodesJerseyApi { 


    @POST

    @Path("/nodes/{nodeId}/children")

    @Consumes({ "application/json", "multipart/form-data" })

    @Produces({ "application/json" })

    @Consumes({ MediaType.MULTIPART_FORM_DATA })

    @Produces({ MediaType.APPLICATION_JSON })

    @ApiOperation(value = "Create a node", tags={  })

    @ApiResponses(value = { 

        @ApiResponse(code = 201, message = "Successful response", response = NodeEntry.class),