You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by ra...@apache.org on 2014/04/29 22:50:29 UTC
git commit: Fix AIRAVATA-1170.
Repository: airavata
Updated Branches:
refs/heads/master e218fc08e -> 596a1e995
Fix AIRAVATA-1170.
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/596a1e99
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/596a1e99
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/596a1e99
Branch: refs/heads/master
Commit: 596a1e995546153e506cb46eaacf87a6cd1c0eda
Parents: e218fc0
Author: raminder <ra...@apache.org>
Authored: Tue Apr 29 16:49:08 2014 -0400
Committer: raminder <ra...@apache.org>
Committed: Tue Apr 29 16:49:08 2014 -0400
----------------------------------------------------------------------
.../registry/jpa/impl/ProjectRegistry.java | 22 ++++++++++----------
1 file changed, 11 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/596a1e99/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/impl/ProjectRegistry.java
----------------------------------------------------------------------
diff --git a/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/impl/ProjectRegistry.java b/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/impl/ProjectRegistry.java
index 63e1ada..1ff1441 100644
--- a/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/impl/ProjectRegistry.java
+++ b/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/impl/ProjectRegistry.java
@@ -21,21 +21,23 @@
package org.apache.airavata.persistance.registry.jpa.impl;
+import java.util.ArrayList;
+import java.util.List;
+
import org.apache.airavata.common.utils.AiravataUtils;
import org.apache.airavata.model.workspace.Project;
-import org.apache.airavata.persistance.registry.jpa.Resource;
import org.apache.airavata.persistance.registry.jpa.ResourceType;
import org.apache.airavata.persistance.registry.jpa.ResourceUtils;
-import org.apache.airavata.persistance.registry.jpa.resources.*;
+import org.apache.airavata.persistance.registry.jpa.resources.GatewayResource;
+import org.apache.airavata.persistance.registry.jpa.resources.ProjectResource;
+import org.apache.airavata.persistance.registry.jpa.resources.ProjectUserResource;
+import org.apache.airavata.persistance.registry.jpa.resources.UserResource;
+import org.apache.airavata.persistance.registry.jpa.resources.WorkerResource;
import org.apache.airavata.persistance.registry.jpa.utils.ThriftDataModelConversion;
import org.apache.airavata.registry.cpi.utils.Constants;
-import org.apache.axis2.i18n.ProjectResourceBundle;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import java.util.ArrayList;
-import java.util.List;
-
public class ProjectRegistry {
private GatewayResource gatewayResource;
private WorkerResource workerResource;
@@ -45,7 +47,7 @@ public class ProjectRegistry {
if (!ResourceUtils.isGatewayExist(gatewayResource.getGatewayName())){
this.gatewayResource = gatewayResource;
}else {
- gatewayResource = (GatewayResource)ResourceUtils.getGateway(gatewayResource.getGatewayName());
+ this.gatewayResource = (GatewayResource)ResourceUtils.getGateway(gatewayResource.getGatewayName());
}
if (!ResourceUtils.isUserExist(user.getUserName())){
workerResource = new WorkerResource(user.getUserName(), gatewayResource);
@@ -66,10 +68,8 @@ public class ProjectRegistry {
projectResource.setName(project.getName());
projectResource.setDescription(project.getDescription());
projectResource.setCreationTime(AiravataUtils.getTime(project.getCreationTime()));
- projectResource.setGateway(gatewayResource);
- UserResource user = (UserResource)ResourceUtils.getUser(project.getOwner());
- ResourceUtils.addGatewayWorker(gatewayResource, user);
- WorkerResource worker = new WorkerResource(project.getOwner(), gatewayResource);
+ projectResource.setGateway(workerResource.getGateway());
+ WorkerResource worker = new WorkerResource(project.getOwner(), workerResource.getGateway());
projectResource.setWorker(worker);
projectResource.save();
ProjectUserResource resource = (ProjectUserResource)projectResource.create(ResourceType.PROJECT_USER);