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/27 22:52:47 UTC
svn commit: r1414416 [1/2] - in
/airavata/trunk/modules/rest/service/src/main/java/org/apache/airavata/services/registry/rest:
resources/ utils/
Author: chathuri
Date: Tue Nov 27 21:52:45 2012
New Revision: 1414416
URL: http://svn.apache.org/viewvc?rev=1414416&view=rev
Log:
fixing AIRAVATA-664
Modified:
airavata/trunk/modules/rest/service/src/main/java/org/apache/airavata/services/registry/rest/resources/BasicRegistryResouce.java
airavata/trunk/modules/rest/service/src/main/java/org/apache/airavata/services/registry/rest/resources/ConfigurationRegistryResource.java
airavata/trunk/modules/rest/service/src/main/java/org/apache/airavata/services/registry/rest/resources/DescriptorRegistryResource.java
airavata/trunk/modules/rest/service/src/main/java/org/apache/airavata/services/registry/rest/resources/ExperimentRegistryResource.java
airavata/trunk/modules/rest/service/src/main/java/org/apache/airavata/services/registry/rest/resources/ProjectRegistryResource.java
airavata/trunk/modules/rest/service/src/main/java/org/apache/airavata/services/registry/rest/resources/ProvenanceRegistryResource.java
airavata/trunk/modules/rest/service/src/main/java/org/apache/airavata/services/registry/rest/resources/PublishWorkflowRegistryResource.java
airavata/trunk/modules/rest/service/src/main/java/org/apache/airavata/services/registry/rest/resources/UserWorkflowRegistryResource.java
airavata/trunk/modules/rest/service/src/main/java/org/apache/airavata/services/registry/rest/utils/RegPoolUtils.java
Modified: airavata/trunk/modules/rest/service/src/main/java/org/apache/airavata/services/registry/rest/resources/BasicRegistryResouce.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/rest/service/src/main/java/org/apache/airavata/services/registry/rest/resources/BasicRegistryResouce.java?rev=1414416&r1=1414415&r2=1414416&view=diff
==============================================================================
--- airavata/trunk/modules/rest/service/src/main/java/org/apache/airavata/services/registry/rest/resources/BasicRegistryResouce.java (original)
+++ airavata/trunk/modules/rest/service/src/main/java/org/apache/airavata/services/registry/rest/resources/BasicRegistryResouce.java Tue Nov 27 21:52:45 2012
@@ -44,7 +44,7 @@ public class BasicRegistryResouce {
@Path(ResourcePathConstants.BasicRegistryConstants.GET_GATEWAY)
@Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
public Response getGateway() {
- AiravataRegistry2 airavataRegistry = RegPoolUtils.acquireRegistry();
+ AiravataRegistry2 airavataRegistry = RegPoolUtils.acquireRegistry(context);
try {
Gateway gateway = airavataRegistry.getGateway();
if (gateway != null) {
@@ -62,7 +62,7 @@ public class BasicRegistryResouce {
return builder.build();
} finally {
if (airavataRegistry != null) {
- RegPoolUtils.releaseRegistry(airavataRegistry);
+ RegPoolUtils.releaseRegistry(context, airavataRegistry);
}
}
}
@@ -71,7 +71,7 @@ public class BasicRegistryResouce {
@Path(ResourcePathConstants.BasicRegistryConstants.GET_USER)
@Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
public Response getAiravataUser() {
- AiravataRegistry2 airavataRegistry = RegPoolUtils.acquireRegistry();
+ AiravataRegistry2 airavataRegistry = RegPoolUtils.acquireRegistry(context);
try {
AiravataUser airavataUser = airavataRegistry.getAiravataUser();
if (airavataUser != null) {
@@ -89,7 +89,7 @@ public class BasicRegistryResouce {
return builder.build();
} finally {
if (airavataRegistry != null) {
- RegPoolUtils.releaseRegistry(airavataRegistry);
+ RegPoolUtils.releaseRegistry(context, airavataRegistry);
}
}
}
@@ -99,7 +99,7 @@ public class BasicRegistryResouce {
@Consumes({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
@Produces(MediaType.TEXT_PLAIN)
public Response setGateway(Gateway gateway) {
- AiravataRegistry2 airavataRegistry = RegPoolUtils.acquireRegistry();
+ AiravataRegistry2 airavataRegistry = RegPoolUtils.acquireRegistry(context);
try {
airavataRegistry.setGateway(gateway);
Response.ResponseBuilder builder = Response.status(Response.Status.OK);
@@ -111,7 +111,7 @@ public class BasicRegistryResouce {
return builder.build();
} finally {
if (airavataRegistry != null) {
- RegPoolUtils.releaseRegistry(airavataRegistry);
+ RegPoolUtils.releaseRegistry(context, airavataRegistry);
}
}
}
@@ -121,7 +121,7 @@ public class BasicRegistryResouce {
@Consumes({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
@Produces(MediaType.TEXT_PLAIN)
public Response setAiravataUser(AiravataUser user) {
- AiravataRegistry2 airavataRegistry = RegPoolUtils.acquireRegistry();
+ AiravataRegistry2 airavataRegistry = RegPoolUtils.acquireRegistry(context);
try {
airavataRegistry.setAiravataUser(user);
Response.ResponseBuilder builder = Response.status(Response.Status.OK);
@@ -133,7 +133,7 @@ public class BasicRegistryResouce {
return builder.build();
} finally {
if (airavataRegistry != null) {
- RegPoolUtils.releaseRegistry(airavataRegistry);
+ RegPoolUtils.releaseRegistry(context, airavataRegistry);
}
}
}
@@ -142,7 +142,7 @@ public class BasicRegistryResouce {
@Path(ResourcePathConstants.BasicRegistryConstants.VERSION)
@Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
public Response getVersion() {
- AiravataRegistry2 airavataRegistry = RegPoolUtils.acquireRegistry();
+ AiravataRegistry2 airavataRegistry = RegPoolUtils.acquireRegistry(context);
try {
Version version = airavataRegistry.getVersion();
if (version != null) {
@@ -160,7 +160,7 @@ public class BasicRegistryResouce {
return builder.build();
} finally {
if (airavataRegistry != null) {
- RegPoolUtils.releaseRegistry(airavataRegistry);
+ RegPoolUtils.releaseRegistry(context, airavataRegistry);
}
}
}
@@ -169,7 +169,7 @@ public class BasicRegistryResouce {
@Path(ResourcePathConstants.BasicRegistryConstants.GET_SERVICE_URL)
@Produces(MediaType.TEXT_PLAIN)
public Response getConnectionURL (){
- AiravataRegistry2 airavataRegistry = RegPoolUtils.acquireRegistry();
+ AiravataRegistry2 airavataRegistry = RegPoolUtils.acquireRegistry(context);
try{
String connectionURL = airavataRegistry.getConnectionURI().toString();
if (connectionURL != null) {
@@ -187,7 +187,7 @@ public class BasicRegistryResouce {
return builder.build();
} finally {
if (airavataRegistry != null) {
- RegPoolUtils.releaseRegistry(airavataRegistry);
+ RegPoolUtils.releaseRegistry(context, airavataRegistry);
}
}
}
@@ -196,7 +196,7 @@ public class BasicRegistryResouce {
@Path(ResourcePathConstants.BasicRegistryConstants.SET_SERVICE_URL)
@Produces(MediaType.TEXT_PLAIN)
public Response setConnectionURL (@FormParam("connectionurl") String connectionURL){
- AiravataRegistry2 airavataRegistry = RegPoolUtils.acquireRegistry();
+ AiravataRegistry2 airavataRegistry = RegPoolUtils.acquireRegistry(context);
try{
URI uri = new URI(connectionURL);
airavataRegistry.setConnectionURI(uri);
@@ -209,7 +209,7 @@ public class BasicRegistryResouce {
return builder.build();
} finally {
if (airavataRegistry != null) {
- RegPoolUtils.releaseRegistry(airavataRegistry);
+ RegPoolUtils.releaseRegistry(context, airavataRegistry);
}
}
}
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=1414416&r1=1414415&r2=1414416&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 Tue Nov 27 21:52:45 2012
@@ -67,7 +67,7 @@ public class ConfigurationRegistryResour
@GET
@Produces(MediaType.TEXT_PLAIN)
public Response getConfiguration(@QueryParam("key") String key) {
- AiravataRegistry2 airavataRegistry = RegPoolUtils.acquireRegistry();
+ AiravataRegistry2 airavataRegistry = RegPoolUtils.acquireRegistry(context);
try {
Object configuration = airavataRegistry.getConfiguration(key);
if (configuration != null) {
@@ -85,7 +85,7 @@ public class ConfigurationRegistryResour
return builder.build();
} finally {
if (airavataRegistry != null) {
- RegPoolUtils.releaseRegistry(airavataRegistry);
+ RegPoolUtils.releaseRegistry(context, airavataRegistry);
}
}
@@ -101,7 +101,7 @@ public class ConfigurationRegistryResour
@Path(ResourcePathConstants.ConfigResourcePathConstants.GET_CONFIGURATION_LIST)
@Produces({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON})
public Response getConfigurationList(@QueryParam("key") String key) {
- AiravataRegistry2 airavataRegistry = RegPoolUtils.acquireRegistry();
+ AiravataRegistry2 airavataRegistry = RegPoolUtils.acquireRegistry(context);
try {
List<Object> configurationList = airavataRegistry.getConfigurationList(key);
@@ -126,7 +126,7 @@ public class ConfigurationRegistryResour
return builder.build();
} finally {
if (airavataRegistry != null) {
- RegPoolUtils.releaseRegistry(airavataRegistry);
+ RegPoolUtils.releaseRegistry(context, airavataRegistry);
}
}
}
@@ -146,7 +146,7 @@ public class ConfigurationRegistryResour
public Response setConfiguration(@FormParam("key") String key,
@FormParam("value") String value,
@FormParam("date") String date) {
- AiravataRegistry2 airavataRegistry = RegPoolUtils.acquireRegistry();
+ AiravataRegistry2 airavataRegistry = RegPoolUtils.acquireRegistry(context);
try {
DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
Date formattedDate = dateFormat.parse(date);
@@ -161,7 +161,7 @@ public class ConfigurationRegistryResour
return builder.build();
} finally {
if (airavataRegistry != null) {
- RegPoolUtils.releaseRegistry(airavataRegistry);
+ RegPoolUtils.releaseRegistry(context, airavataRegistry);
}
}
}
@@ -181,7 +181,7 @@ public class ConfigurationRegistryResour
public Response addConfiguration(@FormParam("key") String key,
@FormParam("value") String value,
@FormParam("date") String date) {
- AiravataRegistry2 airavataRegistry = RegPoolUtils.acquireRegistry();
+ AiravataRegistry2 airavataRegistry = RegPoolUtils.acquireRegistry(context);
try {
DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
Date formattedDate = dateFormat.parse(date);
@@ -196,7 +196,7 @@ public class ConfigurationRegistryResour
return builder.build();
} finally {
if (airavataRegistry != null) {
- RegPoolUtils.releaseRegistry(airavataRegistry);
+ RegPoolUtils.releaseRegistry(context, airavataRegistry);
}
}
}
@@ -211,7 +211,7 @@ public class ConfigurationRegistryResour
@Path(ResourcePathConstants.ConfigResourcePathConstants.DELETE_ALL_CONFIGURATION)
@Produces(MediaType.TEXT_PLAIN)
public Response removeAllConfiguration(@QueryParam("key") String key) {
- AiravataRegistry2 airavataRegistry = RegPoolUtils.acquireRegistry();
+ AiravataRegistry2 airavataRegistry = RegPoolUtils.acquireRegistry(context);
try {
airavataRegistry.removeAllConfiguration(key);
Response.ResponseBuilder builder = Response.status(Response.Status.OK);
@@ -223,7 +223,7 @@ public class ConfigurationRegistryResour
return builder.build();
} finally {
if (airavataRegistry != null) {
- RegPoolUtils.releaseRegistry(airavataRegistry);
+ RegPoolUtils.releaseRegistry(context, airavataRegistry);
}
}
}
@@ -239,7 +239,7 @@ public class ConfigurationRegistryResour
@Path(ResourcePathConstants.ConfigResourcePathConstants.DELETE_CONFIGURATION)
@Produces(MediaType.TEXT_PLAIN)
public Response removeConfiguration(@QueryParam("key") String key, @QueryParam("value") String value) {
- AiravataRegistry2 airavataRegistry = RegPoolUtils.acquireRegistry();
+ AiravataRegistry2 airavataRegistry = RegPoolUtils.acquireRegistry(context);
try {
airavataRegistry.removeConfiguration(key, value);
Response.ResponseBuilder builder = Response.status(Response.Status.OK);
@@ -251,7 +251,7 @@ public class ConfigurationRegistryResour
return builder.build();
} finally {
if (airavataRegistry != null) {
- RegPoolUtils.releaseRegistry(airavataRegistry);
+ RegPoolUtils.releaseRegistry(context, airavataRegistry);
}
}
}
@@ -265,7 +265,7 @@ public class ConfigurationRegistryResour
@Path(ResourcePathConstants.ConfigResourcePathConstants.GET_GFAC_URI_LIST)
@Produces({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON})
public Response getGFacURIs() {
- AiravataRegistry2 airavataRegistry = RegPoolUtils.acquireRegistry();
+ AiravataRegistry2 airavataRegistry = RegPoolUtils.acquireRegistry(context);
try {
List<URI> uris = airavataRegistry.getGFacURIs();
URLList list = new URLList();
@@ -289,7 +289,7 @@ public class ConfigurationRegistryResour
return builder.build();
} finally {
if (airavataRegistry != null) {
- RegPoolUtils.releaseRegistry(airavataRegistry);
+ RegPoolUtils.releaseRegistry(context, airavataRegistry);
}
}
}
@@ -303,7 +303,7 @@ public class ConfigurationRegistryResour
@Path(ResourcePathConstants.ConfigResourcePathConstants.GET_WFINTERPRETER_URI_LIST)
@Produces({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON})
public Response getWorkflowInterpreterURIs() {
- AiravataRegistry2 airavataRegistry = RegPoolUtils.acquireRegistry();
+ AiravataRegistry2 airavataRegistry = RegPoolUtils.acquireRegistry(context);
try {
List<URI> uris = airavataRegistry.getWorkflowInterpreterURIs();
URLList list = new URLList();
@@ -327,7 +327,7 @@ public class ConfigurationRegistryResour
return builder.build();
} finally {
if (airavataRegistry != null) {
- RegPoolUtils.releaseRegistry(airavataRegistry);
+ RegPoolUtils.releaseRegistry(context, airavataRegistry);
}
}
}
@@ -341,7 +341,7 @@ public class ConfigurationRegistryResour
@Path(ResourcePathConstants.ConfigResourcePathConstants.GET_EVENTING_URI)
@Produces(MediaType.TEXT_PLAIN)
public Response getEventingServiceURI() {
- AiravataRegistry2 airavataRegistry = RegPoolUtils.acquireRegistry();
+ AiravataRegistry2 airavataRegistry = RegPoolUtils.acquireRegistry(context);
try {
URI eventingServiceURI = airavataRegistry.getEventingServiceURI();
if (eventingServiceURI != null) {
@@ -359,7 +359,7 @@ public class ConfigurationRegistryResour
return builder.build();
} finally {
if (airavataRegistry != null) {
- RegPoolUtils.releaseRegistry(airavataRegistry);
+ RegPoolUtils.releaseRegistry(context, airavataRegistry);
}
}
}
@@ -373,7 +373,7 @@ public class ConfigurationRegistryResour
@Path(ResourcePathConstants.ConfigResourcePathConstants.GET_MESSAGE_BOX_URI)
@Produces(MediaType.TEXT_PLAIN)
public Response getMessageBoxURI() {
- AiravataRegistry2 airavataRegistry = RegPoolUtils.acquireRegistry();
+ AiravataRegistry2 airavataRegistry = RegPoolUtils.acquireRegistry(context);
try {
URI eventingServiceURI = airavataRegistry.getMessageBoxURI();
if (eventingServiceURI != null) {
@@ -391,7 +391,7 @@ public class ConfigurationRegistryResour
return builder.build();
} finally {
if (airavataRegistry != null) {
- RegPoolUtils.releaseRegistry(airavataRegistry);
+ RegPoolUtils.releaseRegistry(context, airavataRegistry);
}
}
}
@@ -406,7 +406,7 @@ public class ConfigurationRegistryResour
@Path(ResourcePathConstants.ConfigResourcePathConstants.ADD_GFAC_URI)
@Produces(MediaType.TEXT_PLAIN)
public Response addGFacURI(@FormParam("uri") String uri) {
- AiravataRegistry2 airavataRegistry = RegPoolUtils.acquireRegistry();
+ AiravataRegistry2 airavataRegistry = RegPoolUtils.acquireRegistry(context);
try {
URI gfacURI = new URI(uri);
airavataRegistry.addGFacURI(gfacURI);
@@ -419,7 +419,7 @@ public class ConfigurationRegistryResour
return builder.build();
} finally {
if (airavataRegistry != null) {
- RegPoolUtils.releaseRegistry(airavataRegistry);
+ RegPoolUtils.releaseRegistry(context, airavataRegistry);
}
}
}
@@ -434,7 +434,7 @@ public class ConfigurationRegistryResour
@Path(ResourcePathConstants.ConfigResourcePathConstants.ADD_WFINTERPRETER_URI)
@Produces(MediaType.TEXT_PLAIN)
public Response addWorkflowInterpreterURI(@FormParam("uri") String uri) {
- AiravataRegistry2 airavataRegistry = RegPoolUtils.acquireRegistry();
+ AiravataRegistry2 airavataRegistry = RegPoolUtils.acquireRegistry(context);
try {
URI interpreterURI = new URI(uri);
airavataRegistry.addWorkflowInterpreterURI(interpreterURI);
@@ -447,7 +447,7 @@ public class ConfigurationRegistryResour
return builder.build();
} finally {
if (airavataRegistry != null) {
- RegPoolUtils.releaseRegistry(airavataRegistry);
+ RegPoolUtils.releaseRegistry(context, airavataRegistry);
}
}
}
@@ -462,7 +462,7 @@ public class ConfigurationRegistryResour
@Path(ResourcePathConstants.ConfigResourcePathConstants.ADD_EVENTING_URI)
@Produces(MediaType.TEXT_PLAIN)
public Response setEventingURI(@FormParam("uri") String uri) {
- AiravataRegistry2 airavataRegistry = RegPoolUtils.acquireRegistry();
+ AiravataRegistry2 airavataRegistry = RegPoolUtils.acquireRegistry(context);
try {
URI eventingURI = new URI(uri);
airavataRegistry.setEventingURI(eventingURI);
@@ -475,7 +475,7 @@ public class ConfigurationRegistryResour
return builder.build();
} finally {
if (airavataRegistry != null) {
- RegPoolUtils.releaseRegistry(airavataRegistry);
+ RegPoolUtils.releaseRegistry(context, airavataRegistry);
}
}
}
@@ -490,7 +490,7 @@ public class ConfigurationRegistryResour
@Path(ResourcePathConstants.ConfigResourcePathConstants.ADD_MESSAGE_BOX_URI)
@Produces(MediaType.TEXT_PLAIN)
public Response setMessageBoxURI(@FormParam("uri") String uri) {
- AiravataRegistry2 airavataRegistry = RegPoolUtils.acquireRegistry();
+ AiravataRegistry2 airavataRegistry = RegPoolUtils.acquireRegistry(context);
try {
URI msgBoxURI = new URI(uri);
airavataRegistry.setMessageBoxURI(msgBoxURI);
@@ -503,7 +503,7 @@ public class ConfigurationRegistryResour
return builder.build();
} finally {
if (airavataRegistry != null) {
- RegPoolUtils.releaseRegistry(airavataRegistry);
+ RegPoolUtils.releaseRegistry(context, airavataRegistry);
}
}
}
@@ -519,7 +519,7 @@ public class ConfigurationRegistryResour
@Path(ResourcePathConstants.ConfigResourcePathConstants.ADD_GFAC_URI_DATE)
@Produces(MediaType.TEXT_PLAIN)
public Response addGFacURIByDate(@FormParam("uri") String uri, @FormParam("date") String date) {
- AiravataRegistry2 airavataRegistry = RegPoolUtils.acquireRegistry();
+ AiravataRegistry2 airavataRegistry = RegPoolUtils.acquireRegistry(context);
try {
DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
Date formattedDate = dateFormat.parse(date);
@@ -534,7 +534,7 @@ public class ConfigurationRegistryResour
return builder.build();
} finally {
if (airavataRegistry != null) {
- RegPoolUtils.releaseRegistry(airavataRegistry);
+ RegPoolUtils.releaseRegistry(context, airavataRegistry);
}
}
}
@@ -550,7 +550,7 @@ public class ConfigurationRegistryResour
@Path(ResourcePathConstants.ConfigResourcePathConstants.ADD_WFINTERPRETER_URI_DATE)
@Produces(MediaType.TEXT_PLAIN)
public Response addWorkflowInterpreterURI(@FormParam("uri") String uri, @FormParam("date") String date) {
- AiravataRegistry2 airavataRegistry = RegPoolUtils.acquireRegistry();
+ AiravataRegistry2 airavataRegistry = RegPoolUtils.acquireRegistry(context);
try {
DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
Date formattedDate = dateFormat.parse(date);
@@ -565,7 +565,7 @@ public class ConfigurationRegistryResour
return builder.build();
} finally {
if (airavataRegistry != null) {
- RegPoolUtils.releaseRegistry(airavataRegistry);
+ RegPoolUtils.releaseRegistry(context, airavataRegistry);
}
}
}
@@ -581,7 +581,7 @@ public class ConfigurationRegistryResour
@Path(ResourcePathConstants.ConfigResourcePathConstants.ADD_EVENTING_URI_DATE)
@Produces(MediaType.TEXT_PLAIN)
public Response setEventingURIByDate(@FormParam("uri") String uri, @FormParam("date") String date) {
- AiravataRegistry2 airavataRegistry = RegPoolUtils.acquireRegistry();
+ AiravataRegistry2 airavataRegistry = RegPoolUtils.acquireRegistry(context);
try {
DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
Date formattedDate = dateFormat.parse(date);
@@ -596,7 +596,7 @@ public class ConfigurationRegistryResour
return builder.build();
} finally {
if (airavataRegistry != null) {
- RegPoolUtils.releaseRegistry(airavataRegistry);
+ RegPoolUtils.releaseRegistry(context, airavataRegistry);
}
}
}
@@ -612,7 +612,7 @@ public class ConfigurationRegistryResour
@Path(ResourcePathConstants.ConfigResourcePathConstants.ADD_MSG_BOX_URI_DATE)
@Produces(MediaType.TEXT_PLAIN)
public Response setMessageBoxURIByDate(@FormParam("uri") String uri, @FormParam("date") String date) {
- AiravataRegistry2 airavataRegistry = RegPoolUtils.acquireRegistry();
+ AiravataRegistry2 airavataRegistry = RegPoolUtils.acquireRegistry(context);
try {
DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
Date formattedDate = dateFormat.parse(date);
@@ -627,7 +627,7 @@ public class ConfigurationRegistryResour
return builder.build();
} finally {
if (airavataRegistry != null) {
- RegPoolUtils.releaseRegistry(airavataRegistry);
+ RegPoolUtils.releaseRegistry(context, airavataRegistry);
}
}
}
@@ -642,7 +642,7 @@ public class ConfigurationRegistryResour
@Path(ResourcePathConstants.ConfigResourcePathConstants.DELETE_GFAC_URI)
@Produces(MediaType.TEXT_PLAIN)
public Response removeGFacURI(@QueryParam("uri") String uri) {
- AiravataRegistry2 airavataRegistry = RegPoolUtils.acquireRegistry();
+ AiravataRegistry2 airavataRegistry = RegPoolUtils.acquireRegistry(context);
try {
URI gfacURI = new URI(uri);
airavataRegistry.removeGFacURI(gfacURI);
@@ -655,7 +655,7 @@ public class ConfigurationRegistryResour
return builder.build();
} finally {
if (airavataRegistry != null) {
- RegPoolUtils.releaseRegistry(airavataRegistry);
+ RegPoolUtils.releaseRegistry(context, airavataRegistry);
}
}
}
@@ -669,7 +669,7 @@ public class ConfigurationRegistryResour
@Path(ResourcePathConstants.ConfigResourcePathConstants.DELETE_ALL_GFAC_URIS)
@Produces(MediaType.TEXT_PLAIN)
public Response removeAllGFacURI() {
- AiravataRegistry2 airavataRegistry = RegPoolUtils.acquireRegistry();
+ AiravataRegistry2 airavataRegistry = RegPoolUtils.acquireRegistry(context);
try {
airavataRegistry.removeAllGFacURI();
Response.ResponseBuilder builder = Response.status(Response.Status.OK);
@@ -681,7 +681,7 @@ public class ConfigurationRegistryResour
return builder.build();
} finally {
if (airavataRegistry != null) {
- RegPoolUtils.releaseRegistry(airavataRegistry);
+ RegPoolUtils.releaseRegistry(context, airavataRegistry);
}
}
}
@@ -696,7 +696,7 @@ public class ConfigurationRegistryResour
@Path(ResourcePathConstants.ConfigResourcePathConstants.DELETE_WFINTERPRETER_URI)
@Produces(MediaType.TEXT_PLAIN)
public Response removeWorkflowInterpreterURI(@QueryParam("uri") String uri) {
- AiravataRegistry2 airavataRegistry = RegPoolUtils.acquireRegistry();
+ AiravataRegistry2 airavataRegistry = RegPoolUtils.acquireRegistry(context);
try {
URI intURI = new URI(uri);
airavataRegistry.removeWorkflowInterpreterURI(intURI);
@@ -709,7 +709,7 @@ public class ConfigurationRegistryResour
return builder.build();
} finally {
if (airavataRegistry != null) {
- RegPoolUtils.releaseRegistry(airavataRegistry);
+ RegPoolUtils.releaseRegistry(context, airavataRegistry);
}
}
}
@@ -723,7 +723,7 @@ public class ConfigurationRegistryResour
@Path(ResourcePathConstants.ConfigResourcePathConstants.DELETE_ALL_WFINTERPRETER_URIS)
@Produces(MediaType.TEXT_PLAIN)
public Response removeAllWorkflowInterpreterURI() {
- AiravataRegistry2 airavataRegistry = RegPoolUtils.acquireRegistry();
+ AiravataRegistry2 airavataRegistry = RegPoolUtils.acquireRegistry(context);
try {
airavataRegistry.removeAllWorkflowInterpreterURI();
Response.ResponseBuilder builder = Response.status(Response.Status.OK);
@@ -735,7 +735,7 @@ public class ConfigurationRegistryResour
return builder.build();
} finally {
if (airavataRegistry != null) {
- RegPoolUtils.releaseRegistry(airavataRegistry);
+ RegPoolUtils.releaseRegistry(context, airavataRegistry);
}
}
}
@@ -749,7 +749,7 @@ public class ConfigurationRegistryResour
@Path(ResourcePathConstants.ConfigResourcePathConstants.DELETE_EVENTING_URI)
@Produces(MediaType.TEXT_PLAIN)
public Response unsetEventingURI() {
- AiravataRegistry2 airavataRegistry = RegPoolUtils.acquireRegistry();
+ AiravataRegistry2 airavataRegistry = RegPoolUtils.acquireRegistry(context);
try {
airavataRegistry.unsetEventingURI();
Response.ResponseBuilder builder = Response.status(Response.Status.OK);
@@ -761,7 +761,7 @@ public class ConfigurationRegistryResour
return builder.build();
} finally {
if (airavataRegistry != null) {
- RegPoolUtils.releaseRegistry(airavataRegistry);
+ RegPoolUtils.releaseRegistry(context, airavataRegistry);
}
}
}
@@ -775,7 +775,7 @@ public class ConfigurationRegistryResour
@Path(ResourcePathConstants.ConfigResourcePathConstants.DELETE_MSG_BOX_URI)
@Produces(MediaType.TEXT_PLAIN)
public Response unsetMessageBoxURI() {
- AiravataRegistry2 airavataRegistry = RegPoolUtils.acquireRegistry();
+ AiravataRegistry2 airavataRegistry = RegPoolUtils.acquireRegistry(context);
try {
airavataRegistry.unsetMessageBoxURI();
Response.ResponseBuilder builder = Response.status(Response.Status.OK);
@@ -787,7 +787,7 @@ public class ConfigurationRegistryResour
return builder.build();
} finally {
if (airavataRegistry != null) {
- RegPoolUtils.releaseRegistry(airavataRegistry);
+ RegPoolUtils.releaseRegistry(context, airavataRegistry);
}
}
}
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=1414416&r1=1414415&r2=1414416&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 Tue Nov 27 21:52:45 2012
@@ -68,7 +68,7 @@ public class DescriptorRegistryResource
@Path(ResourcePathConstants.DecResourcePathConstants.HOST_DESC_EXISTS)
@Produces(MediaType.TEXT_PLAIN)
public Response isHostDescriptorExists(@QueryParam("hostDescriptorName") String hostDescriptorName) {
- AiravataRegistry2 airavataRegistry = RegPoolUtils.acquireRegistry();
+ AiravataRegistry2 airavataRegistry = RegPoolUtils.acquireRegistry(context);
boolean state;
try {
state = airavataRegistry.isHostDescriptorExists(hostDescriptorName);
@@ -87,7 +87,7 @@ public class DescriptorRegistryResource
return builder.build();
} finally {
if (airavataRegistry != null) {
- RegPoolUtils.releaseRegistry(airavataRegistry);
+ RegPoolUtils.releaseRegistry(context, airavataRegistry);
}
}
}
@@ -103,7 +103,7 @@ public class DescriptorRegistryResource
@Consumes({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
@Produces({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON})
public Response addHostDescriptor(HostDescriptor host) {
- AiravataRegistry2 airavataRegistry = RegPoolUtils.acquireRegistry();
+ AiravataRegistry2 airavataRegistry = RegPoolUtils.acquireRegistry(context);
try {
HostDescription hostDescription = DescriptorUtil.createHostDescription(host);
airavataRegistry.addHostDescriptor(hostDescription);
@@ -120,7 +120,7 @@ public class DescriptorRegistryResource
return builder.build();
} finally {
if (airavataRegistry != null) {
- RegPoolUtils.releaseRegistry(airavataRegistry);
+ RegPoolUtils.releaseRegistry(context, airavataRegistry);
}
}
}
@@ -136,7 +136,7 @@ public class DescriptorRegistryResource
@Consumes({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
@Produces({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON})
public Response updateHostDescriptor(HostDescriptor host) {
- AiravataRegistry2 airavataRegistry = RegPoolUtils.acquireRegistry();
+ AiravataRegistry2 airavataRegistry = RegPoolUtils.acquireRegistry(context);
try {
HostDescription hostDescription = DescriptorUtil.createHostDescription(host);
airavataRegistry.updateHostDescriptor(hostDescription);
@@ -153,7 +153,7 @@ public class DescriptorRegistryResource
return builder.build();
} finally {
if (airavataRegistry != null) {
- RegPoolUtils.releaseRegistry(airavataRegistry);
+ RegPoolUtils.releaseRegistry(context, airavataRegistry);
}
}
}
@@ -170,7 +170,7 @@ public class DescriptorRegistryResource
@Consumes({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
@Produces({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON})
public Response getHostDescriptor(@QueryParam("hostName") String hostName) {
- AiravataRegistry2 airavataRegistry = RegPoolUtils.acquireRegistry();
+ AiravataRegistry2 airavataRegistry = RegPoolUtils.acquireRegistry(context);
try {
HostDescription hostDescription = airavataRegistry.getHostDescriptor(hostName);
HostDescriptor hostDescriptor = DescriptorUtil.createHostDescriptor(hostDescription);
@@ -189,7 +189,7 @@ public class DescriptorRegistryResource
return builder.build();
} finally {
if (airavataRegistry != null) {
- RegPoolUtils.releaseRegistry(airavataRegistry);
+ RegPoolUtils.releaseRegistry(context, airavataRegistry);
}
}
@@ -205,7 +205,7 @@ public class DescriptorRegistryResource
@Path(ResourcePathConstants.DecResourcePathConstants.HOST_DESC_DELETE)
@Produces(MediaType.TEXT_PLAIN)
public Response removeHostDescriptor(@QueryParam("hostName") String hostName) {
- AiravataRegistry2 airavataRegistry = RegPoolUtils.acquireRegistry();
+ AiravataRegistry2 airavataRegistry = RegPoolUtils.acquireRegistry(context);
try {
airavataRegistry.removeHostDescriptor(hostName);
Response.ResponseBuilder builder = Response.status(Response.Status.NO_CONTENT);
@@ -221,7 +221,7 @@ public class DescriptorRegistryResource
return builder.build();
} finally {
if (airavataRegistry != null) {
- RegPoolUtils.releaseRegistry(airavataRegistry);
+ RegPoolUtils.releaseRegistry(context, airavataRegistry);
}
}
}
@@ -236,7 +236,7 @@ public class DescriptorRegistryResource
@Consumes({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
@Produces({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON})
public Response getHostDescriptors() {
- AiravataRegistry2 airavataRegistry = RegPoolUtils.acquireRegistry();
+ AiravataRegistry2 airavataRegistry = RegPoolUtils.acquireRegistry(context);
try {
List<HostDescription> hostDescriptionList = airavataRegistry.getHostDescriptors();
HostDescriptionList list = new HostDescriptionList();
@@ -261,7 +261,7 @@ public class DescriptorRegistryResource
return builder.build();
} finally {
if (airavataRegistry != null) {
- RegPoolUtils.releaseRegistry(airavataRegistry);
+ RegPoolUtils.releaseRegistry(context, airavataRegistry);
}
}
}
@@ -275,7 +275,7 @@ public class DescriptorRegistryResource
@Path(ResourcePathConstants.DecResourcePathConstants.GET_HOST_DESCS_NAMES)
@Produces({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON})
public Response getHostDescriptorNames() {
- AiravataRegistry2 airavataRegistry = RegPoolUtils.acquireRegistry();
+ AiravataRegistry2 airavataRegistry = RegPoolUtils.acquireRegistry(context);
try {
List<HostDescription> hostDescriptionList = airavataRegistry.getHostDescriptors();
List<String> hostDescriptorNames = new ArrayList<String>();
@@ -299,7 +299,7 @@ public class DescriptorRegistryResource
return builder.build();
} finally {
if (airavataRegistry != null) {
- RegPoolUtils.releaseRegistry(airavataRegistry);
+ RegPoolUtils.releaseRegistry(context, airavataRegistry);
}
}
}
@@ -314,7 +314,7 @@ public class DescriptorRegistryResource
@Path(ResourcePathConstants.DecResourcePathConstants.SERVICE_DESC_EXISTS)
@Produces(MediaType.TEXT_PLAIN)
public Response isServiceDescriptorExists(@QueryParam("serviceDescriptorName") String serviceDescriptorName) {
- AiravataRegistry2 airavataRegistry = RegPoolUtils.acquireRegistry();
+ AiravataRegistry2 airavataRegistry = RegPoolUtils.acquireRegistry(context);
boolean state;
try {
state = airavataRegistry.isServiceDescriptorExists(serviceDescriptorName);
@@ -333,7 +333,7 @@ public class DescriptorRegistryResource
return builder.build();
} finally {
if (airavataRegistry != null) {
- RegPoolUtils.releaseRegistry(airavataRegistry);
+ RegPoolUtils.releaseRegistry(context, airavataRegistry);
}
}
}
@@ -349,7 +349,7 @@ public class DescriptorRegistryResource
@Consumes({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
@Produces({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON})
public Response addServiceDescriptor(ServiceDescriptor service) {
- AiravataRegistry2 airavataRegistry = RegPoolUtils.acquireRegistry();
+ AiravataRegistry2 airavataRegistry = RegPoolUtils.acquireRegistry(context);
try {
ServiceDescription serviceDescription = DescriptorUtil.createServiceDescription(service);
airavataRegistry.addServiceDescriptor(serviceDescription);
@@ -366,7 +366,7 @@ public class DescriptorRegistryResource
return builder.build();
} finally {
if (airavataRegistry != null) {
- RegPoolUtils.releaseRegistry(airavataRegistry);
+ RegPoolUtils.releaseRegistry(context, airavataRegistry);
}
}
}
@@ -382,7 +382,7 @@ public class DescriptorRegistryResource
@Consumes({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
@Produces({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON})
public Response updateServiceDescriptor(ServiceDescriptor service) {
- AiravataRegistry2 airavataRegistry = RegPoolUtils.acquireRegistry();
+ AiravataRegistry2 airavataRegistry = RegPoolUtils.acquireRegistry(context);
try {
ServiceDescription serviceDescription = DescriptorUtil.createServiceDescription(service);
airavataRegistry.updateServiceDescriptor(serviceDescription);
@@ -399,7 +399,7 @@ public class DescriptorRegistryResource
return builder.build();
} finally {
if (airavataRegistry != null) {
- RegPoolUtils.releaseRegistry(airavataRegistry);
+ RegPoolUtils.releaseRegistry(context, airavataRegistry);
}
}
}
@@ -416,7 +416,7 @@ public class DescriptorRegistryResource
@Consumes({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
@Produces({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON})
public Response getServiceDescriptor(@QueryParam("serviceName") String serviceName) {
- AiravataRegistry2 airavataRegistry = RegPoolUtils.acquireRegistry();
+ AiravataRegistry2 airavataRegistry = RegPoolUtils.acquireRegistry(context);
try {
ServiceDescription serviceDescription = airavataRegistry.getServiceDescriptor(serviceName);
ServiceDescriptor serviceDescriptor = DescriptorUtil.createServiceDescriptor(serviceDescription);
@@ -435,7 +435,7 @@ public class DescriptorRegistryResource
return builder.build();
} finally {
if (airavataRegistry != null) {
- RegPoolUtils.releaseRegistry(airavataRegistry);
+ RegPoolUtils.releaseRegistry(context, airavataRegistry);
}
}
}
@@ -450,7 +450,7 @@ public class DescriptorRegistryResource
@Path(ResourcePathConstants.DecResourcePathConstants.SERVICE_DESC_DELETE)
@Produces(MediaType.TEXT_PLAIN)
public Response removeServiceDescriptor(@QueryParam("serviceName") String serviceName) {
- AiravataRegistry2 airavataRegistry = RegPoolUtils.acquireRegistry();
+ AiravataRegistry2 airavataRegistry = RegPoolUtils.acquireRegistry(context);
try {
airavataRegistry.removeServiceDescriptor(serviceName);
Response.ResponseBuilder builder = Response.status(Response.Status.OK);
@@ -466,7 +466,7 @@ public class DescriptorRegistryResource
return builder.build();
} finally {
if (airavataRegistry != null) {
- RegPoolUtils.releaseRegistry(airavataRegistry);
+ RegPoolUtils.releaseRegistry(context, airavataRegistry);
}
}
}
@@ -481,7 +481,7 @@ public class DescriptorRegistryResource
@Consumes({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
@Produces({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON})
public Response getServiceDescriptors() {
- AiravataRegistry2 airavataRegistry = RegPoolUtils.acquireRegistry();
+ AiravataRegistry2 airavataRegistry = RegPoolUtils.acquireRegistry(context);
try {
List<ServiceDescription> serviceDescriptors = airavataRegistry.getServiceDescriptors();
ServiceDescriptionList list = new ServiceDescriptionList();
@@ -506,7 +506,7 @@ public class DescriptorRegistryResource
return builder.build();
} finally {
if (airavataRegistry != null) {
- RegPoolUtils.releaseRegistry(airavataRegistry);
+ RegPoolUtils.releaseRegistry(context, airavataRegistry);
}
}
}
@@ -526,7 +526,7 @@ public class DescriptorRegistryResource
public Response isApplicationDescriptorExists(@QueryParam("serviceName") String serviceName,
@QueryParam("hostName") String hostName,
@QueryParam("appDescName") String appDescriptorName) {
- AiravataRegistry2 airavataRegistry = RegPoolUtils.acquireRegistry();
+ AiravataRegistry2 airavataRegistry = RegPoolUtils.acquireRegistry(context);
boolean state;
try {
state = airavataRegistry.isApplicationDescriptorExists(serviceName, hostName, appDescriptorName);
@@ -545,7 +545,7 @@ public class DescriptorRegistryResource
return builder.build();
} finally {
if (airavataRegistry != null) {
- RegPoolUtils.releaseRegistry(airavataRegistry);
+ RegPoolUtils.releaseRegistry(context, airavataRegistry);
}
}
}
@@ -562,7 +562,7 @@ public class DescriptorRegistryResource
@Consumes({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
@Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
public Response addApplicationDescriptor(ApplicationDescriptor applicationDescriptor) {
- AiravataRegistry2 airavataRegistry = RegPoolUtils.acquireRegistry();
+ AiravataRegistry2 airavataRegistry = RegPoolUtils.acquireRegistry(context);
try {
String hostdescName = applicationDescriptor.getHostdescName();
if (!airavataRegistry.isHostDescriptorExists(hostdescName)) {
@@ -603,7 +603,7 @@ public class DescriptorRegistryResource
return builder.build();
} finally {
if (airavataRegistry != null) {
- RegPoolUtils.releaseRegistry(airavataRegistry);
+ RegPoolUtils.releaseRegistry(context, airavataRegistry);
}
}
}
@@ -619,7 +619,7 @@ public class DescriptorRegistryResource
@Consumes({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
@Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
public Response udpateApplicationDescriptor(ApplicationDescriptor applicationDescriptor) {
- AiravataRegistry2 airavataRegistry = RegPoolUtils.acquireRegistry();
+ AiravataRegistry2 airavataRegistry = RegPoolUtils.acquireRegistry(context);
try {
String hostdescName = applicationDescriptor.getHostdescName();
if (!airavataRegistry.isHostDescriptorExists(hostdescName)) {
@@ -661,7 +661,7 @@ public class DescriptorRegistryResource
return builder.build();
} finally {
if (airavataRegistry != null) {
- RegPoolUtils.releaseRegistry(airavataRegistry);
+ RegPoolUtils.releaseRegistry(context, airavataRegistry);
}
}
}
@@ -681,7 +681,7 @@ public class DescriptorRegistryResource
public Response getApplicationDescriptor(@QueryParam("serviceName") String serviceName,
@QueryParam("hostName") String hostName,
@QueryParam("applicationName") String applicationName) {
- AiravataRegistry2 airavataRegistry = RegPoolUtils.acquireRegistry();
+ AiravataRegistry2 airavataRegistry = RegPoolUtils.acquireRegistry(context);
try {
ApplicationDeploymentDescription applicationDeploymentDescription = airavataRegistry.getApplicationDescriptor(serviceName, hostName, applicationName);
ApplicationDescriptor applicationDescriptor = DescriptorUtil.createApplicationDescriptor(applicationDeploymentDescription);
@@ -705,7 +705,7 @@ public class DescriptorRegistryResource
return builder.build();
} finally {
if (airavataRegistry != null) {
- RegPoolUtils.releaseRegistry(airavataRegistry);
+ RegPoolUtils.releaseRegistry(context, airavataRegistry);
}
}
}
@@ -722,7 +722,7 @@ public class DescriptorRegistryResource
@Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
public Response getApplicationDescriptorPerServiceHost(@QueryParam("serviceName") String serviceName,
@QueryParam("hostName") String hostName) {
- AiravataRegistry2 airavataRegistry = RegPoolUtils.acquireRegistry();
+ AiravataRegistry2 airavataRegistry = RegPoolUtils.acquireRegistry(context);
try {
ApplicationDeploymentDescription applicationDeploymentDescription = airavataRegistry.getApplicationDescriptors(serviceName, hostName);
ApplicationDescriptor applicationDescriptor = DescriptorUtil.createApplicationDescriptor(applicationDeploymentDescription);
@@ -746,7 +746,7 @@ public class DescriptorRegistryResource
return builder.build();
} finally {
if (airavataRegistry != null) {
- RegPoolUtils.releaseRegistry(airavataRegistry);
+ RegPoolUtils.releaseRegistry(context, airavataRegistry);
}
}
}
@@ -761,7 +761,7 @@ public class DescriptorRegistryResource
@Path(ResourcePathConstants.DecResourcePathConstants.APP_DESC_ALL_DESCS_SERVICE)
@Produces({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON})
public Response getApplicationDescriptors(@QueryParam("serviceName") String serviceName) {
- AiravataRegistry2 airavataRegistry = RegPoolUtils.acquireRegistry();
+ AiravataRegistry2 airavataRegistry = RegPoolUtils.acquireRegistry(context);
try {
Map<String, ApplicationDeploymentDescription> applicationDeploymentDescriptionMap = airavataRegistry.getApplicationDescriptors(serviceName);
ApplicationDescriptorList applicationDescriptorList = new ApplicationDescriptorList();
@@ -799,7 +799,7 @@ public class DescriptorRegistryResource
return builder.build();
} finally {
if (airavataRegistry != null) {
- RegPoolUtils.releaseRegistry(airavataRegistry);
+ RegPoolUtils.releaseRegistry(context, airavataRegistry);
}
}
}
@@ -813,7 +813,7 @@ public class DescriptorRegistryResource
@Path(ResourcePathConstants.DecResourcePathConstants.APP_DESC_ALL_DESCRIPTORS)
@Produces({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON})
public Response getApplicationDescriptors() {
- AiravataRegistry2 airavataRegistry = RegPoolUtils.acquireRegistry();
+ AiravataRegistry2 airavataRegistry = RegPoolUtils.acquireRegistry(context);
try {
Map<String[], ApplicationDeploymentDescription> applicationDeploymentDescriptionMap = airavataRegistry.getApplicationDescriptors();
ApplicationDescriptorList applicationDescriptorList = new ApplicationDescriptorList();
@@ -853,7 +853,7 @@ public class DescriptorRegistryResource
return builder.build();
} finally {
if (airavataRegistry != null) {
- RegPoolUtils.releaseRegistry(airavataRegistry);
+ RegPoolUtils.releaseRegistry(context, airavataRegistry);
}
}
}
@@ -867,7 +867,7 @@ public class DescriptorRegistryResource
@Path(ResourcePathConstants.DecResourcePathConstants.APP_DESC_NAMES)
@Produces({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON})
public Response getApplicationDescriptorNames() {
- AiravataRegistry2 airavataRegistry = RegPoolUtils.acquireRegistry();
+ AiravataRegistry2 airavataRegistry = RegPoolUtils.acquireRegistry(context);
try {
Map<String[], ApplicationDeploymentDescription> applicationDeploymentDescriptionMap = airavataRegistry.getApplicationDescriptors();
DescriptorNameList descriptorNameList = new DescriptorNameList();
@@ -896,7 +896,7 @@ public class DescriptorRegistryResource
return builder.build();
} finally {
if (airavataRegistry != null) {
- RegPoolUtils.releaseRegistry(airavataRegistry);
+ RegPoolUtils.releaseRegistry(context, airavataRegistry);
}
}
}
@@ -916,7 +916,7 @@ public class DescriptorRegistryResource
public Response removeApplicationDescriptor(@QueryParam("serviceName") String serviceName,
@QueryParam("hostName") String hostName,
@QueryParam("appName") String appName) {
- AiravataRegistry2 airavataRegistry = RegPoolUtils.acquireRegistry();
+ AiravataRegistry2 airavataRegistry = RegPoolUtils.acquireRegistry(context);
try {
airavataRegistry.removeApplicationDescriptor(serviceName, hostName, appName);
Response.ResponseBuilder builder = Response.status(Response.Status.NO_CONTENT);
@@ -932,7 +932,7 @@ public class DescriptorRegistryResource
return builder.build();
} finally {
if (airavataRegistry != null) {
- RegPoolUtils.releaseRegistry(airavataRegistry);
+ RegPoolUtils.releaseRegistry(context, airavataRegistry);
}
}
}
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=1414416&r1=1414415&r2=1414416&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 Tue Nov 27 21:52:45 2012
@@ -68,7 +68,7 @@ public class ExperimentRegistryResource
@Path(ResourcePathConstants.ExperimentResourcePathConstants.DELETE_EXP)
@Produces(MediaType.TEXT_PLAIN)
public Response removeExperiment(@QueryParam("experimentId") String experimentId) {
- AiravataRegistry2 airavataRegistry = RegPoolUtils.acquireRegistry();
+ AiravataRegistry2 airavataRegistry = RegPoolUtils.acquireRegistry(context);
try {
airavataRegistry.removeExperiment(experimentId);
Response.ResponseBuilder builder = Response.status(Response.Status.OK);
@@ -80,7 +80,7 @@ public class ExperimentRegistryResource
return builder.build();
} finally {
if (airavataRegistry != null) {
- RegPoolUtils.releaseRegistry(airavataRegistry);
+ RegPoolUtils.releaseRegistry(context, airavataRegistry);
}
}
}
@@ -94,7 +94,7 @@ public class ExperimentRegistryResource
@Path(ResourcePathConstants.ExperimentResourcePathConstants.GET_ALL_EXPS)
@Produces({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON})
public Response getExperiments() {
- AiravataRegistry2 airavataRegistry = RegPoolUtils.acquireRegistry();
+ AiravataRegistry2 airavataRegistry = RegPoolUtils.acquireRegistry(context);
try {
List<AiravataExperiment> airavataExperimentList = airavataRegistry.getExperiments();
ExperimentList experimentList = new ExperimentList();
@@ -118,7 +118,7 @@ public class ExperimentRegistryResource
return builder.build();
} finally {
if (airavataRegistry != null) {
- RegPoolUtils.releaseRegistry(airavataRegistry);
+ RegPoolUtils.releaseRegistry(context, airavataRegistry);
}
}
}
@@ -133,7 +133,7 @@ public class ExperimentRegistryResource
@Path(ResourcePathConstants.ExperimentResourcePathConstants.GET_EXPS_BY_PROJECT)
@Produces({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON})
public Response getExperimentsByProject(@QueryParam("projectName") String projectName) {
- AiravataRegistry2 airavataRegistry = RegPoolUtils.acquireRegistry();
+ AiravataRegistry2 airavataRegistry = RegPoolUtils.acquireRegistry(context);
try {
List<AiravataExperiment> airavataExperimentList = airavataRegistry.getExperiments(projectName);
ExperimentList experimentList = new ExperimentList();
@@ -157,7 +157,7 @@ public class ExperimentRegistryResource
return builder.build();
} finally {
if (airavataRegistry != null) {
- RegPoolUtils.releaseRegistry(airavataRegistry);
+ RegPoolUtils.releaseRegistry(context, airavataRegistry);
}
}
}
@@ -175,7 +175,7 @@ public class ExperimentRegistryResource
@Produces({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON})
public Response getExperimentsByDate(@QueryParam("fromDate") String fromDate,
@QueryParam("toDate") String toDate) {
- AiravataRegistry2 airavataRegistry = RegPoolUtils.acquireRegistry();
+ AiravataRegistry2 airavataRegistry = RegPoolUtils.acquireRegistry(context);
try {
DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
Date formattedFromDate = dateFormat.parse(fromDate);
@@ -206,7 +206,7 @@ public class ExperimentRegistryResource
return builder.build();
} finally {
if (airavataRegistry != null) {
- RegPoolUtils.releaseRegistry(airavataRegistry);
+ RegPoolUtils.releaseRegistry(context, airavataRegistry);
}
}
}
@@ -226,7 +226,7 @@ public class ExperimentRegistryResource
public Response getExperimentsByProjectDate(@QueryParam("projectName") String projectName,
@QueryParam("fromDate") String fromDate,
@QueryParam("toDate") String toDate) {
- AiravataRegistry2 airavataRegistry = RegPoolUtils.acquireRegistry();
+ AiravataRegistry2 airavataRegistry = RegPoolUtils.acquireRegistry(context);
try {
DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
Date formattedFromDate = dateFormat.parse(fromDate);
@@ -257,7 +257,7 @@ public class ExperimentRegistryResource
return builder.build();
} finally {
if (airavataRegistry != null) {
- RegPoolUtils.releaseRegistry(airavataRegistry);
+ RegPoolUtils.releaseRegistry(context, airavataRegistry);
}
}
}
@@ -277,7 +277,7 @@ public class ExperimentRegistryResource
public Response addExperiment(@FormParam("projectName") String projectName,
@FormParam("experimentID") String experimentID,
@FormParam("submittedDate") String submittedDate) {
- AiravataRegistry2 airavataRegistry = RegPoolUtils.acquireRegistry();
+ AiravataRegistry2 airavataRegistry = RegPoolUtils.acquireRegistry(context);
try {
AiravataExperiment experiment = new AiravataExperiment();
experiment.setExperimentId(experimentID);
@@ -310,7 +310,7 @@ public class ExperimentRegistryResource
return builder.build();
} finally {
if (airavataRegistry != null) {
- RegPoolUtils.releaseRegistry(airavataRegistry);
+ RegPoolUtils.releaseRegistry(context, airavataRegistry);
}
}
@@ -326,7 +326,7 @@ public class ExperimentRegistryResource
@Path(ResourcePathConstants.ExperimentResourcePathConstants.EXP_EXISTS)
@Produces(MediaType.TEXT_PLAIN)
public Response isExperimentExists(@QueryParam("experimentId") String experimentId) {
- AiravataRegistry2 airavataRegistry = RegPoolUtils.acquireRegistry();
+ AiravataRegistry2 airavataRegistry = RegPoolUtils.acquireRegistry(context);
try {
airavataRegistry.isExperimentExists(experimentId);
Response.ResponseBuilder builder = Response.status(Response.Status.NO_CONTENT);
@@ -342,7 +342,7 @@ public class ExperimentRegistryResource
return builder.build();
} finally {
if (airavataRegistry != null) {
- RegPoolUtils.releaseRegistry(airavataRegistry);
+ RegPoolUtils.releaseRegistry(context, airavataRegistry);
}
}
}
@@ -364,7 +364,7 @@ public class ExperimentRegistryResource
if (createIfNotPresent.equals("true")) {
createIfNotPresentStatus = true;
}
- AiravataRegistry2 airavataRegistry = RegPoolUtils.acquireRegistry();
+ AiravataRegistry2 airavataRegistry = RegPoolUtils.acquireRegistry(context);
try {
airavataRegistry.isExperimentExists(experimentId, createIfNotPresentStatus);
Response.ResponseBuilder builder = Response.status(Response.Status.NO_CONTENT);
@@ -376,7 +376,7 @@ public class ExperimentRegistryResource
return builder.build();
} finally {
if (airavataRegistry != null) {
- RegPoolUtils.releaseRegistry(airavataRegistry);
+ RegPoolUtils.releaseRegistry(context, airavataRegistry);
}
}
}
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=1414416&r1=1414415&r2=1414416&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 Tue Nov 27 21:52:45 2012
@@ -60,7 +60,7 @@ public class ProjectRegistryResource {
@Path(ResourcePathConstants.ProjectResourcePathConstants.PROJECT_EXIST)
@Produces(MediaType.TEXT_PLAIN)
public Response isWorkspaceProjectExists(@QueryParam("projectName") String projectName) {
- AiravataRegistry2 airavataRegistry = RegPoolUtils.acquireRegistry();
+ AiravataRegistry2 airavataRegistry = RegPoolUtils.acquireRegistry(context);
try {
boolean result = airavataRegistry.isWorkspaceProjectExists(projectName);
if (result) {
@@ -78,7 +78,7 @@ public class ProjectRegistryResource {
return builder.build();
} finally {
if (airavataRegistry != null) {
- RegPoolUtils.releaseRegistry(airavataRegistry);
+ RegPoolUtils.releaseRegistry(context, airavataRegistry);
}
}
}
@@ -99,7 +99,7 @@ public class ProjectRegistryResource {
if (createIfNotExists.equals("true")) {
createIfNotExistStatus = true;
}
- AiravataRegistry2 airavataRegistry = RegPoolUtils.acquireRegistry();
+ AiravataRegistry2 airavataRegistry = RegPoolUtils.acquireRegistry(context);
try {
boolean result = airavataRegistry.isWorkspaceProjectExists(projectName, createIfNotExistStatus);
if (result) {
@@ -117,7 +117,7 @@ public class ProjectRegistryResource {
return builder.build();
}finally {
if (airavataRegistry != null) {
- RegPoolUtils.releaseRegistry(airavataRegistry);
+ RegPoolUtils.releaseRegistry(context, airavataRegistry);
}
}
}
@@ -131,7 +131,7 @@ public class ProjectRegistryResource {
@Path(ResourcePathConstants.ProjectResourcePathConstants.ADD_PROJECT)
@Produces(MediaType.TEXT_PLAIN)
public Response addWorkspaceProject(@FormParam("projectName") String projectName) {
- AiravataRegistry2 airavataRegistry = RegPoolUtils.acquireRegistry();
+ AiravataRegistry2 airavataRegistry = RegPoolUtils.acquireRegistry(context);
try {
WorkspaceProject workspaceProject = new WorkspaceProject(projectName, airavataRegistry);
airavataRegistry.addWorkspaceProject(workspaceProject);
@@ -148,7 +148,7 @@ public class ProjectRegistryResource {
return builder.build();
} finally {
if (airavataRegistry != null) {
- RegPoolUtils.releaseRegistry(airavataRegistry);
+ RegPoolUtils.releaseRegistry(context, airavataRegistry);
}
}
}
@@ -162,7 +162,7 @@ public class ProjectRegistryResource {
@Path(ResourcePathConstants.ProjectResourcePathConstants.UPDATE_PROJECT)
@Produces(MediaType.TEXT_PLAIN)
public Response updateWorkspaceProject(@FormParam("projectName") String projectName) {
- AiravataRegistry2 airavataRegistry = RegPoolUtils.acquireRegistry();
+ AiravataRegistry2 airavataRegistry = RegPoolUtils.acquireRegistry(context);
try {
WorkspaceProject workspaceProject = new WorkspaceProject(projectName, airavataRegistry);
airavataRegistry.updateWorkspaceProject(workspaceProject);
@@ -179,7 +179,7 @@ public class ProjectRegistryResource {
return builder.build();
} finally {
if (airavataRegistry != null) {
- RegPoolUtils.releaseRegistry(airavataRegistry);
+ RegPoolUtils.releaseRegistry(context, airavataRegistry);
}
}
}
@@ -193,7 +193,7 @@ public class ProjectRegistryResource {
@Path(ResourcePathConstants.ProjectResourcePathConstants.DELETE_PROJECT)
@Produces(MediaType.TEXT_PLAIN)
public Response deleteWorkspaceProject(@QueryParam("projectName") String projectName) {
- AiravataRegistry2 airavataRegistry = RegPoolUtils.acquireRegistry();
+ AiravataRegistry2 airavataRegistry = RegPoolUtils.acquireRegistry(context);
try {
airavataRegistry.deleteWorkspaceProject(projectName);
Response.ResponseBuilder builder = Response.status(Response.Status.OK);
@@ -209,7 +209,7 @@ public class ProjectRegistryResource {
return builder.build();
} finally {
if (airavataRegistry != null) {
- RegPoolUtils.releaseRegistry(airavataRegistry);
+ RegPoolUtils.releaseRegistry(context, airavataRegistry);
}
}
}
@@ -223,7 +223,7 @@ public class ProjectRegistryResource {
@Path(ResourcePathConstants.ProjectResourcePathConstants.GET_PROJECT)
@Produces({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON})
public Response getWorkspaceProject(@QueryParam("projectName") String projectName) {
- AiravataRegistry2 airavataRegistry = RegPoolUtils.acquireRegistry();
+ AiravataRegistry2 airavataRegistry = RegPoolUtils.acquireRegistry(context);
try {
WorkspaceProject workspaceProject = airavataRegistry.getWorkspaceProject(projectName);
if (workspaceProject != null) {
@@ -245,7 +245,7 @@ public class ProjectRegistryResource {
return builder.build();
} finally {
if (airavataRegistry != null) {
- RegPoolUtils.releaseRegistry(airavataRegistry);
+ RegPoolUtils.releaseRegistry(context, airavataRegistry);
}
}
}
@@ -258,7 +258,7 @@ public class ProjectRegistryResource {
@Path(ResourcePathConstants.ProjectResourcePathConstants.GET_PROJECTS)
@Produces({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON})
public Response getWorkspaceProjects() {
- AiravataRegistry2 airavataRegistry = RegPoolUtils.acquireRegistry();
+ AiravataRegistry2 airavataRegistry = RegPoolUtils.acquireRegistry(context);
try {
List<WorkspaceProject> workspaceProjects = airavataRegistry.getWorkspaceProjects();
WorkspaceProjectList workspaceProjectList = new WorkspaceProjectList();
@@ -282,7 +282,7 @@ public class ProjectRegistryResource {
return builder.build();
} finally {
if (airavataRegistry != null) {
- RegPoolUtils.releaseRegistry(airavataRegistry);
+ RegPoolUtils.releaseRegistry(context, airavataRegistry);
}
}
}