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 15:26:02 UTC
svn commit: r1408744 - in /airavata/sandbox/airavata-registry-rest: ./
src/main/java/org/apache/airavata/services/registry/rest/
src/main/java/org/apache/airavata/services/registry/rest/client/
src/main/java/org/apache/airavata/services/registry/rest/r...
Author: chathuri
Date: Tue Nov 13 14:25:56 2012
New Revision: 1408744
URL: http://svn.apache.org/viewvc?rev=1408744&view=rev
Log:
updating client methods
Added:
airavata/sandbox/airavata-registry-rest/src/main/java/org/apache/airavata/services/registry/rest/Test.java
Removed:
airavata/sandbox/airavata-registry-rest/src/main/java/org/apache/airavata/services/registry/rest/User.java
airavata/sandbox/airavata-registry-rest/src/main/java/org/apache/airavata/services/registry/rest/security/
Modified:
airavata/sandbox/airavata-registry-rest/pom.xml
airavata/sandbox/airavata-registry-rest/src/main/java/org/apache/airavata/services/registry/rest/client/DescriptorResourceClient.java
airavata/sandbox/airavata-registry-rest/src/main/java/org/apache/airavata/services/registry/rest/client/ExperimentResourceClient.java
airavata/sandbox/airavata-registry-rest/src/main/java/org/apache/airavata/services/registry/rest/client/ProjectResourceClient.java
airavata/sandbox/airavata-registry-rest/src/main/java/org/apache/airavata/services/registry/rest/client/ProvenanceResourceClient.java
airavata/sandbox/airavata-registry-rest/src/main/java/org/apache/airavata/services/registry/rest/client/PublishedWorkflowResourceClient.java
airavata/sandbox/airavata-registry-rest/src/main/java/org/apache/airavata/services/registry/rest/client/UserWorkflowResourceClient.java
airavata/sandbox/airavata-registry-rest/src/main/java/org/apache/airavata/services/registry/rest/resourcemappings/ApplicationDescriptorList.java
airavata/sandbox/airavata-registry-rest/src/main/java/org/apache/airavata/services/registry/rest/resourcemappings/ConfigurationList.java
airavata/sandbox/airavata-registry-rest/src/main/java/org/apache/airavata/services/registry/rest/resourcemappings/DescriptorNameList.java
airavata/sandbox/airavata-registry-rest/src/main/java/org/apache/airavata/services/registry/rest/resourcemappings/ExperimentDataList.java
airavata/sandbox/airavata-registry-rest/src/main/java/org/apache/airavata/services/registry/rest/resourcemappings/ExperimentIDList.java
airavata/sandbox/airavata-registry-rest/src/main/java/org/apache/airavata/services/registry/rest/resourcemappings/ExperimentList.java
airavata/sandbox/airavata-registry-rest/src/main/java/org/apache/airavata/services/registry/rest/resourcemappings/HostDescriptionList.java
airavata/sandbox/airavata-registry-rest/src/main/java/org/apache/airavata/services/registry/rest/resourcemappings/HostDescriptor.java
airavata/sandbox/airavata-registry-rest/src/main/java/org/apache/airavata/services/registry/rest/resourcemappings/PublishWorkflowNamesList.java
airavata/sandbox/airavata-registry-rest/src/main/java/org/apache/airavata/services/registry/rest/resourcemappings/ServiceDescriptionList.java
airavata/sandbox/airavata-registry-rest/src/main/java/org/apache/airavata/services/registry/rest/resourcemappings/ServiceDescriptor.java
airavata/sandbox/airavata-registry-rest/src/main/java/org/apache/airavata/services/registry/rest/resourcemappings/URLList.java
airavata/sandbox/airavata-registry-rest/src/main/java/org/apache/airavata/services/registry/rest/resourcemappings/WorkflowInstancesList.java
airavata/sandbox/airavata-registry-rest/src/main/java/org/apache/airavata/services/registry/rest/resourcemappings/WorkflowList.java
airavata/sandbox/airavata-registry-rest/src/main/java/org/apache/airavata/services/registry/rest/resourcemappings/WorkflowNodeIODataList.java
airavata/sandbox/airavata-registry-rest/src/main/java/org/apache/airavata/services/registry/rest/resourcemappings/WorkspaceProjectList.java
Modified: airavata/sandbox/airavata-registry-rest/pom.xml
URL: http://svn.apache.org/viewvc/airavata/sandbox/airavata-registry-rest/pom.xml?rev=1408744&r1=1408743&r2=1408744&view=diff
==============================================================================
--- airavata/sandbox/airavata-registry-rest/pom.xml (original)
+++ airavata/sandbox/airavata-registry-rest/pom.xml Tue Nov 13 14:25:56 2012
@@ -121,27 +121,6 @@
<artifactId>airavata-jpa-registry</artifactId>
<version>${airavata.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.airavata</groupId>
- <artifactId>airavata-registry-service</artifactId>
- <version>${airavata.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.airavata</groupId>
- <artifactId>airavata-client-api</artifactId>
- <version>${airavata.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.jackrabbit</groupId>
- <artifactId>jackrabbit-jcr-rmi</artifactId>
- <version>2.2.7</version>
- </dependency>
- <dependency>
- <groupId>org.apache.jackrabbit</groupId>
- <artifactId>jackrabbit-core</artifactId>
- <version>2.2.7</version>
- </dependency>
-
<!-- Logging -->
<dependency>
<groupId>org.slf4j</groupId>
Added: airavata/sandbox/airavata-registry-rest/src/main/java/org/apache/airavata/services/registry/rest/Test.java
URL: http://svn.apache.org/viewvc/airavata/sandbox/airavata-registry-rest/src/main/java/org/apache/airavata/services/registry/rest/Test.java?rev=1408744&view=auto
==============================================================================
--- airavata/sandbox/airavata-registry-rest/src/main/java/org/apache/airavata/services/registry/rest/Test.java (added)
+++ airavata/sandbox/airavata-registry-rest/src/main/java/org/apache/airavata/services/registry/rest/Test.java Tue Nov 13 14:25:56 2012
@@ -0,0 +1,145 @@
+/*
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+
+package org.apache.airavata.services.registry.rest;
+
+
+import org.apache.airavata.commons.gfac.type.HostDescription;
+import org.apache.airavata.schemas.gfac.GlobusHostType;
+import org.apache.airavata.services.registry.rest.client.ConfigurationResourceClient;
+import org.apache.airavata.services.registry.rest.client.DescriptorResourceClient;
+import org.apache.airavata.services.registry.rest.resourcemappings.HostDescriptor;
+
+import java.net.URI;
+import java.util.List;
+
+public class Test {
+ public static void main(String[] args) {
+ configurationResourceClientTest();
+// descriptorClientTest();
+ }
+
+ public static void configurationResourceClientTest(){
+ //configuration resource test
+ ConfigurationResourceClient configurationResourceClient = new ConfigurationResourceClient();
+
+// System.out.println("###############getConfiguration###############");
+// Object configuration = configurationResourceClient.getConfiguration("interpreter.url");
+// System.out.println(configuration.toString());
+//
+// System.out.println("###############getConfigurationList###############");
+// configurationResourceClient.addWFInterpreterURI("http://192.168.17.1:8080/axis2/services/WorkflowInterpretor2");
+ List<Object> configurationList = configurationResourceClient.getConfigurationList("testKey1");
+ for(Object object : configurationList){
+ System.out.println(object.toString());
+ }
+//
+// System.out.println("###############setConfiguration###############");
+// configurationResourceClient.setConfiguration("testKey1", "testVal1", "2012-11-12 00:12:31");
+//
+// System.out.println("###############addConfiguration###############");
+// configurationResourceClient.addConfiguration("testKey1", "testVal2", "2012-11-12 05:12:31");
+
+// System.out.println("###############remove all configuration ###############");
+// configurationResourceClient.removeAllConfiguration("testKey1");
+//
+// System.out.println("###############remove configuration ###############");
+// configurationResourceClient.setConfiguration("testKey2", "testVal2", "2012-11-12 00:12:31");
+// configurationResourceClient.removeAllConfiguration("testKey2");
+//
+// System.out.println("###############get GFAC URI ###############");
+// configurationResourceClient.addGFacURI("http://192.168.17.1:8080/axis2/services/GFacService2");
+// List<URI> gFacURIs = configurationResourceClient.getGFacURIs();
+// for (URI uri : gFacURIs){
+// System.out.println(uri.toString());
+// }
+
+// System.out.println("###############get WF interpreter URIs ###############");
+// List<URI> workflowInterpreterURIs = configurationResourceClient.getWorkflowInterpreterURIs();
+// for (URI uri : workflowInterpreterURIs){
+// System.out.println(uri.toString());
+// }
+//
+// System.out.println("###############get eventing URI ###############");
+// URI eventingURI = configurationResourceClient.getEventingURI();
+// System.out.println(eventingURI.toString());
+//
+// System.out.println("###############get message Box URI ###############");
+// URI mesgBoxUri = configurationResourceClient.getMsgBoxURI();
+// System.out.println(mesgBoxUri.toString());
+//
+// System.out.println("###############Set eventing URI ###############");
+// configurationResourceClient.setEventingURI("http://192.168.17.1:8080/axis2/services/EventingService2");
+//
+// System.out.println("###############Set MSGBox URI ###############");
+// configurationResourceClient.setEventingURI("http://192.168.17.1:8080/axis2/services/MsgBoxService2");
+//
+// System.out.println("###############Add GFAC URI by date ###############");
+// configurationResourceClient.addGFacURIByDate("http://192.168.17.1:8080/axis2/services/GFacService3", "2012-11-12 00:12:27");
+//
+// System.out.println("###############Add WF interpreter URI by date ###############");
+// configurationResourceClient.addWorkflowInterpreterURI("http://192.168.17.1:8080/axis2/services/WorkflowInterpretor3", "2012-11-12 00:12:27");
+
+// System.out.println("###############Set eventing URI by date ###############");
+// configurationResourceClient.setEventingURIByDate("http://192.168.17.1:8080/axis2/services/EventingService3", "2012-11-12 00:12:27");
+//
+// System.out.println("###############Set MsgBox URI by date ###############");
+// configurationResourceClient.setMessageBoxURIByDate("http://192.168.17.1:8080/axis2/services/MsgBoxService3", "2012-11-12 00:12:27");
+
+// System.out.println("############### Remove GFac URI ###############");
+// configurationResourceClient.removeGFacURI("http://192.168.17.1:8080/axis2/services/GFacService3");
+//
+// System.out.println("############### Remove all GFac URI ###############");
+// configurationResourceClient.removeAllGFacURI();
+//
+// System.out.println("############### Remove removeWorkflowInterpreter URI ###############");
+// configurationResourceClient.removeWorkflowInterpreterURI("http://192.168.17.1:8080/axis2/services/WorkflowInterpretor3");
+
+// System.out.println("############### Remove removeAllWorkflowInterpreterURI ###############");
+// configurationResourceClient.removeAllWorkflowInterpreterURI();
+//
+// System.out.println("############### Remove eventing URI ###############");
+// configurationResourceClient.unsetEventingURI();
+//
+// System.out.println("############### unsetMessageBoxURI ###############");
+// configurationResourceClient.unsetMessageBoxURI();
+ }
+
+ public static void descriptorClientTest(){
+ DescriptorResourceClient descriptorResourceClient = new DescriptorResourceClient();
+
+// boolean localHost = descriptorResourceClient.isHostDescriptorExists("LocalHost");
+// System.out.println(localHost);
+
+// HostDescription descriptor = new HostDescription(GlobusHostType.type);
+// descriptor.getType().setHostName("testHost");
+// descriptor.getType().setHostAddress("testHostAddress2");
+// descriptorResourceClient.addHostDescriptor(descriptor);
+
+// HostDescription localHost = descriptorResourceClient.getHostDescriptor("purdue.teragrid.org");
+// List<HostDescription> hostDescriptors = descriptorResourceClient.getHostDescriptors();
+// System.out.println(localHost.getType().getHostName());
+// System.out.println(localHost.getType().getHostAddress());
+
+ }
+
+
+}
Modified: airavata/sandbox/airavata-registry-rest/src/main/java/org/apache/airavata/services/registry/rest/client/DescriptorResourceClient.java
URL: http://svn.apache.org/viewvc/airavata/sandbox/airavata-registry-rest/src/main/java/org/apache/airavata/services/registry/rest/client/DescriptorResourceClient.java?rev=1408744&r1=1408743&r2=1408744&view=diff
==============================================================================
--- airavata/sandbox/airavata-registry-rest/src/main/java/org/apache/airavata/services/registry/rest/client/DescriptorResourceClient.java (original)
+++ airavata/sandbox/airavata-registry-rest/src/main/java/org/apache/airavata/services/registry/rest/client/DescriptorResourceClient.java Tue Nov 13 14:25:56 2012
@@ -34,6 +34,9 @@ import org.apache.airavata.commons.gfac.
import org.apache.airavata.services.registry.rest.resourcemappings.*;
import org.apache.airavata.services.registry.rest.utils.DescriptorUtil;
import org.apache.airavata.services.registry.rest.utils.ResourcePathConstants;
+import org.codehaus.jackson.jaxrs.JacksonJaxbJsonProvider;
+import org.codehaus.jackson.jaxrs.JacksonJsonProvider;
+import org.codehaus.jackson.map.DeserializationConfig;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -59,6 +62,9 @@ public class DescriptorResourceClient {
ClientConfig config = new DefaultClientConfig();
config.getFeatures().put(JSONConfiguration.FEATURE_POJO_MAPPING,
Boolean.TRUE);
+ //config.getFeatures().put(JSONConfiguration.)
+ config.getClasses().add(JacksonJsonProvider.class);
+ //JSONConfiguration build = JSONConfiguration.natural().build();
Client client = Client.create(config);
WebResource baseWebResource = client.resource(getBaseURI());
webResource = baseWebResource.path(ResourcePathConstants.DecResourcePathConstants.DESC_RESOURCE_PATH);
Modified: airavata/sandbox/airavata-registry-rest/src/main/java/org/apache/airavata/services/registry/rest/client/ExperimentResourceClient.java
URL: http://svn.apache.org/viewvc/airavata/sandbox/airavata-registry-rest/src/main/java/org/apache/airavata/services/registry/rest/client/ExperimentResourceClient.java?rev=1408744&r1=1408743&r2=1408744&view=diff
==============================================================================
--- airavata/sandbox/airavata-registry-rest/src/main/java/org/apache/airavata/services/registry/rest/client/ExperimentResourceClient.java (original)
+++ airavata/sandbox/airavata-registry-rest/src/main/java/org/apache/airavata/services/registry/rest/client/ExperimentResourceClient.java Tue Nov 13 14:25:56 2012
@@ -68,7 +68,7 @@ public class ExperimentResourceClient {
formParams.add("experimentID", experiment.getExperimentId());
formParams.add("submittedDate", experiment.getSubmittedDate().toString());
- ClientResponse response = webResource.accept(MediaType.APPLICATION_FORM_URLENCODED).post(ClientResponse.class, formParams);
+ ClientResponse response = webResource.accept(MediaType.TEXT_PLAIN).type(MediaType.APPLICATION_FORM_URLENCODED).post(ClientResponse.class, formParams);
int status = response.getStatus();
if (status != 200) {
@@ -94,7 +94,7 @@ public class ExperimentResourceClient {
public List<AiravataExperiment> getExperiments(){
webResource = getExperimentRegistryBaseResource().path(ResourcePathConstants.ExperimentResourcePathConstants.GET_ALL_EXPS);
- ClientResponse response = webResource.type(MediaType.APPLICATION_JSON).get(ClientResponse.class);
+ ClientResponse response = webResource.accept(MediaType.APPLICATION_JSON).get(ClientResponse.class);
int status = response.getStatus();
if (status != 200) {
@@ -117,7 +117,7 @@ public class ExperimentResourceClient {
MultivaluedMap queryParams = new MultivaluedMapImpl();
queryParams.add("projectName", projectName);
- ClientResponse response = webResource.queryParams(queryParams).type(MediaType.APPLICATION_JSON).get(ClientResponse.class);
+ ClientResponse response = webResource.queryParams(queryParams).accept(MediaType.APPLICATION_JSON).get(ClientResponse.class);
int status = response.getStatus();
if (status != 200) {
@@ -142,7 +142,7 @@ public class ExperimentResourceClient {
queryParams.add("fromDate", from.toString());
queryParams.add("toDate", to.toString());
- ClientResponse response = webResource.queryParams(queryParams).type(MediaType.APPLICATION_JSON).get(ClientResponse.class);
+ ClientResponse response = webResource.queryParams(queryParams).accept(MediaType.APPLICATION_JSON).get(ClientResponse.class);
int status = response.getStatus();
if (status != 200) {
@@ -168,7 +168,7 @@ public class ExperimentResourceClient {
queryParams.add("fromDate", from.toString());
queryParams.add("toDate", to.toString());
- ClientResponse response = webResource.queryParams(queryParams).type(MediaType.APPLICATION_JSON).get(ClientResponse.class);
+ ClientResponse response = webResource.queryParams(queryParams).accept(MediaType.APPLICATION_JSON).get(ClientResponse.class);
int status = response.getStatus();
if (status != 200) {
@@ -213,7 +213,7 @@ public class ExperimentResourceClient {
formParams.add("experimentId", experimentId );
formParams.add("createIfNotPresent", createStatus );
- ClientResponse response = webResource.type(MediaType.TEXT_PLAIN).post(ClientResponse.class, formParams);
+ ClientResponse response = webResource.accept(MediaType.TEXT_PLAIN).post(ClientResponse.class, formParams);
int status = response.getStatus();
if (status != 200) {
Modified: airavata/sandbox/airavata-registry-rest/src/main/java/org/apache/airavata/services/registry/rest/client/ProjectResourceClient.java
URL: http://svn.apache.org/viewvc/airavata/sandbox/airavata-registry-rest/src/main/java/org/apache/airavata/services/registry/rest/client/ProjectResourceClient.java?rev=1408744&r1=1408743&r2=1408744&view=diff
==============================================================================
--- airavata/sandbox/airavata-registry-rest/src/main/java/org/apache/airavata/services/registry/rest/client/ProjectResourceClient.java (original)
+++ airavata/sandbox/airavata-registry-rest/src/main/java/org/apache/airavata/services/registry/rest/client/ProjectResourceClient.java Tue Nov 13 14:25:56 2012
@@ -86,7 +86,7 @@ public class ProjectResourceClient {
formParams.add("projectName", projectName );
formParams.add("createIfNotExists", createStatus );
- ClientResponse response = webResource.type(MediaType.TEXT_PLAIN).post(ClientResponse.class, formParams);
+ ClientResponse response = webResource.accept(MediaType.TEXT_PLAIN).post(ClientResponse.class, formParams);
int status = response.getStatus();
if (status != 200) {
@@ -103,7 +103,7 @@ public class ProjectResourceClient {
MultivaluedMap formParams = new MultivaluedMapImpl();
formParams.add("projectName", projectName );
- ClientResponse response = webResource.type(MediaType.TEXT_PLAIN).post(ClientResponse.class, formParams);
+ ClientResponse response = webResource.accept(MediaType.TEXT_PLAIN).post(ClientResponse.class, formParams);
int status = response.getStatus();
if (status != 200) {
@@ -118,7 +118,7 @@ public class ProjectResourceClient {
MultivaluedMap formParams = new MultivaluedMapImpl();
formParams.add("projectName", projectName );
- ClientResponse response = webResource.type(MediaType.TEXT_PLAIN).post(ClientResponse.class, formParams);
+ ClientResponse response = webResource.accept(MediaType.TEXT_PLAIN).post(ClientResponse.class, formParams);
int status = response.getStatus();
if (status != 200) {
Modified: airavata/sandbox/airavata-registry-rest/src/main/java/org/apache/airavata/services/registry/rest/client/ProvenanceResourceClient.java
URL: http://svn.apache.org/viewvc/airavata/sandbox/airavata-registry-rest/src/main/java/org/apache/airavata/services/registry/rest/client/ProvenanceResourceClient.java?rev=1408744&r1=1408743&r2=1408744&view=diff
==============================================================================
--- airavata/sandbox/airavata-registry-rest/src/main/java/org/apache/airavata/services/registry/rest/client/ProvenanceResourceClient.java (original)
+++ airavata/sandbox/airavata-registry-rest/src/main/java/org/apache/airavata/services/registry/rest/client/ProvenanceResourceClient.java Tue Nov 13 14:25:56 2012
@@ -72,7 +72,7 @@ public class ProvenanceResourceClient {
MultivaluedMap formParams = new MultivaluedMapImpl();
formParams.add("experimentId", experimentId);
formParams.add("user", user);
- ClientResponse response = webResource.type(MediaType.TEXT_PLAIN).post(ClientResponse.class, formParams);
+ ClientResponse response = webResource.accept(MediaType.TEXT_PLAIN).post(ClientResponse.class, formParams);
int status = response.getStatus();
if (status != 200) {
@@ -86,7 +86,7 @@ public class ProvenanceResourceClient {
webResource = getProvenanceRegistryBaseResource().path(ResourcePathConstants.ProvenanceResourcePathConstants.GET_EXPERIMENT_EXECUTIONUSER);
MultivaluedMap queryParams = new MultivaluedMapImpl();
queryParams.add("experimentId", experimentId);
- ClientResponse response = webResource.queryParams(queryParams).type(MediaType.TEXT_PLAIN).get(ClientResponse.class);
+ ClientResponse response = webResource.queryParams(queryParams).accept(MediaType.TEXT_PLAIN).get(ClientResponse.class);
int status = response.getStatus();
if (status != 200) {
@@ -103,7 +103,7 @@ public class ProvenanceResourceClient {
webResource = getProvenanceRegistryBaseResource().path(ResourcePathConstants.ProvenanceResourcePathConstants.EXPERIMENTNAME_EXISTS);
MultivaluedMap queryParams = new MultivaluedMapImpl();
queryParams.add("experimentName", experimentName);
- ClientResponse response = webResource.queryParams(queryParams).type(MediaType.TEXT_PLAIN).get(ClientResponse.class);
+ ClientResponse response = webResource.queryParams(queryParams).accept(MediaType.TEXT_PLAIN).get(ClientResponse.class);
int status = response.getStatus();
if (status != 200) {
logger.error("Failed : HTTP error code : " + status);
@@ -117,7 +117,7 @@ public class ProvenanceResourceClient {
webResource = getProvenanceRegistryBaseResource().path(ResourcePathConstants.ProvenanceResourcePathConstants.GET_EXPERIMENT_NAME);
MultivaluedMap queryParams = new MultivaluedMapImpl();
queryParams.add("experimentId", experimentId);
- ClientResponse response = webResource.queryParams(queryParams).type(MediaType.TEXT_PLAIN).get(ClientResponse.class);
+ ClientResponse response = webResource.queryParams(queryParams).accept(MediaType.TEXT_PLAIN).get(ClientResponse.class);
int status = response.getStatus();
if (status != 200) {
logger.error("Failed : HTTP error code : " + status);
@@ -135,7 +135,7 @@ public class ProvenanceResourceClient {
formParams.add("experimentId", experimentId);
formParams.add("experimentName", experimentName);
- ClientResponse response = webResource.type(MediaType.TEXT_PLAIN).post(ClientResponse.class, formParams);
+ ClientResponse response = webResource.accept(MediaType.TEXT_PLAIN).post(ClientResponse.class, formParams);
int status = response.getStatus();
if (status != 200) {
logger.error("Failed : HTTP error code : " + status);
@@ -149,7 +149,7 @@ public class ProvenanceResourceClient {
webResource = getProvenanceRegistryBaseResource().path(ResourcePathConstants.ProvenanceResourcePathConstants.GET_EXPERIMENTMETADATA);
MultivaluedMap queryParams = new MultivaluedMapImpl();
queryParams.add("experimentId", experimentId);
- ClientResponse response = webResource.queryParams(queryParams).type(MediaType.TEXT_PLAIN).get(ClientResponse.class);
+ ClientResponse response = webResource.queryParams(queryParams).accept(MediaType.TEXT_PLAIN).get(ClientResponse.class);
int status = response.getStatus();
if (status != 200) {
logger.error("Failed : HTTP error code : " + status);
@@ -167,7 +167,7 @@ public class ProvenanceResourceClient {
formParams.add("experimentId", experimentId);
formParams.add("metadata", metadata);
- ClientResponse response = webResource.type(MediaType.TEXT_PLAIN).post(ClientResponse.class, formParams);
+ ClientResponse response = webResource.accept(MediaType.TEXT_PLAIN).post(ClientResponse.class, formParams);
int status = response.getStatus();
if (status != 200) {
logger.error("Failed : HTTP error code : " + status);
@@ -180,7 +180,7 @@ public class ProvenanceResourceClient {
webResource = getProvenanceRegistryBaseResource().path(ResourcePathConstants.ProvenanceResourcePathConstants.GET_WORKFLOWTEMPLATENAME);
MultivaluedMap queryParams = new MultivaluedMapImpl();
queryParams.add("workflowInstanceId", workflowInstanceId);
- ClientResponse response = webResource.queryParams(queryParams).type(MediaType.TEXT_PLAIN).get(ClientResponse.class);
+ ClientResponse response = webResource.queryParams(queryParams).accept(MediaType.TEXT_PLAIN).get(ClientResponse.class);
int status = response.getStatus();
if (status != 200) {
logger.error("Failed : HTTP error code : " + status);
@@ -198,7 +198,7 @@ public class ProvenanceResourceClient {
formParams.add("workflowInstanceId", workflowInstanceId);
formParams.add("templateName", templateName);
- ClientResponse response = webResource.type(MediaType.TEXT_PLAIN).post(ClientResponse.class, formParams);
+ ClientResponse response = webResource.accept(MediaType.TEXT_PLAIN).post(ClientResponse.class, formParams);
int status = response.getStatus();
if (status != 200) {
logger.error("Failed : HTTP error code : " + status);
@@ -211,7 +211,7 @@ public class ProvenanceResourceClient {
webResource = getProvenanceRegistryBaseResource().path(ResourcePathConstants.ProvenanceResourcePathConstants.GET_EXPERIMENTWORKFLOWINSTANCES);
MultivaluedMap queryParams = new MultivaluedMapImpl();
queryParams.add("experimentId", experimentId);
- ClientResponse response = webResource.queryParams(queryParams).type(MediaType.APPLICATION_JSON).get(ClientResponse.class);
+ ClientResponse response = webResource.queryParams(queryParams).accept(MediaType.APPLICATION_JSON).get(ClientResponse.class);
int status = response.getStatus();
if (status != 200) {
logger.error("Failed : HTTP error code : " + status);
@@ -234,7 +234,7 @@ public class ProvenanceResourceClient {
webResource = getProvenanceRegistryBaseResource().path(ResourcePathConstants.ProvenanceResourcePathConstants.WORKFLOWINSTANCE_EXIST_CHECK);
MultivaluedMap queryParams = new MultivaluedMapImpl();
queryParams.add("instanceId", instanceId);
- ClientResponse response = webResource.queryParams(queryParams).type(MediaType.TEXT_PLAIN).get(ClientResponse.class);
+ ClientResponse response = webResource.queryParams(queryParams).accept(MediaType.TEXT_PLAIN).get(ClientResponse.class);
int status = response.getStatus();
if (status != 200) {
logger.error("Failed : HTTP error code : " + status);
@@ -250,7 +250,7 @@ public class ProvenanceResourceClient {
formParams.add("instanceId", instanceId);
formParams.add("createIfNotPresent", createIfNotPresent);
- ClientResponse response = webResource.type(MediaType.TEXT_PLAIN).post(ClientResponse.class, formParams);
+ ClientResponse response = webResource.accept(MediaType.TEXT_PLAIN).post(ClientResponse.class, formParams);
int status = response.getStatus();
if (status != 200) {
logger.error("Failed : HTTP error code : " + status);
@@ -266,7 +266,7 @@ public class ProvenanceResourceClient {
formParams.add("instanceId", instanceId);
formParams.add("executionStatus", executionStatus.name());
- ClientResponse response = webResource.type(MediaType.TEXT_PLAIN).post(ClientResponse.class, formParams);
+ ClientResponse response = webResource.accept(MediaType.TEXT_PLAIN).post(ClientResponse.class, formParams);
int status = response.getStatus();
if (status != 200) {
logger.error("Failed : HTTP error code : " + status);
@@ -282,7 +282,7 @@ public class ProvenanceResourceClient {
formParams.add("executionStatus", workflowInstanceStatus.getExecutionStatus().name());
formParams.add("statusUpdateTime", workflowInstanceStatus.getStatusUpdateTime().toString());
- ClientResponse response = webResource.type(MediaType.TEXT_PLAIN).post(ClientResponse.class, formParams);
+ ClientResponse response = webResource.accept(MediaType.TEXT_PLAIN).post(ClientResponse.class, formParams);
int status = response.getStatus();
if (status != 200) {
logger.error("Failed : HTTP error code : " + status);
@@ -295,7 +295,7 @@ public class ProvenanceResourceClient {
webResource = getProvenanceRegistryBaseResource().path(ResourcePathConstants.ProvenanceResourcePathConstants.GET_WORKFLOWINSTANCESTATUS);
MultivaluedMap queryParams = new MultivaluedMapImpl();
queryParams.add("instanceId", instanceId);
- ClientResponse response = webResource.queryParams(queryParams).type(MediaType.APPLICATION_JSON).get(ClientResponse.class);
+ ClientResponse response = webResource.queryParams(queryParams).accept(MediaType.APPLICATION_JSON).get(ClientResponse.class);
int status = response.getStatus();
if (status != 200) {
logger.error("Failed : HTTP error code : " + status);
@@ -314,7 +314,7 @@ public class ProvenanceResourceClient {
formParams.add("workflowInstanceId", node.getWorkflowInstance().getWorkflowInstanceId());
formParams.add("data", data);
- ClientResponse response = webResource.type(MediaType.TEXT_PLAIN).post(ClientResponse.class, formParams);
+ ClientResponse response = webResource.accept(MediaType.TEXT_PLAIN).post(ClientResponse.class, formParams);
int status = response.getStatus();
if (status != 200) {
logger.error("Failed : HTTP error code : " + status);
@@ -330,7 +330,7 @@ public class ProvenanceResourceClient {
formParams.add("workflowInstanceId", node.getWorkflowInstance().getWorkflowInstanceId());
formParams.add("data", data);
- ClientResponse response = webResource.type(MediaType.TEXT_PLAIN).post(ClientResponse.class, formParams);
+ ClientResponse response = webResource.accept(MediaType.TEXT_PLAIN).post(ClientResponse.class, formParams);
int status = response.getStatus();
if (status != 200) {
logger.error("Failed : HTTP error code : " + status);
@@ -343,7 +343,7 @@ public class ProvenanceResourceClient {
webResource = getProvenanceRegistryBaseResource().path(ResourcePathConstants.ProvenanceResourcePathConstants.GET_EXPERIMENT);
MultivaluedMap queryParams = new MultivaluedMapImpl();
queryParams.add("experimentId", experimentId);
- ClientResponse response = webResource.queryParams(queryParams).type(MediaType.APPLICATION_JSON).get(ClientResponse.class);
+ ClientResponse response = webResource.queryParams(queryParams).accept(MediaType.APPLICATION_JSON).get(ClientResponse.class);
int status = response.getStatus();
if (status != 200) {
logger.error("Failed : HTTP error code : " + status);
@@ -359,7 +359,7 @@ public class ProvenanceResourceClient {
webResource = getProvenanceRegistryBaseResource().path(ResourcePathConstants.ProvenanceResourcePathConstants.GET_EXPERIMENT_METAINFORMATION);
MultivaluedMap queryParams = new MultivaluedMapImpl();
queryParams.add("experimentId", experimentId);
- ClientResponse response = webResource.queryParams(queryParams).type(MediaType.APPLICATION_JSON).get(ClientResponse.class);
+ ClientResponse response = webResource.queryParams(queryParams).accept(MediaType.APPLICATION_JSON).get(ClientResponse.class);
int status = response.getStatus();
if (status != 200) {
logger.error("Failed : HTTP error code : " + status);
@@ -375,7 +375,7 @@ public class ProvenanceResourceClient {
webResource = getProvenanceRegistryBaseResource().path(ResourcePathConstants.ProvenanceResourcePathConstants.GET_ALL_EXPERIMENT_METAINFORMATION);
MultivaluedMap queryParams = new MultivaluedMapImpl();
queryParams.add("user", user);
- ClientResponse response = webResource.queryParams(queryParams).type(MediaType.APPLICATION_JSON).get(ClientResponse.class);
+ ClientResponse response = webResource.queryParams(queryParams).accept(MediaType.APPLICATION_JSON).get(ClientResponse.class);
int status = response.getStatus();
if (status != 200) {
logger.error("Failed : HTTP error code : " + status);
@@ -397,7 +397,7 @@ public class ProvenanceResourceClient {
MultivaluedMap queryParams = new MultivaluedMapImpl();
queryParams.add("user", user);
queryParams.add("experimentNameRegex", experimentNameRegex);
- ClientResponse response = webResource.queryParams(queryParams).type(MediaType.APPLICATION_JSON).get(ClientResponse.class);
+ ClientResponse response = webResource.queryParams(queryParams).accept(MediaType.APPLICATION_JSON).get(ClientResponse.class);
int status = response.getStatus();
if (status != 200) {
logger.error("Failed : HTTP error code : " + status);
@@ -418,7 +418,7 @@ public class ProvenanceResourceClient {
webResource = getProvenanceRegistryBaseResource().path(ResourcePathConstants.ProvenanceResourcePathConstants.GET_EXPERIMENT_ID_USER);
MultivaluedMap queryParams = new MultivaluedMapImpl();
queryParams.add("username", user);
- ClientResponse response = webResource.queryParams(queryParams).type(MediaType.APPLICATION_JSON).get(ClientResponse.class);
+ ClientResponse response = webResource.queryParams(queryParams).accept(MediaType.APPLICATION_JSON).get(ClientResponse.class);
int status = response.getStatus();
if (status != 200) {
logger.error("Failed : HTTP error code : " + status);
@@ -435,7 +435,7 @@ public class ProvenanceResourceClient {
webResource = getProvenanceRegistryBaseResource().path(ResourcePathConstants.ProvenanceResourcePathConstants.GET_EXPERIMENT_USER);
MultivaluedMap queryParams = new MultivaluedMapImpl();
queryParams.add("username", user);
- ClientResponse response = webResource.queryParams(queryParams).type(MediaType.APPLICATION_JSON).get(ClientResponse.class);
+ ClientResponse response = webResource.queryParams(queryParams).accept(MediaType.APPLICATION_JSON).get(ClientResponse.class);
int status = response.getStatus();
if (status != 200) {
logger.error("Failed : HTTP error code : " + status);
@@ -458,7 +458,7 @@ public class ProvenanceResourceClient {
formParams.add("nodeId", workflowStatusNode.getWorkflowInstanceNode().getNodeId());
formParams.add("executionStatus", workflowStatusNode.getExecutionStatus().name());
- ClientResponse response = webResource.type(MediaType.TEXT_PLAIN).post(ClientResponse.class, formParams);
+ ClientResponse response = webResource.accept(MediaType.TEXT_PLAIN).post(ClientResponse.class, formParams);
int status = response.getStatus();
if (status != 200) {
logger.error("Failed : HTTP error code : " + status);
@@ -474,7 +474,7 @@ public class ProvenanceResourceClient {
formParams.add("nodeId", nodeId);
formParams.add("executionStatus", executionStatus.name());
- ClientResponse response = webResource.type(MediaType.TEXT_PLAIN).post(ClientResponse.class, formParams);
+ ClientResponse response = webResource.accept(MediaType.TEXT_PLAIN).post(ClientResponse.class, formParams);
int status = response.getStatus();
if (status != 200) {
logger.error("Failed : HTTP error code : " + status);
@@ -490,7 +490,7 @@ public class ProvenanceResourceClient {
formParams.add("nodeId", workflowNode.getNodeId());
formParams.add("executionStatus", executionStatus.name());
- ClientResponse response = webResource.type(MediaType.TEXT_PLAIN).post(ClientResponse.class, formParams);
+ ClientResponse response = webResource.accept(MediaType.TEXT_PLAIN).post(ClientResponse.class, formParams);
int status = response.getStatus();
if (status != 200) {
logger.error("Failed : HTTP error code : " + status);
@@ -504,7 +504,7 @@ public class ProvenanceResourceClient {
MultivaluedMap queryParams = new MultivaluedMapImpl();
queryParams.add("workflowInstanceId", workflowNode.getWorkflowInstance().getWorkflowInstanceId());
queryParams.add("nodeId", workflowNode.getNodeId());
- ClientResponse response = webResource.queryParams(queryParams).type(MediaType.APPLICATION_JSON).get(ClientResponse.class);
+ ClientResponse response = webResource.queryParams(queryParams).accept(MediaType.APPLICATION_JSON).get(ClientResponse.class);
int status = response.getStatus();
if (status != 200) {
logger.error("Failed : HTTP error code : " + status);
@@ -521,7 +521,7 @@ public class ProvenanceResourceClient {
MultivaluedMap queryParams = new MultivaluedMapImpl();
queryParams.add("workflowInstanceId", workflowNode.getWorkflowInstance().getWorkflowInstanceId());
queryParams.add("nodeId", workflowNode.getNodeId());
- ClientResponse response = webResource.queryParams(queryParams).type(MediaType.TEXT_PLAIN).get(ClientResponse.class);
+ ClientResponse response = webResource.queryParams(queryParams).accept(MediaType.TEXT_PLAIN).get(ClientResponse.class);
int status = response.getStatus();
if (status != 200) {
logger.error("Failed : HTTP error code : " + status);
@@ -544,7 +544,7 @@ public class ProvenanceResourceClient {
webResource = getProvenanceRegistryBaseResource().path(ResourcePathConstants.ProvenanceResourcePathConstants.GET_WORKFLOW_STARTTIME);
MultivaluedMap queryParams = new MultivaluedMapImpl();
queryParams.add("workflowInstanceId", workflowInstance.getWorkflowInstanceId());
- ClientResponse response = webResource.queryParams(queryParams).type(MediaType.TEXT_PLAIN).get(ClientResponse.class);
+ ClientResponse response = webResource.queryParams(queryParams).accept(MediaType.TEXT_PLAIN).get(ClientResponse.class);
int status = response.getStatus();
if (status != 200) {
logger.error("Failed : HTTP error code : " + status);
@@ -565,7 +565,7 @@ public class ProvenanceResourceClient {
public void updateWorkflowNodeGramData(WorkflowNodeGramData workflowNodeGramData){
webResource = getProvenanceRegistryBaseResource().path(ResourcePathConstants.ProvenanceResourcePathConstants.UPDATE_WORKFLOWNODE_GRAMDATA);
- ClientResponse response = webResource.accept(MediaType.APPLICATION_JSON).type(MediaType.TEXT_PLAIN).post(ClientResponse.class, workflowNodeGramData);
+ ClientResponse response = webResource.type(MediaType.APPLICATION_JSON).accept(MediaType.TEXT_PLAIN).post(ClientResponse.class, workflowNodeGramData);
int status = response.getStatus();
if (status != 200) {
logger.error("Failed : HTTP error code : " + status);
@@ -578,7 +578,7 @@ public class ProvenanceResourceClient {
webResource = getProvenanceRegistryBaseResource().path(ResourcePathConstants.ProvenanceResourcePathConstants.GET_WORKFLOWINSTANCEDATA);
MultivaluedMap queryParams = new MultivaluedMapImpl();
queryParams.add("workflowInstanceId", workflowInstanceId);
- ClientResponse response = webResource.queryParams(queryParams).type(MediaType.APPLICATION_JSON).get(ClientResponse.class);
+ ClientResponse response = webResource.queryParams(queryParams).accept(MediaType.APPLICATION_JSON).get(ClientResponse.class);
int status = response.getStatus();
if (status != 200) {
logger.error("Failed : HTTP error code : " + status);
@@ -595,7 +595,7 @@ public class ProvenanceResourceClient {
MultivaluedMap queryParams = new MultivaluedMapImpl();
queryParams.add("workflowInstanceId", workflowInstanceId);
queryParams.add("nodeId", nodeId);
- ClientResponse response = webResource.queryParams(queryParams).type(MediaType.TEXT_PLAIN).get(ClientResponse.class);
+ ClientResponse response = webResource.queryParams(queryParams).accept(MediaType.TEXT_PLAIN).get(ClientResponse.class);
int status = response.getStatus();
if (status != 200) {
logger.error("Failed : HTTP error code : " + status);
@@ -611,7 +611,7 @@ public class ProvenanceResourceClient {
queryParams.add("workflowInstanceId", workflowInstanceId);
queryParams.add("nodeId", nodeId);
queryParams.add("createIfNotPresent", createIfNotPresent);
- ClientResponse response = webResource.queryParams(queryParams).type(MediaType.TEXT_PLAIN).get(ClientResponse.class);
+ ClientResponse response = webResource.queryParams(queryParams).accept(MediaType.TEXT_PLAIN).get(ClientResponse.class);
int status = response.getStatus();
if (status != 200) {
logger.error("Failed : HTTP error code : " + status);
@@ -626,7 +626,7 @@ public class ProvenanceResourceClient {
MultivaluedMap queryParams = new MultivaluedMapImpl();
queryParams.add("workflowInstanceId", workflowInstanceId);
queryParams.add("nodeId", nodeId);
- ClientResponse response = webResource.queryParams(queryParams).type(MediaType.APPLICATION_JSON).get(ClientResponse.class);
+ ClientResponse response = webResource.queryParams(queryParams).accept(MediaType.APPLICATION_JSON).get(ClientResponse.class);
int status = response.getStatus();
if (status != 200) {
logger.error("Failed : HTTP error code : " + status);
@@ -645,7 +645,7 @@ public class ProvenanceResourceClient {
formParams.add("workflowInstanceId", workflowInstanceId);
formParams.add("templateName", templateName);
- ClientResponse response = webResource.type(MediaType.TEXT_PLAIN).post(ClientResponse.class, formParams);
+ ClientResponse response = webResource.accept(MediaType.TEXT_PLAIN).post(ClientResponse.class, formParams);
int status = response.getStatus();
if (status != 200) {
logger.error("Failed : HTTP error code : " + status);
@@ -661,7 +661,7 @@ public class ProvenanceResourceClient {
formParams.add("nodeId", node.getNodeId());
formParams.add("nodeType", type.getNodeType().name());
- ClientResponse response = webResource.type(MediaType.TEXT_PLAIN).post(ClientResponse.class, formParams);
+ ClientResponse response = webResource.accept(MediaType.TEXT_PLAIN).post(ClientResponse.class, formParams);
int status = response.getStatus();
if (status != 200) {
logger.error("Failed : HTTP error code : " + status);
@@ -676,7 +676,7 @@ public class ProvenanceResourceClient {
formParams.add("workflowInstanceId", workflowInstance);
formParams.add("nodeId", nodeId);
- ClientResponse response = webResource.type(MediaType.TEXT_PLAIN).post(ClientResponse.class, formParams);
+ ClientResponse response = webResource.accept(MediaType.TEXT_PLAIN).post(ClientResponse.class, formParams);
int status = response.getStatus();
if (status != 200) {
logger.error("Failed : HTTP error code : " + status);
Modified: airavata/sandbox/airavata-registry-rest/src/main/java/org/apache/airavata/services/registry/rest/client/PublishedWorkflowResourceClient.java
URL: http://svn.apache.org/viewvc/airavata/sandbox/airavata-registry-rest/src/main/java/org/apache/airavata/services/registry/rest/client/PublishedWorkflowResourceClient.java?rev=1408744&r1=1408743&r2=1408744&view=diff
==============================================================================
--- airavata/sandbox/airavata-registry-rest/src/main/java/org/apache/airavata/services/registry/rest/client/PublishedWorkflowResourceClient.java (original)
+++ airavata/sandbox/airavata-registry-rest/src/main/java/org/apache/airavata/services/registry/rest/client/PublishedWorkflowResourceClient.java Tue Nov 13 14:25:56 2012
@@ -66,7 +66,7 @@ public class PublishedWorkflowResourceCl
webResource = getPublishedWFRegistryBaseResource().path(ResourcePathConstants.PublishedWFConstants.PUBLISHWF_EXIST);
MultivaluedMap queryParams = new MultivaluedMapImpl();
queryParams.add("workflowname", workflowName);
- ClientResponse response = webResource.queryParams(queryParams).type(MediaType.TEXT_PLAIN).get(ClientResponse.class);
+ ClientResponse response = webResource.queryParams(queryParams).accept(MediaType.TEXT_PLAIN).get(ClientResponse.class);
int status = response.getStatus();
if (status != 200) {
@@ -84,7 +84,7 @@ public class PublishedWorkflowResourceCl
formParams.add("workflowName", workflowName);
formParams.add("publishWorkflowName", publishWorkflowName);
- ClientResponse response = webResource.type(MediaType.TEXT_PLAIN).post(ClientResponse.class, formParams);
+ ClientResponse response = webResource.accept(MediaType.TEXT_PLAIN).post(ClientResponse.class, formParams);
int status = response.getStatus();
if (status != 200) {
logger.error("Failed : HTTP error code : " + status);
@@ -98,7 +98,7 @@ public class PublishedWorkflowResourceCl
MultivaluedMap formParams = new MultivaluedMapImpl();
formParams.add("workflowName", workflowName);
- ClientResponse response = webResource.type(MediaType.TEXT_PLAIN).post(ClientResponse.class, formParams);
+ ClientResponse response = webResource.accept(MediaType.TEXT_PLAIN).post(ClientResponse.class, formParams);
int status = response.getStatus();
if (status != 200) {
logger.error("Failed : HTTP error code : " + status);
@@ -112,7 +112,7 @@ public class PublishedWorkflowResourceCl
webResource = getPublishedWFRegistryBaseResource().path(ResourcePathConstants.PublishedWFConstants.GET_PUBLISHWORKFLOWGRAPH);
MultivaluedMap queryParams = new MultivaluedMapImpl();
queryParams.add("workflowname", workflowName);
- ClientResponse response = webResource.queryParams(queryParams).type(MediaType.TEXT_PLAIN).get(ClientResponse.class);
+ ClientResponse response = webResource.queryParams(queryParams).accept(MediaType.TEXT_PLAIN).get(ClientResponse.class);
int status = response.getStatus();
if (status != 200) {
@@ -128,7 +128,7 @@ public class PublishedWorkflowResourceCl
public List<String> getPublishedWorkflowNames(){
webResource = getPublishedWFRegistryBaseResource().path(ResourcePathConstants.PublishedWFConstants.GET_PUBLISHWORKFLOWNAMES);
- ClientResponse response = webResource.type(MediaType.APPLICATION_JSON).get(ClientResponse.class);
+ ClientResponse response = webResource.accept(MediaType.APPLICATION_JSON).get(ClientResponse.class);
int status = response.getStatus();
if (status != 200) {
@@ -144,7 +144,7 @@ public class PublishedWorkflowResourceCl
public Map<String, String> getPublishedWorkflows(){
webResource = getPublishedWFRegistryBaseResource().path(ResourcePathConstants.PublishedWFConstants.GET_PUBLISHWORKFLOWS);
- ClientResponse response = webResource.type(MediaType.APPLICATION_JSON).get(ClientResponse.class);
+ ClientResponse response = webResource.accept(MediaType.APPLICATION_JSON).get(ClientResponse.class);
int status = response.getStatus();
if (status != 200) {
@@ -168,7 +168,7 @@ public class PublishedWorkflowResourceCl
webResource = getPublishedWFRegistryBaseResource().path(ResourcePathConstants.PublishedWFConstants.REMOVE_PUBLISHWORKFLOW);
MultivaluedMap queryParams = new MultivaluedMapImpl();
queryParams.add("workflowname", workflowName);
- ClientResponse response = webResource.queryParams(queryParams).type(MediaType.TEXT_PLAIN).delete(ClientResponse.class);
+ ClientResponse response = webResource.queryParams(queryParams).accept(MediaType.TEXT_PLAIN).delete(ClientResponse.class);
int status = response.getStatus();
if (status != 200) {
Modified: airavata/sandbox/airavata-registry-rest/src/main/java/org/apache/airavata/services/registry/rest/client/UserWorkflowResourceClient.java
URL: http://svn.apache.org/viewvc/airavata/sandbox/airavata-registry-rest/src/main/java/org/apache/airavata/services/registry/rest/client/UserWorkflowResourceClient.java?rev=1408744&r1=1408743&r2=1408744&view=diff
==============================================================================
--- airavata/sandbox/airavata-registry-rest/src/main/java/org/apache/airavata/services/registry/rest/client/UserWorkflowResourceClient.java (original)
+++ airavata/sandbox/airavata-registry-rest/src/main/java/org/apache/airavata/services/registry/rest/client/UserWorkflowResourceClient.java Tue Nov 13 14:25:56 2012
@@ -65,7 +65,7 @@ public class UserWorkflowResourceClient
webResource = getUserWFRegistryBaseResource().path(ResourcePathConstants.UserWFConstants.WORKFLOW_EXIST);
MultivaluedMap queryParams = new MultivaluedMapImpl();
queryParams.add("workflowname", workflowName);
- ClientResponse response = webResource.queryParams(queryParams).type(MediaType.TEXT_PLAIN).get(ClientResponse.class);
+ ClientResponse response = webResource.queryParams(queryParams).accept(MediaType.TEXT_PLAIN).get(ClientResponse.class);
int status = response.getStatus();
if (status != 200) {
@@ -83,7 +83,7 @@ public class UserWorkflowResourceClient
formParams.add("workflowName", workflowName);
formParams.add("workflowGraphXml", workflowGraphXml);
- ClientResponse response = webResource.accept(MediaType.APPLICATION_FORM_URLENCODED).type(MediaType.TEXT_PLAIN).post(ClientResponse.class, formParams);
+ ClientResponse response = webResource.type(MediaType.APPLICATION_FORM_URLENCODED).accept(MediaType.TEXT_PLAIN).post(ClientResponse.class, formParams);
int status = response.getStatus();
if (status != 200) {
logger.error("Failed : HTTP error code : " + status);
@@ -98,7 +98,7 @@ public class UserWorkflowResourceClient
formParams.add("workflowName", workflowName);
formParams.add("workflowGraphXml", workflowGraphXml);
- ClientResponse response = webResource.accept(MediaType.APPLICATION_FORM_URLENCODED).type(MediaType.TEXT_PLAIN).post(ClientResponse.class, formParams);
+ ClientResponse response = webResource.type(MediaType.APPLICATION_FORM_URLENCODED).accept(MediaType.TEXT_PLAIN).post(ClientResponse.class, formParams);
int status = response.getStatus();
if (status != 200) {
logger.error("Failed : HTTP error code : " + status);
@@ -111,7 +111,7 @@ public class UserWorkflowResourceClient
webResource = getUserWFRegistryBaseResource().path(ResourcePathConstants.UserWFConstants.GET_WORKFLOWGRAPH);
MultivaluedMap queryParams = new MultivaluedMapImpl();
queryParams.add("workflowname", workflowName);
- ClientResponse response = webResource.queryParams(queryParams).type(MediaType.TEXT_PLAIN).get(ClientResponse.class);
+ ClientResponse response = webResource.queryParams(queryParams).accept(MediaType.TEXT_PLAIN).get(ClientResponse.class);
int status = response.getStatus();
if (status != 200) {
@@ -126,7 +126,7 @@ public class UserWorkflowResourceClient
public Map<String, String> getWorkflows(){
webResource = getUserWFRegistryBaseResource().path(ResourcePathConstants.UserWFConstants.GET_WORKFLOWS);
- ClientResponse response = webResource.type(MediaType.APPLICATION_JSON).get(ClientResponse.class);
+ ClientResponse response = webResource.accept(MediaType.APPLICATION_JSON).get(ClientResponse.class);
int status = response.getStatus();
if (status != 200) {
@@ -150,7 +150,7 @@ public class UserWorkflowResourceClient
webResource = getUserWFRegistryBaseResource().path(ResourcePathConstants.UserWFConstants.REMOVE_WORKFLOW);
MultivaluedMap queryParams = new MultivaluedMapImpl();
queryParams.add("workflowname", workflowName);
- ClientResponse response = webResource.queryParams(queryParams).type(MediaType.TEXT_PLAIN).delete(ClientResponse.class);
+ ClientResponse response = webResource.queryParams(queryParams).accept(MediaType.TEXT_PLAIN).delete(ClientResponse.class);
int status = response.getStatus();
if (status != 200) {
Modified: airavata/sandbox/airavata-registry-rest/src/main/java/org/apache/airavata/services/registry/rest/resourcemappings/ApplicationDescriptorList.java
URL: http://svn.apache.org/viewvc/airavata/sandbox/airavata-registry-rest/src/main/java/org/apache/airavata/services/registry/rest/resourcemappings/ApplicationDescriptorList.java?rev=1408744&r1=1408743&r2=1408744&view=diff
==============================================================================
--- airavata/sandbox/airavata-registry-rest/src/main/java/org/apache/airavata/services/registry/rest/resourcemappings/ApplicationDescriptorList.java (original)
+++ airavata/sandbox/airavata-registry-rest/src/main/java/org/apache/airavata/services/registry/rest/resourcemappings/ApplicationDescriptorList.java Tue Nov 13 14:25:56 2012
@@ -4,7 +4,7 @@ import javax.xml.bind.annotation.XmlRoot
@XmlRootElement
public class ApplicationDescriptorList {
- private ApplicationDescriptor[] applicationDescriptors;
+ private ApplicationDescriptor[] applicationDescriptors = new ApplicationDescriptor[]{};
public ApplicationDescriptorList() {
}
Modified: airavata/sandbox/airavata-registry-rest/src/main/java/org/apache/airavata/services/registry/rest/resourcemappings/ConfigurationList.java
URL: http://svn.apache.org/viewvc/airavata/sandbox/airavata-registry-rest/src/main/java/org/apache/airavata/services/registry/rest/resourcemappings/ConfigurationList.java?rev=1408744&r1=1408743&r2=1408744&view=diff
==============================================================================
--- airavata/sandbox/airavata-registry-rest/src/main/java/org/apache/airavata/services/registry/rest/resourcemappings/ConfigurationList.java (original)
+++ airavata/sandbox/airavata-registry-rest/src/main/java/org/apache/airavata/services/registry/rest/resourcemappings/ConfigurationList.java Tue Nov 13 14:25:56 2012
@@ -4,7 +4,8 @@ import javax.xml.bind.annotation.XmlRoot
@XmlRootElement
public class ConfigurationList {
- private Object[] configValList = null;
+
+ private Object[] configValList = new Object[]{};
public Object[] getConfigValList() {
return configValList;
Modified: airavata/sandbox/airavata-registry-rest/src/main/java/org/apache/airavata/services/registry/rest/resourcemappings/DescriptorNameList.java
URL: http://svn.apache.org/viewvc/airavata/sandbox/airavata-registry-rest/src/main/java/org/apache/airavata/services/registry/rest/resourcemappings/DescriptorNameList.java?rev=1408744&r1=1408743&r2=1408744&view=diff
==============================================================================
--- airavata/sandbox/airavata-registry-rest/src/main/java/org/apache/airavata/services/registry/rest/resourcemappings/DescriptorNameList.java (original)
+++ airavata/sandbox/airavata-registry-rest/src/main/java/org/apache/airavata/services/registry/rest/resourcemappings/DescriptorNameList.java Tue Nov 13 14:25:56 2012
@@ -22,11 +22,12 @@
package org.apache.airavata.services.registry.rest.resourcemappings;
import javax.xml.bind.annotation.XmlRootElement;
+import java.util.ArrayList;
import java.util.List;
@XmlRootElement
public class DescriptorNameList {
- private List<String> descriptorNames;
+ private List<String> descriptorNames = new ArrayList<String>();
public DescriptorNameList() {
}
Modified: airavata/sandbox/airavata-registry-rest/src/main/java/org/apache/airavata/services/registry/rest/resourcemappings/ExperimentDataList.java
URL: http://svn.apache.org/viewvc/airavata/sandbox/airavata-registry-rest/src/main/java/org/apache/airavata/services/registry/rest/resourcemappings/ExperimentDataList.java?rev=1408744&r1=1408743&r2=1408744&view=diff
==============================================================================
--- airavata/sandbox/airavata-registry-rest/src/main/java/org/apache/airavata/services/registry/rest/resourcemappings/ExperimentDataList.java (original)
+++ airavata/sandbox/airavata-registry-rest/src/main/java/org/apache/airavata/services/registry/rest/resourcemappings/ExperimentDataList.java Tue Nov 13 14:25:56 2012
@@ -24,11 +24,12 @@ package org.apache.airavata.services.reg
import org.apache.airavata.registry.api.impl.ExperimentDataImpl;
import javax.xml.bind.annotation.XmlRootElement;
+import java.util.ArrayList;
import java.util.List;
@XmlRootElement
public class ExperimentDataList {
- private List<ExperimentDataImpl> experimentDataList;
+ private List<ExperimentDataImpl> experimentDataList = new ArrayList<ExperimentDataImpl>();
public ExperimentDataList() {
}
Modified: airavata/sandbox/airavata-registry-rest/src/main/java/org/apache/airavata/services/registry/rest/resourcemappings/ExperimentIDList.java
URL: http://svn.apache.org/viewvc/airavata/sandbox/airavata-registry-rest/src/main/java/org/apache/airavata/services/registry/rest/resourcemappings/ExperimentIDList.java?rev=1408744&r1=1408743&r2=1408744&view=diff
==============================================================================
--- airavata/sandbox/airavata-registry-rest/src/main/java/org/apache/airavata/services/registry/rest/resourcemappings/ExperimentIDList.java (original)
+++ airavata/sandbox/airavata-registry-rest/src/main/java/org/apache/airavata/services/registry/rest/resourcemappings/ExperimentIDList.java Tue Nov 13 14:25:56 2012
@@ -22,11 +22,12 @@
package org.apache.airavata.services.registry.rest.resourcemappings;
import javax.xml.bind.annotation.XmlRootElement;
+import java.util.ArrayList;
import java.util.List;
@XmlRootElement(name = "experiments")
public class ExperimentIDList {
- List<String> experimentIDList;
+ List<String> experimentIDList = new ArrayList<String>();
public ExperimentIDList() {
}
Modified: airavata/sandbox/airavata-registry-rest/src/main/java/org/apache/airavata/services/registry/rest/resourcemappings/ExperimentList.java
URL: http://svn.apache.org/viewvc/airavata/sandbox/airavata-registry-rest/src/main/java/org/apache/airavata/services/registry/rest/resourcemappings/ExperimentList.java?rev=1408744&r1=1408743&r2=1408744&view=diff
==============================================================================
--- airavata/sandbox/airavata-registry-rest/src/main/java/org/apache/airavata/services/registry/rest/resourcemappings/ExperimentList.java (original)
+++ airavata/sandbox/airavata-registry-rest/src/main/java/org/apache/airavata/services/registry/rest/resourcemappings/ExperimentList.java Tue Nov 13 14:25:56 2012
@@ -6,7 +6,7 @@ import javax.xml.bind.annotation.XmlRoot
@XmlRootElement
public class ExperimentList {
- private AiravataExperiment[] experiments = null;
+ private AiravataExperiment[] experiments = new AiravataExperiment[]{};
public ExperimentList() {
}
Modified: airavata/sandbox/airavata-registry-rest/src/main/java/org/apache/airavata/services/registry/rest/resourcemappings/HostDescriptionList.java
URL: http://svn.apache.org/viewvc/airavata/sandbox/airavata-registry-rest/src/main/java/org/apache/airavata/services/registry/rest/resourcemappings/HostDescriptionList.java?rev=1408744&r1=1408743&r2=1408744&view=diff
==============================================================================
--- airavata/sandbox/airavata-registry-rest/src/main/java/org/apache/airavata/services/registry/rest/resourcemappings/HostDescriptionList.java (original)
+++ airavata/sandbox/airavata-registry-rest/src/main/java/org/apache/airavata/services/registry/rest/resourcemappings/HostDescriptionList.java Tue Nov 13 14:25:56 2012
@@ -25,7 +25,7 @@ import javax.xml.bind.annotation.XmlRoot
@XmlRootElement
public class HostDescriptionList {
- private HostDescriptor[] hostDescriptions = null;
+ private HostDescriptor[] hostDescriptions = new HostDescriptor[]{};
public HostDescriptor[] getHostDescriptions() {
return hostDescriptions;
Modified: airavata/sandbox/airavata-registry-rest/src/main/java/org/apache/airavata/services/registry/rest/resourcemappings/HostDescriptor.java
URL: http://svn.apache.org/viewvc/airavata/sandbox/airavata-registry-rest/src/main/java/org/apache/airavata/services/registry/rest/resourcemappings/HostDescriptor.java?rev=1408744&r1=1408743&r2=1408744&view=diff
==============================================================================
--- airavata/sandbox/airavata-registry-rest/src/main/java/org/apache/airavata/services/registry/rest/resourcemappings/HostDescriptor.java (original)
+++ airavata/sandbox/airavata-registry-rest/src/main/java/org/apache/airavata/services/registry/rest/resourcemappings/HostDescriptor.java Tue Nov 13 14:25:56 2012
@@ -21,20 +21,37 @@
package org.apache.airavata.services.registry.rest.resourcemappings;
+import java.util.ArrayList;
import java.util.List;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlTransient;
@XmlRootElement(name = "host")
+@XmlAccessorType(XmlAccessType.FIELD)
public class HostDescriptor {
private String hostname;
private String hostAddress;
- private List<String> hostType;
- private List<String> gridFTPEndPoint;
- private List<String> globusGateKeeperEndPoint;
- private List<String> imageID;
- private List<String> instanceID;
+
+ @XmlTransient
+ private List<String> hostType = new ArrayList<String>();
+ @XmlTransient
+ private List<String> gridFTPEndPoint = new ArrayList<String>();
+ @XmlTransient
+ private List<String> globusGateKeeperEndPoint = new ArrayList<String>();
+ @XmlTransient
+ private List<String> imageID = new ArrayList<String>();
+ @XmlTransient
+ private List<String> instanceID = new ArrayList<String>();
+ private String hostTypeVal;
+ private String gridFTPEndPointVal;
+ private String globusGateKeeperEndPointVal;
+ private String imageIDVal;
+ private String instanceIDVal;
+
public String getHostname() {
return hostname;
@@ -57,6 +74,9 @@ public class HostDescriptor {
}
public void setHostType(List<String> hostType) {
+ if (hostType != null && hostType.isEmpty()){
+ hostTypeVal = hostType.get(0);
+ }
this.hostType = hostType;
}
@@ -65,6 +85,10 @@ public class HostDescriptor {
}
public void setGridFTPEndPoint(List<String> gridFTPEndPoint) {
+ if (gridFTPEndPoint != null && !gridFTPEndPoint.isEmpty()) {
+ gridFTPEndPointVal = gridFTPEndPoint.get(0);
+ }
+
this.gridFTPEndPoint = gridFTPEndPoint;
}
@@ -73,6 +97,10 @@ public class HostDescriptor {
}
public void setGlobusGateKeeperEndPoint(List<String> globusGateKeeperEndPoint) {
+ if(globusGateKeeperEndPoint != null && !globusGateKeeperEndPoint.isEmpty()){
+ gridFTPEndPointVal = globusGateKeeperEndPoint.get(0);
+ }
+
this.globusGateKeeperEndPoint = globusGateKeeperEndPoint;
}
@@ -81,6 +109,10 @@ public class HostDescriptor {
}
public void setImageID(List<String> imageID) {
+ if(imageID != null && !imageID.isEmpty()){
+ imageIDVal = imageID.get(0);
+ }
+
this.imageID = imageID;
}
@@ -89,7 +121,49 @@ public class HostDescriptor {
}
public void setInstanceID(List<String> instanceID) {
+ if(instanceID != null && !instanceID.isEmpty()){
+ instanceIDVal = instanceID.get(0);
+ }
this.instanceID = instanceID;
}
+ public void setHostTypeVal(String hostTypeVal) {
+ this.hostTypeVal = hostTypeVal;
+ }
+
+ public void setGridFTPEndPointVal(String gridFTPEndPointVal) {
+ this.gridFTPEndPointVal = gridFTPEndPointVal;
+ }
+
+ public void setGlobusGateKeeperEndPointVal(String globusGateKeeperEndPointVal) {
+ this.globusGateKeeperEndPointVal = globusGateKeeperEndPointVal;
+ }
+
+ public void setImageIDVal(String imageIDVal) {
+ this.imageIDVal = imageIDVal;
+ }
+
+ public void setInstanceIDVal(String instanceIDVal) {
+ this.instanceIDVal = instanceIDVal;
+ }
+
+ public String getHostTypeVal() {
+ return hostTypeVal;
+ }
+
+ public String getGridFTPEndPointVal() {
+ return gridFTPEndPointVal;
+ }
+
+ public String getGlobusGateKeeperEndPointVal() {
+ return globusGateKeeperEndPointVal;
+ }
+
+ public String getImageIDVal() {
+ return imageIDVal;
+ }
+
+ public String getInstanceIDVal() {
+ return instanceIDVal;
+ }
}
Modified: airavata/sandbox/airavata-registry-rest/src/main/java/org/apache/airavata/services/registry/rest/resourcemappings/PublishWorkflowNamesList.java
URL: http://svn.apache.org/viewvc/airavata/sandbox/airavata-registry-rest/src/main/java/org/apache/airavata/services/registry/rest/resourcemappings/PublishWorkflowNamesList.java?rev=1408744&r1=1408743&r2=1408744&view=diff
==============================================================================
--- airavata/sandbox/airavata-registry-rest/src/main/java/org/apache/airavata/services/registry/rest/resourcemappings/PublishWorkflowNamesList.java (original)
+++ airavata/sandbox/airavata-registry-rest/src/main/java/org/apache/airavata/services/registry/rest/resourcemappings/PublishWorkflowNamesList.java Tue Nov 13 14:25:56 2012
@@ -21,10 +21,11 @@
package org.apache.airavata.services.registry.rest.resourcemappings;
+import java.util.ArrayList;
import java.util.List;
public class PublishWorkflowNamesList {
- private List<String> publishWorkflowNames;
+ private List<String> publishWorkflowNames = new ArrayList<String>();
public PublishWorkflowNamesList() {
}
Modified: airavata/sandbox/airavata-registry-rest/src/main/java/org/apache/airavata/services/registry/rest/resourcemappings/ServiceDescriptionList.java
URL: http://svn.apache.org/viewvc/airavata/sandbox/airavata-registry-rest/src/main/java/org/apache/airavata/services/registry/rest/resourcemappings/ServiceDescriptionList.java?rev=1408744&r1=1408743&r2=1408744&view=diff
==============================================================================
--- airavata/sandbox/airavata-registry-rest/src/main/java/org/apache/airavata/services/registry/rest/resourcemappings/ServiceDescriptionList.java (original)
+++ airavata/sandbox/airavata-registry-rest/src/main/java/org/apache/airavata/services/registry/rest/resourcemappings/ServiceDescriptionList.java Tue Nov 13 14:25:56 2012
@@ -4,7 +4,7 @@ import javax.xml.bind.annotation.XmlRoot
@XmlRootElement
public class ServiceDescriptionList {
- private ServiceDescriptor[] serviceDescriptions = null;
+ private ServiceDescriptor[] serviceDescriptions = new ServiceDescriptor[]{};
public ServiceDescriptor[] getServiceDescriptions() {
return serviceDescriptions;
Modified: airavata/sandbox/airavata-registry-rest/src/main/java/org/apache/airavata/services/registry/rest/resourcemappings/ServiceDescriptor.java
URL: http://svn.apache.org/viewvc/airavata/sandbox/airavata-registry-rest/src/main/java/org/apache/airavata/services/registry/rest/resourcemappings/ServiceDescriptor.java?rev=1408744&r1=1408743&r2=1408744&view=diff
==============================================================================
--- airavata/sandbox/airavata-registry-rest/src/main/java/org/apache/airavata/services/registry/rest/resourcemappings/ServiceDescriptor.java (original)
+++ airavata/sandbox/airavata-registry-rest/src/main/java/org/apache/airavata/services/registry/rest/resourcemappings/ServiceDescriptor.java Tue Nov 13 14:25:56 2012
@@ -21,6 +21,7 @@
package org.apache.airavata.services.registry.rest.resourcemappings;
+import java.util.ArrayList;
import java.util.List;
import javax.xml.bind.annotation.XmlRootElement;
@@ -30,8 +31,8 @@ public class ServiceDescriptor {
private String serviceName;
private String description;
- private List<ServiceParameters> inputParams;
- private List<ServiceParameters> outputParams;
+ private List<ServiceParameters> inputParams = new ArrayList<ServiceParameters>();
+ private List<ServiceParameters> outputParams = new ArrayList<ServiceParameters>();
public String getServiceName() {
return serviceName;
Modified: airavata/sandbox/airavata-registry-rest/src/main/java/org/apache/airavata/services/registry/rest/resourcemappings/URLList.java
URL: http://svn.apache.org/viewvc/airavata/sandbox/airavata-registry-rest/src/main/java/org/apache/airavata/services/registry/rest/resourcemappings/URLList.java?rev=1408744&r1=1408743&r2=1408744&view=diff
==============================================================================
--- airavata/sandbox/airavata-registry-rest/src/main/java/org/apache/airavata/services/registry/rest/resourcemappings/URLList.java (original)
+++ airavata/sandbox/airavata-registry-rest/src/main/java/org/apache/airavata/services/registry/rest/resourcemappings/URLList.java Tue Nov 13 14:25:56 2012
@@ -24,7 +24,7 @@ import javax.xml.bind.annotation.XmlRoot
@XmlRootElement
public class URLList {
- private String[] uris = null;
+ private String[] uris = new String[]{};
public String[] getUris() {
return uris;
Modified: airavata/sandbox/airavata-registry-rest/src/main/java/org/apache/airavata/services/registry/rest/resourcemappings/WorkflowInstancesList.java
URL: http://svn.apache.org/viewvc/airavata/sandbox/airavata-registry-rest/src/main/java/org/apache/airavata/services/registry/rest/resourcemappings/WorkflowInstancesList.java?rev=1408744&r1=1408743&r2=1408744&view=diff
==============================================================================
--- airavata/sandbox/airavata-registry-rest/src/main/java/org/apache/airavata/services/registry/rest/resourcemappings/WorkflowInstancesList.java (original)
+++ airavata/sandbox/airavata-registry-rest/src/main/java/org/apache/airavata/services/registry/rest/resourcemappings/WorkflowInstancesList.java Tue Nov 13 14:25:56 2012
@@ -6,7 +6,7 @@ import javax.xml.bind.annotation.XmlRoot
@XmlRootElement
public class WorkflowInstancesList {
- WorkflowInstance[] workflowInstances = null;
+ WorkflowInstance[] workflowInstances = new WorkflowInstance[]{};
public WorkflowInstance[] getWorkflowInstances() {
return workflowInstances;
Modified: airavata/sandbox/airavata-registry-rest/src/main/java/org/apache/airavata/services/registry/rest/resourcemappings/WorkflowList.java
URL: http://svn.apache.org/viewvc/airavata/sandbox/airavata-registry-rest/src/main/java/org/apache/airavata/services/registry/rest/resourcemappings/WorkflowList.java?rev=1408744&r1=1408743&r2=1408744&view=diff
==============================================================================
--- airavata/sandbox/airavata-registry-rest/src/main/java/org/apache/airavata/services/registry/rest/resourcemappings/WorkflowList.java (original)
+++ airavata/sandbox/airavata-registry-rest/src/main/java/org/apache/airavata/services/registry/rest/resourcemappings/WorkflowList.java Tue Nov 13 14:25:56 2012
@@ -22,11 +22,12 @@
package org.apache.airavata.services.registry.rest.resourcemappings;
import javax.xml.bind.annotation.XmlRootElement;
+import java.util.ArrayList;
import java.util.List;
@XmlRootElement
public class WorkflowList {
- private List<Workflow> workflowList;
+ private List<Workflow> workflowList = new ArrayList<Workflow>();
public WorkflowList() {
}
Modified: airavata/sandbox/airavata-registry-rest/src/main/java/org/apache/airavata/services/registry/rest/resourcemappings/WorkflowNodeIODataList.java
URL: http://svn.apache.org/viewvc/airavata/sandbox/airavata-registry-rest/src/main/java/org/apache/airavata/services/registry/rest/resourcemappings/WorkflowNodeIODataList.java?rev=1408744&r1=1408743&r2=1408744&view=diff
==============================================================================
--- airavata/sandbox/airavata-registry-rest/src/main/java/org/apache/airavata/services/registry/rest/resourcemappings/WorkflowNodeIODataList.java (original)
+++ airavata/sandbox/airavata-registry-rest/src/main/java/org/apache/airavata/services/registry/rest/resourcemappings/WorkflowNodeIODataList.java Tue Nov 13 14:25:56 2012
@@ -8,7 +8,7 @@ import javax.xml.bind.annotation.XmlRoot
@XmlRootElement
public class WorkflowNodeIODataList {
- WorkflowNodeIOData[] workflowNodeIOData = null;
+ WorkflowNodeIOData[] workflowNodeIOData = new WorkflowNodeIOData[]{};
public WorkflowNodeIOData[] getWorkflowNodeIOData() {
return workflowNodeIOData;
Modified: airavata/sandbox/airavata-registry-rest/src/main/java/org/apache/airavata/services/registry/rest/resourcemappings/WorkspaceProjectList.java
URL: http://svn.apache.org/viewvc/airavata/sandbox/airavata-registry-rest/src/main/java/org/apache/airavata/services/registry/rest/resourcemappings/WorkspaceProjectList.java?rev=1408744&r1=1408743&r2=1408744&view=diff
==============================================================================
--- airavata/sandbox/airavata-registry-rest/src/main/java/org/apache/airavata/services/registry/rest/resourcemappings/WorkspaceProjectList.java (original)
+++ airavata/sandbox/airavata-registry-rest/src/main/java/org/apache/airavata/services/registry/rest/resourcemappings/WorkspaceProjectList.java Tue Nov 13 14:25:56 2012
@@ -7,7 +7,7 @@ import javax.xml.bind.annotation.XmlRoot
@XmlRootElement
public class WorkspaceProjectList {
- private WorkspaceProject[] workspaceProjects = null;
+ private WorkspaceProject[] workspaceProjects = new WorkspaceProject[]{};
public WorkspaceProjectList() {
}