You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by ch...@apache.org on 2012/11/13 20:30:09 UTC
svn commit: r1408908 - in
/airavata/trunk/modules/airavata-rest-services/src/main/java/org/apache/airavata/services/registry/rest:
client/DescriptorResourceClient.java
resources/DescriptorRegistryResource.java
Author: chathuri
Date: Tue Nov 13 19:30:08 2012
New Revision: 1408908
URL: http://svn.apache.org/viewvc?rev=1408908&view=rev
Log:
updating descriptor client
Modified:
airavata/trunk/modules/airavata-rest-services/src/main/java/org/apache/airavata/services/registry/rest/client/DescriptorResourceClient.java
airavata/trunk/modules/airavata-rest-services/src/main/java/org/apache/airavata/services/registry/rest/resources/DescriptorRegistryResource.java
Modified: airavata/trunk/modules/airavata-rest-services/src/main/java/org/apache/airavata/services/registry/rest/client/DescriptorResourceClient.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/airavata-rest-services/src/main/java/org/apache/airavata/services/registry/rest/client/DescriptorResourceClient.java?rev=1408908&r1=1408907&r2=1408908&view=diff
==============================================================================
--- airavata/trunk/modules/airavata-rest-services/src/main/java/org/apache/airavata/services/registry/rest/client/DescriptorResourceClient.java (original)
+++ airavata/trunk/modules/airavata-rest-services/src/main/java/org/apache/airavata/services/registry/rest/client/DescriptorResourceClient.java Tue Nov 13 19:30:08 2012
@@ -471,7 +471,7 @@ public class DescriptorResourceClient {
return applicationDeploymentDescriptionMap;
}
- private List<String> getApplicationDescriptorNames (){
+ public List<String> getApplicationDescriptorNames (){
webResource = getDescriptorRegistryBaseResource().path(ResourcePathConstants.DecResourcePathConstants.APP_DESC_NAMES);
ClientResponse response = webResource.accept(MediaType.APPLICATION_JSON).get(ClientResponse.class);
int status = response.getStatus();
Modified: airavata/trunk/modules/airavata-rest-services/src/main/java/org/apache/airavata/services/registry/rest/resources/DescriptorRegistryResource.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/airavata-rest-services/src/main/java/org/apache/airavata/services/registry/rest/resources/DescriptorRegistryResource.java?rev=1408908&r1=1408907&r2=1408908&view=diff
==============================================================================
--- airavata/trunk/modules/airavata-rest-services/src/main/java/org/apache/airavata/services/registry/rest/resources/DescriptorRegistryResource.java (original)
+++ airavata/trunk/modules/airavata-rest-services/src/main/java/org/apache/airavata/services/registry/rest/resources/DescriptorRegistryResource.java Tue Nov 13 19:30:08 2012
@@ -597,7 +597,7 @@ public class DescriptorRegistryResource
*/
@GET
@Path(ResourcePathConstants.DecResourcePathConstants.APP_DESC_DESCRIPTION)
- @Produces("text/xml")
+ @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
public Response getApplicationDescriptor(@QueryParam("serviceName") String serviceName,
@QueryParam("hostName") String hostName,
@QueryParam("applicationName") String applicationName) {
@@ -634,7 +634,7 @@ public class DescriptorRegistryResource
*/
@GET
@Path(ResourcePathConstants.DecResourcePathConstants.APP_DESC_PER_HOST_SERVICE)
- @Produces("text/xml")
+ @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
public Response getApplicationDescriptorPerServiceHost(@QueryParam("serviceName") String serviceName,
@QueryParam("hostName") String hostName) {
airavataRegistry = (AiravataRegistry2) context.getAttribute(RestServicesConstants.AIRAVATA_REGISTRY);