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/29 17:12:32 UTC
svn commit: r1415233 [4/4] - in /airavata/trunk/modules/rest:
client/src/main/java/org/apache/airavata/rest/
client/src/main/java/org/apache/airavata/rest/client/
client/src/main/java/org/apache/airavata/rest/utils/
mappings/src/main/java/org/apache/ai...
Modified: airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/UserWorkflowResourceClient.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/UserWorkflowResourceClient.java?rev=1415233&r1=1415232&r2=1415233&view=diff
==============================================================================
--- airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/UserWorkflowResourceClient.java (original)
+++ airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/UserWorkflowResourceClient.java Thu Nov 29 16:12:29 2012
@@ -64,7 +64,7 @@ public class UserWorkflowResourceClient
return UriBuilder.fromUri(baseURI).build();
}
- private com.sun.jersey.api.client.WebResource getUserWFRegistryBaseResource (){
+ private com.sun.jersey.api.client.WebResource getUserWFRegistryBaseResource() {
ClientConfig config = new DefaultClientConfig();
config.getFeatures().put(JSONConfiguration.FEATURE_POJO_MAPPING,
Boolean.TRUE);
@@ -74,7 +74,7 @@ public class UserWorkflowResourceClient
return webResource;
}
- public boolean isWorkflowExists(String workflowName){
+ public boolean isWorkflowExists(String workflowName) {
webResource = getUserWFRegistryBaseResource().path(ResourcePathConstants.UserWFConstants.WORKFLOW_EXIST);
MultivaluedMap queryParams = new MultivaluedMapImpl();
queryParams.add("workflowname", workflowName);
@@ -85,21 +85,24 @@ public class UserWorkflowResourceClient
logger.error(response.getEntity(String.class));
throw new RuntimeException("Failed : HTTP error code : "
+ status);
- }else if (status == ClientConstant.HTTP_UNAUTHORIZED){
- webResource.header("Authorization", BasicAuthHeaderUtil.getBasicAuthHeader(userName, callback.getPassword(userName)));
- response = webResource.queryParams(queryParams).accept(MediaType.TEXT_PLAIN).get(ClientResponse.class);
+ } else if (status == ClientConstant.HTTP_UNAUTHORIZED) {
+ WebResource.Builder builder = BasicAuthHeaderUtil.getBuilder(webResource, queryParams, userName, callback.getPassword(userName));
+ response = builder.accept(MediaType.TEXT_PLAIN).get(ClientResponse.class);
status = response.getStatus();
- if (status != ClientConstant.HTTP_OK ) {
- logger.error(response.getEntity(String.class));
- throw new RuntimeException("Failed : HTTP error code : "
- + status);
+ String exists = response.getEntity(String.class);
+ if (exists.equals("True")){
+ return true;
+ } else {
+ return false;
}
}
- return true;
+ else {
+ return false;
+ }
}
- public void addWorkflow(String workflowName, String workflowGraphXml){
+ public void addWorkflow(String workflowName, String workflowGraphXml) {
webResource = getUserWFRegistryBaseResource().path(ResourcePathConstants.UserWFConstants.ADD_WORKFLOW);
MultivaluedMap formParams = new MultivaluedMapImpl();
formParams.add("workflowName", workflowName);
@@ -111,11 +114,11 @@ public class UserWorkflowResourceClient
logger.error(response.getEntity(String.class));
throw new RuntimeException("Failed : HTTP error code : "
+ status);
- }else if (status == ClientConstant.HTTP_UNAUTHORIZED){
- webResource.header("Authorization", BasicAuthHeaderUtil.getBasicAuthHeader(userName, callback.getPassword(userName)));
- response = webResource.type(MediaType.APPLICATION_FORM_URLENCODED).accept(MediaType.TEXT_PLAIN).post(ClientResponse.class, formParams);
+ } else if (status == ClientConstant.HTTP_UNAUTHORIZED) {
+ WebResource.Builder builder = BasicAuthHeaderUtil.getBuilder(webResource, null, userName, callback.getPassword(userName));
+ response = builder.type(MediaType.APPLICATION_FORM_URLENCODED).accept(MediaType.TEXT_PLAIN).post(ClientResponse.class, formParams);
status = response.getStatus();
- if (status != ClientConstant.HTTP_OK ) {
+ if (status != ClientConstant.HTTP_OK) {
logger.error(response.getEntity(String.class));
throw new RuntimeException("Failed : HTTP error code : "
+ status);
@@ -123,7 +126,7 @@ public class UserWorkflowResourceClient
}
}
- public void updateWorkflow(String workflowName, String workflowGraphXml){
+ public void updateWorkflow(String workflowName, String workflowGraphXml) {
webResource = getUserWFRegistryBaseResource().path(ResourcePathConstants.UserWFConstants.UPDATE_WORKFLOW);
MultivaluedMap formParams = new MultivaluedMapImpl();
formParams.add("workflowName", workflowName);
@@ -135,9 +138,9 @@ public class UserWorkflowResourceClient
logger.error(response.getEntity(String.class));
throw new RuntimeException("Failed : HTTP error code : "
+ status);
- }else if (status == ClientConstant.HTTP_UNAUTHORIZED){
- webResource.header("Authorization", BasicAuthHeaderUtil.getBasicAuthHeader(userName, callback.getPassword(userName)));
- response = webResource.accept(MediaType.TEXT_PLAIN).type(MediaType.APPLICATION_FORM_URLENCODED).post(ClientResponse.class, formParams);
+ } else if (status == ClientConstant.HTTP_UNAUTHORIZED) {
+ WebResource.Builder builder = BasicAuthHeaderUtil.getBuilder(webResource, null, userName, callback.getPassword(userName));
+ response = builder.accept(MediaType.TEXT_PLAIN).type(MediaType.APPLICATION_FORM_URLENCODED).post(ClientResponse.class, formParams);
status = response.getStatus();
if (status != ClientConstant.HTTP_OK) {
logger.error(response.getEntity(String.class));
@@ -147,7 +150,7 @@ public class UserWorkflowResourceClient
}
}
- public String getWorkflowGraphXML(String workflowName){
+ public String getWorkflowGraphXML(String workflowName) {
webResource = getUserWFRegistryBaseResource().path(ResourcePathConstants.UserWFConstants.GET_WORKFLOWGRAPH);
MultivaluedMap queryParams = new MultivaluedMapImpl();
queryParams.add("workflowName", workflowName);
@@ -158,12 +161,12 @@ public class UserWorkflowResourceClient
logger.error(response.getEntity(String.class));
throw new RuntimeException("Failed : HTTP error code : "
+ status);
- }else if (status == ClientConstant.HTTP_UNAUTHORIZED){
- webResource.header("Authorization", BasicAuthHeaderUtil.getBasicAuthHeader(userName, callback.getPassword(userName)));
- response = webResource.queryParams(queryParams).accept(MediaType.APPLICATION_FORM_URLENCODED).get(ClientResponse.class);
+ } else if (status == ClientConstant.HTTP_UNAUTHORIZED) {
+ WebResource.Builder builder = BasicAuthHeaderUtil.getBuilder(webResource, queryParams, userName, callback.getPassword(userName));
+ response = builder.accept(MediaType.APPLICATION_FORM_URLENCODED).get(ClientResponse.class);
status = response.getStatus();
- if (status != ClientConstant.HTTP_OK ) {
+ if (status != ClientConstant.HTTP_OK) {
logger.error(response.getEntity(String.class));
throw new RuntimeException("Failed : HTTP error code : "
+ status);
@@ -174,7 +177,7 @@ public class UserWorkflowResourceClient
return worlflowGraph;
}
- public Map<String, String> getWorkflows(){
+ public Map<String, String> getWorkflows() {
webResource = getUserWFRegistryBaseResource().path(ResourcePathConstants.UserWFConstants.GET_WORKFLOWS);
ClientResponse response = webResource.accept(MediaType.APPLICATION_JSON).get(ClientResponse.class);
int status = response.getStatus();
@@ -183,12 +186,12 @@ public class UserWorkflowResourceClient
logger.error(response.getEntity(String.class));
throw new RuntimeException("Failed : HTTP error code : "
+ status);
- }else if (status == ClientConstant.HTTP_UNAUTHORIZED){
- webResource.header("Authorization", BasicAuthHeaderUtil.getBasicAuthHeader(userName, callback.getPassword(userName)));
- response = webResource.accept(MediaType.APPLICATION_JSON).get(ClientResponse.class);
+ } else if (status == ClientConstant.HTTP_UNAUTHORIZED) {
+ WebResource.Builder builder = BasicAuthHeaderUtil.getBuilder(webResource, null, userName, callback.getPassword(userName));
+ response = builder.accept(MediaType.APPLICATION_JSON).get(ClientResponse.class);
status = response.getStatus();
- if (status != ClientConstant.HTTP_OK ) {
+ if (status != ClientConstant.HTTP_OK) {
logger.error(response.getEntity(String.class));
throw new RuntimeException("Failed : HTTP error code : "
+ status);
@@ -199,14 +202,14 @@ public class UserWorkflowResourceClient
WorkflowList workflowList = response.getEntity(WorkflowList.class);
List<Workflow> workflows = workflowList.getWorkflowList();
- for (Workflow workflow : workflows){
+ for (Workflow workflow : workflows) {
userWFMap.put(workflow.getWorkflowName(), workflow.getWorkflowGraph());
}
return userWFMap;
}
- public void removeWorkflow(String workflowName){
+ public void removeWorkflow(String workflowName) {
webResource = getUserWFRegistryBaseResource().path(ResourcePathConstants.UserWFConstants.REMOVE_WORKFLOW);
MultivaluedMap queryParams = new MultivaluedMapImpl();
queryParams.add("workflowName", workflowName);
@@ -217,12 +220,12 @@ public class UserWorkflowResourceClient
logger.error(response.getEntity(String.class));
throw new RuntimeException("Failed : HTTP error code : "
+ status);
- }else if (status == ClientConstant.HTTP_UNAUTHORIZED){
- webResource.header("Authorization", BasicAuthHeaderUtil.getBasicAuthHeader(userName, callback.getPassword(userName)));
- response = webResource.queryParams(queryParams).accept(MediaType.TEXT_PLAIN).delete(ClientResponse.class);
+ } else if (status == ClientConstant.HTTP_UNAUTHORIZED) {
+ WebResource.Builder builder = BasicAuthHeaderUtil.getBuilder(webResource, queryParams, userName, callback.getPassword(userName));
+ response = builder.accept(MediaType.TEXT_PLAIN).delete(ClientResponse.class);
status = response.getStatus();
- if (status != ClientConstant.HTTP_OK ) {
+ if (status != ClientConstant.HTTP_OK) {
logger.error(response.getEntity(String.class));
throw new RuntimeException("Failed : HTTP error code : "
+ status);
Modified: airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/utils/BasicAuthHeaderUtil.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/utils/BasicAuthHeaderUtil.java?rev=1415233&r1=1415232&r2=1415233&view=diff
==============================================================================
--- airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/utils/BasicAuthHeaderUtil.java (original)
+++ airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/utils/BasicAuthHeaderUtil.java Thu Nov 29 16:12:29 2012
@@ -21,8 +21,12 @@
package org.apache.airavata.rest.utils;
+import com.sun.jersey.api.client.WebResource;
+import org.apache.airavata.registry.api.PasswordCallback;
import org.apache.commons.codec.binary.Base64;
+import javax.ws.rs.core.MultivaluedMap;
+
public class BasicAuthHeaderUtil {
/**
* A method to use by clients in the case of Basic Access authentication.
@@ -38,4 +42,11 @@ public class BasicAuthHeaderUtil {
String encodedString = new String(Base64.encodeBase64(credentials.getBytes()));
return "Basic " + encodedString;
}
+
+ public static WebResource.Builder getBuilder(WebResource webResource, MultivaluedMap queryParams, String userName, String password) {
+ if (queryParams != null){
+ webResource = webResource.queryParams(queryParams);
+ }
+ return webResource.header("Authorization", BasicAuthHeaderUtil.getBasicAuthHeader(userName, password));
+ }
}
Modified: airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/utils/ClientConstant.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/utils/ClientConstant.java?rev=1415233&r1=1415232&r2=1415233&view=diff
==============================================================================
--- airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/utils/ClientConstant.java (original)
+++ airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/utils/ClientConstant.java Thu Nov 29 16:12:29 2012
@@ -24,5 +24,6 @@ package org.apache.airavata.rest.utils;
public class ClientConstant {
public static final int HTTP_OK = 200;
- public static final int HTTP_UNAUTHORIZED = 405;
+ public static final int HTTP_UNAUTHORIZED = 401;
+ public static final int HTTP_BAD_REQUEST = 400;
}
Modified: airavata/trunk/modules/rest/mappings/src/main/java/org/apache/airavata/rest/mappings/utils/ResourcePathConstants.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/rest/mappings/src/main/java/org/apache/airavata/rest/mappings/utils/ResourcePathConstants.java?rev=1415233&r1=1415232&r2=1415233&view=diff
==============================================================================
--- airavata/trunk/modules/rest/mappings/src/main/java/org/apache/airavata/rest/mappings/utils/ResourcePathConstants.java (original)
+++ airavata/trunk/modules/rest/mappings/src/main/java/org/apache/airavata/rest/mappings/utils/ResourcePathConstants.java Thu Nov 29 16:12:29 2012
@@ -23,7 +23,7 @@ package org.apache.airavata.rest.mapping
public class ResourcePathConstants {
- public static final String BASE_URL = "http://localhost:9080/airavata-services";
+ public static final String BASE_URL = "http://localhost:9080/airavata-services/api";
public final class ConfigResourcePathConstants {
public static final String CONFIGURATION_REGISTRY_RESOURCE = "/congfigregistry/";
Modified: airavata/trunk/modules/rest/service/src/main/java/org/apache/airavata/services/registry/rest/resources/ConfigurationRegistryResource.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/rest/service/src/main/java/org/apache/airavata/services/registry/rest/resources/ConfigurationRegistryResource.java?rev=1415233&r1=1415232&r2=1415233&view=diff
==============================================================================
--- airavata/trunk/modules/rest/service/src/main/java/org/apache/airavata/services/registry/rest/resources/ConfigurationRegistryResource.java (original)
+++ airavata/trunk/modules/rest/service/src/main/java/org/apache/airavata/services/registry/rest/resources/ConfigurationRegistryResource.java Thu Nov 29 16:12:29 2012
@@ -50,13 +50,6 @@ public class ConfigurationRegistryResour
@Context
ServletContext context;
- public ConfigurationRegistryResource() {
- }
-
- /**
- * ---------------------------------Configuration Registry----------------------------------*
- */
-
/**
* This method will return the configuration value corrosponding to given config key
*
Modified: airavata/trunk/modules/rest/service/src/main/java/org/apache/airavata/services/registry/rest/resources/DescriptorRegistryResource.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/rest/service/src/main/java/org/apache/airavata/services/registry/rest/resources/DescriptorRegistryResource.java?rev=1415233&r1=1415232&r2=1415233&view=diff
==============================================================================
--- airavata/trunk/modules/rest/service/src/main/java/org/apache/airavata/services/registry/rest/resources/DescriptorRegistryResource.java (original)
+++ airavata/trunk/modules/rest/service/src/main/java/org/apache/airavata/services/registry/rest/resources/DescriptorRegistryResource.java Thu Nov 29 16:12:29 2012
@@ -74,11 +74,11 @@ public class DescriptorRegistryResource
state = airavataRegistry.isHostDescriptorExists(hostDescriptorName);
if (state) {
Response.ResponseBuilder builder = Response.status(Response.Status.OK);
- builder.entity("Host Descriptor exists...");
+ builder.entity("True");
return builder.build();
} else {
Response.ResponseBuilder builder = Response.status(Response.Status.NO_CONTENT);
- builder.entity("Host Descriptor does not exist..");
+ builder.entity("False");
return builder.build();
}
} catch (RegistryException e) {
@@ -173,8 +173,8 @@ public class DescriptorRegistryResource
AiravataRegistry2 airavataRegistry = RegPoolUtils.acquireRegistry(context);
try {
HostDescription hostDescription = airavataRegistry.getHostDescriptor(hostName);
- HostDescriptor hostDescriptor = DescriptorUtil.createHostDescriptor(hostDescription);
if (hostDescription != null) {
+ HostDescriptor hostDescriptor = DescriptorUtil.createHostDescriptor(hostDescription);
Response.ResponseBuilder builder = Response.status(Response.Status.OK);
builder.entity(hostDescriptor);
return builder.build();
@@ -324,7 +324,7 @@ public class DescriptorRegistryResource
return builder.build();
} else {
Response.ResponseBuilder builder = Response.status(Response.Status.NO_CONTENT);
- builder.entity("Service descriptor does not exist...");
+ builder.entity("False");
return builder.build();
}
} catch (RegistryException e) {
@@ -419,8 +419,8 @@ public class DescriptorRegistryResource
AiravataRegistry2 airavataRegistry = RegPoolUtils.acquireRegistry(context);
try {
ServiceDescription serviceDescription = airavataRegistry.getServiceDescriptor(serviceName);
- ServiceDescriptor serviceDescriptor = DescriptorUtil.createServiceDescriptor(serviceDescription);
if (serviceDescription != null) {
+ ServiceDescriptor serviceDescriptor = DescriptorUtil.createServiceDescriptor(serviceDescription);
Response.ResponseBuilder builder = Response.status(Response.Status.OK);
builder.entity(serviceDescriptor);
return builder.build();
@@ -536,7 +536,7 @@ public class DescriptorRegistryResource
return builder.build();
} else {
Response.ResponseBuilder builder = Response.status(Response.Status.NO_CONTENT);
- builder.entity("Application descriptor does not exist...");
+ builder.entity("False");
return builder.build();
}
} catch (RegistryException e) {
@@ -580,10 +580,10 @@ public class DescriptorRegistryResource
} else {
serviceName = serviceDescriptor.getServiceName();
}
- ServiceDescription serviceDescription = DescriptorUtil.createServiceDescription(serviceDescriptor);
- if (!airavataRegistry.isServiceDescriptorExists(serviceName)) {
- airavataRegistry.addServiceDescriptor(serviceDescription);
- }
+// ServiceDescription serviceDescription = DescriptorUtil.createServiceDescription(serviceDescriptor);
+// if (!airavataRegistry.isServiceDescriptorExists(serviceName)) {
+// airavataRegistry.addServiceDescriptor(serviceDescription);
+// }
} else {
serviceName = applicationDescriptor.getName();
}
@@ -637,12 +637,12 @@ public class DescriptorRegistryResource
} else {
serviceName = serviceDescriptor.getServiceName();
}
- ServiceDescription serviceDescription = DescriptorUtil.createServiceDescription(serviceDescriptor);
- if (airavataRegistry.isServiceDescriptorExists(serviceName)) {
- airavataRegistry.updateServiceDescriptor(serviceDescription);
- } else {
- airavataRegistry.addServiceDescriptor(serviceDescription);
- }
+// ServiceDescription serviceDescription = DescriptorUtil.createServiceDescription(serviceDescriptor);
+// if (airavataRegistry.isServiceDescriptorExists(serviceName)) {
+// airavataRegistry.updateServiceDescriptor(serviceDescription);
+// } else {
+// airavataRegistry.addServiceDescriptor(serviceDescription);
+// }
} else {
serviceName = applicationDescriptor.getName();
@@ -684,13 +684,13 @@ public class DescriptorRegistryResource
AiravataRegistry2 airavataRegistry = RegPoolUtils.acquireRegistry(context);
try {
ApplicationDeploymentDescription applicationDeploymentDescription = airavataRegistry.getApplicationDescriptor(serviceName, hostName, applicationName);
- ApplicationDescriptor applicationDescriptor = DescriptorUtil.createApplicationDescriptor(applicationDeploymentDescription);
- applicationDescriptor.setHostdescName(hostName);
- ServiceDescription serviceDescription = airavataRegistry.getServiceDescriptor(serviceName);
- ServiceDescriptor serviceDescriptor = DescriptorUtil.createServiceDescriptor(serviceDescription);
- applicationDescriptor.setServiceDescriptor(serviceDescriptor);
-
if (applicationDeploymentDescription != null) {
+ ApplicationDescriptor applicationDescriptor = DescriptorUtil.createApplicationDescriptor(applicationDeploymentDescription);
+ applicationDescriptor.setHostdescName(hostName);
+ ServiceDescription serviceDescription = airavataRegistry.getServiceDescriptor(serviceName);
+ ServiceDescriptor serviceDescriptor = DescriptorUtil.createServiceDescriptor(serviceDescription);
+ applicationDescriptor.setServiceDescriptor(serviceDescriptor);
+
Response.ResponseBuilder builder = Response.status(Response.Status.OK);
builder.entity(applicationDescriptor);
return builder.build();
Modified: airavata/trunk/modules/rest/service/src/main/java/org/apache/airavata/services/registry/rest/resources/ExperimentRegistryResource.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/rest/service/src/main/java/org/apache/airavata/services/registry/rest/resources/ExperimentRegistryResource.java?rev=1415233&r1=1415232&r2=1415233&view=diff
==============================================================================
--- airavata/trunk/modules/rest/service/src/main/java/org/apache/airavata/services/registry/rest/resources/ExperimentRegistryResource.java (original)
+++ airavata/trunk/modules/rest/service/src/main/java/org/apache/airavata/services/registry/rest/resources/ExperimentRegistryResource.java Thu Nov 29 16:12:29 2012
@@ -330,11 +330,11 @@ public class ExperimentRegistryResource
try {
airavataRegistry.isExperimentExists(experimentId);
Response.ResponseBuilder builder = Response.status(Response.Status.NO_CONTENT);
- builder.entity("Experiment exists...");
+ builder.entity("True");
return builder.build();
} catch (ExperimentDoesNotExistsException e) {
Response.ResponseBuilder builder = Response.status(Response.Status.NOT_FOUND);
- builder.entity("Exprtiment does not exist...");
+ builder.entity("False");
return builder.build();
} catch (RegistryException e) {
Response.ResponseBuilder builder = Response.status(Response.Status.NOT_FOUND);
@@ -360,10 +360,7 @@ public class ExperimentRegistryResource
@Produces(MediaType.TEXT_PLAIN)
public Response isExperimentExistsThenCreate(@FormParam("experimentId") String experimentId,
@FormParam("createIfNotPresent") String createIfNotPresent) {
- boolean createIfNotPresentStatus = false;
- if (createIfNotPresent.equals("true")) {
- createIfNotPresentStatus = true;
- }
+ boolean createIfNotPresentStatus = Boolean.valueOf(createIfNotPresent);
AiravataRegistry2 airavataRegistry = RegPoolUtils.acquireRegistry(context);
try {
airavataRegistry.isExperimentExists(experimentId, createIfNotPresentStatus);
Modified: airavata/trunk/modules/rest/service/src/main/java/org/apache/airavata/services/registry/rest/resources/ProjectRegistryResource.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/rest/service/src/main/java/org/apache/airavata/services/registry/rest/resources/ProjectRegistryResource.java?rev=1415233&r1=1415232&r2=1415233&view=diff
==============================================================================
--- airavata/trunk/modules/rest/service/src/main/java/org/apache/airavata/services/registry/rest/resources/ProjectRegistryResource.java (original)
+++ airavata/trunk/modules/rest/service/src/main/java/org/apache/airavata/services/registry/rest/resources/ProjectRegistryResource.java Thu Nov 29 16:12:29 2012
@@ -65,11 +65,11 @@ public class ProjectRegistryResource {
boolean result = airavataRegistry.isWorkspaceProjectExists(projectName);
if (result) {
Response.ResponseBuilder builder = Response.status(Response.Status.OK);
- builder.entity("Project exists...");
+ builder.entity("True");
return builder.build();
} else {
Response.ResponseBuilder builder = Response.status(Response.Status.NOT_FOUND);
- builder.entity("Project does not exist...");
+ builder.entity("False");
return builder.build();
}
} catch (RegistryException e) {
@@ -95,20 +95,18 @@ public class ProjectRegistryResource {
@Produces(MediaType.TEXT_PLAIN)
public Response isWorkspaceProjectExistsCreate(@FormParam("projectName") String projectName,
@FormParam("createIfNotExists") String createIfNotExists) {
- boolean createIfNotExistStatus = false;
- if (createIfNotExists.equals("true")) {
- createIfNotExistStatus = true;
- }
+ boolean createIfNotExistStatus = Boolean.valueOf(createIfNotExists);
+
AiravataRegistry2 airavataRegistry = RegPoolUtils.acquireRegistry(context);
try {
boolean result = airavataRegistry.isWorkspaceProjectExists(projectName, createIfNotExistStatus);
if (result) {
Response.ResponseBuilder builder = Response.status(Response.Status.OK);
- builder.entity("New project has been created...");
+ builder.entity("True");
return builder.build();
} else {
Response.ResponseBuilder builder = Response.status(Response.Status.NOT_FOUND);
- builder.entity("Could not create the project...");
+ builder.entity("False");
return builder.build();
}
} catch (RegistryException e) {
Modified: airavata/trunk/modules/rest/service/src/main/java/org/apache/airavata/services/registry/rest/resources/ProvenanceRegistryResource.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/rest/service/src/main/java/org/apache/airavata/services/registry/rest/resources/ProvenanceRegistryResource.java?rev=1415233&r1=1415232&r2=1415233&view=diff
==============================================================================
--- airavata/trunk/modules/rest/service/src/main/java/org/apache/airavata/services/registry/rest/resources/ProvenanceRegistryResource.java (original)
+++ airavata/trunk/modules/rest/service/src/main/java/org/apache/airavata/services/registry/rest/resources/ProvenanceRegistryResource.java Thu Nov 29 16:12:29 2012
@@ -360,11 +360,11 @@ public class ProvenanceRegistryResource
Boolean result = airavataRegistry.isWorkflowInstanceExists(instanceId);
if (result) {
Response.ResponseBuilder builder = Response.status(Response.Status.OK);
- builder.entity("Workflow instance available...");
+ builder.entity("True");
return builder.build();
} else {
Response.ResponseBuilder builder = Response.status(Response.Status.NOT_FOUND);
- builder.entity("Workflow instance does not exist...");
+ builder.entity("False");
return builder.build();
}
} catch (RegistryException e) {
@@ -397,11 +397,11 @@ public class ProvenanceRegistryResource
Boolean result = airavataRegistry.isWorkflowInstanceExists(instanceId, Boolean.valueOf(createIfNotPresent));
if (result) {
Response.ResponseBuilder builder = Response.status(Response.Status.OK);
- builder.entity("New workflow instance has been created...");
+ builder.entity("True");
return builder.build();
} else {
Response.ResponseBuilder builder = Response.status(Response.Status.NOT_FOUND);
- builder.entity("Could not create workflow instance...");
+ builder.entity("False");
return builder.build();
}
} catch (RegistryException e) {
@@ -1078,11 +1078,11 @@ public class ProvenanceRegistryResource
boolean workflowInstanceNodePresent = airavataRegistry.isWorkflowInstanceNodePresent(workflowInstanceId, nodeId);
if (workflowInstanceNodePresent) {
Response.ResponseBuilder builder = Response.status(Response.Status.OK);
- builder.entity("Workflow instance node exists...");
+ builder.entity("True");
return builder.build();
} else {
Response.ResponseBuilder builder = Response.status(Response.Status.NO_CONTENT);
- builder.entity("Workflow instance node does not exist...");
+ builder.entity("False");
return builder.build();
}
} catch (RegistryException e) {
@@ -1117,11 +1117,11 @@ public class ProvenanceRegistryResource
boolean workflowInstanceNodePresent = airavataRegistry.isWorkflowInstanceNodePresent(workflowInstanceId, nodeId, Boolean.getBoolean(createIfNotPresent));
if (workflowInstanceNodePresent) {
Response.ResponseBuilder builder = Response.status(Response.Status.OK);
- builder.entity("Workflow instance node exists...");
+ builder.entity("True");
return builder.build();
} else {
Response.ResponseBuilder builder = Response.status(Response.Status.NO_CONTENT);
- builder.entity("Workflow instance node does not exist...");
+ builder.entity("False");
return builder.build();
}
} catch (RegistryException e) {
@@ -1288,11 +1288,11 @@ public class ProvenanceRegistryResource
boolean experimentNameExist = airavataRegistry.isExperimentNameExist(experimentName);
if (experimentNameExist) {
Response.ResponseBuilder builder = Response.status(Response.Status.OK);
- builder.entity("Experiment name exists...");
+ builder.entity("True");
return builder.build();
} else {
Response.ResponseBuilder builder = Response.status(Response.Status.NO_CONTENT);
- builder.entity("Experiment name does not exists...");
+ builder.entity("False");
return builder.build();
}
Modified: airavata/trunk/modules/rest/service/src/main/java/org/apache/airavata/services/registry/rest/resources/PublishWorkflowRegistryResource.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/rest/service/src/main/java/org/apache/airavata/services/registry/rest/resources/PublishWorkflowRegistryResource.java?rev=1415233&r1=1415232&r2=1415233&view=diff
==============================================================================
--- airavata/trunk/modules/rest/service/src/main/java/org/apache/airavata/services/registry/rest/resources/PublishWorkflowRegistryResource.java (original)
+++ airavata/trunk/modules/rest/service/src/main/java/org/apache/airavata/services/registry/rest/resources/PublishWorkflowRegistryResource.java Thu Nov 29 16:12:29 2012
@@ -68,11 +68,11 @@ public class PublishWorkflowRegistryReso
boolean workflowExists = airavataRegistry.isPublishedWorkflowExists(workflowname);
if (workflowExists) {
Response.ResponseBuilder builder = Response.status(Response.Status.OK);
- builder.entity("Publish workflow exists...");
+ builder.entity("True");
return builder.build();
} else {
Response.ResponseBuilder builder = Response.status(Response.Status.NO_CONTENT);
- builder.entity("Publish workflow does not exists...");
+ builder.entity("False");
return builder.build();
}
} catch (RegistryException e) {
Modified: airavata/trunk/modules/rest/service/src/main/java/org/apache/airavata/services/registry/rest/resources/UserWorkflowRegistryResource.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/rest/service/src/main/java/org/apache/airavata/services/registry/rest/resources/UserWorkflowRegistryResource.java?rev=1415233&r1=1415232&r2=1415233&view=diff
==============================================================================
--- airavata/trunk/modules/rest/service/src/main/java/org/apache/airavata/services/registry/rest/resources/UserWorkflowRegistryResource.java (original)
+++ airavata/trunk/modules/rest/service/src/main/java/org/apache/airavata/services/registry/rest/resources/UserWorkflowRegistryResource.java Thu Nov 29 16:12:29 2012
@@ -66,11 +66,11 @@ public class UserWorkflowRegistryResourc
boolean workflowExists = airavataRegistry.isWorkflowExists(workflowName);
if (workflowExists) {
Response.ResponseBuilder builder = Response.status(Response.Status.OK);
- builder.entity("User workflow exists...");
+ builder.entity("True");
return builder.build();
} else {
Response.ResponseBuilder builder = Response.status(Response.Status.NO_CONTENT);
- builder.entity("User workflow does not exists...");
+ builder.entity("False");
return builder.build();
}
} catch (RegistryException e) {