[
http://opencast.jira.com/browse/MH-8187?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=28069#comment-28069
]
Adam McKenzie commented on MH-8187:
-----------------------------------
1.2.x created in r10530
Latest trunk version is r11021.
modules/matterhorn-capture-admin-service-impl
svn merge -r 10530:11021
http://opencast.jira.com/svn/MH/branches/1.2.x/modules/matterhorn-capture-admin-service-impl/
One conflict in:
src/main/java/org/opencastproject/capture/admin/endpoint/CaptureAgentStateRestService.java
@POST
// @Consumes(MediaType.TEXT_XML)
@Produces(MediaType.TEXT_XML)
@Path("agents/{name}/configuration")
<<<<<<< .working
@RestQuery(name = "setAgentStateConfiguration", description = "Set the
configuration of a given capture agent, registering it if it does not exist",
pathParameters = { @RestParameter(description = "The name of a given capture
agent", i$
@RestResponse(description = "{agentName} set to {state}",
responseCode = HttpServletResponse.SC_OK),
@RestResponse(description = "The configuration format is incorrect OR
the agent name is blank or null", responseCode =
HttpServletResponse.SC_BAD_REQUEST) }, returnDescription = "")
=======
@RestQuery(name = "setAgentStateConfiguration", description = "Set the
configuration of a given capture agent, registering it if it does not exist",
pathParameters = {
@RestParameter(description = "The name of a given capture agent",
isRequired = true, name = "name", type = Type.STRING) }, restParameters = {
@RestParameter(description = "An XML representation of the capabilities, as
specified in http://java.sun.com/dtd/properties.dtd (friendly names as keys,
device locations as their corresponding values)", type = Type.TEXT, isRequired
=$
@RestResponse(description = "{agentName} set to {state}", responseCode =
HttpServletResponse.SC_OK),
@RestResponse(description = "The configuration format is incorrect OR the
agent name is blank or null", responseCode =
HttpServletResponse.SC_BAD_REQUEST) }, returnDescription = "")
>>>>>>> .merge-right.r11021
public Response setConfiguration(@PathParam("name") String agentName,
@FormParam("configuration") String configuration) {
if (service == null) {
return
Response.serverError().status(Response.Status.SERVICE_UNAVAILABLE).build();
}
if (configuration == null) {
logger.debug("The configuration data cannot be blank");
return Response.serverError().status(Response.Status.BAD_REQUEST).build();
}
modules/matterhorn-capture-agent-impl
svn merge -r 10530:11021
http://opencast.jira.com/svn/MH/branches/1.2.x/modules/matterhorn-capture-agent-impl/
No conflicts.
> Merge 1.2.x changes into trunk for modules/matterhorn-capture-agent-impl &
> modules/matterhorn-capture-admin-service-impl
> ------------------------------------------------------------------------------------------------------------------------
>
> Key: MH-8187
> URL: http://opencast.jira.com/browse/MH-8187
> Project: Matterhorn Project
> Issue Type: Task
> Components: Capture (Devices and Software)
> Affects Versions: Trunk
> Reporter: Adam McKenzie
> Assignee: Adam McKenzie
> Priority: Critical
> Fix For: 1.3
>
>
--
This message is automatically generated by JIRA.
If you think it was sent incorrectly, please contact your JIRA administrators:
http://opencast.jira.com/secure/ContactAdministrators!default.jspa
For more information on JIRA, see: http://www.atlassian.com/software/jira
_______________________________________________
Matterhorn mailing list
[email protected]
http://lists.opencastproject.org/mailman/listinfo/matterhorn
To unsubscribe please email
[email protected]
_______________________________________________
