Commit 92b038f6 authored by Brian Long's avatar Brian Long
Browse files

Merge branch 'develop' into stable

parents e917e3c5 0365425e

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

+5 −2
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ import javax.ws.rs.POST; 
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.MultipartBody;
@@ -21,7 +22,8 @@ public interface AppDefinitionsCxfApi { 
    @Consumes({ MediaType.MULTIPART_FORM_DATA })

    @Produces({ MediaType.APPLICATION_JSON })

    AppDefinitionRepresentation import_(

    		MultipartBody body);

    		MultipartBody body,

    		@QueryParam("renewIdmEntries") Boolean renewIdmEntries);



    @POST

    @Path("{modelId}/import")
@@ -29,7 +31,8 @@ public interface AppDefinitionsCxfApi { 
    @Produces({ MediaType.APPLICATION_JSON })

    AppDefinitionRepresentation import_(

    		@PathParam("modelId") Long appId,

    		MultipartBody body);

    		MultipartBody body,

    		@QueryParam("renewIdmEntries") Boolean renewIdmEntries);



    @POST

    @Path("publish-app")