aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteve Pitschke2013-07-29 14:08:18 (EDT)
committerSteve Pitschke2013-07-29 14:08:18 (EDT)
commit972f72e5774224157142f57d07114440d922e9b2 (patch)
treef4d81e6ae991a9f1b82c5a04fd1709a94ece92c4
parentdcc09d077eabdad037441fdfb2f193043a7c9094 (diff)
downloadorg.eclipse.lyo.rio-972f72e5774224157142f57d07114440d922e9b2.zip
org.eclipse.lyo.rio-972f72e5774224157142f57d07114440d922e9b2.tar.gz
org.eclipse.lyo.rio-972f72e5774224157142f57d07114440d922e9b2.tar.bz2
Bug 413937: Add text/turtle Support to CM Test Serverrefs/changes/33/14933/1
Change-Id: Iedeea79abbdfad37d848efecb35dc857993ae44c Signed-off-by: Steve Pitschke <pitschke@us.ibm.com>
-rw-r--r--org.eclipse.lyo.oslc4j.changemanagement/src/org/eclipse/lyo/oslc4j/changemanagement/resources/ChangeRequestResource.java17
1 files changed, 11 insertions, 6 deletions
diff --git a/org.eclipse.lyo.oslc4j.changemanagement/src/org/eclipse/lyo/oslc4j/changemanagement/resources/ChangeRequestResource.java b/org.eclipse.lyo.oslc4j.changemanagement/src/org/eclipse/lyo/oslc4j/changemanagement/resources/ChangeRequestResource.java
index a9588ca..c888901 100644
--- a/org.eclipse.lyo.oslc4j.changemanagement/src/org/eclipse/lyo/oslc4j/changemanagement/resources/ChangeRequestResource.java
+++ b/org.eclipse.lyo.oslc4j.changemanagement/src/org/eclipse/lyo/oslc4j/changemanagement/resources/ChangeRequestResource.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2012 IBM Corporation.
+ * Copyright (c) 2012, 2013 IBM Corporation.
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
@@ -96,7 +96,8 @@ public class ChangeRequestResource
usages = {OslcConstants.OSLC_USAGE_DEFAULT}
)
@GET
- @Produces({OslcMediaType.APPLICATION_RDF_XML, OslcMediaType.APPLICATION_XML, OslcMediaType.APPLICATION_JSON})
+ @Produces({OslcMediaType.APPLICATION_RDF_XML, OslcMediaType.APPLICATION_XML,
+ OslcMediaType.APPLICATION_JSON, OslcMediaType.TEXT_TURTLE})
public ChangeRequest[] getChangeRequests(@QueryParam("oslc.where") final String where)
{
@@ -117,7 +118,8 @@ public class ChangeRequestResource
@GET
@Path("{changeRequestId}")
- @Produces({OslcMediaType.APPLICATION_RDF_XML, OslcMediaType.APPLICATION_XML, OslcMediaType.APPLICATION_JSON})
+ @Produces({OslcMediaType.APPLICATION_RDF_XML, OslcMediaType.APPLICATION_XML,
+ OslcMediaType.APPLICATION_JSON, OslcMediaType.TEXT_TURTLE})
public ChangeRequest getChangeRequest(@Context final HttpServletResponse httpServletResponse,
@PathParam("changeRequestId") final String changeRequestId)
{
@@ -200,8 +202,10 @@ public class ChangeRequestResource
usages = {OslcConstants.OSLC_USAGE_DEFAULT}
)
@POST
- @Consumes({OslcMediaType.APPLICATION_RDF_XML, OslcMediaType.APPLICATION_XML, OslcMediaType.APPLICATION_JSON})
- @Produces({OslcMediaType.APPLICATION_RDF_XML, OslcMediaType.APPLICATION_XML, OslcMediaType.APPLICATION_JSON})
+ @Consumes({OslcMediaType.APPLICATION_RDF_XML, OslcMediaType.APPLICATION_XML,
+ OslcMediaType.APPLICATION_JSON, OslcMediaType.TEXT_TURTLE})
+ @Produces({OslcMediaType.APPLICATION_RDF_XML, OslcMediaType.APPLICATION_XML,
+ OslcMediaType.APPLICATION_JSON, OslcMediaType.TEXT_TURTLE})
public Response addChangeRequest(@Context final HttpServletRequest httpServletRequest,
@Context final HttpServletResponse httpServletResponse,
final ChangeRequest changeRequest)
@@ -233,7 +237,8 @@ public class ChangeRequestResource
}
@PUT
- @Consumes({OslcMediaType.APPLICATION_RDF_XML, OslcMediaType.APPLICATION_XML, OslcMediaType.APPLICATION_JSON})
+ @Consumes({OslcMediaType.APPLICATION_RDF_XML, OslcMediaType.APPLICATION_XML,
+ OslcMediaType.APPLICATION_JSON, OslcMediaType.TEXT_TURTLE})
@Path("{changeRequestId}")
public Response updateChangeRequest(@Context final HttpServletResponse httpServletResponse,
@HeaderParam("If-Match") final String eTagHeader,