zzh
/
gatk-3.8
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move AWS keys to a resources subdirectory within the phonehome package 

Resources must be in a subdirectory called "resources" in the package
hierarchy to be picked up by the packaging system. Adding each resource
manually to the jars in build.xml does not cause the resource to be
added to the standalone GATK jar when we package the GATK, so it's best
to always use this convention.
This commit is contained in:
David Roazen 2013-01-31 11:40:40 -05:00
parent 496727ac5e
commit 6ec1e613a2
4 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
build.xml
View File

@ -708,9 +708,6 @@
<include name="**/sting/gatk/**/*.R"/>
<include name="**/sting/alignment/**/*.R"/>
</fileset>
<fileset dir="${java.public.source.dir}">
<include name="**/phonehome/*.key"/>
</fileset>
<fileset dir="${key.dir}">
<include name="**/*.key"/>
</fileset>

4
public/java/src/org/broadinstitute/sting/gatk/phonehome/GATKRunReport.java
View File

@ -350,7 +350,7 @@ public class GATKRunReport {
* @return a non-null AWS access key for the GATK user
*/
protected static String getAWSAccessKey() {
return getAWSKey("GATK_AWS_access.key");
return getAWSKey("resources/GATK_AWS_access.key");
}
/**
@ -358,7 +358,7 @@ public class GATKRunReport {
* @return a non-null AWS secret key for the GATK user
*/
protected static String getAWSSecretKey() {
return getAWSKey("GATK_AWS_secret.key");
return getAWSKey("resources/GATK_AWS_secret.key");
}
/**

0
public/java/src/org/broadinstitute/sting/gatk/phonehome/GATK_AWS_access.key → public/java/src/org/broadinstitute/sting/gatk/phonehome/resources/GATK_AWS_access.key
View File

0
public/java/src/org/broadinstitute/sting/gatk/phonehome/GATK_AWS_secret.key → public/java/src/org/broadinstitute/sting/gatk/phonehome/resources/GATK_AWS_secret.key
View File