airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chath...@apache.org
Subject [49/51] [abbrv] airavata git commit: merge task breakdown branch with master
Date Tue, 03 Nov 2015 19:48:14 GMT
http://git-wip-us.apache.org/repos/asf/airavata/blob/ef332fcb/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Gateway.java
----------------------------------------------------------------------
diff --cc airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Gateway.java
index 34f42f5,39b454c..1a51186
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Gateway.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Gateway.java
@@@ -51,7 -51,7 +51,7 @@@ import org.slf4j.Logger
  import org.slf4j.LoggerFactory;
  
  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
- @Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-10-23")
 -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-10-21")
++@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-11-3")
  public class Gateway implements org.apache.thrift.TBase<Gateway, Gateway._Fields>,
java.io.Serializable, Cloneable, Comparable<Gateway> {
    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("Gateway");
  

http://git-wip-us.apache.org/repos/asf/airavata/blob/ef332fcb/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Group.java
----------------------------------------------------------------------
diff --cc airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Group.java
index 63a6ac3,9bbc875..dd1e048
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Group.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Group.java
@@@ -51,7 -51,7 +51,7 @@@ import org.slf4j.Logger
  import org.slf4j.LoggerFactory;
  
  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
- @Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-10-23")
 -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-10-21")
++@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-11-3")
  public class Group implements org.apache.thrift.TBase<Group, Group._Fields>, java.io.Serializable,
Cloneable, Comparable<Group> {
    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("Group");
  

http://git-wip-us.apache.org/repos/asf/airavata/blob/ef332fcb/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Project.java
----------------------------------------------------------------------
diff --cc airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Project.java
index 3906860,e41a65c..46e7aeb
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Project.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Project.java
@@@ -51,7 -51,7 +51,7 @@@ import org.slf4j.Logger
  import org.slf4j.LoggerFactory;
  
  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
- @Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-10-23")
 -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-10-21")
++@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-11-3")
  public class Project implements org.apache.thrift.TBase<Project, Project._Fields>,
java.io.Serializable, Cloneable, Comparable<Project> {
    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("Project");
  

http://git-wip-us.apache.org/repos/asf/airavata/blob/ef332fcb/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/User.java
----------------------------------------------------------------------
diff --cc airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/User.java
index 113c9f2,d51cc18..1017da9
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/User.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/User.java
@@@ -51,7 -51,7 +51,7 @@@ import org.slf4j.Logger
  import org.slf4j.LoggerFactory;
  
  @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
- @Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-10-23")
 -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-10-21")
++@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-11-3")
  public class User implements org.apache.thrift.TBase<User, User._Fields>, java.io.Serializable,
Cloneable, Comparable<User> {
    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("User");
  

http://git-wip-us.apache.org/repos/asf/airavata/blob/ef332fcb/modules/configuration/server/src/main/resources/PBSTemplate.xslt
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/airavata/blob/ef332fcb/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/GFacUtils.java
----------------------------------------------------------------------
diff --cc modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/GFacUtils.java
index 47be151,f40e8ae..4c9d07d
--- a/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/GFacUtils.java
+++ b/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/GFacUtils.java
@@@ -46,15 -41,15 +42,17 @@@ import org.apache.airavata.model.messag
  import org.apache.airavata.model.process.ProcessModel;
  import org.apache.airavata.model.scheduling.ComputationalResourceSchedulingModel;
  import org.apache.airavata.model.status.*;
+ import org.apache.airavata.model.task.JobSubmissionTaskModel;
  import org.apache.airavata.registry.core.experiment.catalog.impl.RegistryFactory;
 +import org.apache.airavata.registry.core.experiment.catalog.model.ProcessOutput;
  import org.apache.airavata.registry.cpi.*;
  import org.apache.airavata.registry.cpi.utils.Constants;
  import org.apache.commons.io.FileUtils;
  import org.apache.curator.framework.CuratorFramework;
  import org.apache.curator.utils.ZKPaths;
+ import org.apache.thrift.TException;
  import org.apache.zookeeper.CreateMode;
 +import org.apache.zookeeper.KeeperException;
  import org.apache.zookeeper.ZooDefs;
  import org.apache.zookeeper.data.ACL;
  import org.apache.zookeeper.data.Stat;

http://git-wip-us.apache.org/repos/asf/airavata/blob/ef332fcb/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/impl/ExperimentRegistry.java
----------------------------------------------------------------------


Mime
View raw message