diff --git a/build.xml b/build.xml
index 446982a44..6ca959c38 100644
--- a/build.xml
+++ b/build.xml
@@ -28,6 +28,8 @@
+
+
@@ -35,18 +37,25 @@
+
+
+
+
+
+
-
+
-
+
@@ -60,7 +69,7 @@
-
+
@@ -82,7 +91,7 @@
-
+
@@ -113,7 +122,7 @@
-
+
@@ -154,7 +163,7 @@
-
+
@@ -211,11 +220,11 @@
-
+
-
+
@@ -224,11 +233,11 @@
-
+
-
+
@@ -266,7 +275,7 @@
-
+
@@ -312,13 +321,13 @@
-
+
-
+
@@ -327,11 +336,11 @@
-
+
-
@@ -341,9 +350,9 @@
-
+
-
+
@@ -362,14 +371,14 @@
-
+
-
+
-
-
+
@@ -413,9 +422,9 @@
-
+
-
+
@@ -424,12 +433,12 @@
-
+
-
+
@@ -532,6 +541,11 @@
+
+
+
+
+
@@ -539,7 +553,7 @@
-
+
@@ -551,6 +565,12 @@
+
+
+
+
+
+
@@ -579,6 +599,10 @@
+
+
+
+
@@ -593,6 +617,10 @@
+
+
+
+
@@ -605,28 +633,7 @@
-
@@ -643,6 +650,9 @@
+
+
+
@@ -682,20 +692,7 @@
-
+
@@ -780,10 +777,6 @@
-
@@ -800,10 +793,6 @@
-
@@ -851,6 +840,8 @@
+
+
@@ -1187,19 +1178,18 @@
-
-
+
-
+
-
+
diff --git a/public/R/queueJobReport.R b/public/R/scripts/org/broadinstitute/sting/queue/util/queueJobReport.R
similarity index 100%
rename from public/R/queueJobReport.R
rename to public/R/scripts/org/broadinstitute/sting/queue/util/queueJobReport.R
diff --git a/public/R/src/gsalib/DESCRIPTION b/public/R/src/org/broadinstitute/sting/utils/R/gsalib/DESCRIPTION
similarity index 100%
rename from public/R/src/gsalib/DESCRIPTION
rename to public/R/src/org/broadinstitute/sting/utils/R/gsalib/DESCRIPTION
diff --git a/public/R/src/gsalib/R/gsa.error.R b/public/R/src/org/broadinstitute/sting/utils/R/gsalib/R/gsa.error.R
similarity index 100%
rename from public/R/src/gsalib/R/gsa.error.R
rename to public/R/src/org/broadinstitute/sting/utils/R/gsalib/R/gsa.error.R
diff --git a/public/R/src/gsalib/R/gsa.getargs.R b/public/R/src/org/broadinstitute/sting/utils/R/gsalib/R/gsa.getargs.R
similarity index 100%
rename from public/R/src/gsalib/R/gsa.getargs.R
rename to public/R/src/org/broadinstitute/sting/utils/R/gsalib/R/gsa.getargs.R
diff --git a/public/R/src/gsalib/R/gsa.message.R b/public/R/src/org/broadinstitute/sting/utils/R/gsalib/R/gsa.message.R
similarity index 100%
rename from public/R/src/gsalib/R/gsa.message.R
rename to public/R/src/org/broadinstitute/sting/utils/R/gsalib/R/gsa.message.R
diff --git a/public/R/src/gsalib/R/gsa.plot.venn.R b/public/R/src/org/broadinstitute/sting/utils/R/gsalib/R/gsa.plot.venn.R
similarity index 100%
rename from public/R/src/gsalib/R/gsa.plot.venn.R
rename to public/R/src/org/broadinstitute/sting/utils/R/gsalib/R/gsa.plot.venn.R
diff --git a/public/R/src/gsalib/R/gsa.read.eval.R b/public/R/src/org/broadinstitute/sting/utils/R/gsalib/R/gsa.read.eval.R
similarity index 100%
rename from public/R/src/gsalib/R/gsa.read.eval.R
rename to public/R/src/org/broadinstitute/sting/utils/R/gsalib/R/gsa.read.eval.R
diff --git a/public/R/src/gsalib/R/gsa.read.gatkreport.R b/public/R/src/org/broadinstitute/sting/utils/R/gsalib/R/gsa.read.gatkreport.R
similarity index 100%
rename from public/R/src/gsalib/R/gsa.read.gatkreport.R
rename to public/R/src/org/broadinstitute/sting/utils/R/gsalib/R/gsa.read.gatkreport.R
diff --git a/public/R/src/gsalib/R/gsa.read.squidmetrics.R b/public/R/src/org/broadinstitute/sting/utils/R/gsalib/R/gsa.read.squidmetrics.R
similarity index 100%
rename from public/R/src/gsalib/R/gsa.read.squidmetrics.R
rename to public/R/src/org/broadinstitute/sting/utils/R/gsalib/R/gsa.read.squidmetrics.R
diff --git a/public/R/src/gsalib/R/gsa.read.vcf.R b/public/R/src/org/broadinstitute/sting/utils/R/gsalib/R/gsa.read.vcf.R
similarity index 100%
rename from public/R/src/gsalib/R/gsa.read.vcf.R
rename to public/R/src/org/broadinstitute/sting/utils/R/gsalib/R/gsa.read.vcf.R
diff --git a/public/R/src/gsalib/R/gsa.warn.R b/public/R/src/org/broadinstitute/sting/utils/R/gsalib/R/gsa.warn.R
similarity index 100%
rename from public/R/src/gsalib/R/gsa.warn.R
rename to public/R/src/org/broadinstitute/sting/utils/R/gsalib/R/gsa.warn.R
diff --git a/public/R/src/gsalib/Read-and-delete-me b/public/R/src/org/broadinstitute/sting/utils/R/gsalib/Read-and-delete-me
similarity index 100%
rename from public/R/src/gsalib/Read-and-delete-me
rename to public/R/src/org/broadinstitute/sting/utils/R/gsalib/Read-and-delete-me
diff --git a/public/R/src/gsalib/data/tearsheetdrop.jpg b/public/R/src/org/broadinstitute/sting/utils/R/gsalib/data/tearsheetdrop.jpg
similarity index 100%
rename from public/R/src/gsalib/data/tearsheetdrop.jpg
rename to public/R/src/org/broadinstitute/sting/utils/R/gsalib/data/tearsheetdrop.jpg
diff --git a/public/R/src/gsalib/man/gsa.error.Rd b/public/R/src/org/broadinstitute/sting/utils/R/gsalib/man/gsa.error.Rd
similarity index 100%
rename from public/R/src/gsalib/man/gsa.error.Rd
rename to public/R/src/org/broadinstitute/sting/utils/R/gsalib/man/gsa.error.Rd
diff --git a/public/R/src/gsalib/man/gsa.getargs.Rd b/public/R/src/org/broadinstitute/sting/utils/R/gsalib/man/gsa.getargs.Rd
similarity index 100%
rename from public/R/src/gsalib/man/gsa.getargs.Rd
rename to public/R/src/org/broadinstitute/sting/utils/R/gsalib/man/gsa.getargs.Rd
diff --git a/public/R/src/gsalib/man/gsa.message.Rd b/public/R/src/org/broadinstitute/sting/utils/R/gsalib/man/gsa.message.Rd
similarity index 100%
rename from public/R/src/gsalib/man/gsa.message.Rd
rename to public/R/src/org/broadinstitute/sting/utils/R/gsalib/man/gsa.message.Rd
diff --git a/public/R/src/gsalib/man/gsa.plot.venn.Rd b/public/R/src/org/broadinstitute/sting/utils/R/gsalib/man/gsa.plot.venn.Rd
similarity index 100%
rename from public/R/src/gsalib/man/gsa.plot.venn.Rd
rename to public/R/src/org/broadinstitute/sting/utils/R/gsalib/man/gsa.plot.venn.Rd
diff --git a/public/R/src/gsalib/man/gsa.read.eval.Rd b/public/R/src/org/broadinstitute/sting/utils/R/gsalib/man/gsa.read.eval.Rd
similarity index 100%
rename from public/R/src/gsalib/man/gsa.read.eval.Rd
rename to public/R/src/org/broadinstitute/sting/utils/R/gsalib/man/gsa.read.eval.Rd
diff --git a/public/R/src/gsalib/man/gsa.read.gatkreport.Rd b/public/R/src/org/broadinstitute/sting/utils/R/gsalib/man/gsa.read.gatkreport.Rd
similarity index 100%
rename from public/R/src/gsalib/man/gsa.read.gatkreport.Rd
rename to public/R/src/org/broadinstitute/sting/utils/R/gsalib/man/gsa.read.gatkreport.Rd
diff --git a/public/R/src/gsalib/man/gsa.read.squidmetrics.Rd b/public/R/src/org/broadinstitute/sting/utils/R/gsalib/man/gsa.read.squidmetrics.Rd
similarity index 100%
rename from public/R/src/gsalib/man/gsa.read.squidmetrics.Rd
rename to public/R/src/org/broadinstitute/sting/utils/R/gsalib/man/gsa.read.squidmetrics.Rd
diff --git a/public/R/src/gsalib/man/gsa.read.vcf.Rd b/public/R/src/org/broadinstitute/sting/utils/R/gsalib/man/gsa.read.vcf.Rd
similarity index 100%
rename from public/R/src/gsalib/man/gsa.read.vcf.Rd
rename to public/R/src/org/broadinstitute/sting/utils/R/gsalib/man/gsa.read.vcf.Rd
diff --git a/public/R/src/gsalib/man/gsa.warn.Rd b/public/R/src/org/broadinstitute/sting/utils/R/gsalib/man/gsa.warn.Rd
similarity index 100%
rename from public/R/src/gsalib/man/gsa.warn.Rd
rename to public/R/src/org/broadinstitute/sting/utils/R/gsalib/man/gsa.warn.Rd
diff --git a/public/R/src/gsalib/man/gsalib-package.Rd b/public/R/src/org/broadinstitute/sting/utils/R/gsalib/man/gsalib-package.Rd
similarity index 100%
rename from public/R/src/gsalib/man/gsalib-package.Rd
rename to public/R/src/org/broadinstitute/sting/utils/R/gsalib/man/gsalib-package.Rd
diff --git a/public/java/src/org/broadinstitute/sting/utils/R/RScriptExecutor.java b/public/java/src/org/broadinstitute/sting/utils/R/RScriptExecutor.java
index 58f7942fe..9180447b9 100644
--- a/public/java/src/org/broadinstitute/sting/utils/R/RScriptExecutor.java
+++ b/public/java/src/org/broadinstitute/sting/utils/R/RScriptExecutor.java
@@ -25,35 +25,35 @@
package org.broadinstitute.sting.utils.R;
import org.apache.commons.io.FileUtils;
+import org.apache.commons.lang.StringUtils;
import org.apache.log4j.Logger;
import org.broadinstitute.sting.commandline.Advanced;
import org.broadinstitute.sting.commandline.Argument;
-import org.broadinstitute.sting.commandline.ArgumentCollection;
-import org.broadinstitute.sting.gatk.walkers.recalibration.Covariate;
-import org.broadinstitute.sting.utils.PathUtils;
import org.broadinstitute.sting.utils.Utils;
+import org.broadinstitute.sting.utils.exceptions.StingException;
import org.broadinstitute.sting.utils.exceptions.UserException;
+import org.broadinstitute.sting.utils.io.IOUtils;
+import org.broadinstitute.sting.utils.io.Resource;
+import org.broadinstitute.sting.utils.runtime.ProcessController;
+import org.broadinstitute.sting.utils.runtime.ProcessSettings;
import java.io.File;
-import java.io.IOException;
+import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
/**
- * Generic service for executing RScripts in the GATK directory
- *
- * @author Your Name
- * @since Date created
+ * Generic service for executing RScripts
*/
public class RScriptExecutor {
/**
* our log
*/
- protected static Logger logger = Logger.getLogger(RScriptExecutor.class);
+ private static Logger logger = Logger.getLogger(RScriptExecutor.class);
public static class RScriptArgumentCollection {
@Advanced
- @Argument(fullName = "path_to_Rscript", shortName = "Rscript", doc = "The path to your implementation of Rscript. For Broad users this is maybe /broad/software/free/Linux/redhat_5_x86_64/pkgs/r_2.12.0/bin/Rscript", required = false)
+ @Argument(fullName = "path_to_Rscript", shortName = "Rscript", doc = "The path to your implementation of Rscript. Defaults Rscript meaning to use the first available on the environment PATH. For Broad users should 'use R-2.12' or later.", required = false)
public String PATH_TO_RSCRIPT = "Rscript";
@Advanced
@@ -62,40 +62,119 @@ public class RScriptExecutor {
public RScriptArgumentCollection() {}
- /** For testing and convenience */
+ /* For testing and convenience */
public RScriptArgumentCollection(final String PATH_TO_RSCRIPT, final List PATH_TO_RESOURCES) {
this.PATH_TO_RSCRIPT = PATH_TO_RSCRIPT;
this.PATH_TO_RESOURCES = PATH_TO_RESOURCES;
}
}
- final RScriptArgumentCollection myArgs;
- final boolean exceptOnError;
+ private final RScriptArgumentCollection myArgs;
+ private final boolean exceptOnError;
+ private final List libraries = new ArrayList();
+ private final List scriptResources = new ArrayList();
+ private final List scriptFiles = new ArrayList();
+ private final List args = new ArrayList();
public RScriptExecutor(final RScriptArgumentCollection myArgs, final boolean exceptOnError) {
this.myArgs = myArgs;
this.exceptOnError = exceptOnError;
}
- public void callRScripts(String scriptName, Object... scriptArgs) {
- callRScripts(scriptName, Arrays.asList(scriptArgs));
+ public void addLibrary(RScriptLibrary library) {
+ this.libraries.add(library);
}
- public void callRScripts(String scriptName, List