[
http://opencast.jira.com/browse/MH-8851?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=30798#comment-30798
]
Adam McKenzie commented on MH-8851:
-----------------------------------
Not the Berkley merge of 11186, just a rest endpoint name change:
svn diff
http://opencast.jira.com/svn/MH/msub/berkeley.edu/1.2.x/modules/matterhorn-capture-agent-impl
-r11186
Index:
src/main/java/org/opencastproject/capture/endpoint/CaptureRestService.java
===================================================================
--- src/main/java/org/opencastproject/capture/endpoint/CaptureRestService.java
(revision 11186)
+++ src/main/java/org/opencastproject/capture/endpoint/CaptureRestService.java
(revision 12271)
@@ -216,8 +216,9 @@
@GET
@Produces({ MediaType.TEXT_XML, MediaType.TEXT_PLAIN })
- @Path("configuration{type: \\.xml|\\.txt|}")
- @RestQuery(name = "config", description = "Returns a list with the default
agent configuration properties. This is in the same format as the startCapture
endpoint.", pathParameters = { }, restParameters = { }, reponses = {
+ @Path("configuration.{type:xml|txt}")
+ @RestQuery(name = "config", description = "Returns a list with the default
agent configuration properties. This is in the same format as the startCapture
endpoint.", pathParameters = {
+ @RestParameter(name = "type", description = "The Document
Type", isRequired = true, type = RestParameter.Type.STRING) }, restParameters =
{ }, reponses = {
@RestResponse(description = "the configuration values are returned",
responseCode = HttpServletResponse.SC_OK),
@RestResponse(description = "the configuration properties could not
be retrieved", responseCode = HttpServletResponse.SC_INTERNAL_SERVER_ERROR),
@RestResponse(description = "Capture Agent is unavailable",
responseCode = HttpServletResponse.SC_SERVICE_UNAVAILABLE) }, returnDescription
= "")
@@ -228,7 +229,7 @@
}
try {
- if (".xml".equals(type)) {
+ if ("xml".equals(type)) {
return Response.ok(new
PropertiesResponse(service.getDefaultAgentProperties())).type(MediaType.TEXT_XML).build();
} else {
ByteArrayOutputStream baos = new ByteArrayOutputStream();
Index: src/main/resources/ui/index.html
===================================================================
--- src/main/resources/ui/index.html (revision 11186)
+++ src/main/resources/ui/index.html (revision 12271)
@@ -40,7 +40,7 @@
var end = "<a href='http://"; + window.location.hostname +
":8080/captureagent/stopCapture'>Stop Capture</a>";
var client = new XMLHttpRequest();
- client.open("GET", "http://"; + window.location.hostname +
":8080/captureagent/configuration", false);
+ client.open("GET", "http://"; + window.location.hostname +
":8080/captureagent/configuration.xml", false);
client.send();
var form = "<form name='form' action=" + start + "
method='POST'><textarea name=config rows='20' cols='100'>" +
client.responseText + "</textarea><br>" +
"<input type='submit' value='Start Capture'>" +
Property changes on: .
___________________________________________________________________
Modified: svn:mergeinfo
Merged /MH/branches/1.2.x/modules/matterhorn-capture-agent-impl:r10818-11380
Merged /MH/trunk/modules/matterhorn-capture-agent-impl:r10668,10816
> Examine diffs between 1.2 and 1.3 capture agent for code changes that causes
> the jvm to crash
> ---------------------------------------------------------------------------------------------
>
> Key: MH-8851
> URL: http://opencast.jira.com/browse/MH-8851
> Project: Matterhorn Project
> Issue Type: Sub-Task
> Components: Capture (Devices and Software)
> Affects Versions: 1.4, 1.3
> Reporter: Adam McKenzie
> Assignee: Adam McKenzie
> Priority: Release Blocker
> Fix For: 1.4, 1.3
>
> Attachments: revision-11044.diff, svn.log
>
>
> I cannot reproduce the issue on 1.2 in conditions that it reliably happens in
> 1.3. Therefore, I am going to go through all of the commits after the svn log
> says the 1.2 branch happened for the capture agent bundle
> (modules/matterhorn-capture-agent-impl) to determine possible candidates that
> are issues. Then I will create tasks to revert the code and test it on
> capture agents to isolate what might be causing the issue.
--
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]
_______________________________________________
