[12/50] [abbrv] airavata git commit: fixing gateway intialization issue

2016-10-03 Thread scnakandala 
fixing gateway intialization issue


Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/43b3757d
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/43b3757d
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/43b3757d

Branch: refs/heads/airavata-gov-registry
Commit: 43b3757d6c1b759a47603189e0ac0ad97339fd8b
Parents: 83a0bf8
Author: scnakandala 
Authored: Thu Sep 22 13:20:55 2016 -0400
Committer: scnakandala 
Committed: Thu Sep 22 13:20:55 2016 -0400

--
 .../core/experiment/catalog/impl/ExperimentCatalogImpl.java  | 3 ---
 .../core/experiment/catalog/resources/GatewayResource.java   | 4 
 .../registry/api/service/util/ExperimentCatalogInitUtil.java | 2 ++
 3 files changed, 2 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/airavata/blob/43b3757d/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/impl/ExperimentCatalogImpl.java
--
diff --git 
a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/impl/ExperimentCatalogImpl.java
 
b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/impl/ExperimentCatalogImpl.java
index 53bd52b..5264158 100644
--- 
a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/impl/ExperimentCatalogImpl.java
+++ 
b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/impl/ExperimentCatalogImpl.java
@@ -38,7 +38,6 @@ import org.apache.airavata.model.status.ProcessStatus;
 import org.apache.airavata.model.status.TaskStatus;
 import org.apache.airavata.model.task.TaskModel;
 import org.apache.airavata.model.workspace.Gateway;
-import org.apache.airavata.model.workspace.GatewayApprovalStatus;
 import org.apache.airavata.model.workspace.Notification;
 import org.apache.airavata.model.workspace.Project;
 import 
org.apache.airavata.registry.core.experiment.catalog.ExpCatResourceUtils;
@@ -66,7 +65,6 @@ public class ExperimentCatalogImpl implements 
ExperimentCatalog {
 if 
(!ExpCatResourceUtils.isGatewayExist(ServerSettings.getDefaultUserGateway())){
 gatewayResource = (GatewayResource) 
ExpCatResourceUtils.createGateway(ServerSettings.getDefaultUserGateway());
 
gatewayResource.setGatewayName(ServerSettings.getDefaultUserGateway());
-
gatewayResource.setGatewayApprovalStatus(GatewayApprovalStatus.APPROVED.toString());
 gatewayResource.save();
 }else {
 gatewayResource = (GatewayResource) 
ExpCatResourceUtils.getGateway(ServerSettings.getDefaultUserGateway());
@@ -92,7 +90,6 @@ public class ExperimentCatalogImpl implements 
ExperimentCatalog {
 if (!ExpCatResourceUtils.isGatewayExist(gateway)){
 gatewayResource = (GatewayResource) 
ExpCatResourceUtils.createGateway(gateway);
 gatewayResource.setGatewayName(gateway);
-
gatewayResource.setGatewayApprovalStatus(GatewayApprovalStatus.APPROVED.toString());
 gatewayResource.save();
 }else {
 gatewayResource = (GatewayResource) 
ExpCatResourceUtils.getGateway(gateway);

http://git-wip-us.apache.org/repos/asf/airavata/blob/43b3757d/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/GatewayResource.java
--
diff --git 
a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/GatewayResource.java
 
b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/GatewayResource.java
index c745f4e..646594e 100644
--- 
a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/GatewayResource.java
+++ 
b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/GatewayResource.java
@@ -20,7 +20,6 @@
 */
 package org.apache.airavata.registry.core.experiment.catalog.resources;
 
-import org.apache.airavata.model.workspace.GatewayApprovalStatus;
 import 
org.apache.airavata.registry.core.experiment.catalog.ExpCatResourceUtils;
 import 
org.apache.airavata.registry.core.experiment.catalog.ExperimentCatResource;
 import org.apache.airavata.registry.core.experiment.catalog.ResourceType;
@@ -462,9 +461,6 @@ public class GatewayResource extends AbstractExpCatResource 
{
 Gateway existingGateway = em.find(Gateway.class, gatewayId);
 em.close();
 
-if(gatewayApprovalStatus == nul

[10/50] [abbrv] airavata git commit: fixing gateway intialization issue

2016-10-03 Thread scnakandala 
fixing gateway intialization issue


Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/264f616f
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/264f616f
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/264f616f

Branch: refs/heads/airavata-gov-registry
Commit: 264f616ffecd585d92e650685b504101208e79dc
Parents: c084683
Author: scnakandala 
Authored: Thu Sep 22 12:32:49 2016 -0400
Committer: scnakandala 
Committed: Thu Sep 22 12:32:49 2016 -0400

--
 .../core/experiment/catalog/impl/ExperimentCatalogImpl.java| 2 ++
 1 file changed, 2 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/airavata/blob/264f616f/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/impl/ExperimentCatalogImpl.java
--
diff --git 
a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/impl/ExperimentCatalogImpl.java
 
b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/impl/ExperimentCatalogImpl.java
index 8494493..53bd52b 100644
--- 
a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/impl/ExperimentCatalogImpl.java
+++ 
b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/impl/ExperimentCatalogImpl.java
@@ -91,6 +91,8 @@ public class ExperimentCatalogImpl implements 
ExperimentCatalog {
 public ExperimentCatalogImpl(String gateway, String username, String 
password) throws RegistryException{
 if (!ExpCatResourceUtils.isGatewayExist(gateway)){
 gatewayResource = (GatewayResource) 
ExpCatResourceUtils.createGateway(gateway);
+gatewayResource.setGatewayName(gateway);
+
gatewayResource.setGatewayApprovalStatus(GatewayApprovalStatus.APPROVED.toString());
 gatewayResource.save();
 }else {
 gatewayResource = (GatewayResource) 
ExpCatResourceUtils.getGateway(gateway);

[11/50] [abbrv] airavata git commit: fixing gateway intialization issue

2016-10-03 Thread scnakandala 
fixing gateway intialization issue


Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/83a0bf87
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/83a0bf87
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/83a0bf87

Branch: refs/heads/airavata-gov-registry
Commit: 83a0bf8795730d712449653af1f484d9cf152d3f
Parents: 264f616
Author: scnakandala 
Authored: Thu Sep 22 12:54:39 2016 -0400
Committer: scnakandala 
Committed: Thu Sep 22 12:54:39 2016 -0400

--
 .../core/experiment/catalog/resources/GatewayResource.java   | 4 
 1 file changed, 4 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/airavata/blob/83a0bf87/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/GatewayResource.java
--
diff --git 
a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/GatewayResource.java
 
b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/GatewayResource.java
index 646594e..c745f4e 100644
--- 
a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/GatewayResource.java
+++ 
b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/GatewayResource.java
@@ -20,6 +20,7 @@
 */
 package org.apache.airavata.registry.core.experiment.catalog.resources;
 
+import org.apache.airavata.model.workspace.GatewayApprovalStatus;
 import 
org.apache.airavata.registry.core.experiment.catalog.ExpCatResourceUtils;
 import 
org.apache.airavata.registry.core.experiment.catalog.ExperimentCatResource;
 import org.apache.airavata.registry.core.experiment.catalog.ResourceType;
@@ -461,6 +462,9 @@ public class GatewayResource extends AbstractExpCatResource 
{
 Gateway existingGateway = em.find(Gateway.class, gatewayId);
 em.close();
 
+if(gatewayApprovalStatus == null || 
gatewayApprovalStatus.isEmpty())
+gatewayApprovalStatus = 
GatewayApprovalStatus.APPROVED.toString();
+
 em = ExpCatResourceUtils.getEntityManager();
 em.getTransaction().begin();
 Gateway gateway = new Gateway();

[37/49] airavata git commit: fixing gateway intialization issue

2016-10-01 Thread lahiru 
fixing gateway intialization issue


Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/264f616f
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/264f616f
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/264f616f

Branch: refs/heads/lahiru/AIRAVATA-2107
Commit: 264f616ffecd585d92e650685b504101208e79dc
Parents: c084683
Author: scnakandala 
Authored: Thu Sep 22 12:32:49 2016 -0400
Committer: scnakandala 
Committed: Thu Sep 22 12:32:49 2016 -0400

--
 .../core/experiment/catalog/impl/ExperimentCatalogImpl.java| 2 ++
 1 file changed, 2 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/airavata/blob/264f616f/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/impl/ExperimentCatalogImpl.java
--
diff --git 
a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/impl/ExperimentCatalogImpl.java
 
b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/impl/ExperimentCatalogImpl.java
index 8494493..53bd52b 100644
--- 
a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/impl/ExperimentCatalogImpl.java
+++ 
b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/impl/ExperimentCatalogImpl.java
@@ -91,6 +91,8 @@ public class ExperimentCatalogImpl implements 
ExperimentCatalog {
 public ExperimentCatalogImpl(String gateway, String username, String 
password) throws RegistryException{
 if (!ExpCatResourceUtils.isGatewayExist(gateway)){
 gatewayResource = (GatewayResource) 
ExpCatResourceUtils.createGateway(gateway);
+gatewayResource.setGatewayName(gateway);
+
gatewayResource.setGatewayApprovalStatus(GatewayApprovalStatus.APPROVED.toString());
 gatewayResource.save();
 }else {
 gatewayResource = (GatewayResource) 
ExpCatResourceUtils.getGateway(gateway);

[39/49] airavata git commit: fixing gateway intialization issue

2016-10-01 Thread lahiru 
fixing gateway intialization issue


Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/43b3757d
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/43b3757d
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/43b3757d

Branch: refs/heads/lahiru/AIRAVATA-2107
Commit: 43b3757d6c1b759a47603189e0ac0ad97339fd8b
Parents: 83a0bf8
Author: scnakandala 
Authored: Thu Sep 22 13:20:55 2016 -0400
Committer: scnakandala 
Committed: Thu Sep 22 13:20:55 2016 -0400

--
 .../core/experiment/catalog/impl/ExperimentCatalogImpl.java  | 3 ---
 .../core/experiment/catalog/resources/GatewayResource.java   | 4 
 .../registry/api/service/util/ExperimentCatalogInitUtil.java | 2 ++
 3 files changed, 2 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/airavata/blob/43b3757d/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/impl/ExperimentCatalogImpl.java
--
diff --git 
a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/impl/ExperimentCatalogImpl.java
 
b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/impl/ExperimentCatalogImpl.java
index 53bd52b..5264158 100644
--- 
a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/impl/ExperimentCatalogImpl.java
+++ 
b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/impl/ExperimentCatalogImpl.java
@@ -38,7 +38,6 @@ import org.apache.airavata.model.status.ProcessStatus;
 import org.apache.airavata.model.status.TaskStatus;
 import org.apache.airavata.model.task.TaskModel;
 import org.apache.airavata.model.workspace.Gateway;
-import org.apache.airavata.model.workspace.GatewayApprovalStatus;
 import org.apache.airavata.model.workspace.Notification;
 import org.apache.airavata.model.workspace.Project;
 import 
org.apache.airavata.registry.core.experiment.catalog.ExpCatResourceUtils;
@@ -66,7 +65,6 @@ public class ExperimentCatalogImpl implements 
ExperimentCatalog {
 if 
(!ExpCatResourceUtils.isGatewayExist(ServerSettings.getDefaultUserGateway())){
 gatewayResource = (GatewayResource) 
ExpCatResourceUtils.createGateway(ServerSettings.getDefaultUserGateway());
 
gatewayResource.setGatewayName(ServerSettings.getDefaultUserGateway());
-
gatewayResource.setGatewayApprovalStatus(GatewayApprovalStatus.APPROVED.toString());
 gatewayResource.save();
 }else {
 gatewayResource = (GatewayResource) 
ExpCatResourceUtils.getGateway(ServerSettings.getDefaultUserGateway());
@@ -92,7 +90,6 @@ public class ExperimentCatalogImpl implements 
ExperimentCatalog {
 if (!ExpCatResourceUtils.isGatewayExist(gateway)){
 gatewayResource = (GatewayResource) 
ExpCatResourceUtils.createGateway(gateway);
 gatewayResource.setGatewayName(gateway);
-
gatewayResource.setGatewayApprovalStatus(GatewayApprovalStatus.APPROVED.toString());
 gatewayResource.save();
 }else {
 gatewayResource = (GatewayResource) 
ExpCatResourceUtils.getGateway(gateway);

http://git-wip-us.apache.org/repos/asf/airavata/blob/43b3757d/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/GatewayResource.java
--
diff --git 
a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/GatewayResource.java
 
b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/GatewayResource.java
index c745f4e..646594e 100644
--- 
a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/GatewayResource.java
+++ 
b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/GatewayResource.java
@@ -20,7 +20,6 @@
 */
 package org.apache.airavata.registry.core.experiment.catalog.resources;
 
-import org.apache.airavata.model.workspace.GatewayApprovalStatus;
 import 
org.apache.airavata.registry.core.experiment.catalog.ExpCatResourceUtils;
 import 
org.apache.airavata.registry.core.experiment.catalog.ExperimentCatResource;
 import org.apache.airavata.registry.core.experiment.catalog.ResourceType;
@@ -462,9 +461,6 @@ public class GatewayResource extends AbstractExpCatResource 
{
 Gateway existingGateway = em.find(Gateway.class, gatewayId);
 em.close();
 
-if(gatewayApprovalStatus == null

[38/49] airavata git commit: fixing gateway intialization issue

2016-10-01 Thread lahiru 
fixing gateway intialization issue


Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/83a0bf87
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/83a0bf87
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/83a0bf87

Branch: refs/heads/lahiru/AIRAVATA-2107
Commit: 83a0bf8795730d712449653af1f484d9cf152d3f
Parents: 264f616
Author: scnakandala 
Authored: Thu Sep 22 12:54:39 2016 -0400
Committer: scnakandala 
Committed: Thu Sep 22 12:54:39 2016 -0400

--
 .../core/experiment/catalog/resources/GatewayResource.java   | 4 
 1 file changed, 4 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/airavata/blob/83a0bf87/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/GatewayResource.java
--
diff --git 
a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/GatewayResource.java
 
b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/GatewayResource.java
index 646594e..c745f4e 100644
--- 
a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/GatewayResource.java
+++ 
b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/GatewayResource.java
@@ -20,6 +20,7 @@
 */
 package org.apache.airavata.registry.core.experiment.catalog.resources;
 
+import org.apache.airavata.model.workspace.GatewayApprovalStatus;
 import 
org.apache.airavata.registry.core.experiment.catalog.ExpCatResourceUtils;
 import 
org.apache.airavata.registry.core.experiment.catalog.ExperimentCatResource;
 import org.apache.airavata.registry.core.experiment.catalog.ResourceType;
@@ -461,6 +462,9 @@ public class GatewayResource extends AbstractExpCatResource 
{
 Gateway existingGateway = em.find(Gateway.class, gatewayId);
 em.close();
 
+if(gatewayApprovalStatus == null || 
gatewayApprovalStatus.isEmpty())
+gatewayApprovalStatus = 
GatewayApprovalStatus.APPROVED.toString();
+
 em = ExpCatResourceUtils.getEntityManager();
 em.getTransaction().begin();
 Gateway gateway = new Gateway();

[42/50] [abbrv] airavata git commit: fixing gateway intialization issue

2016-09-29 Thread lahiru 
fixing gateway intialization issue


Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/43b3757d
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/43b3757d
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/43b3757d

Branch: refs/heads/lahiru/AIRAVATA-2065
Commit: 43b3757d6c1b759a47603189e0ac0ad97339fd8b
Parents: 83a0bf8
Author: scnakandala 
Authored: Thu Sep 22 13:20:55 2016 -0400
Committer: scnakandala 
Committed: Thu Sep 22 13:20:55 2016 -0400

--
 .../core/experiment/catalog/impl/ExperimentCatalogImpl.java  | 3 ---
 .../core/experiment/catalog/resources/GatewayResource.java   | 4 
 .../registry/api/service/util/ExperimentCatalogInitUtil.java | 2 ++
 3 files changed, 2 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/airavata/blob/43b3757d/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/impl/ExperimentCatalogImpl.java
--
diff --git 
a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/impl/ExperimentCatalogImpl.java
 
b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/impl/ExperimentCatalogImpl.java
index 53bd52b..5264158 100644
--- 
a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/impl/ExperimentCatalogImpl.java
+++ 
b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/impl/ExperimentCatalogImpl.java
@@ -38,7 +38,6 @@ import org.apache.airavata.model.status.ProcessStatus;
 import org.apache.airavata.model.status.TaskStatus;
 import org.apache.airavata.model.task.TaskModel;
 import org.apache.airavata.model.workspace.Gateway;
-import org.apache.airavata.model.workspace.GatewayApprovalStatus;
 import org.apache.airavata.model.workspace.Notification;
 import org.apache.airavata.model.workspace.Project;
 import 
org.apache.airavata.registry.core.experiment.catalog.ExpCatResourceUtils;
@@ -66,7 +65,6 @@ public class ExperimentCatalogImpl implements 
ExperimentCatalog {
 if 
(!ExpCatResourceUtils.isGatewayExist(ServerSettings.getDefaultUserGateway())){
 gatewayResource = (GatewayResource) 
ExpCatResourceUtils.createGateway(ServerSettings.getDefaultUserGateway());
 
gatewayResource.setGatewayName(ServerSettings.getDefaultUserGateway());
-
gatewayResource.setGatewayApprovalStatus(GatewayApprovalStatus.APPROVED.toString());
 gatewayResource.save();
 }else {
 gatewayResource = (GatewayResource) 
ExpCatResourceUtils.getGateway(ServerSettings.getDefaultUserGateway());
@@ -92,7 +90,6 @@ public class ExperimentCatalogImpl implements 
ExperimentCatalog {
 if (!ExpCatResourceUtils.isGatewayExist(gateway)){
 gatewayResource = (GatewayResource) 
ExpCatResourceUtils.createGateway(gateway);
 gatewayResource.setGatewayName(gateway);
-
gatewayResource.setGatewayApprovalStatus(GatewayApprovalStatus.APPROVED.toString());
 gatewayResource.save();
 }else {
 gatewayResource = (GatewayResource) 
ExpCatResourceUtils.getGateway(gateway);

http://git-wip-us.apache.org/repos/asf/airavata/blob/43b3757d/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/GatewayResource.java
--
diff --git 
a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/GatewayResource.java
 
b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/GatewayResource.java
index c745f4e..646594e 100644
--- 
a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/GatewayResource.java
+++ 
b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/GatewayResource.java
@@ -20,7 +20,6 @@
 */
 package org.apache.airavata.registry.core.experiment.catalog.resources;
 
-import org.apache.airavata.model.workspace.GatewayApprovalStatus;
 import 
org.apache.airavata.registry.core.experiment.catalog.ExpCatResourceUtils;
 import 
org.apache.airavata.registry.core.experiment.catalog.ExperimentCatResource;
 import org.apache.airavata.registry.core.experiment.catalog.ResourceType;
@@ -462,9 +461,6 @@ public class GatewayResource extends AbstractExpCatResource 
{
 Gateway existingGateway = em.find(Gateway.class, gatewayId);
 em.close();
 
-if(gatewayApprovalStatus == null

[40/50] [abbrv] airavata git commit: fixing gateway intialization issue

2016-09-29 Thread lahiru 
fixing gateway intialization issue


Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/264f616f
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/264f616f
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/264f616f

Branch: refs/heads/lahiru/AIRAVATA-2065
Commit: 264f616ffecd585d92e650685b504101208e79dc
Parents: c084683
Author: scnakandala 
Authored: Thu Sep 22 12:32:49 2016 -0400
Committer: scnakandala 
Committed: Thu Sep 22 12:32:49 2016 -0400

--
 .../core/experiment/catalog/impl/ExperimentCatalogImpl.java| 2 ++
 1 file changed, 2 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/airavata/blob/264f616f/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/impl/ExperimentCatalogImpl.java
--
diff --git 
a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/impl/ExperimentCatalogImpl.java
 
b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/impl/ExperimentCatalogImpl.java
index 8494493..53bd52b 100644
--- 
a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/impl/ExperimentCatalogImpl.java
+++ 
b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/impl/ExperimentCatalogImpl.java
@@ -91,6 +91,8 @@ public class ExperimentCatalogImpl implements 
ExperimentCatalog {
 public ExperimentCatalogImpl(String gateway, String username, String 
password) throws RegistryException{
 if (!ExpCatResourceUtils.isGatewayExist(gateway)){
 gatewayResource = (GatewayResource) 
ExpCatResourceUtils.createGateway(gateway);
+gatewayResource.setGatewayName(gateway);
+
gatewayResource.setGatewayApprovalStatus(GatewayApprovalStatus.APPROVED.toString());
 gatewayResource.save();
 }else {
 gatewayResource = (GatewayResource) 
ExpCatResourceUtils.getGateway(gateway);

[41/50] [abbrv] airavata git commit: fixing gateway intialization issue

2016-09-29 Thread lahiru 
fixing gateway intialization issue


Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/83a0bf87
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/83a0bf87
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/83a0bf87

Branch: refs/heads/lahiru/AIRAVATA-2065
Commit: 83a0bf8795730d712449653af1f484d9cf152d3f
Parents: 264f616
Author: scnakandala 
Authored: Thu Sep 22 12:54:39 2016 -0400
Committer: scnakandala 
Committed: Thu Sep 22 12:54:39 2016 -0400

--
 .../core/experiment/catalog/resources/GatewayResource.java   | 4 
 1 file changed, 4 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/airavata/blob/83a0bf87/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/GatewayResource.java
--
diff --git 
a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/GatewayResource.java
 
b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/GatewayResource.java
index 646594e..c745f4e 100644
--- 
a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/GatewayResource.java
+++ 
b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/GatewayResource.java
@@ -20,6 +20,7 @@
 */
 package org.apache.airavata.registry.core.experiment.catalog.resources;
 
+import org.apache.airavata.model.workspace.GatewayApprovalStatus;
 import 
org.apache.airavata.registry.core.experiment.catalog.ExpCatResourceUtils;
 import 
org.apache.airavata.registry.core.experiment.catalog.ExperimentCatResource;
 import org.apache.airavata.registry.core.experiment.catalog.ResourceType;
@@ -461,6 +462,9 @@ public class GatewayResource extends AbstractExpCatResource 
{
 Gateway existingGateway = em.find(Gateway.class, gatewayId);
 em.close();
 
+if(gatewayApprovalStatus == null || 
gatewayApprovalStatus.isEmpty())
+gatewayApprovalStatus = 
GatewayApprovalStatus.APPROVED.toString();
+
 em = ExpCatResourceUtils.getEntityManager();
 em.getTransaction().begin();
 Gateway gateway = new Gateway();

airavata git commit: fixing gateway intialization issue

2016-09-22 Thread scnakandala 
Repository: airavata
Updated Branches:
  refs/heads/develop 83a0bf879 -> 43b3757d6


fixing gateway intialization issue


Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/43b3757d
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/43b3757d
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/43b3757d

Branch: refs/heads/develop
Commit: 43b3757d6c1b759a47603189e0ac0ad97339fd8b
Parents: 83a0bf8
Author: scnakandala 
Authored: Thu Sep 22 13:20:55 2016 -0400
Committer: scnakandala 
Committed: Thu Sep 22 13:20:55 2016 -0400

--
 .../core/experiment/catalog/impl/ExperimentCatalogImpl.java  | 3 ---
 .../core/experiment/catalog/resources/GatewayResource.java   | 4 
 .../registry/api/service/util/ExperimentCatalogInitUtil.java | 2 ++
 3 files changed, 2 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/airavata/blob/43b3757d/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/impl/ExperimentCatalogImpl.java
--
diff --git 
a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/impl/ExperimentCatalogImpl.java
 
b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/impl/ExperimentCatalogImpl.java
index 53bd52b..5264158 100644
--- 
a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/impl/ExperimentCatalogImpl.java
+++ 
b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/impl/ExperimentCatalogImpl.java
@@ -38,7 +38,6 @@ import org.apache.airavata.model.status.ProcessStatus;
 import org.apache.airavata.model.status.TaskStatus;
 import org.apache.airavata.model.task.TaskModel;
 import org.apache.airavata.model.workspace.Gateway;
-import org.apache.airavata.model.workspace.GatewayApprovalStatus;
 import org.apache.airavata.model.workspace.Notification;
 import org.apache.airavata.model.workspace.Project;
 import 
org.apache.airavata.registry.core.experiment.catalog.ExpCatResourceUtils;
@@ -66,7 +65,6 @@ public class ExperimentCatalogImpl implements 
ExperimentCatalog {
 if 
(!ExpCatResourceUtils.isGatewayExist(ServerSettings.getDefaultUserGateway())){
 gatewayResource = (GatewayResource) 
ExpCatResourceUtils.createGateway(ServerSettings.getDefaultUserGateway());
 
gatewayResource.setGatewayName(ServerSettings.getDefaultUserGateway());
-
gatewayResource.setGatewayApprovalStatus(GatewayApprovalStatus.APPROVED.toString());
 gatewayResource.save();
 }else {
 gatewayResource = (GatewayResource) 
ExpCatResourceUtils.getGateway(ServerSettings.getDefaultUserGateway());
@@ -92,7 +90,6 @@ public class ExperimentCatalogImpl implements 
ExperimentCatalog {
 if (!ExpCatResourceUtils.isGatewayExist(gateway)){
 gatewayResource = (GatewayResource) 
ExpCatResourceUtils.createGateway(gateway);
 gatewayResource.setGatewayName(gateway);
-
gatewayResource.setGatewayApprovalStatus(GatewayApprovalStatus.APPROVED.toString());
 gatewayResource.save();
 }else {
 gatewayResource = (GatewayResource) 
ExpCatResourceUtils.getGateway(gateway);

http://git-wip-us.apache.org/repos/asf/airavata/blob/43b3757d/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/GatewayResource.java
--
diff --git 
a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/GatewayResource.java
 
b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/GatewayResource.java
index c745f4e..646594e 100644
--- 
a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/GatewayResource.java
+++ 
b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/GatewayResource.java
@@ -20,7 +20,6 @@
 */
 package org.apache.airavata.registry.core.experiment.catalog.resources;
 
-import org.apache.airavata.model.workspace.GatewayApprovalStatus;
 import 
org.apache.airavata.registry.core.experiment.catalog.ExpCatResourceUtils;
 import 
org.apache.airavata.registry.core.experiment.catalog.ExperimentCatResource;
 import org.apache.airavata.registry.core.experiment.catalog.ResourceType;
@@ -462,9 +461,6 @@ public class GatewayResource extends AbstractExpCatResource 
{
 Gateway existingGateway = em.find(Gateway.class, gatewayId);

airavata git commit: fixing gateway intialization issue

2016-09-22 Thread scnakandala 
Repository: airavata
Updated Branches:
  refs/heads/develop 264f616ff -> 83a0bf879


fixing gateway intialization issue


Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/83a0bf87
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/83a0bf87
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/83a0bf87

Branch: refs/heads/develop
Commit: 83a0bf8795730d712449653af1f484d9cf152d3f
Parents: 264f616
Author: scnakandala 
Authored: Thu Sep 22 12:54:39 2016 -0400
Committer: scnakandala 
Committed: Thu Sep 22 12:54:39 2016 -0400

--
 .../core/experiment/catalog/resources/GatewayResource.java   | 4 
 1 file changed, 4 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/airavata/blob/83a0bf87/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/GatewayResource.java
--
diff --git 
a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/GatewayResource.java
 
b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/GatewayResource.java
index 646594e..c745f4e 100644
--- 
a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/GatewayResource.java
+++ 
b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/GatewayResource.java
@@ -20,6 +20,7 @@
 */
 package org.apache.airavata.registry.core.experiment.catalog.resources;
 
+import org.apache.airavata.model.workspace.GatewayApprovalStatus;
 import 
org.apache.airavata.registry.core.experiment.catalog.ExpCatResourceUtils;
 import 
org.apache.airavata.registry.core.experiment.catalog.ExperimentCatResource;
 import org.apache.airavata.registry.core.experiment.catalog.ResourceType;
@@ -461,6 +462,9 @@ public class GatewayResource extends AbstractExpCatResource 
{
 Gateway existingGateway = em.find(Gateway.class, gatewayId);
 em.close();
 
+if(gatewayApprovalStatus == null || 
gatewayApprovalStatus.isEmpty())
+gatewayApprovalStatus = 
GatewayApprovalStatus.APPROVED.toString();
+
 em = ExpCatResourceUtils.getEntityManager();
 em.getTransaction().begin();
 Gateway gateway = new Gateway();

airavata git commit: fixing gateway intialization issue

2016-09-22 Thread scnakandala 
Repository: airavata
Updated Branches:
  refs/heads/develop c08468357 -> 264f616ff


fixing gateway intialization issue


Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/264f616f
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/264f616f
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/264f616f

Branch: refs/heads/develop
Commit: 264f616ffecd585d92e650685b504101208e79dc
Parents: c084683
Author: scnakandala 
Authored: Thu Sep 22 12:32:49 2016 -0400
Committer: scnakandala 
Committed: Thu Sep 22 12:32:49 2016 -0400

--
 .../core/experiment/catalog/impl/ExperimentCatalogImpl.java| 2 ++
 1 file changed, 2 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/airavata/blob/264f616f/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/impl/ExperimentCatalogImpl.java
--
diff --git 
a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/impl/ExperimentCatalogImpl.java
 
b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/impl/ExperimentCatalogImpl.java
index 8494493..53bd52b 100644
--- 
a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/impl/ExperimentCatalogImpl.java
+++ 
b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/impl/ExperimentCatalogImpl.java
@@ -91,6 +91,8 @@ public class ExperimentCatalogImpl implements 
ExperimentCatalog {
 public ExperimentCatalogImpl(String gateway, String username, String 
password) throws RegistryException{
 if (!ExpCatResourceUtils.isGatewayExist(gateway)){
 gatewayResource = (GatewayResource) 
ExpCatResourceUtils.createGateway(gateway);
+gatewayResource.setGatewayName(gateway);
+
gatewayResource.setGatewayApprovalStatus(GatewayApprovalStatus.APPROVED.toString());
 gatewayResource.save();
 }else {
 gatewayResource = (GatewayResource) 
ExpCatResourceUtils.getGateway(gateway);