Merge branch 'develop' into stable
This commit is contained in:
commit
6853324d2d
@ -1,8 +1,6 @@
|
||||
|
||||
package com.inteligr8.alfresco.activiti.api;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import javax.ws.rs.Consumes;
|
||||
import javax.ws.rs.POST;
|
||||
import javax.ws.rs.Path;
|
||||
@ -10,7 +8,7 @@ import javax.ws.rs.PathParam;
|
||||
import javax.ws.rs.Produces;
|
||||
import javax.ws.rs.core.MediaType;
|
||||
|
||||
import org.apache.cxf.jaxrs.ext.multipart.Attachment;
|
||||
import org.apache.cxf.jaxrs.ext.multipart.MultipartBody;
|
||||
|
||||
import com.inteligr8.alfresco.activiti.model.AppDefinitionRepresentation;
|
||||
import com.inteligr8.alfresco.activiti.model.AppDefinitionUpdateResultRepresentation;
|
||||
@ -20,32 +18,32 @@ public interface AppDefinitionsCxfApi {
|
||||
|
||||
@POST
|
||||
@Path("import")
|
||||
@Consumes({ MediaType.APPLICATION_JSON, "application/zip", MediaType.MULTIPART_FORM_DATA })
|
||||
@Consumes({ MediaType.MULTIPART_FORM_DATA })
|
||||
@Produces({ MediaType.APPLICATION_JSON })
|
||||
AppDefinitionRepresentation import_(
|
||||
List<Attachment> attachments);
|
||||
MultipartBody body);
|
||||
|
||||
@POST
|
||||
@Path("{modelId}/import")
|
||||
@Consumes({ MediaType.APPLICATION_JSON, "application/zip", MediaType.MULTIPART_FORM_DATA })
|
||||
@Consumes({ MediaType.MULTIPART_FORM_DATA })
|
||||
@Produces({ MediaType.APPLICATION_JSON })
|
||||
AppDefinitionRepresentation import_(
|
||||
@PathParam("modelId") Long appId,
|
||||
List<Attachment> attachments);
|
||||
MultipartBody body);
|
||||
|
||||
@POST
|
||||
@Path("publish-app")
|
||||
@Consumes({ MediaType.APPLICATION_JSON, "application/zip", MediaType.MULTIPART_FORM_DATA })
|
||||
@Consumes({ MediaType.MULTIPART_FORM_DATA })
|
||||
@Produces({ MediaType.APPLICATION_JSON })
|
||||
AppDefinitionUpdateResultRepresentation publishApp(
|
||||
List<Attachment> attachments);
|
||||
MultipartBody body);
|
||||
|
||||
@POST
|
||||
@Path("{modelId}/publish-app")
|
||||
@Consumes({ MediaType.APPLICATION_JSON, "application/zip", MediaType.MULTIPART_FORM_DATA })
|
||||
@Consumes({ MediaType.MULTIPART_FORM_DATA })
|
||||
@Produces({ MediaType.APPLICATION_JSON })
|
||||
AppDefinitionUpdateResultRepresentation publishApp(
|
||||
@PathParam("modelId") Long appId,
|
||||
List<Attachment> attachments);
|
||||
MultipartBody body);
|
||||
|
||||
}
|
||||
|
@ -1,16 +1,15 @@
|
||||
|
||||
package com.inteligr8.alfresco.activiti.api;
|
||||
|
||||
import java.io.InputStream;
|
||||
|
||||
import javax.ws.rs.Consumes;
|
||||
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.glassfish.jersey.media.multipart.FormDataContentDisposition;
|
||||
import org.glassfish.jersey.media.multipart.FormDataMultiPart;
|
||||
import org.glassfish.jersey.media.multipart.FormDataParam;
|
||||
|
||||
import com.inteligr8.alfresco.activiti.model.AppDefinitionRepresentation;
|
||||
@ -21,36 +20,34 @@ public interface AppDefinitionsJerseyApi {
|
||||
|
||||
@POST
|
||||
@Path("import")
|
||||
@Consumes({ MediaType.APPLICATION_JSON, "application/zip", MediaType.MULTIPART_FORM_DATA })
|
||||
@Consumes({ MediaType.MULTIPART_FORM_DATA })
|
||||
@Produces({ MediaType.APPLICATION_JSON })
|
||||
AppDefinitionRepresentation import_(
|
||||
@FormDataParam("file") InputStream filedataStream,
|
||||
@FormDataParam("file") FormDataContentDisposition filedataDisposition);
|
||||
AppDefinitionRepresentation importApp(
|
||||
@FormDataParam("file") FormDataMultiPart file,
|
||||
@QueryParam("renewIdmEntries") Boolean renewIdmEntries);
|
||||
|
||||
@POST
|
||||
@Path("{modelId}/import")
|
||||
@Consumes({ MediaType.APPLICATION_JSON, "application/zip", MediaType.MULTIPART_FORM_DATA })
|
||||
@Consumes({ MediaType.MULTIPART_FORM_DATA })
|
||||
@Produces({ MediaType.APPLICATION_JSON })
|
||||
AppDefinitionRepresentation import_(
|
||||
AppDefinitionRepresentation importApp(
|
||||
@PathParam("modelId") Long appId,
|
||||
@FormDataParam("file") InputStream filedataStream,
|
||||
@FormDataParam("file") FormDataContentDisposition filedataDisposition);
|
||||
@FormDataParam("file") FormDataMultiPart file,
|
||||
@QueryParam("renewIdmEntries") Boolean renewIdmEntries);
|
||||
|
||||
@POST
|
||||
@Path("publish-app")
|
||||
@Consumes({ MediaType.APPLICATION_JSON, "application/zip", MediaType.MULTIPART_FORM_DATA })
|
||||
@Consumes({ MediaType.MULTIPART_FORM_DATA })
|
||||
@Produces({ MediaType.APPLICATION_JSON })
|
||||
AppDefinitionUpdateResultRepresentation publishApp(
|
||||
@FormDataParam("file") InputStream filedataStream,
|
||||
@FormDataParam("file") FormDataContentDisposition filedataDisposition);
|
||||
FormDataMultiPart file);
|
||||
|
||||
@POST
|
||||
@Path("{modelId}/publish-app")
|
||||
@Consumes({ MediaType.APPLICATION_JSON, "application/zip", MediaType.MULTIPART_FORM_DATA })
|
||||
@Consumes({ MediaType.MULTIPART_FORM_DATA })
|
||||
@Produces({ MediaType.APPLICATION_JSON })
|
||||
AppDefinitionUpdateResultRepresentation publishApp(
|
||||
@PathParam("modelId") Long appId,
|
||||
@FormDataParam("file") InputStream filedataStream,
|
||||
@FormDataParam("file") FormDataContentDisposition filedataDisposition);
|
||||
FormDataMultiPart file);
|
||||
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user