airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From scnakand...@apache.org
Subject airavata git commit: fixing AIRAVATA-1531
Date Thu, 09 Jul 2015 15:01:28 GMT
Repository: airavata
Updated Branches:
  refs/heads/airavata-0.15-release-branch 7b8662c70 -> 5621a0825


fixing AIRAVATA-1531


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

Branch: refs/heads/airavata-0.15-release-branch
Commit: 5621a0825d544d4ff9ab61ee64d2b6da65bf16ae
Parents: 7b8662c
Author: Supun Nakandala <scnakandala@apache.org>
Authored: Thu Jul 9 20:30:57 2015 +0530
Committer: Supun Nakandala <scnakandala@apache.org>
Committed: Thu Jul 9 20:30:57 2015 +0530

----------------------------------------------------------------------
 .../application/catalog/data/resources/AppDeploymentResource.java | 3 +++
 .../application/catalog/data/resources/AppInterfaceResource.java  | 3 +++
 .../application/catalog/data/resources/AppModuleResource.java     | 3 +++
 .../catalog/data/resources/ComputeResourceResource.java           | 3 +++
 4 files changed, 12 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/airavata/blob/5621a082/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/resources/AppDeploymentResource.java
----------------------------------------------------------------------
diff --git a/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/resources/AppDeploymentResource.java
b/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/resources/AppDeploymentResource.java
index a635666..7d1dfbd 100644
--- a/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/resources/AppDeploymentResource.java
+++ b/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/resources/AppDeploymentResource.java
@@ -37,6 +37,7 @@ import javax.persistence.EntityManager;
 import javax.persistence.Query;
 import java.sql.Timestamp;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 
 public class AppDeploymentResource extends AbstractResource {
@@ -274,6 +275,8 @@ public class AppDeploymentResource extends AbstractResource {
                 em.close();
             }
         }
+        Collections.sort(appDeployments, (o1, o2) -> ((AppDeploymentResource) o1).getCreatedTime()
+                .compareTo(((AppDeploymentResource) o2).getCreatedTime()));
         return appDeployments;
     }
 

http://git-wip-us.apache.org/repos/asf/airavata/blob/5621a082/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/resources/AppInterfaceResource.java
----------------------------------------------------------------------
diff --git a/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/resources/AppInterfaceResource.java
b/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/resources/AppInterfaceResource.java
index 3f6b60d..d434ce6 100644
--- a/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/resources/AppInterfaceResource.java
+++ b/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/resources/AppInterfaceResource.java
@@ -35,6 +35,7 @@ import javax.persistence.EntityManager;
 import javax.persistence.Query;
 import java.sql.Timestamp;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 
 public class AppInterfaceResource extends AbstractResource {
@@ -223,6 +224,8 @@ public class AppInterfaceResource extends AbstractResource {
                 em.close();
             }
         }
+        Collections.sort(resourceList, (o1, o2) -> ((AppInterfaceResource) o1).getCreatedTime()
+                .compareTo(((AppInterfaceResource) o2).getCreatedTime()));
         return resourceList;
     }
 

http://git-wip-us.apache.org/repos/asf/airavata/blob/5621a082/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/resources/AppModuleResource.java
----------------------------------------------------------------------
diff --git a/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/resources/AppModuleResource.java
b/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/resources/AppModuleResource.java
index 79803af..6ad095e 100644
--- a/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/resources/AppModuleResource.java
+++ b/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/resources/AppModuleResource.java
@@ -35,6 +35,7 @@ import javax.persistence.EntityManager;
 import javax.persistence.Query;
 import java.sql.Timestamp;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 
 public class AppModuleResource extends AbstractResource {
@@ -229,6 +230,8 @@ public class AppModuleResource extends AbstractResource {
                 em.close();
             }
         }
+        Collections.sort(appModuleResources, (o1, o2) -> ((AppModuleResource) o1).getCreatedTime()
+                .compareTo(((AppModuleResource) o2).getCreatedTime()));
         return appModuleResources;
     }
 

http://git-wip-us.apache.org/repos/asf/airavata/blob/5621a082/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/resources/ComputeResourceResource.java
----------------------------------------------------------------------
diff --git a/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/resources/ComputeResourceResource.java
b/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/resources/ComputeResourceResource.java
index 932713b..3c97dc8 100644
--- a/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/resources/ComputeResourceResource.java
+++ b/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/resources/ComputeResourceResource.java
@@ -35,6 +35,7 @@ import javax.persistence.EntityManager;
 import javax.persistence.Query;
 import java.sql.Timestamp;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 
 public class ComputeResourceResource extends AbstractResource {
@@ -190,6 +191,8 @@ public class ComputeResourceResource extends AbstractResource {
                 em.close();
             }
         }
+        Collections.sort(computeResourceResources, (o1, o2) -> ((ComputeResource) o1).getCreationTime()
+                .compareTo(((ComputeResource) o2).getCreationTime()));
         return computeResourceResources;
     }
 


Mime
View raw message