Repository: airavata Updated Branches: refs/heads/master 8ebff8604 -> b393df565
bin assembly path issues Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/b393df56 Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/b393df56 Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/b393df56 Branch: refs/heads/master Commit: b393df565a9ebb77d349f128e904dbdb69ed4f05 Parents: 8ebff86 Author: Chathuri Wimalasena <[email protected]> Authored: Fri Jun 5 15:15:00 2015 -0400 Committer: Chathuri Wimalasena <[email protected]> Committed: Fri Jun 5 15:15:00 2015 -0400 ---------------------------------------------------------------------- distribution/src/main/assembly/bin-assembly.xml | 29 +------------------- .../apache/airavata/job/AMQPMonitorTest.java | 2 +- 2 files changed, 2 insertions(+), 29 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata/blob/b393df56/distribution/src/main/assembly/bin-assembly.xml ---------------------------------------------------------------------- diff --git a/distribution/src/main/assembly/bin-assembly.xml b/distribution/src/main/assembly/bin-assembly.xml index 6c290b8..498f6c3 100644 --- a/distribution/src/main/assembly/bin-assembly.xml +++ b/distribution/src/main/assembly/bin-assembly.xml @@ -58,34 +58,7 @@ <!-- ********************** copy database scripts ********************** --> <fileSet> - <directory>../../ws-messenger/messagebroker/src/main/resources/database_scripts - </directory> - <outputDirectory>bin/database_scripts - </outputDirectory> - <includes> - <include>*sql*</include> - </includes> - </fileSet> - <fileSet> - <directory>../../ws-messenger/messagebox/src/main/resources/database_scripts - </directory> - <outputDirectory>bin/database_scripts - </outputDirectory> - <includes> - <include>*sql*</include> - </includes> - </fileSet> - <fileSet> - <directory>../../registry/airavata-jpa-registry/src/main/resources - </directory> - <outputDirectory>bin/database_scripts - </outputDirectory> - <includes> - <include>*sql*</include> - </includes> - </fileSet> - <fileSet> - <directory>../../app-catalog/app-catalog-data/src/main/resources + <directory>../modules/registry/airavata-registry-core/src/main/resources </directory> <outputDirectory>bin/database_scripts </outputDirectory> http://git-wip-us.apache.org/repos/asf/airavata/blob/b393df56/modules/gfac/gfac-impl/src/test/java/org/apache/airavata/job/AMQPMonitorTest.java ---------------------------------------------------------------------- diff --git a/modules/gfac/gfac-impl/src/test/java/org/apache/airavata/job/AMQPMonitorTest.java b/modules/gfac/gfac-impl/src/test/java/org/apache/airavata/job/AMQPMonitorTest.java index 81f2b60..0ffa02e 100644 --- a/modules/gfac/gfac-impl/src/test/java/org/apache/airavata/job/AMQPMonitorTest.java +++ b/modules/gfac/gfac-impl/src/test/java/org/apache/airavata/job/AMQPMonitorTest.java @@ -126,7 +126,7 @@ public class AMQPMonitorTest { SSHJobSubmission sshJobSubmission = new SSHJobSubmission("TestSSHJobSubmissionInterfaceId", SecurityProtocol.GSI, resourceJobManager); - AppCatalog appCatalog = AppCatalogFactory.getAppCatalog(); + AppCatalog appCatalog = RegistryFactory.getAppCatalog(); String jobSubmissionID = appCatalog.getComputeResource().addSSHJobSubmission(sshJobSubmission); JobSubmissionInterface jobSubmissionInterface = new JobSubmissionInterface(jobSubmissionID, JobSubmissionProtocol.SSH, 1);
