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/6cf4f876 Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/6cf4f876 Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/6cf4f876 Branch: refs/heads/master Commit: 6cf4f876cc0b49383deaf735b02f0a11e16c28df Parents: 3b2ea90 adb9b95 Author: lahiru <[email protected]> Authored: Tue Oct 21 21:47:25 2014 -0400 Committer: lahiru <[email protected]> Committed: Tue Oct 21 21:47:25 2014 -0400 ---------------------------------------------------------------------- .../server/handler/AiravataServerHandler.java | 24 +- .../AiravataExperimentStatusUpdator.java | 6 +- .../java/org/apache/airavata/api/Airavata.java | 12027 +++++++++-------- .../main/resources/lib/airavata/Airavata.cpp | 395 + .../src/main/resources/lib/airavata/Airavata.h | 167 + .../lib/airavata/Airavata_server.skeleton.cpp | 5 + .../lib/airavata/messagingEvents_types.cpp | 104 +- .../lib/airavata/messagingEvents_types.h | 76 +- .../resources/lib/Airavata/API/Airavata.php | 318 + .../Airavata/Model/Messaging/Event/Types.php | 80 + .../client/samples/CreateLaunchExperiment.java | 156 +- .../tools/RegisterSampleApplications.java | 123 +- .../event/ExperimentStatusChangeEvent.java | 100 +- .../model/messaging/event/JobIdentifier.java | 100 +- .../model/messaging/event/TaskIdentifier.java | 100 +- .../messaging/event/WorkflowIdentifier.java | 100 +- .../airavataAPI.thrift | 26 + .../messagingEvents.thrift | 4 + modules/airavata-client/pom.xml | 23 - .../apache/airavata/client/AiravataClient.java | 7 +- .../client/RegistryServiceCallbackHandler.java | 65 + .../airavata/client/RegistryServiceStub.java | 956 ++ .../appcatalog/cpi/ComputeResource.java | 15 + .../catalog/data/impl/ComputeResourceImpl.java | 56 +- .../data/model/UnicoreJobSubmission.java | 44 + .../data/resources/AbstractResource.java | 9 + .../resources/UnicoreJobSubmissionResource.java | 315 + .../catalog/data/util/AppCatalogJPAUtils.java | 20 +- .../data/util/AppCatalogResourceType.java | 1 + .../data/util/AppCatalogThriftConversion.java | 23 + .../src/main/resources/META-INF/persistence.xml | 1 + .../src/main/resources/appcatalog-derby.sql | 9 + .../src/main/resources/appcatalog-mysql.sql | 8 +- .../src/test/resources/appcatalog-derby.sql | 34 + modules/distribution/server/pom.xml | 9 - .../server/src/main/assembly/bin-assembly.xml | 561 +- modules/gfac/gfac-bes/pom.xml | 309 +- .../gfac/bes/provider/impl/BESProvider.java | 1 - .../bes/security/UNICORESecurityContext.java | 2 +- .../airavata/gfac/core/cpi/BetterGfacImpl.java | 70 +- .../handler/AbstractRecoverableHandler.java | 13 + .../core/monitor/AiravataJobStatusUpdator.java | 3 +- .../core/monitor/AiravataTaskStatusUpdator.java | 7 +- .../AiravataWorkflowNodeStatusUpdator.java | 6 +- .../state/GfacExperimentStateChangeRequest.java | 3 +- .../gfac/core/utils/OutHandlerWorker.java | 2 +- .../gsissh/handler/GSISSHOutputHandler.java | 4 + .../gfac/local/provider/impl/LocalProvider.java | 6 +- .../monitor/impl/pull/qstat/HPCPullMonitor.java | 9 +- .../monitor/impl/push/amqp/AMQPMonitor.java | 5 +- .../airavata/messaging/core/MessageContext.java | 8 +- .../messaging/core/impl/RabbitMQConsumer.java | 14 +- .../engine/interpretor/WorkflowInterpreter.java | 26 +- .../org/apache/airavata/xbaya/XBayaEngine.java | 22 +- .../registry/ComponentRegistryLoader.java | 4 +- .../airavata/xbaya/messaging/Monitor.java | 5 +- .../ui/dialogs/registry/RegistryWindow.java | 5 + .../WorkflowInterpreterLaunchWindow.java | 129 +- pom.xml | 2 +- 59 files changed, 10670 insertions(+), 6052 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata/blob/6cf4f876/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/handler/AiravataServerHandler.java ----------------------------------------------------------------------
