Author: chathuri
Date: Tue Dec 4 17:51:14 2012
New Revision: 1417062
URL: http://svn.apache.org/viewvc?rev=1417062&view=rev
Log:
move registryListner class to common module
Added:
airavata/trunk/modules/rest/mappings/src/main/java/org/apache/airavata/rest/mappings/utils/RegIdentifier.java
- copied, changed from r1416936,
airavata/trunk/modules/rest/service/src/main/java/org/apache/airavata/services/registry/rest/utils/RegIdentifier.java
airavata/trunk/modules/rest/mappings/src/main/java/org/apache/airavata/rest/mappings/utils/RegPoolUtils.java
- copied, changed from r1416940,
airavata/trunk/modules/rest/service/src/main/java/org/apache/airavata/services/registry/rest/utils/RegPoolUtils.java
airavata/trunk/modules/rest/mappings/src/main/java/org/apache/airavata/rest/mappings/utils/RegistryInstancesPool.java
- copied, changed from r1416936,
airavata/trunk/modules/rest/service/src/main/java/org/apache/airavata/services/registry/rest/utils/RegistryInstancesPool.java
airavata/trunk/modules/rest/mappings/src/main/java/org/apache/airavata/rest/mappings/utils/RegistryListener.java
- copied, changed from r1416940,
airavata/trunk/modules/rest/service/src/main/java/org/apache/airavata/services/registry/rest/utils/RegistryListener.java
Removed:
airavata/trunk/modules/rest/service/src/main/java/org/apache/airavata/services/registry/rest/utils/RegIdentifier.java
airavata/trunk/modules/rest/service/src/main/java/org/apache/airavata/services/registry/rest/utils/RegPoolUtils.java
airavata/trunk/modules/rest/service/src/main/java/org/apache/airavata/services/registry/rest/utils/RegistryInstancesPool.java
airavata/trunk/modules/rest/service/src/main/java/org/apache/airavata/services/registry/rest/utils/RegistryListener.java
Modified:
airavata/trunk/modules/rest/mappings/pom.xml
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/webapp/WEB-INF/web.xml
Modified: airavata/trunk/modules/rest/mappings/pom.xml
URL:
http://svn.apache.org/viewvc/airavata/trunk/modules/rest/mappings/pom.xml?rev=1417062&r1=1417061&r2=1417062&view=diff
==============================================================================
--- airavata/trunk/modules/rest/mappings/pom.xml (original)
+++ airavata/trunk/modules/rest/mappings/pom.xml Tue Dec 4 17:51:14 2012
@@ -58,6 +58,11 @@
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
</dependency>
+ <dependency>
+ <groupId>javax.ws.rs</groupId>
+ <artifactId>jsr311-api</artifactId>
+ <version>1.1.1</version>
+ </dependency>
</dependencies>
<properties>
Copied:
airavata/trunk/modules/rest/mappings/src/main/java/org/apache/airavata/rest/mappings/utils/RegIdentifier.java
(from r1416936,
airavata/trunk/modules/rest/service/src/main/java/org/apache/airavata/services/registry/rest/utils/RegIdentifier.java)
URL:
http://svn.apache.org/viewvc/airavata/trunk/modules/rest/mappings/src/main/java/org/apache/airavata/rest/mappings/utils/RegIdentifier.java?p2=airavata/trunk/modules/rest/mappings/src/main/java/org/apache/airavata/rest/mappings/utils/RegIdentifier.java&p1=airavata/trunk/modules/rest/service/src/main/java/org/apache/airavata/services/registry/rest/utils/RegIdentifier.java&r1=1416936&r2=1417062&rev=1417062&view=diff
==============================================================================
---
airavata/trunk/modules/rest/service/src/main/java/org/apache/airavata/services/registry/rest/utils/RegIdentifier.java
(original)
+++
airavata/trunk/modules/rest/mappings/src/main/java/org/apache/airavata/rest/mappings/utils/RegIdentifier.java
Tue Dec 4 17:51:14 2012
@@ -19,7 +19,7 @@
*
*/
-package org.apache.airavata.services.registry.rest.utils;
+package org.apache.airavata.rest.mappings.utils;
public class RegIdentifier {
private String user;
Copied:
airavata/trunk/modules/rest/mappings/src/main/java/org/apache/airavata/rest/mappings/utils/RegPoolUtils.java
(from r1416940,
airavata/trunk/modules/rest/service/src/main/java/org/apache/airavata/services/registry/rest/utils/RegPoolUtils.java)
URL:
http://svn.apache.org/viewvc/airavata/trunk/modules/rest/mappings/src/main/java/org/apache/airavata/rest/mappings/utils/RegPoolUtils.java?p2=airavata/trunk/modules/rest/mappings/src/main/java/org/apache/airavata/rest/mappings/utils/RegPoolUtils.java&p1=airavata/trunk/modules/rest/service/src/main/java/org/apache/airavata/services/registry/rest/utils/RegPoolUtils.java&r1=1416940&r2=1417062&rev=1417062&view=diff
==============================================================================
---
airavata/trunk/modules/rest/service/src/main/java/org/apache/airavata/services/registry/rest/utils/RegPoolUtils.java
(original)
+++
airavata/trunk/modules/rest/mappings/src/main/java/org/apache/airavata/rest/mappings/utils/RegPoolUtils.java
Tue Dec 4 17:51:14 2012
@@ -19,7 +19,7 @@
*
*/
-package org.apache.airavata.services.registry.rest.utils;
+package org.apache.airavata.rest.mappings.utils;
import org.apache.airavata.common.context.RequestContext;
import org.apache.airavata.common.context.WorkflowContext;
@@ -32,7 +32,6 @@ import org.apache.airavata.registry.api.
import
org.apache.airavata.registry.api.exception.RegistryAccessorInvalidException;
import
org.apache.airavata.registry.api.exception.RegistryAccessorNotFoundException;
import
org.apache.airavata.registry.api.exception.RegistryAccessorUndefinedException;
-import org.apache.airavata.rest.mappings.utils.RestServicesConstants;
import javax.servlet.ServletContext;
import javax.ws.rs.core.Context;
@@ -51,7 +50,8 @@ public class RegPoolUtils {
Gateway gateway =
(Gateway)context.getAttribute(RestServicesConstants.GATEWAY);
AiravataUser airavataUser = new AiravataUser(user);
- RegistryInstancesPool registryInstancesPool = (RegistryInstancesPool)
context.getAttribute(RestServicesConstants.AIRAVATA_REGISTRY_POOL);
+ RegistryInstancesPool registryInstancesPool =
+ (RegistryInstancesPool)
context.getAttribute(RestServicesConstants.AIRAVATA_REGISTRY_POOL);
Map<RegIdentifier,AiravataRegistry2> registryMap =
registryInstancesPool.getRegistryInstancesList();
boolean foundReg=false;
try{
@@ -59,11 +59,13 @@ public class RegPoolUtils {
synchronized (registryMap){
RegIdentifier identifier = new RegIdentifier(user,
gateway.getGatewayName());
if (registryMap.size()==0){
- registryMap.put(identifier,
AiravataRegistryFactory.getRegistry(gateway, airavataUser));
+ registryMap.put(identifier,
+ AiravataRegistryFactory.getRegistry(gateway,
airavataUser));
}else {
airavataRegistry = registryMap.get(identifier);
if (airavataRegistry == null){
- registryMap.put(identifier,
AiravataRegistryFactory.getRegistry(gateway, airavataUser));
+ registryMap.put(identifier,
+
AiravataRegistryFactory.getRegistry(gateway, airavataUser));
}
}
airavataRegistry=registryMap.get(identifier);
@@ -86,10 +88,14 @@ public class RegPoolUtils {
}
public static void releaseRegistry(ServletContext context,
AiravataRegistry2 airavataRegistry) {
- RegistryInstancesPool registryInstancesPool =
(RegistryInstancesPool)context.getAttribute(RestServicesConstants.AIRAVATA_REGISTRY_POOL);
- Map<RegIdentifier, AiravataRegistry2> registryInstancesList =
registryInstancesPool.getRegistryInstancesList();
+ RegistryInstancesPool registryInstancesPool =
+
(RegistryInstancesPool)context.getAttribute(RestServicesConstants.AIRAVATA_REGISTRY_POOL);
+ Map<RegIdentifier, AiravataRegistry2> registryInstancesList =
+ registryInstancesPool.getRegistryInstancesList();
synchronized (registryInstancesList){
- RegIdentifier regIdentifier = new
RegIdentifier(airavataRegistry.getUser().getUserName(),
airavataRegistry.getGateway().getGatewayName());
+ RegIdentifier regIdentifier =
+ new RegIdentifier(airavataRegistry.getUser().getUserName(),
+ airavataRegistry.getGateway().getGatewayName());
registryInstancesList.put(regIdentifier, airavataRegistry);
}
}
Copied:
airavata/trunk/modules/rest/mappings/src/main/java/org/apache/airavata/rest/mappings/utils/RegistryInstancesPool.java
(from r1416936,
airavata/trunk/modules/rest/service/src/main/java/org/apache/airavata/services/registry/rest/utils/RegistryInstancesPool.java)
URL:
http://svn.apache.org/viewvc/airavata/trunk/modules/rest/mappings/src/main/java/org/apache/airavata/rest/mappings/utils/RegistryInstancesPool.java?p2=airavata/trunk/modules/rest/mappings/src/main/java/org/apache/airavata/rest/mappings/utils/RegistryInstancesPool.java&p1=airavata/trunk/modules/rest/service/src/main/java/org/apache/airavata/services/registry/rest/utils/RegistryInstancesPool.java&r1=1416936&r2=1417062&rev=1417062&view=diff
==============================================================================
---
airavata/trunk/modules/rest/service/src/main/java/org/apache/airavata/services/registry/rest/utils/RegistryInstancesPool.java
(original)
+++
airavata/trunk/modules/rest/mappings/src/main/java/org/apache/airavata/rest/mappings/utils/RegistryInstancesPool.java
Tue Dec 4 17:51:14 2012
@@ -19,7 +19,7 @@
*
*/
-package org.apache.airavata.services.registry.rest.utils;
+package org.apache.airavata.rest.mappings.utils;
import org.apache.airavata.registry.api.AiravataRegistry2;
Copied:
airavata/trunk/modules/rest/mappings/src/main/java/org/apache/airavata/rest/mappings/utils/RegistryListener.java
(from r1416940,
airavata/trunk/modules/rest/service/src/main/java/org/apache/airavata/services/registry/rest/utils/RegistryListener.java)
URL:
http://svn.apache.org/viewvc/airavata/trunk/modules/rest/mappings/src/main/java/org/apache/airavata/rest/mappings/utils/RegistryListener.java?p2=airavata/trunk/modules/rest/mappings/src/main/java/org/apache/airavata/rest/mappings/utils/RegistryListener.java&p1=airavata/trunk/modules/rest/service/src/main/java/org/apache/airavata/services/registry/rest/utils/RegistryListener.java&r1=1416940&r2=1417062&rev=1417062&view=diff
==============================================================================
---
airavata/trunk/modules/rest/service/src/main/java/org/apache/airavata/services/registry/rest/utils/RegistryListener.java
(original)
+++
airavata/trunk/modules/rest/mappings/src/main/java/org/apache/airavata/rest/mappings/utils/RegistryListener.java
Tue Dec 4 17:51:14 2012
@@ -19,7 +19,7 @@
*
*/
-package org.apache.airavata.services.registry.rest.utils;
+package org.apache.airavata.rest.mappings.utils;
import org.apache.airavata.common.utils.ServerSettings;
import org.apache.airavata.registry.api.Gateway;
@@ -43,7 +43,8 @@ public class RegistryListener implements
servletContext.setAttribute(RestServicesConstants.GATEWAY,
gateway);
servletContext.setAttribute(RestServicesConstants.AIRAVATA_USER,
user);
-
servletContext.setAttribute(RestServicesConstants.AIRAVATA_REGISTRY_POOL,new
RegistryInstancesPool(100));
+ servletContext.setAttribute(
+ RestServicesConstants.AIRAVATA_REGISTRY_POOL,new
RegistryInstancesPool(100));
} catch (Exception e) {
e.printStackTrace();
}
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=1417062&r1=1417061&r2=1417062&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 Dec 4 17:51:14 2012
@@ -26,7 +26,7 @@ import org.apache.airavata.registry.api.
import org.apache.airavata.registry.api.AiravataUser;
import org.apache.airavata.registry.api.Gateway;
import org.apache.airavata.rest.mappings.utils.ResourcePathConstants;
-import org.apache.airavata.services.registry.rest.utils.RegPoolUtils;
+import org.apache.airavata.rest.mappings.utils.RegPoolUtils;
import javax.servlet.ServletContext;
import javax.ws.rs.*;
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=1417062&r1=1417061&r2=1417062&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 Dec 4 17:51:14 2012
@@ -26,8 +26,7 @@ import org.apache.airavata.registry.api.
import org.apache.airavata.rest.mappings.resourcemappings.ConfigurationList;
import org.apache.airavata.rest.mappings.resourcemappings.URLList;
import org.apache.airavata.rest.mappings.utils.ResourcePathConstants;
-import org.apache.airavata.rest.mappings.utils.RestServicesConstants;
-import org.apache.airavata.services.registry.rest.utils.RegPoolUtils;
+import org.apache.airavata.rest.mappings.utils.RegPoolUtils;
import javax.servlet.ServletContext;
import javax.ws.rs.*;
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=1417062&r1=1417061&r2=1417062&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 Dec 4 17:51:14 2012
@@ -32,7 +32,7 @@ import org.apache.airavata.registry.api.
import org.apache.airavata.rest.mappings.resourcemappings.*;
import org.apache.airavata.rest.mappings.utils.DescriptorUtil;
import org.apache.airavata.rest.mappings.utils.ResourcePathConstants;
-import org.apache.airavata.services.registry.rest.utils.RegPoolUtils;
+import org.apache.airavata.rest.mappings.utils.RegPoolUtils;
import javax.servlet.ServletContext;
import javax.ws.rs.*;
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=1417062&r1=1417061&r2=1417062&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 Dec 4 17:51:14 2012
@@ -30,8 +30,7 @@ import org.apache.airavata.registry.api.
import
org.apache.airavata.registry.api.exception.worker.WorkspaceProjectDoesNotExistsException;
import org.apache.airavata.rest.mappings.resourcemappings.ExperimentList;
import org.apache.airavata.rest.mappings.utils.ResourcePathConstants;
-import org.apache.airavata.rest.mappings.utils.RestServicesConstants;
-import org.apache.airavata.services.registry.rest.utils.RegPoolUtils;
+import org.apache.airavata.rest.mappings.utils.RegPoolUtils;
import javax.servlet.ServletContext;
import javax.ws.rs.*;
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=1417062&r1=1417061&r2=1417062&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 Dec 4 17:51:14 2012
@@ -28,7 +28,7 @@ import org.apache.airavata.registry.api.
import
org.apache.airavata.registry.api.exception.worker.WorkspaceProjectDoesNotExistsException;
import org.apache.airavata.rest.mappings.resourcemappings.WorkspaceProjectList;
import org.apache.airavata.rest.mappings.utils.ResourcePathConstants;
-import org.apache.airavata.services.registry.rest.utils.RegPoolUtils;
+import org.apache.airavata.rest.mappings.utils.RegPoolUtils;
import javax.servlet.ServletContext;
import javax.ws.rs.*;
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=1417062&r1=1417061&r2=1417062&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
Tue Dec 4 17:51:14 2012
@@ -29,7 +29,7 @@ import org.apache.airavata.rest.mappings
import org.apache.airavata.rest.mappings.resourcemappings.ExperimentIDList;
import
org.apache.airavata.rest.mappings.resourcemappings.WorkflowInstancesList;
import org.apache.airavata.rest.mappings.utils.ResourcePathConstants;
-import org.apache.airavata.services.registry.rest.utils.RegPoolUtils;
+import org.apache.airavata.rest.mappings.utils.RegPoolUtils;
import javax.servlet.ServletContext;
import javax.ws.rs.*;
@@ -789,7 +789,7 @@ public class ProvenanceRegistryResource
public Response getExperimentIdByUser(@QueryParam("username") String
username) {
AiravataRegistry2 airavataRegistry =
RegPoolUtils.acquireRegistry(context);
try {
- ArrayList<String> experiments = (ArrayList)
airavataRegistry.getExperimentIdByUser(username);
+ List<String> experiments =
airavataRegistry.getExperimentIdByUser(username);
ExperimentIDList experimentIDList = new ExperimentIDList();
experimentIDList.setExperimentIDList(experiments);
if (experiments.size() != 0) {
@@ -1206,8 +1206,10 @@ public class ProvenanceRegistryResource
@FormParam("nodeType") String
nodeType) {
AiravataRegistry2 airavataRegistry =
RegPoolUtils.acquireRegistry(context);
try {
- WorkflowInstanceNodeData workflowInstanceNodeData =
airavataRegistry.getWorkflowInstanceData(workflowInstanceId).getNodeData(nodeId);
- WorkflowInstanceNode workflowInstanceNode =
workflowInstanceNodeData.getWorkflowInstanceNode();
+ WorkflowInstanceNodeData workflowInstanceNodeData =
+
airavataRegistry.getWorkflowInstanceData(workflowInstanceId).getNodeData(nodeId);
+ WorkflowInstanceNode workflowInstanceNode =
+ workflowInstanceNodeData.getWorkflowInstanceNode();
WorkflowNodeType workflowNodeType = new WorkflowNodeType();
//currently from API only service node is being used
@@ -1307,7 +1309,8 @@ public class ProvenanceRegistryResource
public Response getExperimentMetaInformation(@QueryParam("experimentId")
String experimentId) {
AiravataRegistry2 airavataRegistry =
RegPoolUtils.acquireRegistry(context);
try {
- ExperimentDataImpl experimentMetaInformation =
(ExperimentDataImpl)
airavataRegistry.getExperimentMetaInformation(experimentId);
+ ExperimentDataImpl experimentMetaInformation =
+ (ExperimentDataImpl)
airavataRegistry.getExperimentMetaInformation(experimentId);
if (experimentMetaInformation != null) {
Response.ResponseBuilder builder =
Response.status(Response.Status.OK);
builder.entity(experimentMetaInformation);
@@ -1339,7 +1342,8 @@ public class ProvenanceRegistryResource
public Response getAllExperimentMetaInformation(@QueryParam("user") String
user) {
AiravataRegistry2 airavataRegistry =
RegPoolUtils.acquireRegistry(context);
try {
- List<ExperimentData> allExperimentMetaInformation =
airavataRegistry.getAllExperimentMetaInformation(user);
+ List<ExperimentData> allExperimentMetaInformation =
+ airavataRegistry.getAllExperimentMetaInformation(user);
ExperimentDataList experimentDataList = new ExperimentDataList();
List<ExperimentDataImpl> experimentDatas = new
ArrayList<ExperimentDataImpl>();
for (ExperimentData experimentData : allExperimentMetaInformation)
{
@@ -1380,7 +1384,8 @@ public class ProvenanceRegistryResource
@QueryParam("experimentNameRegex")
String experimentNameRegex) {
AiravataRegistry2 airavataRegistry =
RegPoolUtils.acquireRegistry(context);
try {
- List<ExperimentData> experimentDataList =
airavataRegistry.searchExperiments(user, experimentNameRegex);
+ List<ExperimentData> experimentDataList =
+ airavataRegistry.searchExperiments(user,
experimentNameRegex);
ExperimentDataList experimentData = new ExperimentDataList();
List<ExperimentDataImpl> experimentDatas = new
ArrayList<ExperimentDataImpl>();
for (ExperimentData experimentData1 : experimentDataList) {
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=1417062&r1=1417061&r2=1417062&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
Tue Dec 4 17:51:14 2012
@@ -30,7 +30,7 @@ import org.apache.airavata.rest.mappings
import org.apache.airavata.rest.mappings.resourcemappings.Workflow;
import org.apache.airavata.rest.mappings.resourcemappings.WorkflowList;
import org.apache.airavata.rest.mappings.utils.ResourcePathConstants;
-import org.apache.airavata.services.registry.rest.utils.RegPoolUtils;
+import org.apache.airavata.rest.mappings.utils.RegPoolUtils;
import javax.servlet.ServletContext;
import javax.ws.rs.*;
@@ -170,7 +170,8 @@ public class PublishWorkflowRegistryReso
public Response getPublishedWorkflowGraphXML(@QueryParam("workflowName")
String workflowName) {
AiravataRegistry2 airavataRegistry =
RegPoolUtils.acquireRegistry(context);
try {
- String publishedWorkflowGraphXML =
airavataRegistry.getPublishedWorkflowGraphXML(workflowName);
+ String publishedWorkflowGraphXML =
+
airavataRegistry.getPublishedWorkflowGraphXML(workflowName);
if (publishedWorkflowGraphXML != null) {
Response.ResponseBuilder builder =
Response.status(Response.Status.OK);
builder.entity(publishedWorkflowGraphXML);
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=1417062&r1=1417061&r2=1417062&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
Tue Dec 4 17:51:14 2012
@@ -28,7 +28,7 @@ import org.apache.airavata.registry.api.
import org.apache.airavata.rest.mappings.resourcemappings.Workflow;
import org.apache.airavata.rest.mappings.resourcemappings.WorkflowList;
import org.apache.airavata.rest.mappings.utils.ResourcePathConstants;
-import org.apache.airavata.services.registry.rest.utils.RegPoolUtils;
+import org.apache.airavata.rest.mappings.utils.RegPoolUtils;
import javax.servlet.ServletContext;
import javax.ws.rs.*;
Modified: airavata/trunk/modules/rest/service/src/main/webapp/WEB-INF/web.xml
URL:
http://svn.apache.org/viewvc/airavata/trunk/modules/rest/service/src/main/webapp/WEB-INF/web.xml?rev=1417062&r1=1417061&r2=1417062&view=diff
==============================================================================
--- airavata/trunk/modules/rest/service/src/main/webapp/WEB-INF/web.xml
(original)
+++ airavata/trunk/modules/rest/service/src/main/webapp/WEB-INF/web.xml Tue Dec
4 17:51:14 2012
@@ -3,7 +3,7 @@
see implementation details
http://jersey.java.net/nonav/documentation/latest/jax-rs.html#d4e194 -->
<web-app version="2.5" xmlns="http://java.sun.com/xml/ns/javaee";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd";>
<listener>
-
<listener-class>org.apache.airavata.services.registry.rest.utils.RegistryListener</listener-class>
+
<listener-class>org.apache.airavata.rest.mappings.utils.RegistryListener</listener-class>
</listener>
<servlet>
