merge 0.14 branch with master
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/e54313c5 Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/e54313c5 Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/e54313c5 Branch: refs/heads/master Commit: e54313c5e64dbd8eb0ebb0f1217f788cf1c81cd2 Parents: 46be455 429d23f Author: Chathuri Wimalasena <[email protected]> Authored: Thu Jan 8 22:02:22 2015 -0500 Committer: Chathuri Wimalasena <[email protected]> Committed: Thu Jan 8 22:02:22 2015 -0500 ---------------------------------------------------------------------- INSTALL | 12 +- README | 59 +- RELEASE_NOTES | 74 + airavata-api/airavata-api-server/pom.xml | 2 +- .../util/AiravataServerThreadPoolExecutor.java | 24 +- airavata-api/airavata-api-stubs/pom.xml | 2 +- .../airavata-cpp-sdk/pom.xml | 2 +- .../airavata-cpp-sdk/src/main/resources/INSTALL | 3 +- .../airavata-client-properties.ini | 17 + .../airavata-php-sdk/pom.xml | 2 +- .../conf/airavata-client-properties.ini | 21 + .../resources/conf/app-catalog-identifiers.ini | 17 + .../resources/lib/AiravataClientFactory.php | 17 + .../java-client-samples/pom.xml | 5 +- .../tools/RegisterOGCEUS3Application.java | 21 + .../client/tools/RegisterUS3Application.java | 21 + airavata-api/airavata-client-sdks/pom.xml | 2 +- airavata-api/airavata-data-models/pom.xml | 2 +- airavata-api/airavata-model-utils/pom.xml | 2 +- airavata-api/generate-thrift-files.sh | 2 +- airavata-api/pom.xml | 2 +- modules/airavata-client/pom.xml | 2 +- .../client/RegistryServiceCallbackHandler.java | 24 +- .../airavata/client/RegistryServiceStub.java | 21 +- modules/app-catalog/app-catalog-cpi/pom.xml | 2 +- .../appcatalog/cpi/WorkflowCatalog.java | 21 + modules/app-catalog/app-catalog-data/pom.xml | 2 +- .../data/model/UnicoreJobSubmission.java | 21 + .../resources/UnicoreJobSubmissionResource.java | 21 + modules/app-catalog/pom.xml | 2 +- modules/commons/gfac-schema/pom.xml | 2 +- modules/commons/pom.xml | 2 +- modules/commons/utils/pom.xml | 2 +- .../commons/workflow-execution-context/pom.xml | 2 +- modules/commons/workflow-tracking/pom.xml | 2 +- modules/configuration/client/pom.xml | 2 +- modules/configuration/pom.xml | 2 +- modules/configuration/server/pom.xml | 2 +- .../server/src/main/resources/zoo.cfg | 17 + .../credential-store-webapp/pom.xml | 2 +- .../credential-store/pom.xml | 5 +- modules/credential-store-service/pom.xml | 2 +- modules/distribution/api-server/pom.xml | 2 +- modules/distribution/client/java/pom.xml | 2 +- .../client/java/src/main/resources/INSTALL | 31 - .../client/java/src/main/resources/README | 66 +- modules/distribution/client/pom.xml | 2 +- modules/distribution/gfac-server/pom.xml | 2 +- .../distribution/orchestrator-server/pom.xml | 5 +- modules/distribution/pom.xml | 2 +- modules/distribution/release/pom.xml | 2 +- modules/distribution/server/pom.xml | 1271 +++++++++--------- .../server/src/main/resources/INSTALL | 47 +- .../server/src/main/resources/README | 198 +-- .../main/resources/samples/registerSample.sh | 17 + .../src/main/resources/samples/scripts/add.sh | 17 + .../src/main/resources/samples/scripts/echo.sh | 18 + .../main/resources/samples/scripts/multiply.sh | 18 + .../main/resources/samples/scripts/subtract.sh | 18 + modules/distribution/xbaya-gui/pom.xml | 2 +- modules/gfac/airavata-gfac-service/pom.xml | 2 +- .../src/test/resources/zoo.cfg | 17 + modules/gfac/airavata-gfac-stubs/pom.xml | 2 +- .../gfac-application-specific-handlers/pom.xml | 4 +- .../gfac/bes/handlers/AbstractSMSHandler.java | 21 + .../gfac/bes/handlers/SMSByteIOInHandler.java | 21 + .../gfac/bes/handlers/SMSByteIOOutHandler.java | 21 + .../gfac/bes/handlers/SMSDirectoryHandler.java | 21 + .../bes/security/UNICORESecurityContext.java | 21 + .../airavata/gfac/bes/utils/ActivityInfo.java | 20 + .../airavata/gfac/bes/utils/BESConstants.java | 21 + .../airavata/gfac/bes/utils/MyProxyLogon.java | 21 + .../airavata/gfac/bes/utils/SecurityUtils.java | 21 + modules/gfac/gfac-core/pom.xml | 2 +- modules/gfac/gfac-ec2/pom.xml | 5 +- modules/gfac/gfac-gsissh/pom.xml | 2 +- modules/gfac/gfac-local/pom.xml | 2 +- modules/gfac/gfac-monitor/pom.xml | 2 +- modules/gfac/gfac-ssh/pom.xml | 2 +- modules/gfac/pom.xml | 2 +- modules/integration-tests/pom.xml | 19 +- modules/messaging/core/pom.xml | 5 +- .../airavata/messaging/core/MessageHandler.java | 21 + .../messaging/core/MessagingConstants.java | 21 + .../messaging/core/impl/RabbitMQConsumer.java | 3 +- modules/messaging/pom.xml | 2 +- .../airavata-orchestrator-service/pom.xml | 2 +- .../OrchestratorServerThreadPoolExecutor.java | 21 + .../src/test/resources/monitor.properties | 20 + .../src/test/resources/zoo.cfg | 17 + .../airavata-orchestrator-stubs/pom.xml | 2 +- modules/orchestrator/orchestrator-core/pom.xml | 2 +- modules/orchestrator/pom.xml | 2 +- modules/registry/airavata-jpa-registry/pom.xml | 2 +- .../jpa/OrchestratorDataResourceTest.java | 20 + modules/registry/pom.xml | 2 +- modules/registry/registry-cpi/pom.xml | 2 +- modules/security/pom.xml | 2 +- modules/server/pom.xml | 2 +- modules/test-suite/pom.xml | 2 +- modules/workflow-model/pom.xml | 2 +- modules/workflow-model/workflow-engine/pom.xml | 2 +- .../engine/WorkflowEngineException.java | 21 + .../workflow-model-component/pom.xml | 2 +- .../workflow-model/workflow-model-core/pom.xml | 2 +- modules/ws-messenger/client/pom.xml | 2 +- modules/ws-messenger/commons/pom.xml | 2 +- modules/ws-messenger/message-monitor/pom.xml | 2 +- modules/ws-messenger/pom.xml | 2 +- modules/xbaya-gui/pom.xml | 2 +- .../xbaya/messaging/EventDataRepository.java | 1 - .../xbaya/ui/menues/ApplicationMenuItem.java | 21 + .../xbaya/ui/monitor/MonitorEventHandler.java | 19 +- pom.xml | 5 +- tools/gsissh/pom.xml | 2 +- tools/pom.xml | 2 +- tools/registry-tool/pom.xml | 2 +- 117 files changed, 1663 insertions(+), 1014 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata/blob/e54313c5/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/tools/RegisterOGCEUS3Application.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata/blob/e54313c5/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/tools/RegisterUS3Application.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata/blob/e54313c5/modules/distribution/gfac-server/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata/blob/e54313c5/modules/gfac/gfac-application-specific-handlers/pom.xml ---------------------------------------------------------------------- diff --cc modules/gfac/gfac-application-specific-handlers/pom.xml index 0a58857,0000000..b6b7d4f mode 100644,000000..100644 --- a/modules/gfac/gfac-application-specific-handlers/pom.xml +++ b/modules/gfac/gfac-application-specific-handlers/pom.xml @@@ -1,22 -1,0 +1,22 @@@ +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> + <parent> + <artifactId>gfac</artifactId> + <groupId>org.apache.airavata</groupId> - <version>0.14-SNAPSHOT</version> ++ <version>0.15-SNAPSHOT</version> + </parent> + <modelVersion>4.0.0</modelVersion> + + <artifactId>airavata-gfac-application-specific-handlers</artifactId> + <dependencies> + <dependency> + <groupId>org.apache.airavata</groupId> + <artifactId>airavata-gfac-core</artifactId> - <version>0.14-SNAPSHOT</version> ++ <version>0.15-SNAPSHOT</version> + </dependency> + </dependencies> + + +</project> http://git-wip-us.apache.org/repos/asf/airavata/blob/e54313c5/modules/gfac/gfac-bes/src/main/java/org/apache/airavata/gfac/bes/handlers/AbstractSMSHandler.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata/blob/e54313c5/modules/gfac/gfac-bes/src/main/java/org/apache/airavata/gfac/bes/security/UNICORESecurityContext.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata/blob/e54313c5/modules/gfac/gfac-bes/src/main/java/org/apache/airavata/gfac/bes/utils/SecurityUtils.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata/blob/e54313c5/modules/gfac/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata/blob/e54313c5/modules/ws-messenger/message-monitor/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata/blob/e54313c5/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/messaging/EventDataRepository.java ----------------------------------------------------------------------
