Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndy Jury2014-10-06 20:10:06 +0000
committerAndy Jury2014-10-06 20:10:06 +0000
commit607e6ed65b09742b74fd98dfdbf7df0ebb8a5a60 (patch)
tree256d379b09fde71cf854f1d95295b98421f74106
parentf80f15758129ad0c615226317130bffc6409b7d7 (diff)
downloadorg.eclipse.osee-0.19.0.v201410062056_RC.tar.gz
org.eclipse.osee-0.19.0.v201410062056_RC.tar.xz
org.eclipse.osee-0.19.0.v201410062056_RC.zip
bug[ats_ATS113479]: Fix Headless Runner from 0.18.0.0.19.0.v201410062056_RC
-rw-r--r--plugins/org.eclipse.osee.ote.rest.client/src/org/eclipse/osee/ote/rest/client/internal/GetOteServerFile.java2
-rw-r--r--plugins/org.eclipse.osee.ote.rest/src/org/eclipse/osee/ote/rest/internal/OteFilesResource.java2
2 files changed, 2 insertions, 2 deletions
diff --git a/plugins/org.eclipse.osee.ote.rest.client/src/org/eclipse/osee/ote/rest/client/internal/GetOteServerFile.java b/plugins/org.eclipse.osee.ote.rest.client/src/org/eclipse/osee/ote/rest/client/internal/GetOteServerFile.java
index 17c90b13c17..afd6b20533b 100644
--- a/plugins/org.eclipse.osee.ote.rest.client/src/org/eclipse/osee/ote/rest/client/internal/GetOteServerFile.java
+++ b/plugins/org.eclipse.osee.ote.rest.client/src/org/eclipse/osee/ote/rest/client/internal/GetOteServerFile.java
@@ -34,7 +34,7 @@ public class GetOteServerFile extends BaseClientCallable<Progress> {
public void doWork() throws Exception {
URI targetUri = UriBuilder.fromUri(uri).path("ote").path("file").queryParam("path", filePath).build();
- Response response = factory.target(targetUri).request(MediaType.APPLICATION_JSON).get();
+ Response response = factory.target(targetUri).request(MediaType.APPLICATION_XML).get();
if (response.getStatus() == Status.OK.getStatusCode()) {
InputStream is = (InputStream) response.getEntity();
FileOutputStream fos = new FileOutputStream(destination);
diff --git a/plugins/org.eclipse.osee.ote.rest/src/org/eclipse/osee/ote/rest/internal/OteFilesResource.java b/plugins/org.eclipse.osee.ote.rest/src/org/eclipse/osee/ote/rest/internal/OteFilesResource.java
index 100c7004660..a618a465383 100644
--- a/plugins/org.eclipse.osee.ote.rest/src/org/eclipse/osee/ote/rest/internal/OteFilesResource.java
+++ b/plugins/org.eclipse.osee.ote.rest/src/org/eclipse/osee/ote/rest/internal/OteFilesResource.java
@@ -41,7 +41,7 @@ public class OteFilesResource {
Request request;
@GET
- @Produces(MediaType.APPLICATION_XML)
+ @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
public StreamingOutput getFile(@QueryParam("path") String path ) throws OseeCoreException {
final String myPath = path;
return new StreamingOutput() {

Back to the top