Repository: airavata Updated Branches: refs/heads/master 59cc938b6 -> 59dcfaa41
server distribution need apache-commons-io Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/59dcfaa4 Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/59dcfaa4 Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/59dcfaa4 Branch: refs/heads/master Commit: 59dcfaa41ac0153fc442338b6de7543242ff1a93 Parents: 59cc938 Author: chathuri <[email protected]> Authored: Thu Mar 6 15:10:16 2014 -0500 Committer: chathuri <[email protected]> Committed: Thu Mar 6 15:10:16 2014 -0500 ---------------------------------------------------------------------- .../apache/airavata/client/samples/CreateLaunchExperiment.java | 6 +++--- modules/distribution/airavata-server/pom.xml | 5 +++++ .../airavata-server/src/main/assembly/bin-assembly.xml | 1 + .../persistance/registry/jpa/resources/TaskDetailResource.java | 2 +- 4 files changed, 10 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata/blob/59dcfaa4/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/CreateLaunchExperiment.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/CreateLaunchExperiment.java b/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/CreateLaunchExperiment.java index 5d8c69b..9a61243 100644 --- a/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/CreateLaunchExperiment.java +++ b/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/CreateLaunchExperiment.java @@ -61,7 +61,7 @@ public class CreateLaunchExperiment { final Airavata.Client airavata = AiravataClientFactory.createAiravataClient(THRIFT_SERVER_HOST, THRIFT_SERVER_PORT); System.out.println("API version is " + airavata.GetAPIVersion()); addDescriptors(); - final String expId = createLocalExperiment(airavata); + final String expId = createExperiment(airavata); System.out.println("Experiment ID : " + expId); launchExperiment(airavata, expId); System.out.println("Launched successfully"); @@ -122,8 +122,8 @@ public class CreateLaunchExperiment { try { DocumentCreator documentCreator = new DocumentCreator(getAiravataAPI()); documentCreator.createEchoAppLocalHostDocs(); -// documentCreator.createEchoAppGramDocs(); -// documentCreator.createEchoAppGSISSHDocs(); + documentCreator.createEchoAppGramDocs(); + documentCreator.createEchoAppGSISSHDocs(); } catch (AiravataAPIInvocationException e) { logger.error("Unable to create airavata API", e.getMessage()); throw new AiravataAPIInvocationException(e); http://git-wip-us.apache.org/repos/asf/airavata/blob/59dcfaa4/modules/distribution/airavata-server/pom.xml ---------------------------------------------------------------------- diff --git a/modules/distribution/airavata-server/pom.xml b/modules/distribution/airavata-server/pom.xml index 5cc29ea..298a039 100644 --- a/modules/distribution/airavata-server/pom.xml +++ b/modules/distribution/airavata-server/pom.xml @@ -313,6 +313,11 @@ <version>2.4</version> </dependency> <dependency> + <groupId>commons-io</groupId> + <artifactId>commons-io</artifactId> + <version>2.4</version> + </dependency> + <dependency> <groupId>org.apache.airavata</groupId> <artifactId>airavata-standalone-server</artifactId> <version>${project.version}</version> http://git-wip-us.apache.org/repos/asf/airavata/blob/59dcfaa4/modules/distribution/airavata-server/src/main/assembly/bin-assembly.xml ---------------------------------------------------------------------- diff --git a/modules/distribution/airavata-server/src/main/assembly/bin-assembly.xml b/modules/distribution/airavata-server/src/main/assembly/bin-assembly.xml index 69de5c5..9b9f67c 100644 --- a/modules/distribution/airavata-server/src/main/assembly/bin-assembly.xml +++ b/modules/distribution/airavata-server/src/main/assembly/bin-assembly.xml @@ -184,6 +184,7 @@ <include>commons-collections:commons-collections</include> <include>commons-configuration:commons-configuration</include> <include>commons-lang:commons-lang</include> + <include>commons-io:commons-io</include> <include>org.ogce:xpp3:jar</include> <include>org.ogce:xpp5:jar</include> <include>org.ogce:xsul:jar</include> http://git-wip-us.apache.org/repos/asf/airavata/blob/59dcfaa4/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/TaskDetailResource.java ---------------------------------------------------------------------- diff --git a/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/TaskDetailResource.java b/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/TaskDetailResource.java index 2d4dc5b..75194b0 100644 --- a/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/TaskDetailResource.java +++ b/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/TaskDetailResource.java @@ -534,7 +534,7 @@ public class TaskDetailResource extends AbstractResource { } public DataTransferDetailResource getDataTransferDetail (String dataTransferId){ - return (DataTransferDetailResource)get(ResourceType.TASK_DETAIL, dataTransferId); + return (DataTransferDetailResource)get(ResourceType.DATA_TRANSFER_DETAIL, dataTransferId); } }
