You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by la...@apache.org on 2014/06/29 15:06:21 UTC
[1/2] git commit: fixing a bulid error
Repository: airavata
Updated Branches:
refs/heads/master eaf09bd90 -> abd7f1981
fixing a bulid error
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/ac8bbf07
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/ac8bbf07
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/ac8bbf07
Branch: refs/heads/master
Commit: ac8bbf0710713c3ad69287ce145a532b14cd7676
Parents: 33a6d8b
Author: lahiru <la...@apache.org>
Authored: Sun Jun 29 09:05:23 2014 -0400
Committer: lahiru <la...@apache.org>
Committed: Sun Jun 29 09:05:23 2014 -0400
----------------------------------------------------------------------
.../org/apache/airavata/orchestrator/core/NewOrchestratorTest.java | 2 +-
.../orchestrator/core/OrchestratorTestWithMyProxyAuth.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/ac8bbf07/modules/orchestrator/orchestrator-core/src/test/java/org/apache/airavata/orchestrator/core/NewOrchestratorTest.java
----------------------------------------------------------------------
diff --git a/modules/orchestrator/orchestrator-core/src/test/java/org/apache/airavata/orchestrator/core/NewOrchestratorTest.java b/modules/orchestrator/orchestrator-core/src/test/java/org/apache/airavata/orchestrator/core/NewOrchestratorTest.java
index fd13cd4..36bd720 100644
--- a/modules/orchestrator/orchestrator-core/src/test/java/org/apache/airavata/orchestrator/core/NewOrchestratorTest.java
+++ b/modules/orchestrator/orchestrator-core/src/test/java/org/apache/airavata/orchestrator/core/NewOrchestratorTest.java
@@ -98,7 +98,7 @@ public class NewOrchestratorTest extends BaseOrchestratorTest {
simpleExperiment.setExperimentID(experimentId);
tasks = orchestrator.createTasks(experimentId);
for(TaskDetails details:tasks) {
- orchestrator.launchExperiment(simpleExperiment,test, details);
+ orchestrator.launchExperiment(simpleExperiment,test, details,null);
}
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/ac8bbf07/modules/orchestrator/orchestrator-core/src/test/java/org/apache/airavata/orchestrator/core/OrchestratorTestWithMyProxyAuth.java
----------------------------------------------------------------------
diff --git a/modules/orchestrator/orchestrator-core/src/test/java/org/apache/airavata/orchestrator/core/OrchestratorTestWithMyProxyAuth.java b/modules/orchestrator/orchestrator-core/src/test/java/org/apache/airavata/orchestrator/core/OrchestratorTestWithMyProxyAuth.java
index f3d6768..102e707 100644
--- a/modules/orchestrator/orchestrator-core/src/test/java/org/apache/airavata/orchestrator/core/OrchestratorTestWithMyProxyAuth.java
+++ b/modules/orchestrator/orchestrator-core/src/test/java/org/apache/airavata/orchestrator/core/OrchestratorTestWithMyProxyAuth.java
@@ -91,7 +91,7 @@ public class OrchestratorTestWithMyProxyAuth extends BaseOrchestratorTest {
for (TaskDetails taskDetail: tasks)
{
- orchestrator.launchExperiment(simpleExperiment,test, taskDetail);
+ orchestrator.launchExperiment(simpleExperiment,test, taskDetail,null);
}
}
}
[2/2] git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/airavata
Posted by la...@apache.org.
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/abd7f198
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/abd7f198
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/abd7f198
Branch: refs/heads/master
Commit: abd7f198168bab499ea40f178ba888572d3d1c9f
Parents: ac8bbf0 eaf09bd
Author: lahiru <la...@apache.org>
Authored: Sun Jun 29 09:05:43 2014 -0400
Committer: lahiru <la...@apache.org>
Committed: Sun Jun 29 09:05:43 2014 -0400
----------------------------------------------------------------------
.../api/server/ApplicationCatalogServer.java | 2 +
.../api/server/util/AppCatalogInitUtil.java | 166 +
.../api/server/util/DatabaseCreator.java | 6 +-
.../api/server/util/RegistryInitUtil.java | 2 +-
.../api/appcatalog/ApplicationCatalogAPI.java | 26216 -----------------
.../applicationCatalogAPIConstants.java | 55 -
.../api/client/AiravataClientFactory.java | 6 +-
.../resources/lib/ApplicationCatalogAPI.cpp | 2253 +-
.../main/resources/lib/ApplicationCatalogAPI.h | 690 +-
.../ApplicationCatalogAPI_server.skeleton.cpp | 28 +-
.../resources/lib/applicationCatalogAPI_types.h | 4 +-
.../applicationDeploymentModel_constants.cpp | 19 +
.../lib/applicationDeploymentModel_constants.h | 25 +
.../lib/applicationDeploymentModel_types.cpp | 477 +
.../lib/applicationDeploymentModel_types.h | 269 +
.../lib/applicationInterfaceModel_constants.cpp | 19 +
.../lib/applicationInterfaceModel_constants.h | 25 +
.../lib/applicationInterfaceModel_types.cpp | 504 +
.../lib/applicationInterfaceModel_types.h | 308 +
.../lib/computeHostModel_constants.cpp | 19 +
.../resources/lib/computeHostModel_constants.h | 25 +
.../resources/lib/computeHostModel_types.cpp | 1025 +
.../main/resources/lib/computeHostModel_types.h | 534 +
.../API/AppCatalog/ApplicationCatalogAPI.php | 1257 +-
.../java-client-samples/pom.xml | 7 +-
.../model/appcatalog/ApplicationDeployment.java | 600 -
.../model/appcatalog/ApplicationDescriptor.java | 506 -
.../model/appcatalog/ApplicationInterface.java | 658 -
.../appcatalog/ComputeResourceDescription.java | 1537 -
.../model/appcatalog/DataMovementProtocol.java | 83 -
.../model/appcatalog/GSISSHJobSubmission.java | 1262 -
.../model/appcatalog/GlobusJobSubmission.java | 768 -
.../model/appcatalog/GridFTPDataMovement.java | 651 -
.../model/appcatalog/JobSubmissionProtocol.java | 80 -
.../model/appcatalog/ResourceJobManager.java | 83 -
.../model/appcatalog/SCPDataMovement.java | 610 -
.../model/appcatalog/SSHJobSubmission.java | 610 -
.../model/appcatalog/SecurityProtocol.java | 82 -
.../applicationCatalogDataModelConstants.java | 55 -
.../computehost/ComputeResourceDescription.java | 1436 +
.../model/computehost/DataMovementProtocol.java | 83 +
.../model/computehost/GSISSHJobSubmission.java | 1262 +
.../model/computehost/GlobusJobSubmission.java | 768 +
.../model/computehost/GridFTPDataMovement.java | 651 +
.../computehost/JobSubmissionProtocol.java | 80 +
.../model/computehost/ResourceJobManager.java | 83 +
.../model/computehost/SCPDataMovement.java | 610 +
.../model/computehost/SSHJobSubmission.java | 610 +
.../model/computehost/SecurityProtocol.java | 82 +
.../computehost/computeHostModelConstants.java | 55 +
.../applicationCatalogAPI.thrift | 9 +-
.../applicationInterfaceModel.thrift | 6 +-
.../org/airavata/appcatalog/cpi/AppCatalog.java | 7 +
.../appcatalog/cpi/ApplicationDeployment.java | 4 +
.../appcatalog/cpi/ApplicationInterface.java | 4 +
.../appcatalog/cpi/ComputeResource.java | 53 +
modules/app-catalog/app-catalog-data/pom.xml | 5 -
.../catalog/data/model/AppEnvironment.java | 3 +-
.../catalog/data/model/AppEnvironment_PK.java | 4 +-
.../catalog/data/model/AppInput_PK.java | 4 +-
.../catalog/data/model/AppModuleMapping.java | 3 +-
.../catalog/data/model/AppModuleMapping_PK.java | 4 +-
.../catalog/data/model/AppOutput_PK.java | 4 +-
.../data/model/ApplicationDeployment.java | 3 +-
.../catalog/data/model/ApplicationInput.java | 3 +-
.../data/model/ApplicationInterface.java | 3 +-
.../catalog/data/model/ApplicationModule.java | 3 +-
.../catalog/data/model/ApplicationOutput.java | 3 +-
.../catalog/data/model/ComputeResource.java | 3 +-
.../data/model/DataMovementProtocol.java | 3 +-
.../data/model/DataMovementProtocolPK.java | 4 +-
.../catalog/data/model/GSISSHExport.java | 9 +-
.../catalog/data/model/GSISSHExportPK.java | 4 +-
.../data/model/GSISSHPostJobCommand.java | 13 +-
.../data/model/GSISSHPostJobCommandPK.java | 4 +-
.../catalog/data/model/GSISSHPreJobCommand.java | 13 +-
.../data/model/GSISSHPreJobCommandPK.java | 4 +-
.../catalog/data/model/GSISSHSubmission.java | 3 +-
.../catalog/data/model/GatewayProfile.java | 3 +-
.../catalog/data/model/GlobusJobSubmission.java | 3 +-
.../catalog/data/model/GridFTPDataMovement.java | 3 +-
.../catalog/data/model/HostAlias.java | 3 +-
.../catalog/data/model/HostAliasPK.java | 4 +-
.../catalog/data/model/HostIPAddress.java | 3 +-
.../catalog/data/model/HostIPAddressPK.java | 4 +-
.../data/model/JobSubmissionProtocol.java | 3 +-
.../data/model/JobSubmissionProtocolPK.java | 4 +-
.../catalog/data/model/LibraryApendPath.java | 3 +-
.../catalog/data/model/LibraryApendPath_PK.java | 4 +-
.../catalog/data/model/LibraryPrepandPath.java | 3 +-
.../data/model/LibraryPrepandPath_PK.java | 4 +-
.../catalog/data/model/SCPDataMovement.java | 3 +-
.../catalog/data/model/SSHSubmission.java | 3 +-
.../data/resources/AbstractResource.java | 10 +-
.../data/resources/AppEnvironmentResource.java | 280 +
.../data/resources/AppInterfaceResource.java | 253 +
.../resources/AppModuleMappingResource.java | 282 +
.../resources/ApplicationInputResource.java | 380 +
.../resources/ApplicationOutputResource.java | 359 +
.../resources/DataMovementProtocolResource.java | 333 +
.../data/resources/GSISSHExportResource.java | 296 +
.../resources/GSISSHPostJobCommandResource.java | 306 +
.../resources/GSISSHPreJobCommandResource.java | 305 +
.../resources/GSISSHSubmissionResource.java | 406 +
.../data/resources/GatewayProfileResource.java | 271 +
.../resources/GlobusJobSubmissionResource.java | 373 +
.../resources/GridFTPDataMovementResource.java | 333 +
.../data/resources/HostAliasResource.java | 108 +-
.../data/resources/HostIPAddressResource.java | 301 +
.../JobSubmissionProtocolResource.java | 333 +
.../resources/LibraryApendPathResource.java | 8 +-
.../data/resources/SCPDataMovementResource.java | 333 +
.../data/resources/SSHSubmissionResource.java | 331 +
.../catalog/data/util/AppCatalogJPAUtils.java | 279 +-
.../src/main/resources/appcatalog-derby.sql | 2 +-
.../src/main/resources/appcatalog-mysql.sql | 2 +-
modules/app-catalog/app-catalog-jpa/pom.xml | 131 -
.../appcatalog/jpa/model/Application.java | 77 -
.../jpa/model/ApplicationDeployment.java | 69 -
.../jpa/model/ApplicationDeploymentPK.java | 40 -
.../jpa/model/ApplicationInputOutputs.java | 68 -
.../jpa/model/ApplicationInputOutputsPK.java | 39 -
.../appcatalog/jpa/model/ComputeResource.java | 68 -
.../jpa/model/DataMovementProtocol.java | 75 -
.../jpa/model/DataMovementProtocolPK.java | 72 -
.../appcatalog/jpa/model/Deployment.java | 152 -
.../appcatalog/jpa/model/GSISSHExport.java | 64 -
.../appcatalog/jpa/model/GSISSHExportPK.java | 62 -
.../jpa/model/GSISSHPostJobCommand.java | 66 -
.../jpa/model/GSISSHPostJobCommandPK.java | 62 -
.../jpa/model/GSISSHPreJobCommand.java | 64 -
.../jpa/model/GSISSHPreJobCommandPK.java | 62 -
.../appcatalog/jpa/model/GSISSHSubmission.java | 102 -
.../jpa/model/GatewayApplications.java | 68 -
.../jpa/model/GatewayApplicationsPK.java | 40 -
.../appcatalog/jpa/model/GatewayProfile.java | 43 -
.../jpa/model/GlobusJobSubmission.java | 92 -
.../appcatalog/jpa/model/InputOutputs.java | 67 -
.../jpa/model/JobSubmissionProtocol.java | 76 -
.../jpa/model/JobSubmissionProtocolPK.java | 72 -
.../appcatalog/jpa/model/SCPDataMovement.java | 82 -
.../appcatalog/jpa/model/SSHSubmission.java | 82 -
.../src/main/resources/META-INF/persistence.xml | 28 -
.../src/main/resources/appcatalog-mysql_new.sql | 203 -
modules/commons/pom.xml | 4 +-
modules/distribution/server/pom.xml | 5 -
.../server/src/main/assembly/bin-assembly.xml | 9 +
modules/gfac/gfac-bes/pom.xml | 8 +
modules/gfac/gfac-gsissh/pom.xml | 10 +-
modules/orchestrator/orchestrator-core/pom.xml | 5 -
modules/registry/airavata-jpa-registry/pom.xml | 7 +-
modules/ws-messenger/pom.xml | 2 +-
pom.xml | 28 +-
153 files changed, 18955 insertions(+), 36614 deletions(-)
----------------------------------------------------------------------