airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From lah...@apache.org
Subject [2/2] git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/airavata
Date Tue, 11 Feb 2014 20:49:44 GMT
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/airavata


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

Branch: refs/heads/master
Commit: cb78c9264513f5a55f1c4ed88738261d82763634
Parents: dea7937 daa536f
Author: lahiru <lahiru@apache.org>
Authored: Tue Feb 11 15:49:35 2014 -0500
Committer: lahiru <lahiru@apache.org>
Committed: Tue Feb 11 15:49:35 2014 -0500

----------------------------------------------------------------------
 .../model/util/ExperimentModelUtil.java         | 126 +++++++++++++++++++
 .../core/impl/EmbeddedGFACJobSubmitter.java     |   2 -
 .../orchestrator/core/NewOrchestratorTest.java  |   8 +-
 .../registry/jpa/impl/RegistryImpl.java         |   8 +-
 modules/registry/airavata-registry-test/pom.xml |  16 ++-
 .../api/test/AiravataRegistryAPITest.java       |   2 +-
 .../registry/api/test/util/Initialize.java      |   9 +-
 .../airavata/registry/cpi/ChildDataType.java    |  10 ++
 .../registry/cpi/DependentDataType.java         |  10 --
 .../airavata/registry/cpi/ParentDataType.java   |  12 ++
 .../apache/airavata/registry/cpi/Registry.java  |  21 +---
 .../airavata/registry/cpi/TopLevelDataType.java |  12 --
 12 files changed, 175 insertions(+), 61 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/airavata/blob/cb78c926/modules/orchestrator/orchestrator-core/src/main/java/org/apache/airavata/orchestrator/core/impl/EmbeddedGFACJobSubmitter.java
----------------------------------------------------------------------
diff --cc modules/orchestrator/orchestrator-core/src/main/java/org/apache/airavata/orchestrator/core/impl/EmbeddedGFACJobSubmitter.java
index 729fdf4,6806989..63b1135
--- a/modules/orchestrator/orchestrator-core/src/main/java/org/apache/airavata/orchestrator/core/impl/EmbeddedGFACJobSubmitter.java
+++ b/modules/orchestrator/orchestrator-core/src/main/java/org/apache/airavata/orchestrator/core/impl/EmbeddedGFACJobSubmitter.java
@@@ -45,11 -45,8 +45,9 @@@ import org.apache.airavata.orchestrator
  import org.apache.airavata.orchestrator.core.gfac.GFACInstance;
  import org.apache.airavata.orchestrator.core.job.JobSubmitter;
  import org.apache.airavata.orchestrator.core.utils.OrchestratorUtils;
 +import org.apache.airavata.registry.api.AiravataRegistry2;
  import org.apache.airavata.registry.api.JobRequest;
  import org.apache.airavata.registry.cpi.DataType;
- import org.apache.airavata.registry.cpi.DependentDataType;
- import org.apache.airavata.registry.cpi.TopLevelDataType;
  import org.slf4j.Logger;
  import org.slf4j.LoggerFactory;
  


Mime
View raw message