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

Merge branch 'develop' into stable

parents 9ba16c4b c0916958

src/main/java/com/inteligr8/alfresco/activiti/api/TemplatesCxfApi.java

+3 −0
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ 
 */

package com.inteligr8.alfresco.activiti.api;



import javax.ws.rs.Consumes;

import javax.ws.rs.POST;

import javax.ws.rs.Path;

import javax.ws.rs.PathParam;
@@ -34,6 +35,7 @@ public interface TemplatesCxfApi extends TemplatesApi { 


    @POST

    @Path("admin/document-templates")

    @Consumes({ MediaType.MULTIPART_FORM_DATA })

    @Produces({ MediaType.APPLICATION_JSON })

    public DocumentTemplateLight createDocumentTemplate(

            @QueryParam("tenantId") Long tenantId,
@@ -41,6 +43,7 @@ public interface TemplatesCxfApi extends TemplatesApi { 


    @POST

    @Path("admin/document-templates/{templateId}")

    @Consumes({ MediaType.MULTIPART_FORM_DATA })

    @Produces({ MediaType.APPLICATION_JSON })

    public DocumentTemplateLight updateDocumentTemplate(

            @PathParam("templateId") long id,

src/main/java/com/inteligr8/alfresco/activiti/api/TemplatesJerseyApi.java

+3 −0
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ 
 */

package com.inteligr8.alfresco.activiti.api;



import javax.ws.rs.Consumes;

import javax.ws.rs.POST;

import javax.ws.rs.Path;

import javax.ws.rs.PathParam;
@@ -34,6 +35,7 @@ public interface TemplatesJerseyApi extends TemplatesApi { 


    @POST

    @Path("admin/document-templates")

    @Consumes({ MediaType.MULTIPART_FORM_DATA })

    @Produces({ MediaType.APPLICATION_JSON })

    public DocumentTemplateLight createDocumentTemplate(

            @QueryParam("tenantId") Long tenantId,
@@ -41,6 +43,7 @@ public interface TemplatesJerseyApi extends TemplatesApi { 


    @POST

    @Path("admin/document-templates/{templateId}")

    @Consumes({ MediaType.MULTIPART_FORM_DATA })

    @Produces({ MediaType.APPLICATION_JSON })

    public DocumentTemplateLight updateDocumentTemplate(

            @PathParam("templateId") long id,