diff --git a/.gitignore b/.gitignore old mode 100644 new mode 100755 diff --git a/.gitmodules b/.gitmodules old mode 100644 new mode 100755 index e67f8541f8..60a042e5f9 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,3 @@ [submodule "cellbase-web/lib/jsorolla"] path = cellbase-web/lib/jsorolla - url = https://github.com/opencb/jsorolla.git + url = https://github.com/Lucioric2000/jsorolla.git diff --git a/LICENSE b/LICENSE old mode 100644 new mode 100755 diff --git a/README.md b/README.md old mode 100644 new mode 100755 diff --git a/cellbase-app/app/bin/obsolete/gene-chunkIds.js b/cellbase-app/app/bin/obsolete/gene-chunkIds.js old mode 100644 new mode 100755 diff --git a/cellbase-app/app/bin/obsolete/genome-fetcher/CHECKSUMS b/cellbase-app/app/bin/obsolete/genome-fetcher/CHECKSUMS old mode 100644 new mode 100755 diff --git a/cellbase-app/app/bin/obsolete/genome-fetcher/genome-fetcher.py b/cellbase-app/app/bin/obsolete/genome-fetcher/genome-fetcher.py index ae2d7c4548..d4e5fa2492 100755 --- a/cellbase-app/app/bin/obsolete/genome-fetcher/genome-fetcher.py +++ b/cellbase-app/app/bin/obsolete/genome-fetcher/genome-fetcher.py @@ -101,7 +101,7 @@ logging.debug(sp_obj['assembly']) outfile = sequence_folder+"/"+sp_short.capitalize() + ".{0}".format(sp_obj['assembly'])+".fa.gz" logging.debug(outfile) - command = "wget --tries=10 " + url_seq +" -O '"+outfile+"' -o "+outfile+".log" + command = "wget -N --tries=10 " + url_seq +" -O '"+outfile+"' -o "+outfile+".log" logging.debug(command) os.system(command) cmd = "./genome_info.pl --species '{0}' -o {1}/genome_info.json".format(sp, sequence_folder) @@ -109,7 +109,7 @@ os.system(cmd) # for i in sp_obj['chromosomes']: # outfile = seq_folder+"/chrom_"+i+".fa.gz" - # command = "wget --tries=10 " + url_seq+"/*.dna.chromosome."+i+".fa.gz -O '"+outfile+"' -o "+outfile+".log" + # command = "wget -N --tries=10 " + url_seq+"/*.dna.chromosome."+i+".fa.gz -O '"+outfile+"' -o "+outfile+".log" # logging.debug(command) # os.system(command) @@ -121,7 +121,7 @@ url_gtf = sp_obj['sequence_url'].replace("fasta", "gtf")+"{0}".format(sp_short) logging.debug(url_gtf) outfile = gene_folder+"/"+sp_short+".gtf.gz" - command = "wget --tries=10 " + url_gtf+"/*.gtf.gz -O '"+outfile+"' -o "+outfile+".log" + command = "wget -N --tries=10 " + url_gtf+"/*.gtf.gz -O '"+outfile+"' -o "+outfile+".log" logging.debug(command) os.system(command) if sp_obj['phylo'] is not 'Bacteria': @@ -159,7 +159,7 @@ variation_url = sp_obj['variation_url'] for file in variation_files: outfile = variation_folder+"/"+file - command = "wget --tries=10 " + variation_url+"/"+file+" -O '"+outfile+"' -o "+outfile+".log" + command = "wget -N --tries=10 " + variation_url+"/"+file+" -O '"+outfile+"' -o "+outfile+".log" logging.debug(command) os.system(command) @@ -172,7 +172,7 @@ regulation_url = sp_obj['regulation_url']+sp_short for file in regulation_files: outfile = regulation_folder+"/"+file - command = "wget --tries=10 " + regulation_url+"/"+file+" -O '"+outfile+"' -o "+outfile+".log" + command = "wget -N --tries=10 " + regulation_url+"/"+file+" -O '"+outfile+"' -o "+outfile+".log" logging.debug(command) os.system(command) diff --git a/cellbase-app/app/bin/obsolete/genome-fetcher/species.json b/cellbase-app/app/bin/obsolete/genome-fetcher/species.json old mode 100644 new mode 100755 diff --git a/cellbase-app/app/bin/obsolete/genome-fetcher/species_info.json b/cellbase-app/app/bin/obsolete/genome-fetcher/species_info.json old mode 100644 new mode 100755 diff --git a/cellbase-app/app/bin/obsolete/genome-fetcher/species_info.txt b/cellbase-app/app/bin/obsolete/genome-fetcher/species_info.txt old mode 100644 new mode 100755 diff --git a/cellbase-app/app/bin/obsolete/variation-chunkIds.js b/cellbase-app/app/bin/obsolete/variation-chunkIds.js old mode 100644 new mode 100755 diff --git a/cellbase-app/app/example/5000_variants.vcf.gz b/cellbase-app/app/example/5000_variants.vcf.gz old mode 100644 new mode 100755 diff --git a/cellbase-app/app/example/BasicTest.Json b/cellbase-app/app/example/BasicTest.Json old mode 100644 new mode 100755 diff --git a/cellbase-app/app/example/BasicTest.gvf b/cellbase-app/app/example/BasicTest.gvf old mode 100644 new mode 100755 diff --git a/cellbase-app/app/example/Escherichia coli.owl b/cellbase-app/app/example/Escherichia coli.owl old mode 100644 new mode 100755 diff --git a/cellbase-app/app/example/Homo_sapiens_incl_consequences_1000.Json b/cellbase-app/app/example/Homo_sapiens_incl_consequences_1000.Json old mode 100644 new mode 100755 diff --git a/cellbase-app/app/example/Homo_sapiens_incl_consequences_1000.gvf b/cellbase-app/app/example/Homo_sapiens_incl_consequences_1000.gvf old mode 100644 new mode 100755 diff --git a/cellbase-app/app/mongodb-scripts/add_database_roles_mongo.js b/cellbase-app/app/mongodb-scripts/add_database_roles_mongo.js old mode 100644 new mode 100755 diff --git a/cellbase-app/app/mongodb-scripts/clinical-indexes.js b/cellbase-app/app/mongodb-scripts/clinical-indexes.js old mode 100644 new mode 100755 diff --git a/cellbase-app/app/mongodb-scripts/clinical-legacy-indexes.js b/cellbase-app/app/mongodb-scripts/clinical-legacy-indexes.js old mode 100644 new mode 100755 diff --git a/cellbase-app/app/mongodb-scripts/conservation-indexes.js b/cellbase-app/app/mongodb-scripts/conservation-indexes.js old mode 100644 new mode 100755 diff --git a/cellbase-app/app/mongodb-scripts/create-biouser.js b/cellbase-app/app/mongodb-scripts/create-biouser.js old mode 100644 new mode 100755 diff --git a/cellbase-app/app/mongodb-scripts/drugbank-indexes.js b/cellbase-app/app/mongodb-scripts/drugbank-indexes.js old mode 100644 new mode 100755 diff --git a/cellbase-app/app/mongodb-scripts/gene-indexes.js b/cellbase-app/app/mongodb-scripts/gene-indexes.js old mode 100644 new mode 100755 diff --git a/cellbase-app/app/mongodb-scripts/genome_sequence-indexes.js b/cellbase-app/app/mongodb-scripts/genome_sequence-indexes.js old mode 100644 new mode 100755 diff --git a/cellbase-app/app/mongodb-scripts/grant-users.js b/cellbase-app/app/mongodb-scripts/grant-users.js old mode 100644 new mode 100755 diff --git a/cellbase-app/app/mongodb-scripts/mutation-indexes.js b/cellbase-app/app/mongodb-scripts/mutation-indexes.js old mode 100644 new mode 100755 diff --git a/cellbase-app/app/mongodb-scripts/protein-indexes.js b/cellbase-app/app/mongodb-scripts/protein-indexes.js old mode 100644 new mode 100755 diff --git a/cellbase-app/app/mongodb-scripts/protein_functional_prediction-indexes.js b/cellbase-app/app/mongodb-scripts/protein_functional_prediction-indexes.js old mode 100644 new mode 100755 diff --git a/cellbase-app/app/mongodb-scripts/protein_protein_interaction-indexes.js b/cellbase-app/app/mongodb-scripts/protein_protein_interaction-indexes.js old mode 100644 new mode 100755 diff --git a/cellbase-app/app/mongodb-scripts/regulatory_region-indexes.js b/cellbase-app/app/mongodb-scripts/regulatory_region-indexes.js old mode 100644 new mode 100755 diff --git a/cellbase-app/app/mongodb-scripts/repeat-indexes.js b/cellbase-app/app/mongodb-scripts/repeat-indexes.js old mode 100644 new mode 100755 diff --git a/cellbase-app/app/mongodb-scripts/variation-indexes.js b/cellbase-app/app/mongodb-scripts/variation-indexes.js old mode 100644 new mode 100755 diff --git a/cellbase-app/app/mongodb-scripts/variation_functional_score-indexes.js b/cellbase-app/app/mongodb-scripts/variation_functional_score-indexes.js old mode 100644 new mode 100755 diff --git a/cellbase-app/app/mongodb-scripts/variation_phenotype-indexes.js b/cellbase-app/app/mongodb-scripts/variation_phenotype-indexes.js old mode 100644 new mode 100755 diff --git a/cellbase-app/app/mongodb-scripts/variation_phenotype_annotation-indexes.js b/cellbase-app/app/mongodb-scripts/variation_phenotype_annotation-indexes.js old mode 100644 new mode 100755 diff --git a/cellbase-app/pom.xml b/cellbase-app/pom.xml old mode 100644 new mode 100755 index 30708578b8..ca17e70782 --- a/cellbase-app/pom.xml +++ b/cellbase-app/pom.xml @@ -47,6 +47,11 @@ commons-io 2.4 + + commons-net + commons-net + ${commons-net.version} + org.spockframework spock-core diff --git a/cellbase-app/src/main/java/org/opencb/cellbase/app/CellBaseMain.java b/cellbase-app/src/main/java/org/opencb/cellbase/app/CellBaseMain.java old mode 100644 new mode 100755 diff --git a/cellbase-app/src/main/java/org/opencb/cellbase/app/cli/BuildCommandExecutor.java b/cellbase-app/src/main/java/org/opencb/cellbase/app/cli/BuildCommandExecutor.java old mode 100644 new mode 100755 diff --git a/cellbase-app/src/main/java/org/opencb/cellbase/app/cli/CliOptionsParser.java b/cellbase-app/src/main/java/org/opencb/cellbase/app/cli/CliOptionsParser.java old mode 100644 new mode 100755 diff --git a/cellbase-app/src/main/java/org/opencb/cellbase/app/cli/CommandExecutor.java b/cellbase-app/src/main/java/org/opencb/cellbase/app/cli/CommandExecutor.java old mode 100644 new mode 100755 diff --git a/cellbase-app/src/main/java/org/opencb/cellbase/app/cli/DownloadCommandExecutor.java b/cellbase-app/src/main/java/org/opencb/cellbase/app/cli/DownloadCommandExecutor.java old mode 100644 new mode 100755 index b0c2948463..94a3ba1e48 --- a/cellbase-app/src/main/java/org/opencb/cellbase/app/cli/DownloadCommandExecutor.java +++ b/cellbase-app/src/main/java/org/opencb/cellbase/app/cli/DownloadCommandExecutor.java @@ -24,6 +24,8 @@ import org.apache.commons.collections.map.HashedMap; import org.apache.commons.io.FilenameUtils; import org.apache.commons.io.IOUtils; +import org.apache.commons.net.ftp.FTPClient; +import org.apache.commons.net.ftp.FTPFile; import org.apache.commons.lang.StringUtils; import org.opencb.cellbase.core.config.Species; import org.opencb.commons.utils.FileUtils; @@ -1165,6 +1167,25 @@ private void downloadFile(String url, String outputFileName) throws IOException, private void downloadFile(String url, String outputFileName, List wgetAdditionalArgs) throws IOException, InterruptedException { + File file = new File(outputFileName); + if (file.exists()) { + FTPClient ftpClient = new FTPClient(); + // code to connect and login.... + + FTPFile remotefile = ftpClient.mlistFile(outputFileName); + long remotesize = remotefile.getSize(); + long localsize = file.length(); + long locallastmodified = file.lastModified(); + logger.info("File " + outputFileName + " exists, with size " + localsize + " vs " + + remotesize + " in remote and will not be downloaded again"); + if (remotesize == localsize) { + logger.info("Download avoided because the files have the same size"); + return; + } + //If the filestamps differ, regardless of the timestamps downloads the file + Calendar remotets = remotefile.getTimestamp(); + logger.info("local ts " + locallastmodified + "wheras remote ts is " + remotets.toString()); + } List wgetArgs = new ArrayList<>(Arrays.asList("--tries=10", url, "-O", outputFileName, "-o", outputFileName + ".log")); if (wgetAdditionalArgs != null && !wgetAdditionalArgs.isEmpty()) { diff --git a/cellbase-app/src/main/java/org/opencb/cellbase/app/cli/EtlCommons.java b/cellbase-app/src/main/java/org/opencb/cellbase/app/cli/EtlCommons.java old mode 100644 new mode 100755 diff --git a/cellbase-app/src/main/java/org/opencb/cellbase/app/cli/LoadCommandExecutor.java b/cellbase-app/src/main/java/org/opencb/cellbase/app/cli/LoadCommandExecutor.java old mode 100644 new mode 100755 diff --git a/cellbase-app/src/main/java/org/opencb/cellbase/app/cli/PostLoadCommandExecutor.java b/cellbase-app/src/main/java/org/opencb/cellbase/app/cli/PostLoadCommandExecutor.java old mode 100644 new mode 100755 diff --git a/cellbase-app/src/main/java/org/opencb/cellbase/app/cli/QueryCommandExecutor.java b/cellbase-app/src/main/java/org/opencb/cellbase/app/cli/QueryCommandExecutor.java old mode 100644 new mode 100755 diff --git a/cellbase-app/src/main/java/org/opencb/cellbase/app/cli/QueryGrpcCommandExecutor.java b/cellbase-app/src/main/java/org/opencb/cellbase/app/cli/QueryGrpcCommandExecutor.java old mode 100644 new mode 100755 diff --git a/cellbase-app/src/main/java/org/opencb/cellbase/app/cli/VariantAnnotationCommandExecutor.java b/cellbase-app/src/main/java/org/opencb/cellbase/app/cli/VariantAnnotationCommandExecutor.java old mode 100644 new mode 100755 diff --git a/cellbase-app/src/main/java/org/opencb/cellbase/app/cli/variant/annotation/BenchmarkDataWriter.java b/cellbase-app/src/main/java/org/opencb/cellbase/app/cli/variant/annotation/BenchmarkDataWriter.java old mode 100644 new mode 100755 diff --git a/cellbase-app/src/main/java/org/opencb/cellbase/app/cli/variant/annotation/BenchmarkTask.java b/cellbase-app/src/main/java/org/opencb/cellbase/app/cli/variant/annotation/BenchmarkTask.java old mode 100644 new mode 100755 diff --git a/cellbase-app/src/main/java/org/opencb/cellbase/app/cli/variant/annotation/CellBaseLocalVariantAnnotator.java b/cellbase-app/src/main/java/org/opencb/cellbase/app/cli/variant/annotation/CellBaseLocalVariantAnnotator.java old mode 100644 new mode 100755 diff --git a/cellbase-app/src/main/java/org/opencb/cellbase/app/cli/variant/annotation/CellBaseWSVariantAnnotator.java b/cellbase-app/src/main/java/org/opencb/cellbase/app/cli/variant/annotation/CellBaseWSVariantAnnotator.java old mode 100644 new mode 100755 diff --git a/cellbase-app/src/main/java/org/opencb/cellbase/app/cli/variant/annotation/JsonStringAnnotatorTask.java b/cellbase-app/src/main/java/org/opencb/cellbase/app/cli/variant/annotation/JsonStringAnnotatorTask.java old mode 100644 new mode 100755 diff --git a/cellbase-app/src/main/java/org/opencb/cellbase/app/cli/variant/annotation/PopulationFrequenciesAnnotator.java b/cellbase-app/src/main/java/org/opencb/cellbase/app/cli/variant/annotation/PopulationFrequenciesAnnotator.java old mode 100644 new mode 100755 diff --git a/cellbase-app/src/main/java/org/opencb/cellbase/app/cli/variant/annotation/SequenceOntologyTermComparisonObject.java b/cellbase-app/src/main/java/org/opencb/cellbase/app/cli/variant/annotation/SequenceOntologyTermComparisonObject.java old mode 100644 new mode 100755 diff --git a/cellbase-app/src/main/java/org/opencb/cellbase/app/cli/variant/annotation/VariantAnnotationDiff.java b/cellbase-app/src/main/java/org/opencb/cellbase/app/cli/variant/annotation/VariantAnnotationDiff.java old mode 100644 new mode 100755 diff --git a/cellbase-app/src/main/java/org/opencb/cellbase/app/cli/variant/annotation/VariantAnnotatorTask.java b/cellbase-app/src/main/java/org/opencb/cellbase/app/cli/variant/annotation/VariantAnnotatorTask.java old mode 100644 new mode 100755 diff --git a/cellbase-app/src/main/java/org/opencb/cellbase/app/cli/variant/annotation/VariationDataReader.java b/cellbase-app/src/main/java/org/opencb/cellbase/app/cli/variant/annotation/VariationDataReader.java old mode 100644 new mode 100755 diff --git a/cellbase-app/src/main/java/org/opencb/cellbase/app/cli/variant/annotation/VcfStringAnnotatorTask.java b/cellbase-app/src/main/java/org/opencb/cellbase/app/cli/variant/annotation/VcfStringAnnotatorTask.java old mode 100644 new mode 100755 diff --git a/cellbase-app/src/main/java/org/opencb/cellbase/app/cli/variant/annotation/VcfVariantAnnotator.java b/cellbase-app/src/main/java/org/opencb/cellbase/app/cli/variant/annotation/VcfVariantAnnotator.java old mode 100644 new mode 100755 diff --git a/cellbase-app/src/main/java/org/opencb/cellbase/app/cli/variant/annotation/indexers/CustomAnnotationVariantIndexer.java b/cellbase-app/src/main/java/org/opencb/cellbase/app/cli/variant/annotation/indexers/CustomAnnotationVariantIndexer.java old mode 100644 new mode 100755 diff --git a/cellbase-app/src/main/java/org/opencb/cellbase/app/cli/variant/annotation/indexers/PopulationFrequencyVariantIndexer.java b/cellbase-app/src/main/java/org/opencb/cellbase/app/cli/variant/annotation/indexers/PopulationFrequencyVariantIndexer.java old mode 100644 new mode 100755 diff --git a/cellbase-app/src/main/java/org/opencb/cellbase/app/cli/variant/annotation/indexers/VariantIndexer.java b/cellbase-app/src/main/java/org/opencb/cellbase/app/cli/variant/annotation/indexers/VariantIndexer.java old mode 100644 new mode 100755 diff --git a/cellbase-app/src/main/java/org/opencb/cellbase/app/transform/CaddAllAnnotationParser.java b/cellbase-app/src/main/java/org/opencb/cellbase/app/transform/CaddAllAnnotationParser.java old mode 100644 new mode 100755 diff --git a/cellbase-app/src/main/java/org/opencb/cellbase/app/transform/CaddScoreParser.java b/cellbase-app/src/main/java/org/opencb/cellbase/app/transform/CaddScoreParser.java old mode 100644 new mode 100755 diff --git a/cellbase-app/src/main/java/org/opencb/cellbase/app/transform/CellBaseParser.java b/cellbase-app/src/main/java/org/opencb/cellbase/app/transform/CellBaseParser.java old mode 100644 new mode 100755 diff --git a/cellbase-app/src/main/java/org/opencb/cellbase/app/transform/ConservationParser.java b/cellbase-app/src/main/java/org/opencb/cellbase/app/transform/ConservationParser.java old mode 100644 new mode 100755 diff --git a/cellbase-app/src/main/java/org/opencb/cellbase/app/transform/DgvParser.java b/cellbase-app/src/main/java/org/opencb/cellbase/app/transform/DgvParser.java old mode 100644 new mode 100755 diff --git a/cellbase-app/src/main/java/org/opencb/cellbase/app/transform/DisgenetParser.java b/cellbase-app/src/main/java/org/opencb/cellbase/app/transform/DisgenetParser.java old mode 100644 new mode 100755 diff --git a/cellbase-app/src/main/java/org/opencb/cellbase/app/transform/DrugParser.java b/cellbase-app/src/main/java/org/opencb/cellbase/app/transform/DrugParser.java old mode 100644 new mode 100755 diff --git a/cellbase-app/src/main/java/org/opencb/cellbase/app/transform/GeneExpressionAtlasParser.java b/cellbase-app/src/main/java/org/opencb/cellbase/app/transform/GeneExpressionAtlasParser.java old mode 100644 new mode 100755 diff --git a/cellbase-app/src/main/java/org/opencb/cellbase/app/transform/GeneParser.java b/cellbase-app/src/main/java/org/opencb/cellbase/app/transform/GeneParser.java old mode 100644 new mode 100755 diff --git a/cellbase-app/src/main/java/org/opencb/cellbase/app/transform/GeneParserProto.java b/cellbase-app/src/main/java/org/opencb/cellbase/app/transform/GeneParserProto.java old mode 100644 new mode 100755 diff --git a/cellbase-app/src/main/java/org/opencb/cellbase/app/transform/GeneParserUtils.java b/cellbase-app/src/main/java/org/opencb/cellbase/app/transform/GeneParserUtils.java old mode 100644 new mode 100755 diff --git a/cellbase-app/src/main/java/org/opencb/cellbase/app/transform/GenomeSequenceFastaParser.java b/cellbase-app/src/main/java/org/opencb/cellbase/app/transform/GenomeSequenceFastaParser.java old mode 100644 new mode 100755 diff --git a/cellbase-app/src/main/java/org/opencb/cellbase/app/transform/InteractionParser.java b/cellbase-app/src/main/java/org/opencb/cellbase/app/transform/InteractionParser.java old mode 100644 new mode 100755 diff --git a/cellbase-app/src/main/java/org/opencb/cellbase/app/transform/Main.java b/cellbase-app/src/main/java/org/opencb/cellbase/app/transform/Main.java old mode 100644 new mode 100755 diff --git a/cellbase-app/src/main/java/org/opencb/cellbase/app/transform/ProteinParser.java b/cellbase-app/src/main/java/org/opencb/cellbase/app/transform/ProteinParser.java old mode 100644 new mode 100755 diff --git a/cellbase-app/src/main/java/org/opencb/cellbase/app/transform/RegulatoryRegionParser.java b/cellbase-app/src/main/java/org/opencb/cellbase/app/transform/RegulatoryRegionParser.java old mode 100644 new mode 100755 diff --git a/cellbase-app/src/main/java/org/opencb/cellbase/app/transform/RepeatsParser.java b/cellbase-app/src/main/java/org/opencb/cellbase/app/transform/RepeatsParser.java old mode 100644 new mode 100755 diff --git a/cellbase-app/src/main/java/org/opencb/cellbase/app/transform/VariationPhenotypeAnnotationParser.java b/cellbase-app/src/main/java/org/opencb/cellbase/app/transform/VariationPhenotypeAnnotationParser.java old mode 100644 new mode 100755 diff --git a/cellbase-app/src/main/java/org/opencb/cellbase/app/transform/clinical/variant/ClinVarIndexer.java b/cellbase-app/src/main/java/org/opencb/cellbase/app/transform/clinical/variant/ClinVarIndexer.java old mode 100644 new mode 100755 diff --git a/cellbase-app/src/main/java/org/opencb/cellbase/app/transform/clinical/variant/ClinVarParser.java b/cellbase-app/src/main/java/org/opencb/cellbase/app/transform/clinical/variant/ClinVarParser.java old mode 100644 new mode 100755 diff --git a/cellbase-app/src/main/java/org/opencb/cellbase/app/transform/clinical/variant/ClinicalIndexer.java b/cellbase-app/src/main/java/org/opencb/cellbase/app/transform/clinical/variant/ClinicalIndexer.java old mode 100644 new mode 100755 diff --git a/cellbase-app/src/main/java/org/opencb/cellbase/app/transform/clinical/variant/ClinicalVariantParser.java b/cellbase-app/src/main/java/org/opencb/cellbase/app/transform/clinical/variant/ClinicalVariantParser.java old mode 100644 new mode 100755 diff --git a/cellbase-app/src/main/java/org/opencb/cellbase/app/transform/clinical/variant/CosmicIndexer.java b/cellbase-app/src/main/java/org/opencb/cellbase/app/transform/clinical/variant/CosmicIndexer.java old mode 100644 new mode 100755 diff --git a/cellbase-app/src/main/java/org/opencb/cellbase/app/transform/clinical/variant/CosmicParser.java b/cellbase-app/src/main/java/org/opencb/cellbase/app/transform/clinical/variant/CosmicParser.java old mode 100644 new mode 100755 diff --git a/cellbase-app/src/main/java/org/opencb/cellbase/app/transform/clinical/variant/DOCMIndexer.java b/cellbase-app/src/main/java/org/opencb/cellbase/app/transform/clinical/variant/DOCMIndexer.java old mode 100644 new mode 100755 index 9236eb6efd..d2302c750a --- a/cellbase-app/src/main/java/org/opencb/cellbase/app/transform/clinical/variant/DOCMIndexer.java +++ b/cellbase-app/src/main/java/org/opencb/cellbase/app/transform/clinical/variant/DOCMIndexer.java @@ -30,7 +30,7 @@ public class DOCMIndexer extends ClinicalIndexer { private static final String DISEASE = "disease"; private static final String SOURCE_PUBMED_ID = "source_pubmed_id"; private static final String PMID = "PMID:"; - private static final String URL_PREFIX = "http://docm.genome.wustl.edu/variants/"; + private static final String URL_PREFIX = "http://docm.info/variants/"; private static final String HGVS = "hgvs"; private static final String GENE = "gene"; private static final String TRANSCRIPT = "transcript"; diff --git a/cellbase-app/src/main/java/org/opencb/cellbase/app/transform/clinical/variant/GwasParser.java b/cellbase-app/src/main/java/org/opencb/cellbase/app/transform/clinical/variant/GwasParser.java old mode 100644 new mode 100755 diff --git a/cellbase-app/src/main/java/org/opencb/cellbase/app/transform/clinical/variant/IARCTP53Indexer.java b/cellbase-app/src/main/java/org/opencb/cellbase/app/transform/clinical/variant/IARCTP53Indexer.java old mode 100644 new mode 100755 diff --git a/cellbase-app/src/main/java/org/opencb/cellbase/app/transform/formats/Cadd.java b/cellbase-app/src/main/java/org/opencb/cellbase/app/transform/formats/Cadd.java old mode 100644 new mode 100755 diff --git a/cellbase-app/src/main/java/org/opencb/cellbase/app/transform/formats/ConservedRegionFeature.java b/cellbase-app/src/main/java/org/opencb/cellbase/app/transform/formats/ConservedRegionFeature.java old mode 100644 new mode 100755 diff --git a/cellbase-app/src/main/java/org/opencb/cellbase/app/transform/formats/GeneExpressionAtlas.java b/cellbase-app/src/main/java/org/opencb/cellbase/app/transform/formats/GeneExpressionAtlas.java old mode 100644 new mode 100755 diff --git a/cellbase-app/src/main/java/org/opencb/cellbase/app/transform/utils/GenomeSequenceUtils.java b/cellbase-app/src/main/java/org/opencb/cellbase/app/transform/utils/GenomeSequenceUtils.java old mode 100644 new mode 100755 diff --git a/cellbase-app/src/main/java/org/opencb/cellbase/app/transform/utils/StringUtils.java b/cellbase-app/src/main/java/org/opencb/cellbase/app/transform/utils/StringUtils.java old mode 100644 new mode 100755 diff --git a/cellbase-app/src/main/java/org/opencb/cellbase/app/transform/utils/VariationUtils.java b/cellbase-app/src/main/java/org/opencb/cellbase/app/transform/utils/VariationUtils.java old mode 100644 new mode 100755 diff --git a/cellbase-app/src/main/java/org/opencb/cellbase/app/transform/variation/AbstractVariationFile.java b/cellbase-app/src/main/java/org/opencb/cellbase/app/transform/variation/AbstractVariationFile.java old mode 100644 new mode 100755 diff --git a/cellbase-app/src/main/java/org/opencb/cellbase/app/transform/variation/VariationFeatureFile.java b/cellbase-app/src/main/java/org/opencb/cellbase/app/transform/variation/VariationFeatureFile.java old mode 100644 new mode 100755 diff --git a/cellbase-app/src/main/java/org/opencb/cellbase/app/transform/variation/VariationFile.java b/cellbase-app/src/main/java/org/opencb/cellbase/app/transform/variation/VariationFile.java old mode 100644 new mode 100755 diff --git a/cellbase-app/src/main/java/org/opencb/cellbase/app/transform/variation/VariationParser.java b/cellbase-app/src/main/java/org/opencb/cellbase/app/transform/variation/VariationParser.java old mode 100644 new mode 100755 diff --git a/cellbase-app/src/main/java/org/opencb/cellbase/app/transform/variation/VariationSynonymFile.java b/cellbase-app/src/main/java/org/opencb/cellbase/app/transform/variation/VariationSynonymFile.java old mode 100644 new mode 100755 diff --git a/cellbase-app/src/main/java/org/opencb/cellbase/app/transform/variation/VariationTranscriptFile.java b/cellbase-app/src/main/java/org/opencb/cellbase/app/transform/variation/VariationTranscriptFile.java old mode 100644 new mode 100755 diff --git a/cellbase-app/src/test/groovy/org/opencb/cellbase/app/transform/CaddAllAnnotationParserTest.groovy b/cellbase-app/src/test/groovy/org/opencb/cellbase/app/transform/CaddAllAnnotationParserTest.groovy old mode 100644 new mode 100755 diff --git a/cellbase-app/src/test/groovy/org/opencb/cellbase/app/transform/ClinVarParserTest.groovy b/cellbase-app/src/test/groovy/org/opencb/cellbase/app/transform/ClinVarParserTest.groovy old mode 100644 new mode 100755 diff --git a/cellbase-app/src/test/groovy/org/opencb/cellbase/app/transform/CosmicParserTest.groovy b/cellbase-app/src/test/groovy/org/opencb/cellbase/app/transform/CosmicParserTest.groovy old mode 100644 new mode 100755 diff --git a/cellbase-app/src/test/groovy/org/opencb/cellbase/app/transform/GeneParserTest.groovy b/cellbase-app/src/test/groovy/org/opencb/cellbase/app/transform/GeneParserTest.groovy old mode 100644 new mode 100755 diff --git a/cellbase-app/src/test/groovy/org/opencb/cellbase/app/transform/GwasParserTest.groovy b/cellbase-app/src/test/groovy/org/opencb/cellbase/app/transform/GwasParserTest.groovy old mode 100644 new mode 100755 diff --git a/cellbase-app/src/test/java/org/opencb/cellbase/app/cli/PostLoadCommandExecutorTest.java b/cellbase-app/src/test/java/org/opencb/cellbase/app/cli/PostLoadCommandExecutorTest.java old mode 100644 new mode 100755 diff --git a/cellbase-app/src/test/java/org/opencb/cellbase/app/cli/VariantAnnotationCommandExecutorTest.java b/cellbase-app/src/test/java/org/opencb/cellbase/app/cli/VariantAnnotationCommandExecutorTest.java old mode 100644 new mode 100755 diff --git a/cellbase-app/src/test/java/org/opencb/cellbase/app/loaders/mongodb/VariantEffectMongoDBLoaderTest.java b/cellbase-app/src/test/java/org/opencb/cellbase/app/loaders/mongodb/VariantEffectMongoDBLoaderTest.java old mode 100644 new mode 100755 diff --git a/cellbase-app/src/test/java/org/opencb/cellbase/app/transform/CaddScoreParserTest.java b/cellbase-app/src/test/java/org/opencb/cellbase/app/transform/CaddScoreParserTest.java old mode 100644 new mode 100755 diff --git a/cellbase-app/src/test/java/org/opencb/cellbase/app/transform/DgvParserTest.java b/cellbase-app/src/test/java/org/opencb/cellbase/app/transform/DgvParserTest.java old mode 100644 new mode 100755 diff --git a/cellbase-app/src/test/java/org/opencb/cellbase/app/transform/GenericParserTest.java b/cellbase-app/src/test/java/org/opencb/cellbase/app/transform/GenericParserTest.java old mode 100644 new mode 100755 diff --git a/cellbase-app/src/test/java/org/opencb/cellbase/app/transform/RegulatoryRegionParserTest.java b/cellbase-app/src/test/java/org/opencb/cellbase/app/transform/RegulatoryRegionParserTest.java old mode 100644 new mode 100755 diff --git a/cellbase-app/src/test/java/org/opencb/cellbase/app/transform/RepeatsParserTest.java b/cellbase-app/src/test/java/org/opencb/cellbase/app/transform/RepeatsParserTest.java old mode 100644 new mode 100755 diff --git a/cellbase-app/src/test/java/org/opencb/cellbase/app/transform/clinical/variant/ClinicalVariantParserTest.java b/cellbase-app/src/test/java/org/opencb/cellbase/app/transform/clinical/variant/ClinicalVariantParserTest.java old mode 100644 new mode 100755 diff --git a/cellbase-app/src/test/java/org/opencb/cellbase/app/transform/utils/GenomeSequenceUtilsTest.java b/cellbase-app/src/test/java/org/opencb/cellbase/app/transform/utils/GenomeSequenceUtilsTest.java old mode 100644 new mode 100755 diff --git a/cellbase-app/src/test/java/org/opencb/cellbase/app/transform/variation/VariationParserTest.java b/cellbase-app/src/test/java/org/opencb/cellbase/app/transform/variation/VariationParserTest.java old mode 100644 new mode 100755 diff --git a/cellbase-app/src/test/java/org/opencb/fetcher/testGenerateCellbaseLibProperties.java b/cellbase-app/src/test/java/org/opencb/fetcher/testGenerateCellbaseLibProperties.java old mode 100644 new mode 100755 diff --git a/cellbase-app/src/test/resources/caddTest.tsv.gz b/cellbase-app/src/test/resources/caddTest.tsv.gz old mode 100644 new mode 100755 diff --git a/cellbase-app/src/test/resources/caddTest.tsv.gz.tbi b/cellbase-app/src/test/resources/caddTest.tsv.gz.tbi old mode 100644 new mode 100755 diff --git a/cellbase-app/src/test/resources/cadd_example.txt.gz b/cellbase-app/src/test/resources/cadd_example.txt.gz old mode 100644 new mode 100755 diff --git a/cellbase-app/src/test/resources/clinvarExample.xml b/cellbase-app/src/test/resources/clinvarExample.xml old mode 100644 new mode 100755 diff --git a/cellbase-app/src/test/resources/clinvarParser/ClinVar_Traits_EFO_Names.csv b/cellbase-app/src/test/resources/clinvarParser/ClinVar_Traits_EFO_Names.csv old mode 100644 new mode 100755 diff --git a/cellbase-app/src/test/resources/clinvarParser/clinvar_v19_test.xml.gz b/cellbase-app/src/test/resources/clinvarParser/clinvar_v19_test.xml.gz old mode 100644 new mode 100755 diff --git a/cellbase-app/src/test/resources/cosmicTest.csv b/cellbase-app/src/test/resources/cosmicTest.csv old mode 100644 new mode 100755 diff --git a/cellbase-app/src/test/resources/dbSnpTest.gz b/cellbase-app/src/test/resources/dbSnpTest.gz old mode 100644 new mode 100755 diff --git a/cellbase-app/src/test/resources/dbSnpTest.gz.tbi b/cellbase-app/src/test/resources/dbSnpTest.gz.tbi old mode 100644 new mode 100755 diff --git a/cellbase-app/src/test/resources/dgv.json.gz b/cellbase-app/src/test/resources/dgv.json.gz old mode 100644 new mode 100755 diff --git a/cellbase-app/src/test/resources/dgv.txt.gz b/cellbase-app/src/test/resources/dgv.txt.gz old mode 100644 new mode 100755 diff --git a/cellbase-app/src/test/resources/disGeNetTest.csv b/cellbase-app/src/test/resources/disGeNetTest.csv old mode 100644 new mode 100755 diff --git a/cellbase-app/src/test/resources/ebolaGenome/Ebola_virus.KM034562v1.fa.gz b/cellbase-app/src/test/resources/ebolaGenome/Ebola_virus.KM034562v1.fa.gz old mode 100644 new mode 100755 diff --git a/cellbase-app/src/test/resources/ebolaGenome/Ebola_virus.gtf.gz b/cellbase-app/src/test/resources/ebolaGenome/Ebola_virus.gtf.gz old mode 100644 new mode 100755 diff --git a/cellbase-app/src/test/resources/entrezIdToEnsemblIdTest.csv b/cellbase-app/src/test/resources/entrezIdToEnsemblIdTest.csv old mode 100644 new mode 100755 diff --git a/cellbase-app/src/test/resources/geneParser/Homo_sapiens.GRCh38.fa b/cellbase-app/src/test/resources/geneParser/Homo_sapiens.GRCh38.fa old mode 100644 new mode 100755 diff --git a/cellbase-app/src/test/resources/geneParser/MotifFeatures.gff.gz b/cellbase-app/src/test/resources/geneParser/MotifFeatures.gff.gz old mode 100644 new mode 100755 diff --git a/cellbase-app/src/test/resources/geneParser/homo_sapiens.gtf b/cellbase-app/src/test/resources/geneParser/homo_sapiens.gtf old mode 100644 new mode 100755 diff --git a/cellbase-app/src/test/resources/geneParser/tfbs.txt b/cellbase-app/src/test/resources/geneParser/tfbs.txt old mode 100644 new mode 100755 diff --git a/cellbase-app/src/test/resources/gwasTest.csv b/cellbase-app/src/test/resources/gwasTest.csv old mode 100644 new mode 100755 diff --git a/cellbase-app/src/test/resources/regulation/Regulatory_Build.regulatory_features.gff.gz b/cellbase-app/src/test/resources/regulation/Regulatory_Build.regulatory_features.gff.gz old mode 100644 new mode 100755 diff --git a/cellbase-app/src/test/resources/regulation/motiffeatures.gff.gz b/cellbase-app/src/test/resources/regulation/motiffeatures.gff.gz old mode 100644 new mode 100755 diff --git a/cellbase-app/src/test/resources/repeats/genomicSuperDups.txt.gz b/cellbase-app/src/test/resources/repeats/genomicSuperDups.txt.gz old mode 100644 new mode 100755 diff --git a/cellbase-app/src/test/resources/repeats/repeats.test.json.gz b/cellbase-app/src/test/resources/repeats/repeats.test.json.gz old mode 100644 new mode 100755 diff --git a/cellbase-app/src/test/resources/repeats/simpleRepeat.txt.gz b/cellbase-app/src/test/resources/repeats/simpleRepeat.txt.gz old mode 100644 new mode 100755 diff --git a/cellbase-app/src/test/resources/repeats/windowMasker.txt.gz b/cellbase-app/src/test/resources/repeats/windowMasker.txt.gz old mode 100644 new mode 100755 diff --git a/cellbase-app/src/test/resources/variant/annotation/Homo_sapiens.GRCh37.75.dna.primary_assembly.chr17.fa.gz b/cellbase-app/src/test/resources/variant/annotation/Homo_sapiens.GRCh37.75.dna.primary_assembly.chr17.fa.gz old mode 100644 new mode 100755 diff --git a/cellbase-app/src/test/resources/variant/annotation/Homo_sapiens.GRCh37.75.dna.primary_assembly.chr17.fa.gz.fai b/cellbase-app/src/test/resources/variant/annotation/Homo_sapiens.GRCh37.75.dna.primary_assembly.chr17.fa.gz.fai old mode 100644 new mode 100755 diff --git a/cellbase-app/src/test/resources/variant/annotation/Homo_sapiens.GRCh37.75.dna.primary_assembly.chr17.fa.gz.gzi b/cellbase-app/src/test/resources/variant/annotation/Homo_sapiens.GRCh37.75.dna.primary_assembly.chr17.fa.gz.gzi old mode 100644 new mode 100755 diff --git a/cellbase-app/src/test/resources/variant/annotation/clinicalVariant/ClinVarFullRelease_2020-02.xml.gz b/cellbase-app/src/test/resources/variant/annotation/clinicalVariant/ClinVarFullRelease_2020-02.xml.gz old mode 100644 new mode 100755 diff --git a/cellbase-app/src/test/resources/variant/annotation/clinicalVariant/CosmicMutantExport.tsv.gz b/cellbase-app/src/test/resources/variant/annotation/clinicalVariant/CosmicMutantExport.tsv.gz old mode 100644 new mode 100755 diff --git a/cellbase-app/src/test/resources/variant/annotation/clinicalVariant/datasets/germlineMutationDataIARC TP53 Database, R18.txt b/cellbase-app/src/test/resources/variant/annotation/clinicalVariant/datasets/germlineMutationDataIARC TP53 Database, R18.txt old mode 100644 new mode 100755 diff --git a/cellbase-app/src/test/resources/variant/annotation/clinicalVariant/datasets/germlineMutationReferenceIARC TP53 Database, R18.txt b/cellbase-app/src/test/resources/variant/annotation/clinicalVariant/datasets/germlineMutationReferenceIARC TP53 Database, R18.txt old mode 100644 new mode 100755 diff --git a/cellbase-app/src/test/resources/variant/annotation/clinicalVariant/datasets/somaticMutationDataIARC TP53 Database, R18.txt b/cellbase-app/src/test/resources/variant/annotation/clinicalVariant/datasets/somaticMutationDataIARC TP53 Database, R18.txt old mode 100644 new mode 100755 diff --git a/cellbase-app/src/test/resources/variant/annotation/clinicalVariant/datasets/somaticMutationReferenceIARC TP53 Database, R18.txt b/cellbase-app/src/test/resources/variant/annotation/clinicalVariant/datasets/somaticMutationReferenceIARC TP53 Database, R18.txt old mode 100644 new mode 100755 diff --git a/cellbase-app/src/test/resources/variant/annotation/clinicalVariant/docm.json.gz b/cellbase-app/src/test/resources/variant/annotation/clinicalVariant/docm.json.gz old mode 100644 new mode 100755 diff --git a/cellbase-app/src/test/resources/variant/annotation/clinicalVariant/variant_summary.txt.gz b/cellbase-app/src/test/resources/variant/annotation/clinicalVariant/variant_summary.txt.gz old mode 100644 new mode 100755 diff --git a/cellbase-app/src/test/resources/variant/annotation/clinicalVariant/variation_allele.txt.gz b/cellbase-app/src/test/resources/variant/annotation/clinicalVariant/variation_allele.txt.gz old mode 100644 new mode 100755 diff --git a/cellbase-app/src/test/resources/variant/annotation/commandExecutor/additionalPopulationFrequency/Homo_sapiens.1.vcf.gz b/cellbase-app/src/test/resources/variant/annotation/commandExecutor/additionalPopulationFrequency/Homo_sapiens.1.vcf.gz old mode 100644 new mode 100755 diff --git a/cellbase-app/src/test/resources/variant/annotation/commandExecutor/additionalPopulationFrequency/chr1.2017-12-27_01_12.hgva.freq.cellbase.test.json.gz b/cellbase-app/src/test/resources/variant/annotation/commandExecutor/additionalPopulationFrequency/chr1.2017-12-27_01_12.hgva.freq.cellbase.test.json.gz old mode 100644 new mode 100755 diff --git a/cellbase-app/src/test/resources/variant/annotation/commandExecutor/configuration.json b/cellbase-app/src/test/resources/variant/annotation/commandExecutor/configuration.json old mode 100644 new mode 100755 diff --git a/cellbase-app/src/test/resources/variant/annotation/commandExecutor/customAnnotation/GEL_GL_6628.duprem.sites.annot.subset.atomic.left.split.test.vcf.gz b/cellbase-app/src/test/resources/variant/annotation/commandExecutor/customAnnotation/GEL_GL_6628.duprem.sites.annot.subset.atomic.left.split.test.vcf.gz old mode 100644 new mode 100755 diff --git a/cellbase-app/src/test/resources/variant/annotation/commandExecutor/customAnnotation/proband.duprem.atomic.left.split.vcf.gz b/cellbase-app/src/test/resources/variant/annotation/commandExecutor/customAnnotation/proband.duprem.atomic.left.split.vcf.gz old mode 100644 new mode 100755 diff --git a/cellbase-app/src/test/resources/variant/annotation/commandExecutor/customAnnotation/twoCustomFiles/GEL_GL_6628.duprem.sites.annot.subset.atomic.left.split.test.vcf.gz b/cellbase-app/src/test/resources/variant/annotation/commandExecutor/customAnnotation/twoCustomFiles/GEL_GL_6628.duprem.sites.annot.subset.atomic.left.split.test.vcf.gz old mode 100644 new mode 100755 diff --git a/cellbase-app/src/test/resources/variant/annotation/commandExecutor/customAnnotation/twoCustomFiles/GEL_GL_another.duprem.sites.annot.subset.atomic.left.split.test.vcf.gz b/cellbase-app/src/test/resources/variant/annotation/commandExecutor/customAnnotation/twoCustomFiles/GEL_GL_another.duprem.sites.annot.subset.atomic.left.split.test.vcf.gz old mode 100644 new mode 100755 diff --git a/cellbase-app/src/test/resources/variationParser/genotype_code.txt.gz b/cellbase-app/src/test/resources/variationParser/genotype_code.txt.gz old mode 100644 new mode 100755 diff --git a/cellbase-app/src/test/resources/variationParser/seq_region.txt.gz b/cellbase-app/src/test/resources/variationParser/seq_region.txt.gz old mode 100644 new mode 100755 diff --git a/cellbase-app/src/test/resources/variationParser/source.txt.gz b/cellbase-app/src/test/resources/variationParser/source.txt.gz old mode 100644 new mode 100755 diff --git a/cellbase-app/src/test/resources/variationParser/transcript_variation.txt.gz b/cellbase-app/src/test/resources/variationParser/transcript_variation.txt.gz old mode 100644 new mode 100755 diff --git a/cellbase-app/src/test/resources/variationParser/variation.txt.gz b/cellbase-app/src/test/resources/variationParser/variation.txt.gz old mode 100644 new mode 100755 diff --git a/cellbase-app/src/test/resources/variationParser/variation_feature.txt.gz b/cellbase-app/src/test/resources/variationParser/variation_feature.txt.gz old mode 100644 new mode 100755 diff --git a/cellbase-app/src/test/resources/variationParser/variation_synonym.txt.gz b/cellbase-app/src/test/resources/variationParser/variation_synonym.txt.gz old mode 100644 new mode 100755 diff --git a/cellbase-app/src/test/resources/vep-example-output.txt b/cellbase-app/src/test/resources/vep-example-output.txt old mode 100644 new mode 100755 diff --git a/cellbase-client/pom.xml b/cellbase-client/pom.xml old mode 100644 new mode 100755 diff --git a/cellbase-client/src/main/java/org/opencb/cellbase/client/config/ClientConfiguration.java b/cellbase-client/src/main/java/org/opencb/cellbase/client/config/ClientConfiguration.java old mode 100644 new mode 100755 diff --git a/cellbase-client/src/main/java/org/opencb/cellbase/client/config/GrpcConfig.java b/cellbase-client/src/main/java/org/opencb/cellbase/client/config/GrpcConfig.java old mode 100644 new mode 100755 diff --git a/cellbase-client/src/main/java/org/opencb/cellbase/client/config/RestConfig.java b/cellbase-client/src/main/java/org/opencb/cellbase/client/config/RestConfig.java old mode 100644 new mode 100755 diff --git a/cellbase-client/src/main/java/org/opencb/cellbase/client/grpc/CellbaseGrpcClient.java b/cellbase-client/src/main/java/org/opencb/cellbase/client/grpc/CellbaseGrpcClient.java old mode 100644 new mode 100755 diff --git a/cellbase-client/src/main/java/org/opencb/cellbase/client/grpc/GeneGrpcClient.java b/cellbase-client/src/main/java/org/opencb/cellbase/client/grpc/GeneGrpcClient.java old mode 100644 new mode 100755 diff --git a/cellbase-client/src/main/java/org/opencb/cellbase/client/grpc/GenomicRegionGrpcClient.java b/cellbase-client/src/main/java/org/opencb/cellbase/client/grpc/GenomicRegionGrpcClient.java old mode 100644 new mode 100755 diff --git a/cellbase-client/src/main/java/org/opencb/cellbase/client/grpc/ParentGrpcClient.java b/cellbase-client/src/main/java/org/opencb/cellbase/client/grpc/ParentGrpcClient.java old mode 100644 new mode 100755 diff --git a/cellbase-client/src/main/java/org/opencb/cellbase/client/grpc/RegulatoryGrpcClient.java b/cellbase-client/src/main/java/org/opencb/cellbase/client/grpc/RegulatoryGrpcClient.java old mode 100644 new mode 100755 diff --git a/cellbase-client/src/main/java/org/opencb/cellbase/client/grpc/TranscriptGrpcClient.java b/cellbase-client/src/main/java/org/opencb/cellbase/client/grpc/TranscriptGrpcClient.java old mode 100644 new mode 100755 diff --git a/cellbase-client/src/main/java/org/opencb/cellbase/client/grpc/VariantAnnotationGrpcClient.java b/cellbase-client/src/main/java/org/opencb/cellbase/client/grpc/VariantAnnotationGrpcClient.java old mode 100644 new mode 100755 diff --git a/cellbase-client/src/main/java/org/opencb/cellbase/client/grpc/VariationGrpcClient.java b/cellbase-client/src/main/java/org/opencb/cellbase/client/grpc/VariationGrpcClient.java old mode 100644 new mode 100755 diff --git a/cellbase-client/src/main/java/org/opencb/cellbase/client/rest/CellBaseClient.java b/cellbase-client/src/main/java/org/opencb/cellbase/client/rest/CellBaseClient.java old mode 100644 new mode 100755 diff --git a/cellbase-client/src/main/java/org/opencb/cellbase/client/rest/ClinicalVariantClient.java b/cellbase-client/src/main/java/org/opencb/cellbase/client/rest/ClinicalVariantClient.java old mode 100644 new mode 100755 diff --git a/cellbase-client/src/main/java/org/opencb/cellbase/client/rest/FeatureClient.java b/cellbase-client/src/main/java/org/opencb/cellbase/client/rest/FeatureClient.java old mode 100644 new mode 100755 diff --git a/cellbase-client/src/main/java/org/opencb/cellbase/client/rest/GeneClient.java b/cellbase-client/src/main/java/org/opencb/cellbase/client/rest/GeneClient.java old mode 100644 new mode 100755 diff --git a/cellbase-client/src/main/java/org/opencb/cellbase/client/rest/GenericClient.java b/cellbase-client/src/main/java/org/opencb/cellbase/client/rest/GenericClient.java old mode 100644 new mode 100755 diff --git a/cellbase-client/src/main/java/org/opencb/cellbase/client/rest/GenomicRegionClient.java b/cellbase-client/src/main/java/org/opencb/cellbase/client/rest/GenomicRegionClient.java old mode 100644 new mode 100755 diff --git a/cellbase-client/src/main/java/org/opencb/cellbase/client/rest/MetaClient.java b/cellbase-client/src/main/java/org/opencb/cellbase/client/rest/MetaClient.java old mode 100644 new mode 100755 diff --git a/cellbase-client/src/main/java/org/opencb/cellbase/client/rest/ParentRestClient.java b/cellbase-client/src/main/java/org/opencb/cellbase/client/rest/ParentRestClient.java old mode 100644 new mode 100755 diff --git a/cellbase-client/src/main/java/org/opencb/cellbase/client/rest/ProteinClient.java b/cellbase-client/src/main/java/org/opencb/cellbase/client/rest/ProteinClient.java old mode 100644 new mode 100755 diff --git a/cellbase-client/src/main/java/org/opencb/cellbase/client/rest/TranscriptClient.java b/cellbase-client/src/main/java/org/opencb/cellbase/client/rest/TranscriptClient.java old mode 100644 new mode 100755 diff --git a/cellbase-client/src/main/java/org/opencb/cellbase/client/rest/VariantClient.java b/cellbase-client/src/main/java/org/opencb/cellbase/client/rest/VariantClient.java old mode 100644 new mode 100755 diff --git a/cellbase-client/src/main/java/org/opencb/cellbase/client/rest/VariationClient.java b/cellbase-client/src/main/java/org/opencb/cellbase/client/rest/VariationClient.java old mode 100644 new mode 100755 diff --git a/cellbase-client/src/main/java/org/opencb/cellbase/client/rest/models/GroupByFields.java b/cellbase-client/src/main/java/org/opencb/cellbase/client/rest/models/GroupByFields.java old mode 100644 new mode 100755 diff --git a/cellbase-client/src/main/java/org/opencb/cellbase/client/rest/models/GroupCount.java b/cellbase-client/src/main/java/org/opencb/cellbase/client/rest/models/GroupCount.java old mode 100644 new mode 100755 diff --git a/cellbase-client/src/main/java/org/opencb/cellbase/client/rest/models/mixin/DrugResponseClassificationMixIn.java b/cellbase-client/src/main/java/org/opencb/cellbase/client/rest/models/mixin/DrugResponseClassificationMixIn.java old mode 100644 new mode 100755 diff --git a/cellbase-client/src/main/resources/client-configuration.yml b/cellbase-client/src/main/resources/client-configuration.yml old mode 100644 new mode 100755 diff --git a/cellbase-client/src/test/java/org/opencb/cellbase/client/config/ClientConfigurationTest.java b/cellbase-client/src/test/java/org/opencb/cellbase/client/config/ClientConfigurationTest.java old mode 100644 new mode 100755 diff --git a/cellbase-client/src/test/java/org/opencb/cellbase/client/grpc/GeneGrpcClientTest.java b/cellbase-client/src/test/java/org/opencb/cellbase/client/grpc/GeneGrpcClientTest.java old mode 100644 new mode 100755 diff --git a/cellbase-client/src/test/java/org/opencb/cellbase/client/grpc/TranscriptGrpcClientTest.java b/cellbase-client/src/test/java/org/opencb/cellbase/client/grpc/TranscriptGrpcClientTest.java old mode 100644 new mode 100755 diff --git a/cellbase-client/src/test/java/org/opencb/cellbase/client/rest/ClinicalVariantClientTest.java b/cellbase-client/src/test/java/org/opencb/cellbase/client/rest/ClinicalVariantClientTest.java old mode 100644 new mode 100755 diff --git a/cellbase-client/src/test/java/org/opencb/cellbase/client/rest/GeneClientTest.java b/cellbase-client/src/test/java/org/opencb/cellbase/client/rest/GeneClientTest.java old mode 100644 new mode 100755 diff --git a/cellbase-client/src/test/java/org/opencb/cellbase/client/rest/GenericClientTest.java b/cellbase-client/src/test/java/org/opencb/cellbase/client/rest/GenericClientTest.java old mode 100644 new mode 100755 diff --git a/cellbase-client/src/test/java/org/opencb/cellbase/client/rest/GenomicRegionClientTest.java b/cellbase-client/src/test/java/org/opencb/cellbase/client/rest/GenomicRegionClientTest.java old mode 100644 new mode 100755 diff --git a/cellbase-client/src/test/java/org/opencb/cellbase/client/rest/MetaClientTest.java b/cellbase-client/src/test/java/org/opencb/cellbase/client/rest/MetaClientTest.java old mode 100644 new mode 100755 diff --git a/cellbase-client/src/test/java/org/opencb/cellbase/client/rest/ProteinClientTest.java b/cellbase-client/src/test/java/org/opencb/cellbase/client/rest/ProteinClientTest.java old mode 100644 new mode 100755 diff --git a/cellbase-client/src/test/java/org/opencb/cellbase/client/rest/TranscriptClientTest.java b/cellbase-client/src/test/java/org/opencb/cellbase/client/rest/TranscriptClientTest.java old mode 100644 new mode 100755 diff --git a/cellbase-client/src/test/java/org/opencb/cellbase/client/rest/VariantClientTest.java b/cellbase-client/src/test/java/org/opencb/cellbase/client/rest/VariantClientTest.java old mode 100644 new mode 100755 diff --git a/cellbase-client/src/test/java/org/opencb/cellbase/client/rest/VariationClientTest.java b/cellbase-client/src/test/java/org/opencb/cellbase/client/rest/VariationClientTest.java old mode 100644 new mode 100755 diff --git a/cellbase-client/src/test/resources/client-configuration-test.yml b/cellbase-client/src/test/resources/client-configuration-test.yml old mode 100644 new mode 100755 diff --git a/cellbase-core/pom.xml b/cellbase-core/pom.xml old mode 100644 new mode 100755 diff --git a/cellbase-core/src/main/java/org/opencb/cellbase/core/api/CellBaseDBAdaptor.java b/cellbase-core/src/main/java/org/opencb/cellbase/core/api/CellBaseDBAdaptor.java old mode 100644 new mode 100755 diff --git a/cellbase-core/src/main/java/org/opencb/cellbase/core/api/ClinicalDBAdaptor.java b/cellbase-core/src/main/java/org/opencb/cellbase/core/api/ClinicalDBAdaptor.java old mode 100644 new mode 100755 diff --git a/cellbase-core/src/main/java/org/opencb/cellbase/core/api/ConservationDBAdaptor.java b/cellbase-core/src/main/java/org/opencb/cellbase/core/api/ConservationDBAdaptor.java old mode 100644 new mode 100755 diff --git a/cellbase-core/src/main/java/org/opencb/cellbase/core/api/DBAdaptorFactory.java b/cellbase-core/src/main/java/org/opencb/cellbase/core/api/DBAdaptorFactory.java old mode 100644 new mode 100755 diff --git a/cellbase-core/src/main/java/org/opencb/cellbase/core/api/FeatureDBAdaptor.java b/cellbase-core/src/main/java/org/opencb/cellbase/core/api/FeatureDBAdaptor.java old mode 100644 new mode 100755 diff --git a/cellbase-core/src/main/java/org/opencb/cellbase/core/api/GeneDBAdaptor.java b/cellbase-core/src/main/java/org/opencb/cellbase/core/api/GeneDBAdaptor.java old mode 100644 new mode 100755 diff --git a/cellbase-core/src/main/java/org/opencb/cellbase/core/api/GenomeDBAdaptor.java b/cellbase-core/src/main/java/org/opencb/cellbase/core/api/GenomeDBAdaptor.java old mode 100644 new mode 100755 diff --git a/cellbase-core/src/main/java/org/opencb/cellbase/core/api/PathwayDBAdaptor.java b/cellbase-core/src/main/java/org/opencb/cellbase/core/api/PathwayDBAdaptor.java old mode 100644 new mode 100755 diff --git a/cellbase-core/src/main/java/org/opencb/cellbase/core/api/ProteinDBAdaptor.java b/cellbase-core/src/main/java/org/opencb/cellbase/core/api/ProteinDBAdaptor.java old mode 100644 new mode 100755 diff --git a/cellbase-core/src/main/java/org/opencb/cellbase/core/api/ProteinProteinInteractionDBAdaptor.java b/cellbase-core/src/main/java/org/opencb/cellbase/core/api/ProteinProteinInteractionDBAdaptor.java old mode 100644 new mode 100755 diff --git a/cellbase-core/src/main/java/org/opencb/cellbase/core/api/RegulationDBAdaptor.java b/cellbase-core/src/main/java/org/opencb/cellbase/core/api/RegulationDBAdaptor.java old mode 100644 new mode 100755 diff --git a/cellbase-core/src/main/java/org/opencb/cellbase/core/api/RepeatsDBAdaptor.java b/cellbase-core/src/main/java/org/opencb/cellbase/core/api/RepeatsDBAdaptor.java old mode 100644 new mode 100755 diff --git a/cellbase-core/src/main/java/org/opencb/cellbase/core/api/TranscriptDBAdaptor.java b/cellbase-core/src/main/java/org/opencb/cellbase/core/api/TranscriptDBAdaptor.java old mode 100644 new mode 100755 diff --git a/cellbase-core/src/main/java/org/opencb/cellbase/core/api/VariantAnnotationDBAdaptor.java b/cellbase-core/src/main/java/org/opencb/cellbase/core/api/VariantAnnotationDBAdaptor.java old mode 100644 new mode 100755 diff --git a/cellbase-core/src/main/java/org/opencb/cellbase/core/api/VariantDBAdaptor.java b/cellbase-core/src/main/java/org/opencb/cellbase/core/api/VariantDBAdaptor.java old mode 100644 new mode 100755 diff --git a/cellbase-core/src/main/java/org/opencb/cellbase/core/api/XRefDBAdaptor.java b/cellbase-core/src/main/java/org/opencb/cellbase/core/api/XRefDBAdaptor.java old mode 100644 new mode 100755 diff --git a/cellbase-core/src/main/java/org/opencb/cellbase/core/common/ConservationScoreRegion.java b/cellbase-core/src/main/java/org/opencb/cellbase/core/common/ConservationScoreRegion.java old mode 100644 new mode 100755 diff --git a/cellbase-core/src/main/java/org/opencb/cellbase/core/common/GitRepositoryState.java b/cellbase-core/src/main/java/org/opencb/cellbase/core/common/GitRepositoryState.java old mode 100644 new mode 100755 diff --git a/cellbase-core/src/main/java/org/opencb/cellbase/core/common/IntervalFeatureFrequency.java b/cellbase-core/src/main/java/org/opencb/cellbase/core/common/IntervalFeatureFrequency.java old mode 100644 new mode 100755 diff --git a/cellbase-core/src/main/java/org/opencb/cellbase/core/common/Region.java b/cellbase-core/src/main/java/org/opencb/cellbase/core/common/Region.java old mode 100644 new mode 100755 diff --git a/cellbase-core/src/main/java/org/opencb/cellbase/core/common/Species.java b/cellbase-core/src/main/java/org/opencb/cellbase/core/common/Species.java old mode 100644 new mode 100755 diff --git a/cellbase-core/src/main/java/org/opencb/cellbase/core/common/clinical/ClinicalVariant.java b/cellbase-core/src/main/java/org/opencb/cellbase/core/common/clinical/ClinicalVariant.java old mode 100644 new mode 100755 diff --git a/cellbase-core/src/main/java/org/opencb/cellbase/core/common/clinical/ClinvarPublicSet.java b/cellbase-core/src/main/java/org/opencb/cellbase/core/common/clinical/ClinvarPublicSet.java old mode 100644 new mode 100755 diff --git a/cellbase-core/src/main/java/org/opencb/cellbase/core/common/clinical/Cosmic.java b/cellbase-core/src/main/java/org/opencb/cellbase/core/common/clinical/Cosmic.java old mode 100644 new mode 100755 diff --git a/cellbase-core/src/main/java/org/opencb/cellbase/core/common/clinical/gwas/Gwas.java b/cellbase-core/src/main/java/org/opencb/cellbase/core/common/clinical/gwas/Gwas.java old mode 100644 new mode 100755 diff --git a/cellbase-core/src/main/java/org/opencb/cellbase/core/common/clinical/gwas/GwasStudy.java b/cellbase-core/src/main/java/org/opencb/cellbase/core/common/clinical/gwas/GwasStudy.java old mode 100644 new mode 100755 diff --git a/cellbase-core/src/main/java/org/opencb/cellbase/core/common/clinical/gwas/GwasTest.java b/cellbase-core/src/main/java/org/opencb/cellbase/core/common/clinical/gwas/GwasTest.java old mode 100644 new mode 100755 diff --git a/cellbase-core/src/main/java/org/opencb/cellbase/core/common/clinical/gwas/GwasTrait.java b/cellbase-core/src/main/java/org/opencb/cellbase/core/common/clinical/gwas/GwasTrait.java old mode 100644 new mode 100755 diff --git a/cellbase-core/src/main/java/org/opencb/cellbase/core/common/core/Chromosome.java b/cellbase-core/src/main/java/org/opencb/cellbase/core/common/core/Chromosome.java old mode 100644 new mode 100755 diff --git a/cellbase-core/src/main/java/org/opencb/cellbase/core/common/core/CpGIsland.java b/cellbase-core/src/main/java/org/opencb/cellbase/core/common/core/CpGIsland.java old mode 100644 new mode 100755 diff --git a/cellbase-core/src/main/java/org/opencb/cellbase/core/common/core/Cytoband.java b/cellbase-core/src/main/java/org/opencb/cellbase/core/common/core/Cytoband.java old mode 100644 new mode 100755 diff --git a/cellbase-core/src/main/java/org/opencb/cellbase/core/common/core/Exon.java b/cellbase-core/src/main/java/org/opencb/cellbase/core/common/core/Exon.java old mode 100644 new mode 100755 diff --git a/cellbase-core/src/main/java/org/opencb/cellbase/core/common/core/Gene.java b/cellbase-core/src/main/java/org/opencb/cellbase/core/common/core/Gene.java old mode 100644 new mode 100755 diff --git a/cellbase-core/src/main/java/org/opencb/cellbase/core/common/core/GenomeSequenceChunk.java b/cellbase-core/src/main/java/org/opencb/cellbase/core/common/core/GenomeSequenceChunk.java old mode 100644 new mode 100755 diff --git a/cellbase-core/src/main/java/org/opencb/cellbase/core/common/core/MiRNAGene.java b/cellbase-core/src/main/java/org/opencb/cellbase/core/common/core/MiRNAGene.java old mode 100644 new mode 100755 diff --git a/cellbase-core/src/main/java/org/opencb/cellbase/core/common/core/Transcript.java b/cellbase-core/src/main/java/org/opencb/cellbase/core/common/core/Transcript.java old mode 100644 new mode 100755 diff --git a/cellbase-core/src/main/java/org/opencb/cellbase/core/common/core/TranscriptTfbs.java b/cellbase-core/src/main/java/org/opencb/cellbase/core/common/core/TranscriptTfbs.java old mode 100644 new mode 100755 diff --git a/cellbase-core/src/main/java/org/opencb/cellbase/core/common/core/Xref.java b/cellbase-core/src/main/java/org/opencb/cellbase/core/common/core/Xref.java old mode 100644 new mode 100755 diff --git a/cellbase-core/src/main/java/org/opencb/cellbase/core/common/drug/Drug.java b/cellbase-core/src/main/java/org/opencb/cellbase/core/common/drug/Drug.java old mode 100644 new mode 100755 diff --git a/cellbase-core/src/main/java/org/opencb/cellbase/core/common/drug/DrugPartnerInteraction.java b/cellbase-core/src/main/java/org/opencb/cellbase/core/common/drug/DrugPartnerInteraction.java old mode 100644 new mode 100755 diff --git a/cellbase-core/src/main/java/org/opencb/cellbase/core/common/drug/Interactor.java b/cellbase-core/src/main/java/org/opencb/cellbase/core/common/drug/Interactor.java old mode 100644 new mode 100755 diff --git a/cellbase-core/src/main/java/org/opencb/cellbase/core/common/drug/Partner.java b/cellbase-core/src/main/java/org/opencb/cellbase/core/common/drug/Partner.java old mode 100644 new mode 100755 diff --git a/cellbase-core/src/main/java/org/opencb/cellbase/core/common/drug/XRef.java b/cellbase-core/src/main/java/org/opencb/cellbase/core/common/drug/XRef.java old mode 100644 new mode 100755 diff --git a/cellbase-core/src/main/java/org/opencb/cellbase/core/common/genedisease/Disgenet.java b/cellbase-core/src/main/java/org/opencb/cellbase/core/common/genedisease/Disgenet.java old mode 100644 new mode 100755 diff --git a/cellbase-core/src/main/java/org/opencb/cellbase/core/common/pathway/BiopaxPathway.java b/cellbase-core/src/main/java/org/opencb/cellbase/core/common/pathway/BiopaxPathway.java old mode 100644 new mode 100755 diff --git a/cellbase-core/src/main/java/org/opencb/cellbase/core/common/pathway/ComplexComponent.java b/cellbase-core/src/main/java/org/opencb/cellbase/core/common/pathway/ComplexComponent.java old mode 100644 new mode 100755 diff --git a/cellbase-core/src/main/java/org/opencb/cellbase/core/common/pathway/Interaction.java b/cellbase-core/src/main/java/org/opencb/cellbase/core/common/pathway/Interaction.java old mode 100644 new mode 100755 diff --git a/cellbase-core/src/main/java/org/opencb/cellbase/core/common/pathway/PhysicalEntity.java b/cellbase-core/src/main/java/org/opencb/cellbase/core/common/pathway/PhysicalEntity.java old mode 100644 new mode 100755 diff --git a/cellbase-core/src/main/java/org/opencb/cellbase/core/common/pathway/SubPathway.java b/cellbase-core/src/main/java/org/opencb/cellbase/core/common/pathway/SubPathway.java old mode 100644 new mode 100755 diff --git a/cellbase-core/src/main/java/org/opencb/cellbase/core/common/protein/FunctionPrediction.java b/cellbase-core/src/main/java/org/opencb/cellbase/core/common/protein/FunctionPrediction.java old mode 100644 new mode 100755 diff --git a/cellbase-core/src/main/java/org/opencb/cellbase/core/common/protein/Interaction.java b/cellbase-core/src/main/java/org/opencb/cellbase/core/common/protein/Interaction.java old mode 100644 new mode 100755 diff --git a/cellbase-core/src/main/java/org/opencb/cellbase/core/common/protein/Interactor.java b/cellbase-core/src/main/java/org/opencb/cellbase/core/common/protein/Interactor.java old mode 100644 new mode 100755 diff --git a/cellbase-core/src/main/java/org/opencb/cellbase/core/common/protein/Psimi.java b/cellbase-core/src/main/java/org/opencb/cellbase/core/common/protein/Psimi.java old mode 100644 new mode 100755 diff --git a/cellbase-core/src/main/java/org/opencb/cellbase/core/common/protein/Score.java b/cellbase-core/src/main/java/org/opencb/cellbase/core/common/protein/Score.java old mode 100644 new mode 100755 diff --git a/cellbase-core/src/main/java/org/opencb/cellbase/core/common/protein/XRef.java b/cellbase-core/src/main/java/org/opencb/cellbase/core/common/protein/XRef.java old mode 100644 new mode 100755 diff --git a/cellbase-core/src/main/java/org/opencb/cellbase/core/common/regulatory/ConservedRegion.java b/cellbase-core/src/main/java/org/opencb/cellbase/core/common/regulatory/ConservedRegion.java old mode 100644 new mode 100755 diff --git a/cellbase-core/src/main/java/org/opencb/cellbase/core/common/regulatory/MirnaDisease.java b/cellbase-core/src/main/java/org/opencb/cellbase/core/common/regulatory/MirnaDisease.java old mode 100644 new mode 100755 diff --git a/cellbase-core/src/main/java/org/opencb/cellbase/core/common/regulatory/MirnaGene.java b/cellbase-core/src/main/java/org/opencb/cellbase/core/common/regulatory/MirnaGene.java old mode 100644 new mode 100755 diff --git a/cellbase-core/src/main/java/org/opencb/cellbase/core/common/regulatory/MirnaGeneToMature.java b/cellbase-core/src/main/java/org/opencb/cellbase/core/common/regulatory/MirnaGeneToMature.java old mode 100644 new mode 100755 diff --git a/cellbase-core/src/main/java/org/opencb/cellbase/core/common/regulatory/MirnaMature.java b/cellbase-core/src/main/java/org/opencb/cellbase/core/common/regulatory/MirnaMature.java old mode 100644 new mode 100755 diff --git a/cellbase-core/src/main/java/org/opencb/cellbase/core/common/regulatory/MirnaTarget.java b/cellbase-core/src/main/java/org/opencb/cellbase/core/common/regulatory/MirnaTarget.java old mode 100644 new mode 100755 diff --git a/cellbase-core/src/main/java/org/opencb/cellbase/core/common/regulatory/MirnaToGene.java b/cellbase-core/src/main/java/org/opencb/cellbase/core/common/regulatory/MirnaToGene.java old mode 100644 new mode 100755 diff --git a/cellbase-core/src/main/java/org/opencb/cellbase/core/common/regulatory/Pwm.java b/cellbase-core/src/main/java/org/opencb/cellbase/core/common/regulatory/Pwm.java old mode 100644 new mode 100755 diff --git a/cellbase-core/src/main/java/org/opencb/cellbase/core/common/regulatory/RegulatoryRegion.java b/cellbase-core/src/main/java/org/opencb/cellbase/core/common/regulatory/RegulatoryRegion.java old mode 100644 new mode 100755 diff --git a/cellbase-core/src/main/java/org/opencb/cellbase/core/common/regulatory/Tfbs.java b/cellbase-core/src/main/java/org/opencb/cellbase/core/common/regulatory/Tfbs.java old mode 100644 new mode 100755 diff --git a/cellbase-core/src/main/java/org/opencb/cellbase/core/common/variation/ConsequenceType.java b/cellbase-core/src/main/java/org/opencb/cellbase/core/common/variation/ConsequenceType.java old mode 100644 new mode 100755 diff --git a/cellbase-core/src/main/java/org/opencb/cellbase/core/common/variation/GenomicVariantEffect.java b/cellbase-core/src/main/java/org/opencb/cellbase/core/common/variation/GenomicVariantEffect.java old mode 100644 new mode 100755 diff --git a/cellbase-core/src/main/java/org/opencb/cellbase/core/common/variation/Mutation.java b/cellbase-core/src/main/java/org/opencb/cellbase/core/common/variation/Mutation.java old mode 100644 new mode 100755 diff --git a/cellbase-core/src/main/java/org/opencb/cellbase/core/common/variation/MutationPhenotypeAnnotation.java b/cellbase-core/src/main/java/org/opencb/cellbase/core/common/variation/MutationPhenotypeAnnotation.java old mode 100644 new mode 100755 diff --git a/cellbase-core/src/main/java/org/opencb/cellbase/core/common/variation/Phenotype.java b/cellbase-core/src/main/java/org/opencb/cellbase/core/common/variation/Phenotype.java old mode 100644 new mode 100755 diff --git a/cellbase-core/src/main/java/org/opencb/cellbase/core/common/variation/PopulationFrequency.java b/cellbase-core/src/main/java/org/opencb/cellbase/core/common/variation/PopulationFrequency.java old mode 100644 new mode 100755 diff --git a/cellbase-core/src/main/java/org/opencb/cellbase/core/common/variation/SampleGenotype.java b/cellbase-core/src/main/java/org/opencb/cellbase/core/common/variation/SampleGenotype.java old mode 100644 new mode 100755 diff --git a/cellbase-core/src/main/java/org/opencb/cellbase/core/common/variation/StructuralVariation.java b/cellbase-core/src/main/java/org/opencb/cellbase/core/common/variation/StructuralVariation.java old mode 100644 new mode 100755 diff --git a/cellbase-core/src/main/java/org/opencb/cellbase/core/common/variation/TranscriptVariation.java b/cellbase-core/src/main/java/org/opencb/cellbase/core/common/variation/TranscriptVariation.java old mode 100644 new mode 100755 diff --git a/cellbase-core/src/main/java/org/opencb/cellbase/core/common/variation/Variation.java b/cellbase-core/src/main/java/org/opencb/cellbase/core/common/variation/Variation.java old mode 100644 new mode 100755 diff --git a/cellbase-core/src/main/java/org/opencb/cellbase/core/common/variation/Xref.java b/cellbase-core/src/main/java/org/opencb/cellbase/core/common/variation/Xref.java old mode 100644 new mode 100755 diff --git a/cellbase-core/src/main/java/org/opencb/cellbase/core/config/CellBaseConfiguration.java b/cellbase-core/src/main/java/org/opencb/cellbase/core/config/CellBaseConfiguration.java old mode 100644 new mode 100755 diff --git a/cellbase-core/src/main/java/org/opencb/cellbase/core/config/DatabaseCredentials.java b/cellbase-core/src/main/java/org/opencb/cellbase/core/config/DatabaseCredentials.java old mode 100644 new mode 100755 diff --git a/cellbase-core/src/main/java/org/opencb/cellbase/core/config/Databases.java b/cellbase-core/src/main/java/org/opencb/cellbase/core/config/Databases.java old mode 100644 new mode 100755 diff --git a/cellbase-core/src/main/java/org/opencb/cellbase/core/config/DownloadProperties.java b/cellbase-core/src/main/java/org/opencb/cellbase/core/config/DownloadProperties.java old mode 100644 new mode 100755 diff --git a/cellbase-core/src/main/java/org/opencb/cellbase/core/config/Species.java b/cellbase-core/src/main/java/org/opencb/cellbase/core/config/Species.java old mode 100644 new mode 100755 diff --git a/cellbase-core/src/main/java/org/opencb/cellbase/core/config/SpeciesProperties.java b/cellbase-core/src/main/java/org/opencb/cellbase/core/config/SpeciesProperties.java old mode 100644 new mode 100755 diff --git a/cellbase-core/src/main/java/org/opencb/cellbase/core/loader/CellBaseLoader.java b/cellbase-core/src/main/java/org/opencb/cellbase/core/loader/CellBaseLoader.java old mode 100644 new mode 100755 diff --git a/cellbase-core/src/main/java/org/opencb/cellbase/core/loader/CellBaseTypeConverter.java b/cellbase-core/src/main/java/org/opencb/cellbase/core/loader/CellBaseTypeConverter.java old mode 100644 new mode 100755 diff --git a/cellbase-core/src/main/java/org/opencb/cellbase/core/loader/LoadRunner.java b/cellbase-core/src/main/java/org/opencb/cellbase/core/loader/LoadRunner.java old mode 100644 new mode 100755 diff --git a/cellbase-core/src/main/java/org/opencb/cellbase/core/loader/LoaderException.java b/cellbase-core/src/main/java/org/opencb/cellbase/core/loader/LoaderException.java old mode 100644 new mode 100755 diff --git a/cellbase-core/src/main/java/org/opencb/cellbase/core/monitor/HealthStatus.java b/cellbase-core/src/main/java/org/opencb/cellbase/core/monitor/HealthStatus.java old mode 100644 new mode 100755 diff --git a/cellbase-core/src/main/java/org/opencb/cellbase/core/monitor/Monitor.java b/cellbase-core/src/main/java/org/opencb/cellbase/core/monitor/Monitor.java old mode 100644 new mode 100755 diff --git a/cellbase-core/src/main/java/org/opencb/cellbase/core/serializer/CellBaseFileSerializer.java b/cellbase-core/src/main/java/org/opencb/cellbase/core/serializer/CellBaseFileSerializer.java old mode 100644 new mode 100755 diff --git a/cellbase-core/src/main/java/org/opencb/cellbase/core/serializer/CellBaseJsonFileSerializer.java b/cellbase-core/src/main/java/org/opencb/cellbase/core/serializer/CellBaseJsonFileSerializer.java old mode 100644 new mode 100755 diff --git a/cellbase-core/src/main/java/org/opencb/cellbase/core/serializer/CellBaseSerializer.java b/cellbase-core/src/main/java/org/opencb/cellbase/core/serializer/CellBaseSerializer.java old mode 100644 new mode 100755 diff --git a/cellbase-core/src/main/java/org/opencb/cellbase/core/variant/AnnotationBasedPhasedQueryManager.java b/cellbase-core/src/main/java/org/opencb/cellbase/core/variant/AnnotationBasedPhasedQueryManager.java old mode 100644 new mode 100755 diff --git a/cellbase-core/src/main/java/org/opencb/cellbase/core/variant/ClinicalPhasedQueryManager.java b/cellbase-core/src/main/java/org/opencb/cellbase/core/variant/ClinicalPhasedQueryManager.java old mode 100644 new mode 100755 diff --git a/cellbase-core/src/main/java/org/opencb/cellbase/core/variant/CustomAnnotationPhasedQueryManager.java b/cellbase-core/src/main/java/org/opencb/cellbase/core/variant/CustomAnnotationPhasedQueryManager.java old mode 100644 new mode 100755 diff --git a/cellbase-core/src/main/java/org/opencb/cellbase/core/variant/PhasedQueryManager.java b/cellbase-core/src/main/java/org/opencb/cellbase/core/variant/PhasedQueryManager.java old mode 100644 new mode 100755 diff --git a/cellbase-core/src/main/java/org/opencb/cellbase/core/variant/PopulationFrequencyPhasedQueryManager.java b/cellbase-core/src/main/java/org/opencb/cellbase/core/variant/PopulationFrequencyPhasedQueryManager.java old mode 100644 new mode 100755 diff --git a/cellbase-core/src/main/java/org/opencb/cellbase/core/variant/annotation/CellBaseNormalizerSequenceAdaptor.java b/cellbase-core/src/main/java/org/opencb/cellbase/core/variant/annotation/CellBaseNormalizerSequenceAdaptor.java old mode 100644 new mode 100755 diff --git a/cellbase-core/src/main/java/org/opencb/cellbase/core/variant/annotation/ConsequenceTypeBNDCalculator.java b/cellbase-core/src/main/java/org/opencb/cellbase/core/variant/annotation/ConsequenceTypeBNDCalculator.java old mode 100644 new mode 100755 diff --git a/cellbase-core/src/main/java/org/opencb/cellbase/core/variant/annotation/ConsequenceTypeCNVGainCalculator.java b/cellbase-core/src/main/java/org/opencb/cellbase/core/variant/annotation/ConsequenceTypeCNVGainCalculator.java old mode 100644 new mode 100755 diff --git a/cellbase-core/src/main/java/org/opencb/cellbase/core/variant/annotation/ConsequenceTypeCalculator.java b/cellbase-core/src/main/java/org/opencb/cellbase/core/variant/annotation/ConsequenceTypeCalculator.java old mode 100644 new mode 100755 diff --git a/cellbase-core/src/main/java/org/opencb/cellbase/core/variant/annotation/ConsequenceTypeDeletionCalculator.java b/cellbase-core/src/main/java/org/opencb/cellbase/core/variant/annotation/ConsequenceTypeDeletionCalculator.java old mode 100644 new mode 100755 diff --git a/cellbase-core/src/main/java/org/opencb/cellbase/core/variant/annotation/ConsequenceTypeGenericRegionCalculator.java b/cellbase-core/src/main/java/org/opencb/cellbase/core/variant/annotation/ConsequenceTypeGenericRegionCalculator.java old mode 100644 new mode 100755 diff --git a/cellbase-core/src/main/java/org/opencb/cellbase/core/variant/annotation/ConsequenceTypeInsertionCalculator.java b/cellbase-core/src/main/java/org/opencb/cellbase/core/variant/annotation/ConsequenceTypeInsertionCalculator.java old mode 100644 new mode 100755 diff --git a/cellbase-core/src/main/java/org/opencb/cellbase/core/variant/annotation/ConsequenceTypeMNVCalculator.java b/cellbase-core/src/main/java/org/opencb/cellbase/core/variant/annotation/ConsequenceTypeMNVCalculator.java old mode 100644 new mode 100755 diff --git a/cellbase-core/src/main/java/org/opencb/cellbase/core/variant/annotation/ConsequenceTypeSNVCalculator.java b/cellbase-core/src/main/java/org/opencb/cellbase/core/variant/annotation/ConsequenceTypeSNVCalculator.java old mode 100644 new mode 100755 diff --git a/cellbase-core/src/main/java/org/opencb/cellbase/core/variant/annotation/UnsupportedURLVariantFormat.java b/cellbase-core/src/main/java/org/opencb/cellbase/core/variant/annotation/UnsupportedURLVariantFormat.java old mode 100644 new mode 100755 diff --git a/cellbase-core/src/main/java/org/opencb/cellbase/core/variant/annotation/VariantAnnotationCalculator.java b/cellbase-core/src/main/java/org/opencb/cellbase/core/variant/annotation/VariantAnnotationCalculator.java old mode 100644 new mode 100755 diff --git a/cellbase-core/src/main/java/org/opencb/cellbase/core/variant/annotation/VariantAnnotationUtils.java b/cellbase-core/src/main/java/org/opencb/cellbase/core/variant/annotation/VariantAnnotationUtils.java old mode 100644 new mode 100755 diff --git a/cellbase-core/src/main/java/org/opencb/cellbase/core/variant/annotation/VariantAnnotator.java b/cellbase-core/src/main/java/org/opencb/cellbase/core/variant/annotation/VariantAnnotator.java old mode 100644 new mode 100755 diff --git a/cellbase-core/src/main/java/org/opencb/cellbase/core/variant/annotation/hgvs/CdnaCoord.java b/cellbase-core/src/main/java/org/opencb/cellbase/core/variant/annotation/hgvs/CdnaCoord.java old mode 100644 new mode 100755 diff --git a/cellbase-core/src/main/java/org/opencb/cellbase/core/variant/annotation/hgvs/HgvsCalculator.java b/cellbase-core/src/main/java/org/opencb/cellbase/core/variant/annotation/hgvs/HgvsCalculator.java old mode 100644 new mode 100755 diff --git a/cellbase-core/src/main/java/org/opencb/cellbase/core/variant/annotation/hgvs/HgvsDeletionCalculator.java b/cellbase-core/src/main/java/org/opencb/cellbase/core/variant/annotation/hgvs/HgvsDeletionCalculator.java old mode 100644 new mode 100755 diff --git a/cellbase-core/src/main/java/org/opencb/cellbase/core/variant/annotation/hgvs/HgvsInsertionCalculator.java b/cellbase-core/src/main/java/org/opencb/cellbase/core/variant/annotation/hgvs/HgvsInsertionCalculator.java old mode 100644 new mode 100755 diff --git a/cellbase-core/src/main/java/org/opencb/cellbase/core/variant/annotation/hgvs/HgvsSNVCalculator.java b/cellbase-core/src/main/java/org/opencb/cellbase/core/variant/annotation/hgvs/HgvsSNVCalculator.java old mode 100644 new mode 100755 diff --git a/cellbase-core/src/main/java/org/opencb/cellbase/core/variant/annotation/hgvs/HgvsStringBuilder.java b/cellbase-core/src/main/java/org/opencb/cellbase/core/variant/annotation/hgvs/HgvsStringBuilder.java new file mode 100755 index 0000000000..e6dfc8cb77 --- /dev/null +++ b/cellbase-core/src/main/java/org/opencb/cellbase/core/variant/annotation/hgvs/HgvsStringBuilder.java @@ -0,0 +1,240 @@ +package org.opencb.cellbase.core.variant.annotation.hgvs; + +/** + * Created by fjlopez on 26/01/17. + */ + +import org.apache.commons.lang.NotImplementedException; + +/** + * Builder to get the hgvs identifier properly formatted. + */ +public class HgvsStringBuilder { + + enum Kind { CODING, NON_CODING } + + // HGVS string parts + private String prefix; + private String chromosome; + private String transcriptId; + private String geneId; + private Kind kind; + private String mutationType; + private int start; + private int end; + private String reference; // reference allele + private String alternate; // alternate allele + + // cDNA-specific fields + private CdnaCoord cdnaStart; + private CdnaCoord cdnaEnd; + + public HgvsStringBuilder() { + + } + + public String getPrefix() { + return prefix; + } + + public void setPrefix(String prefix) { + this.prefix = prefix; + } + + public String getChromosome() { + return chromosome; + } + + public void setChromosome(String chromosome) { + this.chromosome = chromosome; + } + + public String getTranscriptId() { + return transcriptId; + } + + public void setTranscriptId(String transcriptId) { + this.transcriptId = transcriptId; + } + + public String getGeneId() { + return geneId; + } + + public void setGeneId(String geneId) { + this.geneId = geneId; + } + + public Kind getKind() { + return kind; + } + + public void setKind(Kind kind) { + this.kind = kind; + } + + public String getMutationType() { + return mutationType; + } + + public void setMutationType(String mutationType) { + this.mutationType = mutationType; + } + + public int getStart() { + return start; + } + + public void setStart(int start) { + this.start = start; + } + + public int getEnd() { + return end; + } + + public void setEnd(int end) { + this.end = end; + } + + public String getReference() { + return reference; + } + + public void setReference(String reference) { + this.reference = reference; + } + + public String getAlternate() { + return alternate; + } + + public void setAlternate(String alternate) { + this.alternate = alternate; + } + + public CdnaCoord getCdnaStart() { + return cdnaStart; + } + + public void setCdnaStart(CdnaCoord cdnaStart) { + this.cdnaStart = cdnaStart; + } + + public CdnaCoord getCdnaEnd() { + return cdnaEnd; + } + + public void setCdnaEnd(CdnaCoord cdnaEnd) { + this.cdnaEnd = cdnaEnd; + } + + /** + * Generate a HGVS string. + * @return String containing an HGVS formatted variant representation + */ + public String format() { +// + + StringBuilder allele = new StringBuilder(); + allele.append(formatPrefix()); // if use_prefix else '' + allele.append(":"); + + if (kind.equals(Kind.CODING)) { + allele.append("c.").append(formatCdna()); + } else if (kind.equals(Kind.NON_CODING)) { + allele.append("n.").append(formatCdna()); +// elif self.kind == 'p': +// allele = 'p.' + self.format_protein() +// elif self.kind == 'g': +// allele = 'g.' + self.format_genome() + } else { + throw new NotImplementedException("HGVS calculation not implemented for variant " + chromosome + ":" + + start + ":" + reference + ":" + alternate + "; kind: " + kind); + } +// if prefix: + return allele.toString(); +// else: +// return allele + } + + /** + * Generate HGVS trancript/geneId prefix. + * Some examples of full hgvs names with transcriptId include: + * NM_007294.3:c.2207A>C + * NM_007294.3(BRCA1):c.2207A>C + */ + private String formatPrefix() { +// if use_gene and self.geneId: + StringBuilder stringBuilder = new StringBuilder(transcriptId); + stringBuilder.append("(").append(geneId).append(")"); + + return stringBuilder.toString(); +// return self.transcriptId + } + + /** + * Generate HGVS cDNA allele. + * Some examples include: + * Substitution: 101A>C, + * Indel: 3428delCinsTA, 1000_1003delATG, 1000_1001insATG + */ + private String formatCdna() { + return formatCdnaCoords() + formatDnaAllele(); + } + + /** + * Generate HGVS DNA allele. + * @return + */ + private String formatDnaAllele() { + +// We are not considering this case since would mean there's no variant +// if self.mutation_type == '=': +// #No change. +// #example: +// 101 A = +// return self.ref_allele + '=' + + if (">".equals(mutationType)) { + // SNP. + // example: + // 101 A > C + return reference + '>' + alternate; + } else if ("delins".equals(mutationType)) { + // Indel. + // example: + // 112_117d elAGGTCAinsTG, 112_117d elinsTG + return "del" + reference + "ins" + alternate; + } else if ("del".equals(mutationType)) { + // Delete, duplication. + // example: + // 1000_1003d elATG, 1000_1003d upATG + return mutationType + reference; + } else if ("dup".equals(mutationType)) { + // Insertion normalized as duplication + // example: + // "ENST00000382869.3:c.1735+32dupA" + return mutationType + alternate; + } else if ("ins".equals(mutationType)) { + // Insert. + // example: + // 1000_1001 insATG + return mutationType + alternate; + } else { + throw new AssertionError("unknown mutation type: '" + mutationType + "'"); + } + } + + /** + * Generate HGVS cDNA coordinates string. + */ + private String formatCdnaCoords() { + if (cdnaStart.equals(cdnaEnd)) { + return cdnaStart.toString(); + } else { + return cdnaStart.toString() + "_" + cdnaEnd.toString(); + } + } + +} diff --git a/cellbase-core/src/main/proto/protobuf/opencb/service/gene_service.proto b/cellbase-core/src/main/proto/protobuf/opencb/service/gene_service.proto old mode 100644 new mode 100755 diff --git a/cellbase-core/src/main/proto/protobuf/opencb/service/generic_service.proto b/cellbase-core/src/main/proto/protobuf/opencb/service/generic_service.proto old mode 100644 new mode 100755 diff --git a/cellbase-core/src/main/proto/protobuf/opencb/service/genomic_region_service.proto b/cellbase-core/src/main/proto/protobuf/opencb/service/genomic_region_service.proto old mode 100644 new mode 100755 diff --git a/cellbase-core/src/main/proto/protobuf/opencb/service/regulatory_region_service.proto b/cellbase-core/src/main/proto/protobuf/opencb/service/regulatory_region_service.proto old mode 100644 new mode 100755 diff --git a/cellbase-core/src/main/proto/protobuf/opencb/service/transcript_service.proto b/cellbase-core/src/main/proto/protobuf/opencb/service/transcript_service.proto old mode 100644 new mode 100755 diff --git a/cellbase-core/src/main/proto/protobuf/opencb/service/variant_annotation_service.proto b/cellbase-core/src/main/proto/protobuf/opencb/service/variant_annotation_service.proto old mode 100644 new mode 100755 diff --git a/cellbase-core/src/main/proto/protobuf/opencb/service/variant_service.proto b/cellbase-core/src/main/proto/protobuf/opencb/service/variant_service.proto old mode 100644 new mode 100755 diff --git a/cellbase-core/src/main/resources/configuration.json b/cellbase-core/src/main/resources/configuration.json old mode 100644 new mode 100755 index c562c34789..210d6a7b29 --- a/cellbase-core/src/main/resources/configuration.json +++ b/cellbase-core/src/main/resources/configuration.json @@ -1,4 +1,624 @@ { +<<<<<<< HEAD + "version": "v4", + "apiVersion": "v3", + "wiki": "https://github.com/opencb/cellbase/wiki", + "maintenanceFlagFile": "/tmp/maintenance", + "maintainerContact": "javier.lopez@genomicsengland.co.uk", + "databases": { + "mongodb": { + "host": "localhost:27017", + "user": "", + "password": "", + "options": { + "authenticationDatabase": "admin", + "readPreference": "nearest", + "replicaSet": "", + "connectionsPerHost": 20 + } + }, + "neo4j": { + "hsapiens": { + "host": "localhost:27017", + "user": "", + "password": "" + }, + "mmusculus": { + "host": "localhost:27017", + "user": "", + "password": "" + } + } + }, + "defaultOutdir": "/tmp", + "download": { + "ensembl": { + "database": { + "host": "ensembldb.ensembl.org:3306", + "user": "anonymous", + "password": "" + }, + "libs": "/srv/qgen/ensembl/ensembl-io", + "url": { + "host": "ftp://ftp.ensembl.org/pub" + } + }, + "ensemblGenomes":{ + "database":{ + "host": "mysql-eg-publicsql.ebi.ac.uk:4157", + "user": "anonymous", + "password": "" + }, + "libs": "/srv/qgen/ensembl/ensembl-io", + "url":{ + "host":"ftp://ftp.ensemblgenomes.org/pub" + } + }, + "geneUniprotXref": { + "host": "ftp://ftp.uniprot.org/pub/databases/uniprot/current_release/knowledgebase/idmapping/by_organism/" + }, + "geneExpressionAtlas": { + "host": "ftp://ftp.ebi.ac.uk/pub/databases/microarray/data/gxa/allgenes_updown_in_organism_part_2.0.14.tab.gz" + }, + "mirbase": { + "host": "ftp://mirbase.org/pub/mirbase/CURRENT/" + }, + "mirbaseReadme": { + "host": "ftp://mirbase.org/pub/mirbase/CURRENT/README" + }, + "targetScan": { + "host": "http://hgdownload.cse.ucsc.edu/goldenPath/" + }, + "miRTarBase": { + "host": "http://mirtarbase.mbc.nctu.edu.tw/cache/download/4.5/" + }, + "uniprot": { + "host": "ftp://ftp.uniprot.org/pub/databases/uniprot/current_release/knowledgebase/complete/uniprot_sprot.xml.gz" + }, + "uniprotRelNotes": { + "host": "ftp://ftp.uniprot.org/pub/databases/uniprot/relnotes.txt" + }, + "intact": { + "host": "ftp://ftp.ebi.ac.uk/pub/databases/intact/current/psimitab/intact.txt" + }, + "interpro": { + "host": "ftp://ftp.ebi.ac.uk/pub/databases/interpro/current/protein2ipr.dat.gz" + }, + "interproRelNotes": { + "host": "ftp://ftp.ebi.ac.uk/pub/databases/interpro/current/release_notes.txt" + }, + "conservation": { + "host": "ftp://hgdownload.cse.ucsc.edu/goldenPath/" + }, + "gerp": { + "host": "http://mendel.stanford.edu/SidowLab/downloads/gerp/hg19.GERP_scores.tar.gz" + }, + "clinvar": { + "host": "ftp://ftp.ncbi.nlm.nih.gov/pub/clinvar/xml/ClinVarFullRelease_2018-10.xml.gz" + }, + "clinvarSummary": { + "host": "ftp://ftp.ncbi.nlm.nih.gov/pub/clinvar/tab_delimited/variant_summary.txt.gz" + }, + "clinvarVariationAllele": { + "host": "ftp://ftp.ncbi.nlm.nih.gov/pub/clinvar/tab_delimited/variation_allele.txt.gz" + }, + "clinvarEfoTerms": { + "host": "ftp://ftp.ebi.ac.uk/pub/databases/eva/ClinVar/2015/ClinVar_Traits_EFO_Names_260615.csv" + }, + "iarctp53": { + "host": "http://p53.iarc.fr/ajax/Zipper.ashx" + }, + "docm": { + "host": "http://docm.info/api/" + }, + "docmVersion": { + "host": "http://docm.info" + }, + "dgv": { + "host": "http://dgv.tcag.ca/v106/docs" + }, + "simpleRepeats": { + "host": "http://hgdownload.cse.ucsc.edu/goldenPath" + }, + "windowMasker": { + "host": "http://hgdownload.cse.ucsc.edu/goldenPath" + }, + "genomicSuperDups": { + "host": "http://hgdownload.cse.ucsc.edu/goldenPath" + }, + "gwasCatalog": { + "host": "ftp://ftp.ebi.ac.uk/pub/databases/gwas/releases/2016/09/28/gwas-catalog-associations.tsv" + }, + "hpo": { + "host": "http://compbio.charite.de/hudson/job/hpo.annotations.monthly/lastStableBuild/artifact/annotation/ALL_SOURCES_ALL_FREQUENCIES_diseases_to_genes_to_phenotypes.txt" + }, + "disgenet": { + "host": "http://www.disgenet.org/static/disgenet_ap1/files/downloads/all_gene_disease_associations.tsv.gz" + }, + "disgenetReadme": { + "host": "http://www.disgenet.org/static/disgenet_ap1/files/downloads/readme.txt" + }, + "dgidb": { + "host": "http://dgidb.org/data/interactions.tsv" + }, + "cadd": { + "host": "http://krishna.gs.washington.edu/download/CADD/v1.3/whole_genome_SNVs.tsv.gz" + }, + "reactome": { + "host": "http://www.reactome.org/download/current/biopax.zip" + } + }, + "species": { + "vertebrates": [ + { + "id": "hsapiens", + "scientificName": "Homo sapiens", + "assemblies": [ + { + "ensemblVersion":"82_37", + "name":"GRCh37" + }, + { + "ensemblVersion":"89_38", + "name":"GRCh38_89" + }, + { + "ensemblVersion":"89", + "name":"GRCh38" + } + ], + "data":[ + "genome", + "genome_info", + "gene", + "gene_disease_association", + "variation", + "variation_functional_score", + "regulation", + "protein", + "conservation", + "clinical_variants", + "clinical", + "svs", + "repeats" + ] + }, + { + "id":"mmusculus", + "scientificName":"Mus musculus", + "assemblies":[ + { + "ensemblVersion":"82_38", + "name":"GRCm38" + } + ], + "data":[ + "genome", + "genome_info", + "gene", + "variation", + "regulation", + "protein", + "conservation" + ] + }, + { + "id":"drerio", + "scientificName":"Danio rerio", + "assemblies":[ + { + "ensemblVersion":"82_10", + "name":"GRCz10" + } + ], + "data":[ + "genome", + "genome_info", + "gene", + "variation", + "protein" + ] + }, + { + "id":"rnorvegicus", + "scientificName":"Rattus norvegicus", + "assemblies":[ + { + "ensemblVersion":"82_6", + "name":"Rnor_6.0" + } + ], + "data":[ + "genome", + "genome_info", + "gene", + "variation", + "protein" + ] + }, + { + "id":"ptroglodytes", + "scientificName":"Pan troglodytes", + "assemblies":[ + { + "ensemblVersion":"82_214", + "name":"CHIMP2.1.4" + } + ], + "data":[ + "genome", + "genome_info", + "gene", + "variation" + ] + }, + { + "id":"ggorilla", + "scientificName":"Gorilla gorilla", + "assemblies":[ + { + "ensemblVersion":"82_31", + "name":"gorGor3.1" + } + ], + "data":[ + "genome", + "genome_info", + "gene" + ] + }, + { + "id":"csabaeus", + "scientificName":"Chlorocebus sabaeus", + "assemblies":[ + { + "ensemblVersion":"82_1", + "name":"ChlSab1.1" + } + ], + "data":[ + "genome", + "genome_info", + "gene" + ] + }, + { + "id":"sscrofa", + "scientificName":"Sus scrofa", + "assemblies":[ + { + "ensemblVersion":"82_102", + "name":"Sscrofa10.2" + } + ], + "data":[ + "genome", + "genome_info", + "gene", + "variation", + "protein" + ] + }, + { + "id":"cfamiliaris", + "scientificName":"Canis familiaris", + "assemblies":[ + { + "ensemblVersion":"82_31", + "name":"CanFam3.1" + } + ], + "data":[ + "genome", + "genome_info", + "gene", + "variation" + ] + } + ], + "metazoa":[ + { + "id":"celegans", + "scientificName":"Caenorhabditis elegans", + "assemblies":[ + { + "ensemblVersion":"29_82_245", + "name":"WBcel235" + } + ], + "data":[ + "genome", + "genome_info", + "gene", + "variation", + "protein" + ] + }, + { + "id":"dmelanogaster", + "scientificName":"Drosophila melanogaster", + "assemblies":[ + { + "ensemblVersion":"29_82_6", + "name":"BDGP6" + } + ], + "data":[ + "genome", + "genome_info", + "gene", + "variation", + "protein" + ] + }, + { + "id":"agambiae", + "scientificName":"Anopheles gambiae", + "assemblies":[ + { + "ensemblVersion":"29_82_4", + "name":"AgamP4" + } + ], + "data":[ + "genome", + "genome_info", + "gene", + "variation", + "protein" + ] + } + ], + "fungi":[ + { + "id":"scerevisiae", + "scientificName":"Saccharomyces cerevisiae", + "assemblies":[ + { + "ensemblVersion":"29_82_4", + "name":"R64-1-1" + } + ], + "data":[ + "genome", + "genome_info", + "gene", + "variation", + "protein" + ] + }, + { + "id":"afumigatus", + "scientificName":"Aspergillus fumigatus", + "assemblies":[ + { + "ensemblVersion":"29_82_2", + "name":"CADRE" + } + ], + "data":[ + "genome", + "genome_info", + "gene" + ] + }, + { + "id":"anidulans", + "scientificName":"Aspergillus nidulans", + "assemblies":[ + { + "ensemblVersion":"29_82_6", + "name":"ASM1142v1" + } + ], + "data":[ + "genome", + "genome_info", + "gene" + ] + } + ], + "protist":[ + { + "id":"pfalciparum", + "scientificName":"Plasmodium falciparum", + "assemblies":[ + { + "ensemblVersion":"29_82_3", + "name":"ASM276v1" + } + ], + "data":[ + "genome", + "genome_info", + "gene", + "variation", + "protein" + ] + }, + { + "id":"lmajor", + "scientificName":"Leishmania major", + "assemblies":[ + { + "ensemblVersion":"29_82_2", + "name":"ASM272v2" + } + ], + "data":[ + "genome", + "genome_info", + "gene" + ] + } + ], + "plants":[ + { + "id":"athaliana", + "scientificName":"Arabidopsis thaliana", + "assemblies":[ + { + "ensemblVersion":"29_82_10", + "name":"TAIR10" + } + ], + "data":[ + "genome", + "genome_info", + "gene", + "variation", + "protein" + ] + }, + { + "id":"osativa", + "scientificName":"Oryza sativa", + "assemblies":[ + { + "ensemblVersion":"29_82_7", + "name":"IRGSP-1.0" + } + ], + "data":[ + "genome", + "genome_info", + "gene", + "variation" + ] + }, + { + "id":"gmax", + "scientificName":"Glycine max", + "assemblies":[ + { + "ensemblVersion":"29_82_1", + "name":"V1.0" + } + ], + "data":[ + "genome", + "genome_info", + "gene" + ] + }, + { + "id":"vvinifera", + "scientificName":"Vitis vinifera", + "assemblies":[ + { + "ensemblVersion":"29_82_3", + "name":"IGGP_12x" + } + ], + "data":[ + "genome", + "genome_info", + "gene", + "variation" + ] + }, + { + "id":"zmays", + "scientificName":"Zea mays", + "assemblies":[ + { + "ensemblVersion":"29_82_6", + "name":"AGPv3" + } + ], + "data":[ + "genome", + "genome_info", + "gene", + "variation" + ] + }, + { + "id":"sbicolor", + "scientificName":"Sorghum bicolor", + "assemblies":[ + { + "ensemblVersion":"29_82_14", + "name":"Sorbi1" + } + ], + "data":[ + "genome", + "genome_info", + "gene", + "variation" + ] + }, + { + "id":"slycopersicum", + "scientificName":"Solanum lycopersicum", + "assemblies":[ + { + "ensemblVersion":"29_82_250", + "name":"GCA_000188115.2" + } + ], + "data":[ + "genome", + "genome_info", + "gene", + "variation" + ] + } + ], + "virus" : [ + { + "id":"evirus", + "scientificName":"Ebola virus", + "assemblies":[ + { + "name":"KM034562v1" + } + ], + "data":[ + "genome", + "gene" + ] + } + ], + "bacteria": [ + { + "id": "mpneumoniae", + "scientificName": "Mycoplasma pneumoniae M129", + "assemblies": [ + { + "ensemblVersion":"29_82_1", + "ensemblCollection":"bacteria_0_collection", + "name":"ASM2734v1" + } + ], + "data":[ + "genome", + "genome_info", + "gene", + "protein" + ] + }, + { + "id": "ecoli", + "scientificName": "Escherichia coli", + "assemblies": [ + { + "ensemblVersion":"29_82_1", + "ensemblCollection":"bacteria_91_collection", + "name":"HUSEC2011CHR1" + } + ], + "data":[ + "genome", + "genome_info", + "gene", + "protein" + ] + } + ] + } +======= "version": "v4", "apiVersion": "${cellbase.version}", "wiki": "https://github.com/opencb/cellbase/wiki", @@ -614,4 +1234,5 @@ } ] } +>>>>>>> a06ad91c3ea228e658c3495fc957d56b2572a9be } diff --git a/cellbase-core/src/main/resources/log4j.properties b/cellbase-core/src/main/resources/log4j.properties old mode 100644 new mode 100755 diff --git a/cellbase-core/src/main/resources/org/opencb/cellbase/core/variation/variation_consequences.properties b/cellbase-core/src/main/resources/org/opencb/cellbase/core/variation/variation_consequences.properties old mode 100644 new mode 100755 diff --git a/cellbase-core/src/test/java/org/opencb/cellbase/core/CellBaseConfigurationTest.java b/cellbase-core/src/test/java/org/opencb/cellbase/core/CellBaseConfigurationTest.java old mode 100644 new mode 100755 diff --git a/cellbase-core/src/test/java/org/opencb/cellbase/core/variant/VariantAnnotatorRunnerTest.java b/cellbase-core/src/test/java/org/opencb/cellbase/core/variant/VariantAnnotatorRunnerTest.java old mode 100644 new mode 100755 diff --git a/cellbase-core/src/test/resources/cellBaseProperties_test.json b/cellbase-core/src/test/resources/cellBaseProperties_test.json old mode 100644 new mode 100755 diff --git a/cellbase-core/src/test/resources/gene.json b/cellbase-core/src/test/resources/gene.json old mode 100644 new mode 100755 diff --git a/cellbase-lib/pom.xml b/cellbase-lib/pom.xml old mode 100644 new mode 100755 diff --git a/cellbase-lib/src/main/java/org/opencb/cellbase/lib/MongoDBCollectionConfiguration.java b/cellbase-lib/src/main/java/org/opencb/cellbase/lib/MongoDBCollectionConfiguration.java old mode 100644 new mode 100755 diff --git a/cellbase-lib/src/main/java/org/opencb/cellbase/lib/VariantMongoIterator.java b/cellbase-lib/src/main/java/org/opencb/cellbase/lib/VariantMongoIterator.java old mode 100644 new mode 100755 diff --git a/cellbase-lib/src/main/java/org/opencb/cellbase/lib/impl/ClinicalLegacyMongoDBAdaptor.java b/cellbase-lib/src/main/java/org/opencb/cellbase/lib/impl/ClinicalLegacyMongoDBAdaptor.java old mode 100644 new mode 100755 diff --git a/cellbase-lib/src/main/java/org/opencb/cellbase/lib/impl/ClinicalMongoDBAdaptor.java b/cellbase-lib/src/main/java/org/opencb/cellbase/lib/impl/ClinicalMongoDBAdaptor.java old mode 100644 new mode 100755 diff --git a/cellbase-lib/src/main/java/org/opencb/cellbase/lib/impl/ConservationMongoDBAdaptor.java b/cellbase-lib/src/main/java/org/opencb/cellbase/lib/impl/ConservationMongoDBAdaptor.java old mode 100644 new mode 100755 diff --git a/cellbase-lib/src/main/java/org/opencb/cellbase/lib/impl/GeneMongoDBAdaptor.java b/cellbase-lib/src/main/java/org/opencb/cellbase/lib/impl/GeneMongoDBAdaptor.java old mode 100644 new mode 100755 diff --git a/cellbase-lib/src/main/java/org/opencb/cellbase/lib/impl/GenomeMongoDBAdaptor.java b/cellbase-lib/src/main/java/org/opencb/cellbase/lib/impl/GenomeMongoDBAdaptor.java old mode 100644 new mode 100755 diff --git a/cellbase-lib/src/main/java/org/opencb/cellbase/lib/impl/MetaMongoDBAdaptor.java b/cellbase-lib/src/main/java/org/opencb/cellbase/lib/impl/MetaMongoDBAdaptor.java old mode 100644 new mode 100755 diff --git a/cellbase-lib/src/main/java/org/opencb/cellbase/lib/impl/MongoDBAdaptor.java b/cellbase-lib/src/main/java/org/opencb/cellbase/lib/impl/MongoDBAdaptor.java old mode 100644 new mode 100755 diff --git a/cellbase-lib/src/main/java/org/opencb/cellbase/lib/impl/MongoDBAdaptorFactory.java b/cellbase-lib/src/main/java/org/opencb/cellbase/lib/impl/MongoDBAdaptorFactory.java old mode 100644 new mode 100755 diff --git a/cellbase-lib/src/main/java/org/opencb/cellbase/lib/impl/ProteinMongoDBAdaptor.java b/cellbase-lib/src/main/java/org/opencb/cellbase/lib/impl/ProteinMongoDBAdaptor.java old mode 100644 new mode 100755 diff --git a/cellbase-lib/src/main/java/org/opencb/cellbase/lib/impl/ProteinProteinInteractionMongoDBAdaptor.java b/cellbase-lib/src/main/java/org/opencb/cellbase/lib/impl/ProteinProteinInteractionMongoDBAdaptor.java old mode 100644 new mode 100755 diff --git a/cellbase-lib/src/main/java/org/opencb/cellbase/lib/impl/RegulationMongoDBAdaptor.java b/cellbase-lib/src/main/java/org/opencb/cellbase/lib/impl/RegulationMongoDBAdaptor.java old mode 100644 new mode 100755 diff --git a/cellbase-lib/src/main/java/org/opencb/cellbase/lib/impl/RepeatsMongoDBAdaptor.java b/cellbase-lib/src/main/java/org/opencb/cellbase/lib/impl/RepeatsMongoDBAdaptor.java old mode 100644 new mode 100755 diff --git a/cellbase-lib/src/main/java/org/opencb/cellbase/lib/impl/TranscriptMongoDBAdaptor.java b/cellbase-lib/src/main/java/org/opencb/cellbase/lib/impl/TranscriptMongoDBAdaptor.java old mode 100644 new mode 100755 diff --git a/cellbase-lib/src/main/java/org/opencb/cellbase/lib/impl/VariantMongoDBAdaptor.java b/cellbase-lib/src/main/java/org/opencb/cellbase/lib/impl/VariantMongoDBAdaptor.java old mode 100644 new mode 100755 diff --git a/cellbase-lib/src/main/java/org/opencb/cellbase/lib/impl/XRefMongoDBAdaptor.java b/cellbase-lib/src/main/java/org/opencb/cellbase/lib/impl/XRefMongoDBAdaptor.java old mode 100644 new mode 100755 diff --git a/cellbase-lib/src/main/java/org/opencb/cellbase/lib/loader/MongoDBCellBaseLoader.java b/cellbase-lib/src/main/java/org/opencb/cellbase/lib/loader/MongoDBCellBaseLoader.java old mode 100644 new mode 100755 diff --git a/cellbase-lib/src/main/java/org/opencb/cellbase/lib/loader/converters/GeneConverter.java b/cellbase-lib/src/main/java/org/opencb/cellbase/lib/loader/converters/GeneConverter.java old mode 100644 new mode 100755 diff --git a/cellbase-lib/src/main/java/org/opencb/cellbase/lib/loader/converters/MongoDBTypeConverter.java b/cellbase-lib/src/main/java/org/opencb/cellbase/lib/loader/converters/MongoDBTypeConverter.java old mode 100644 new mode 100755 diff --git a/cellbase-lib/src/main/java/org/opencb/cellbase/lib/loader/converters/VariationConverter.java b/cellbase-lib/src/main/java/org/opencb/cellbase/lib/loader/converters/VariationConverter.java old mode 100644 new mode 100755 diff --git a/cellbase-lib/src/main/java/org/opencb/cellbase/lib/model/ClinicalVariation.java b/cellbase-lib/src/main/java/org/opencb/cellbase/lib/model/ClinicalVariation.java old mode 100644 new mode 100755 diff --git a/cellbase-lib/src/test/java/org/opencb/cellbase/lib/GenericMongoDBAdaptorTest.java b/cellbase-lib/src/test/java/org/opencb/cellbase/lib/GenericMongoDBAdaptorTest.java old mode 100644 new mode 100755 diff --git a/cellbase-lib/src/test/java/org/opencb/cellbase/lib/impl/CellBaseNormalizerSequenceAdaptorTest.java b/cellbase-lib/src/test/java/org/opencb/cellbase/lib/impl/CellBaseNormalizerSequenceAdaptorTest.java old mode 100644 new mode 100755 diff --git a/cellbase-lib/src/test/java/org/opencb/cellbase/lib/impl/ClinicalLegacyMongoDBAdaptorTest.java b/cellbase-lib/src/test/java/org/opencb/cellbase/lib/impl/ClinicalLegacyMongoDBAdaptorTest.java old mode 100644 new mode 100755 diff --git a/cellbase-lib/src/test/java/org/opencb/cellbase/lib/impl/ClinicalMongoDBAdaptorTest.java b/cellbase-lib/src/test/java/org/opencb/cellbase/lib/impl/ClinicalMongoDBAdaptorTest.java old mode 100644 new mode 100755 diff --git a/cellbase-lib/src/test/java/org/opencb/cellbase/lib/impl/GeneMongoDBAdaptorTest.java b/cellbase-lib/src/test/java/org/opencb/cellbase/lib/impl/GeneMongoDBAdaptorTest.java old mode 100644 new mode 100755 diff --git a/cellbase-lib/src/test/java/org/opencb/cellbase/lib/impl/GenomeMongoDBAdaptorTest.java b/cellbase-lib/src/test/java/org/opencb/cellbase/lib/impl/GenomeMongoDBAdaptorTest.java old mode 100644 new mode 100755 diff --git a/cellbase-lib/src/test/java/org/opencb/cellbase/lib/impl/ProteinMongoDBAdaptorTest.java b/cellbase-lib/src/test/java/org/opencb/cellbase/lib/impl/ProteinMongoDBAdaptorTest.java old mode 100644 new mode 100755 diff --git a/cellbase-lib/src/test/java/org/opencb/cellbase/lib/impl/TranscriptMongoDBAdaptorTest.java b/cellbase-lib/src/test/java/org/opencb/cellbase/lib/impl/TranscriptMongoDBAdaptorTest.java old mode 100644 new mode 100755 diff --git a/cellbase-lib/src/test/java/org/opencb/cellbase/lib/impl/VariantAnnotationCalculatorTest.java b/cellbase-lib/src/test/java/org/opencb/cellbase/lib/impl/VariantAnnotationCalculatorTest.java old mode 100644 new mode 100755 diff --git a/cellbase-lib/src/test/java/org/opencb/cellbase/lib/impl/VariantMongoDBAdaptorTest.java b/cellbase-lib/src/test/java/org/opencb/cellbase/lib/impl/VariantMongoDBAdaptorTest.java old mode 100644 new mode 100755 diff --git a/cellbase-lib/src/test/java/org/opencb/cellbase/lib/impl/XRefMongoDBAdaptorTest.java b/cellbase-lib/src/test/java/org/opencb/cellbase/lib/impl/XRefMongoDBAdaptorTest.java old mode 100644 new mode 100755 diff --git a/cellbase-lib/src/test/java/org/opencb/cellbase/lib/loader/LoadRunnerTest.java b/cellbase-lib/src/test/java/org/opencb/cellbase/lib/loader/LoadRunnerTest.java old mode 100644 new mode 100755 diff --git a/cellbase-lib/src/test/java/org/opencb/cellbase/lib/loader/MongoDBCellBaseLoaderTest.java b/cellbase-lib/src/test/java/org/opencb/cellbase/lib/loader/MongoDBCellBaseLoaderTest.java old mode 100644 new mode 100755 diff --git a/cellbase-lib/src/test/java/org/opencb/cellbase/lib/monitor/MonitorTest.java b/cellbase-lib/src/test/java/org/opencb/cellbase/lib/monitor/MonitorTest.java old mode 100644 new mode 100755 diff --git a/cellbase-lib/src/test/java/org/opencb/cellbase/lib/variant/hgvs/HgvsCalculatorTest.java b/cellbase-lib/src/test/java/org/opencb/cellbase/lib/variant/hgvs/HgvsCalculatorTest.java old mode 100644 new mode 100755 diff --git a/cellbase-lib/src/test/resources/clinicalMongoDBAdaptor/nativeGet/clinical_variants.full.test.json.gz b/cellbase-lib/src/test/resources/clinicalMongoDBAdaptor/nativeGet/clinical_variants.full.test.json.gz old mode 100644 new mode 100755 diff --git a/cellbase-lib/src/test/resources/clinicalMongoDBAdaptor/phasedQueries/clinical_variants.full.test.json.gz b/cellbase-lib/src/test/resources/clinicalMongoDBAdaptor/phasedQueries/clinical_variants.full.test.json.gz old mode 100644 new mode 100755 diff --git a/cellbase-lib/src/test/resources/clinvar.json.gz b/cellbase-lib/src/test/resources/clinvar.json.gz old mode 100644 new mode 100755 diff --git a/cellbase-lib/src/test/resources/configuration.test.json b/cellbase-lib/src/test/resources/configuration.test.json old mode 100644 new mode 100755 index 95264e5eb5..3deb3417cc --- a/cellbase-lib/src/test/resources/configuration.test.json +++ b/cellbase-lib/src/test/resources/configuration.test.json @@ -108,10 +108,10 @@ "host": "http://p53.iarc.fr/ajax/Zipper.ashx" }, "docm": { - "host": "http://docm.genome.wustl.edu/api/" + "host": "http://docm.info/api/" }, "docmVersion": { - "host": "http://docm.genome.wustl.edu" + "host": "http://docm.info" }, "dgv": { "host": "http://dgv.tcag.ca/v106/docs" diff --git a/cellbase-lib/src/test/resources/cosmic.json.gz b/cellbase-lib/src/test/resources/cosmic.json.gz old mode 100644 new mode 100755 diff --git a/cellbase-lib/src/test/resources/gene.test.json.gz b/cellbase-lib/src/test/resources/gene.test.json.gz old mode 100644 new mode 100755 diff --git a/cellbase-lib/src/test/resources/genome/genome_info.json b/cellbase-lib/src/test/resources/genome/genome_info.json old mode 100644 new mode 100755 diff --git a/cellbase-lib/src/test/resources/genome/genome_sequence.test.json.gz b/cellbase-lib/src/test/resources/genome/genome_sequence.test.json.gz old mode 100644 new mode 100755 diff --git a/cellbase-lib/src/test/resources/gwas.json.gz b/cellbase-lib/src/test/resources/gwas.json.gz old mode 100644 new mode 100755 diff --git a/cellbase-lib/src/test/resources/hgvs/gene.test.json.gz b/cellbase-lib/src/test/resources/hgvs/gene.test.json.gz old mode 100644 new mode 100755 diff --git a/cellbase-lib/src/test/resources/hgvs/genome_sequence.test.json.gz b/cellbase-lib/src/test/resources/hgvs/genome_sequence.test.json.gz old mode 100644 new mode 100755 diff --git a/cellbase-lib/src/test/resources/protein/protein.test.json.gz b/cellbase-lib/src/test/resources/protein/protein.test.json.gz old mode 100644 new mode 100755 diff --git a/cellbase-lib/src/test/resources/transcript/gene.test.json.gz b/cellbase-lib/src/test/resources/transcript/gene.test.json.gz old mode 100644 new mode 100755 diff --git a/cellbase-lib/src/test/resources/variant-annotation-test.json.gz b/cellbase-lib/src/test/resources/variant-annotation-test.json.gz old mode 100644 new mode 100755 diff --git a/cellbase-lib/src/test/resources/variant-annotation/clinical_variants.test.json.gz b/cellbase-lib/src/test/resources/variant-annotation/clinical_variants.test.json.gz old mode 100644 new mode 100755 diff --git a/cellbase-lib/src/test/resources/variant-annotation/gene.test.json.gz b/cellbase-lib/src/test/resources/variant-annotation/gene.test.json.gz old mode 100644 new mode 100755 diff --git a/cellbase-lib/src/test/resources/variant-annotation/genome_sequence.test.json.gz b/cellbase-lib/src/test/resources/variant-annotation/genome_sequence.test.json.gz old mode 100644 new mode 100755 diff --git a/cellbase-lib/src/test/resources/variant-annotation/prot_func_pred_chr_13.test.json.gz b/cellbase-lib/src/test/resources/variant-annotation/prot_func_pred_chr_13.test.json.gz old mode 100644 new mode 100755 diff --git a/cellbase-lib/src/test/resources/variant-annotation/prot_func_pred_chr_18.test.json.gz b/cellbase-lib/src/test/resources/variant-annotation/prot_func_pred_chr_18.test.json.gz old mode 100644 new mode 100755 diff --git a/cellbase-lib/src/test/resources/variant-annotation/prot_func_pred_chr_19.test.json.gz b/cellbase-lib/src/test/resources/variant-annotation/prot_func_pred_chr_19.test.json.gz old mode 100644 new mode 100755 diff --git a/cellbase-lib/src/test/resources/variant-annotation/prot_func_pred_chr_MT.test.json.gz b/cellbase-lib/src/test/resources/variant-annotation/prot_func_pred_chr_MT.test.json.gz old mode 100644 new mode 100755 diff --git a/cellbase-lib/src/test/resources/variant-annotation/protein.test.json.gz b/cellbase-lib/src/test/resources/variant-annotation/protein.test.json.gz old mode 100644 new mode 100755 diff --git a/cellbase-lib/src/test/resources/variant-annotation/regulatory_region.test.json.gz b/cellbase-lib/src/test/resources/variant-annotation/regulatory_region.test.json.gz old mode 100644 new mode 100755 diff --git a/cellbase-lib/src/test/resources/variant-annotation/repeats.json.gz b/cellbase-lib/src/test/resources/variant-annotation/repeats.json.gz old mode 100644 new mode 100755 diff --git a/cellbase-lib/src/test/resources/variant-annotation/structuralVariants.json.gz b/cellbase-lib/src/test/resources/variant-annotation/structuralVariants.json.gz old mode 100644 new mode 100755 diff --git a/cellbase-lib/src/test/resources/variant-annotation/variation_chr1.full.test.json.gz b/cellbase-lib/src/test/resources/variant-annotation/variation_chr1.full.test.json.gz old mode 100644 new mode 100755 diff --git a/cellbase-lib/src/test/resources/variant-annotation/variation_chr19.full.test.json.gz b/cellbase-lib/src/test/resources/variant-annotation/variation_chr19.full.test.json.gz old mode 100644 new mode 100755 diff --git a/cellbase-lib/src/test/resources/variant-annotation/variation_chr2.full.test.json.gz b/cellbase-lib/src/test/resources/variant-annotation/variation_chr2.full.test.json.gz old mode 100644 new mode 100755 diff --git a/cellbase-lib/src/test/resources/variant-annotation/variation_chrMT.full.test.json.gz b/cellbase-lib/src/test/resources/variant-annotation/variation_chrMT.full.test.json.gz old mode 100644 new mode 100755 diff --git a/cellbase-lib/src/test/resources/variation_chr1.full.test.json.gz b/cellbase-lib/src/test/resources/variation_chr1.full.test.json.gz old mode 100644 new mode 100755 diff --git a/cellbase-lib/src/test/resources/variation_chr10.full.test.json.gz b/cellbase-lib/src/test/resources/variation_chr10.full.test.json.gz old mode 100644 new mode 100755 diff --git a/cellbase-lib/src/test/resources/variation_chr17.full.test.json.gz b/cellbase-lib/src/test/resources/variation_chr17.full.test.json.gz old mode 100644 new mode 100755 diff --git a/cellbase-lib/src/test/resources/variation_chr22.full.test.json.gz b/cellbase-lib/src/test/resources/variation_chr22.full.test.json.gz old mode 100644 new mode 100755 diff --git a/cellbase-lib/src/test/resources/xref/gene.test.json.gz b/cellbase-lib/src/test/resources/xref/gene.test.json.gz old mode 100644 new mode 100755 diff --git a/cellbase-mongodb/src/test/resources/variant-annotation-test.json.gz b/cellbase-mongodb/src/test/resources/variant-annotation-test.json.gz old mode 100644 new mode 100755 diff --git a/cellbase-server/pom.xml b/cellbase-server/pom.xml old mode 100644 new mode 100755 diff --git a/cellbase-server/src/main/java/org/opencb/cellbase/server/CellBaseServer.java b/cellbase-server/src/main/java/org/opencb/cellbase/server/CellBaseServer.java old mode 100644 new mode 100755 diff --git a/cellbase-server/src/main/java/org/opencb/cellbase/server/grpc/GeneGrpcService.java b/cellbase-server/src/main/java/org/opencb/cellbase/server/grpc/GeneGrpcService.java old mode 100644 new mode 100755 diff --git a/cellbase-server/src/main/java/org/opencb/cellbase/server/grpc/GenomicRegionGrpcService.java b/cellbase-server/src/main/java/org/opencb/cellbase/server/grpc/GenomicRegionGrpcService.java old mode 100644 new mode 100755 diff --git a/cellbase-server/src/main/java/org/opencb/cellbase/server/grpc/GrpcServer.java b/cellbase-server/src/main/java/org/opencb/cellbase/server/grpc/GrpcServer.java old mode 100644 new mode 100755 diff --git a/cellbase-server/src/main/java/org/opencb/cellbase/server/grpc/IGrpcService.java b/cellbase-server/src/main/java/org/opencb/cellbase/server/grpc/IGrpcService.java old mode 100644 new mode 100755 diff --git a/cellbase-server/src/main/java/org/opencb/cellbase/server/grpc/ProtoConverterUtils.java b/cellbase-server/src/main/java/org/opencb/cellbase/server/grpc/ProtoConverterUtils.java old mode 100644 new mode 100755 diff --git a/cellbase-server/src/main/java/org/opencb/cellbase/server/grpc/RegulatoryGrpcService.java b/cellbase-server/src/main/java/org/opencb/cellbase/server/grpc/RegulatoryGrpcService.java old mode 100644 new mode 100755 diff --git a/cellbase-server/src/main/java/org/opencb/cellbase/server/grpc/TranscriptGrpcService.java b/cellbase-server/src/main/java/org/opencb/cellbase/server/grpc/TranscriptGrpcService.java old mode 100644 new mode 100755 diff --git a/cellbase-server/src/main/java/org/opencb/cellbase/server/grpc/VariantAnnotationGrpcService.java b/cellbase-server/src/main/java/org/opencb/cellbase/server/grpc/VariantAnnotationGrpcService.java old mode 100644 new mode 100755 diff --git a/cellbase-server/src/main/java/org/opencb/cellbase/server/grpc/VariantGrpcService.java b/cellbase-server/src/main/java/org/opencb/cellbase/server/grpc/VariantGrpcService.java old mode 100644 new mode 100755 diff --git a/cellbase-server/src/main/java/org/opencb/cellbase/server/ws/CORSFilter.java b/cellbase-server/src/main/java/org/opencb/cellbase/server/ws/CORSFilter.java old mode 100644 new mode 100755 diff --git a/cellbase-server/src/main/java/org/opencb/cellbase/server/ws/CellBaseExceptionMapper.java b/cellbase-server/src/main/java/org/opencb/cellbase/server/ws/CellBaseExceptionMapper.java old mode 100644 new mode 100755 diff --git a/cellbase-server/src/main/java/org/opencb/cellbase/server/ws/MetaWSServer.java b/cellbase-server/src/main/java/org/opencb/cellbase/server/ws/MetaWSServer.java old mode 100644 new mode 100755 diff --git a/cellbase-server/src/main/java/org/opencb/cellbase/server/ws/SpeciesWSServer.java b/cellbase-server/src/main/java/org/opencb/cellbase/server/ws/SpeciesWSServer.java old mode 100644 new mode 100755 diff --git a/cellbase-server/src/main/java/org/opencb/cellbase/server/ws/clinical/ClinicalWSServer.java b/cellbase-server/src/main/java/org/opencb/cellbase/server/ws/clinical/ClinicalWSServer.java old mode 100644 new mode 100755 diff --git a/cellbase-server/src/main/java/org/opencb/cellbase/server/ws/feature/ClinicalLegacyWSServer.java b/cellbase-server/src/main/java/org/opencb/cellbase/server/ws/feature/ClinicalLegacyWSServer.java old mode 100644 new mode 100755 diff --git a/cellbase-server/src/main/java/org/opencb/cellbase/server/ws/feature/VariationWSServer.java b/cellbase-server/src/main/java/org/opencb/cellbase/server/ws/feature/VariationWSServer.java old mode 100644 new mode 100755 diff --git a/cellbase-server/src/main/java/org/opencb/cellbase/server/ws/genomic/ChromosomeWSServer.java b/cellbase-server/src/main/java/org/opencb/cellbase/server/ws/genomic/ChromosomeWSServer.java old mode 100644 new mode 100755 diff --git a/cellbase-server/src/main/java/org/opencb/cellbase/server/ws/network/PathwayWSServerMongo.java b/cellbase-server/src/main/java/org/opencb/cellbase/server/ws/network/PathwayWSServerMongo.java old mode 100644 new mode 100755 diff --git a/cellbase-server/src/main/java/org/opencb/cellbase/server/ws/network/ProteinProteinInteractionWSServer.java b/cellbase-server/src/main/java/org/opencb/cellbase/server/ws/network/ProteinProteinInteractionWSServer.java old mode 100644 new mode 100755 diff --git a/cellbase-server/src/main/java/org/opencb/cellbase/server/ws/phenotype/PhenotypeWSServer.java b/cellbase-server/src/main/java/org/opencb/cellbase/server/ws/phenotype/PhenotypeWSServer.java old mode 100644 new mode 100755 diff --git a/cellbase-server/src/main/webapp/index.old.html b/cellbase-server/src/main/webapp/index.old.html old mode 100644 new mode 100755 diff --git a/cellbase-server/src/main/webapp/webservices/index.html b/cellbase-server/src/main/webapp/webservices/index.html old mode 100644 new mode 100755 diff --git a/cellbase-server/src/main/webapp/webservices/swagger-ui/css/print.css b/cellbase-server/src/main/webapp/webservices/swagger-ui/css/print.css old mode 100644 new mode 100755 diff --git a/cellbase-server/src/main/webapp/webservices/swagger-ui/css/reset.css b/cellbase-server/src/main/webapp/webservices/swagger-ui/css/reset.css old mode 100644 new mode 100755 diff --git a/cellbase-server/src/main/webapp/webservices/swagger-ui/css/screen.css b/cellbase-server/src/main/webapp/webservices/swagger-ui/css/screen.css old mode 100644 new mode 100755 diff --git a/cellbase-server/src/main/webapp/webservices/swagger-ui/css/style.css b/cellbase-server/src/main/webapp/webservices/swagger-ui/css/style.css old mode 100644 new mode 100755 diff --git a/cellbase-server/src/main/webapp/webservices/swagger-ui/css/typography.css b/cellbase-server/src/main/webapp/webservices/swagger-ui/css/typography.css old mode 100644 new mode 100755 diff --git a/cellbase-server/src/main/webapp/webservices/swagger-ui/fonts/droid-sans-v6-latin-700.eot b/cellbase-server/src/main/webapp/webservices/swagger-ui/fonts/droid-sans-v6-latin-700.eot old mode 100644 new mode 100755 diff --git a/cellbase-server/src/main/webapp/webservices/swagger-ui/fonts/droid-sans-v6-latin-700.svg b/cellbase-server/src/main/webapp/webservices/swagger-ui/fonts/droid-sans-v6-latin-700.svg old mode 100644 new mode 100755 diff --git a/cellbase-server/src/main/webapp/webservices/swagger-ui/fonts/droid-sans-v6-latin-700.ttf b/cellbase-server/src/main/webapp/webservices/swagger-ui/fonts/droid-sans-v6-latin-700.ttf old mode 100644 new mode 100755 diff --git a/cellbase-server/src/main/webapp/webservices/swagger-ui/fonts/droid-sans-v6-latin-700.woff b/cellbase-server/src/main/webapp/webservices/swagger-ui/fonts/droid-sans-v6-latin-700.woff old mode 100644 new mode 100755 diff --git a/cellbase-server/src/main/webapp/webservices/swagger-ui/fonts/droid-sans-v6-latin-700.woff2 b/cellbase-server/src/main/webapp/webservices/swagger-ui/fonts/droid-sans-v6-latin-700.woff2 old mode 100644 new mode 100755 diff --git a/cellbase-server/src/main/webapp/webservices/swagger-ui/fonts/droid-sans-v6-latin-regular.eot b/cellbase-server/src/main/webapp/webservices/swagger-ui/fonts/droid-sans-v6-latin-regular.eot old mode 100644 new mode 100755 diff --git a/cellbase-server/src/main/webapp/webservices/swagger-ui/fonts/droid-sans-v6-latin-regular.svg b/cellbase-server/src/main/webapp/webservices/swagger-ui/fonts/droid-sans-v6-latin-regular.svg old mode 100644 new mode 100755 diff --git a/cellbase-server/src/main/webapp/webservices/swagger-ui/fonts/droid-sans-v6-latin-regular.ttf b/cellbase-server/src/main/webapp/webservices/swagger-ui/fonts/droid-sans-v6-latin-regular.ttf old mode 100644 new mode 100755 diff --git a/cellbase-server/src/main/webapp/webservices/swagger-ui/fonts/droid-sans-v6-latin-regular.woff b/cellbase-server/src/main/webapp/webservices/swagger-ui/fonts/droid-sans-v6-latin-regular.woff old mode 100644 new mode 100755 diff --git a/cellbase-server/src/main/webapp/webservices/swagger-ui/fonts/droid-sans-v6-latin-regular.woff2 b/cellbase-server/src/main/webapp/webservices/swagger-ui/fonts/droid-sans-v6-latin-regular.woff2 old mode 100644 new mode 100755 diff --git a/cellbase-server/src/main/webapp/webservices/swagger-ui/images/explorer_icons.png b/cellbase-server/src/main/webapp/webservices/swagger-ui/images/explorer_icons.png old mode 100644 new mode 100755 diff --git a/cellbase-server/src/main/webapp/webservices/swagger-ui/images/logo_small.png b/cellbase-server/src/main/webapp/webservices/swagger-ui/images/logo_small.png old mode 100644 new mode 100755 diff --git a/cellbase-server/src/main/webapp/webservices/swagger-ui/images/pet_store_api.png b/cellbase-server/src/main/webapp/webservices/swagger-ui/images/pet_store_api.png old mode 100644 new mode 100755 diff --git a/cellbase-server/src/main/webapp/webservices/swagger-ui/images/throbber.gif b/cellbase-server/src/main/webapp/webservices/swagger-ui/images/throbber.gif old mode 100644 new mode 100755 diff --git a/cellbase-server/src/main/webapp/webservices/swagger-ui/images/wordnik_api.png b/cellbase-server/src/main/webapp/webservices/swagger-ui/images/wordnik_api.png old mode 100644 new mode 100755 diff --git a/cellbase-server/src/main/webapp/webservices/swagger-ui/lang/en.js b/cellbase-server/src/main/webapp/webservices/swagger-ui/lang/en.js old mode 100644 new mode 100755 diff --git a/cellbase-server/src/main/webapp/webservices/swagger-ui/lang/es.js b/cellbase-server/src/main/webapp/webservices/swagger-ui/lang/es.js old mode 100644 new mode 100755 diff --git a/cellbase-server/src/main/webapp/webservices/swagger-ui/lang/pt.js b/cellbase-server/src/main/webapp/webservices/swagger-ui/lang/pt.js old mode 100644 new mode 100755 diff --git a/cellbase-server/src/main/webapp/webservices/swagger-ui/lang/ru.js b/cellbase-server/src/main/webapp/webservices/swagger-ui/lang/ru.js old mode 100644 new mode 100755 diff --git a/cellbase-server/src/main/webapp/webservices/swagger-ui/lang/translator.js b/cellbase-server/src/main/webapp/webservices/swagger-ui/lang/translator.js old mode 100644 new mode 100755 diff --git a/cellbase-server/src/main/webapp/webservices/swagger-ui/lib/backbone-min.js b/cellbase-server/src/main/webapp/webservices/swagger-ui/lib/backbone-min.js old mode 100644 new mode 100755 diff --git a/cellbase-server/src/main/webapp/webservices/swagger-ui/lib/handlebars-2.0.0.js b/cellbase-server/src/main/webapp/webservices/swagger-ui/lib/handlebars-2.0.0.js old mode 100644 new mode 100755 diff --git a/cellbase-server/src/main/webapp/webservices/swagger-ui/lib/highlight.7.3.pack.js b/cellbase-server/src/main/webapp/webservices/swagger-ui/lib/highlight.7.3.pack.js old mode 100644 new mode 100755 diff --git a/cellbase-server/src/main/webapp/webservices/swagger-ui/lib/jquery-1.8.0.min.js b/cellbase-server/src/main/webapp/webservices/swagger-ui/lib/jquery-1.8.0.min.js old mode 100644 new mode 100755 diff --git a/cellbase-server/src/main/webapp/webservices/swagger-ui/lib/jquery.ba-bbq.min.js b/cellbase-server/src/main/webapp/webservices/swagger-ui/lib/jquery.ba-bbq.min.js old mode 100644 new mode 100755 diff --git a/cellbase-server/src/main/webapp/webservices/swagger-ui/lib/jquery.slideto.min.js b/cellbase-server/src/main/webapp/webservices/swagger-ui/lib/jquery.slideto.min.js old mode 100644 new mode 100755 diff --git a/cellbase-server/src/main/webapp/webservices/swagger-ui/lib/jquery.wiggle.min.js b/cellbase-server/src/main/webapp/webservices/swagger-ui/lib/jquery.wiggle.min.js old mode 100644 new mode 100755 diff --git a/cellbase-server/src/main/webapp/webservices/swagger-ui/lib/marked.js b/cellbase-server/src/main/webapp/webservices/swagger-ui/lib/marked.js old mode 100644 new mode 100755 diff --git a/cellbase-server/src/main/webapp/webservices/swagger-ui/lib/swagger-oauth.js b/cellbase-server/src/main/webapp/webservices/swagger-ui/lib/swagger-oauth.js old mode 100644 new mode 100755 diff --git a/cellbase-server/src/main/webapp/webservices/swagger-ui/lib/underscore-min.js b/cellbase-server/src/main/webapp/webservices/swagger-ui/lib/underscore-min.js old mode 100644 new mode 100755 diff --git a/cellbase-server/src/main/webapp/webservices/swagger-ui/lib/underscore-min.map b/cellbase-server/src/main/webapp/webservices/swagger-ui/lib/underscore-min.map old mode 100644 new mode 100755 diff --git a/cellbase-server/src/main/webapp/webservices/swagger-ui/o2c.html b/cellbase-server/src/main/webapp/webservices/swagger-ui/o2c.html old mode 100644 new mode 100755 diff --git a/cellbase-server/src/main/webapp/webservices/swagger-ui/swagger-ui.js b/cellbase-server/src/main/webapp/webservices/swagger-ui/swagger-ui.js old mode 100644 new mode 100755 diff --git a/cellbase-server/src/main/webapp/webservices/swagger-ui/swagger-ui.min.js b/cellbase-server/src/main/webapp/webservices/swagger-ui/swagger-ui.min.js old mode 100644 new mode 100755 diff --git a/cellbase-test/README.md b/cellbase-test/README.md old mode 100644 new mode 100755 diff --git a/cellbase-test/fitnesse/FitNesseRoot/CellBase/CellBaseCompleteSuite.wiki b/cellbase-test/fitnesse/FitNesseRoot/CellBase/CellBaseCompleteSuite.wiki old mode 100644 new mode 100755 diff --git a/cellbase-test/fitnesse/FitNesseRoot/CellBase/CellBaseCompleteSuite/GeneralTests.wiki b/cellbase-test/fitnesse/FitNesseRoot/CellBase/CellBaseCompleteSuite/GeneralTests.wiki old mode 100644 new mode 100755 diff --git a/cellbase-test/fitnesse/FitNesseRoot/CellBase/CellBaseCompleteSuite/GeneralTests/MetaTests.wiki b/cellbase-test/fitnesse/FitNesseRoot/CellBase/CellBaseCompleteSuite/GeneralTests/MetaTests.wiki old mode 100644 new mode 100755 diff --git a/cellbase-test/fitnesse/FitNesseRoot/CellBase/CellBaseCompleteSuite/HSapiensTests.wiki b/cellbase-test/fitnesse/FitNesseRoot/CellBase/CellBaseCompleteSuite/HSapiensTests.wiki old mode 100644 new mode 100755 diff --git a/cellbase-test/fitnesse/FitNesseRoot/CellBase/CellBaseCompleteSuite/HSapiensTests/ClinicalTests.wiki b/cellbase-test/fitnesse/FitNesseRoot/CellBase/CellBaseCompleteSuite/HSapiensTests/ClinicalTests.wiki old mode 100644 new mode 100755 diff --git a/cellbase-test/fitnesse/FitNesseRoot/CellBase/CellBaseCompleteSuite/HSapiensTests/GeneTests.wiki b/cellbase-test/fitnesse/FitNesseRoot/CellBase/CellBaseCompleteSuite/HSapiensTests/GeneTests.wiki old mode 100644 new mode 100755 diff --git a/cellbase-test/fitnesse/FitNesseRoot/CellBase/CellBaseCompleteSuite/HSapiensTests/GenomeSequenceTests.wiki b/cellbase-test/fitnesse/FitNesseRoot/CellBase/CellBaseCompleteSuite/HSapiensTests/GenomeSequenceTests.wiki old mode 100644 new mode 100755 diff --git a/cellbase-test/fitnesse/FitNesseRoot/CellBase/CellBaseCompleteSuite/HSapiensTests/ProteinTests.wiki b/cellbase-test/fitnesse/FitNesseRoot/CellBase/CellBaseCompleteSuite/HSapiensTests/ProteinTests.wiki old mode 100644 new mode 100755 diff --git a/cellbase-test/fitnesse/FitNesseRoot/CellBase/CellBaseCompleteSuite/HSapiensTests/RegionTests.wiki b/cellbase-test/fitnesse/FitNesseRoot/CellBase/CellBaseCompleteSuite/HSapiensTests/RegionTests.wiki old mode 100644 new mode 100755 diff --git a/cellbase-test/fitnesse/FitNesseRoot/CellBase/CellBaseCompleteSuite/HSapiensTests/RegulationTests.wiki b/cellbase-test/fitnesse/FitNesseRoot/CellBase/CellBaseCompleteSuite/HSapiensTests/RegulationTests.wiki old mode 100644 new mode 100755 diff --git a/cellbase-test/fitnesse/FitNesseRoot/CellBase/CellBaseCompleteSuite/HSapiensTests/SpeciesTests.wiki b/cellbase-test/fitnesse/FitNesseRoot/CellBase/CellBaseCompleteSuite/HSapiensTests/SpeciesTests.wiki old mode 100644 new mode 100755 diff --git a/cellbase-test/fitnesse/FitNesseRoot/CellBase/CellBaseCompleteSuite/HSapiensTests/TFBSTests.wiki b/cellbase-test/fitnesse/FitNesseRoot/CellBase/CellBaseCompleteSuite/HSapiensTests/TFBSTests.wiki old mode 100644 new mode 100755 diff --git a/cellbase-test/fitnesse/FitNesseRoot/CellBase/CellBaseCompleteSuite/HSapiensTests/TranscriptTests.wiki b/cellbase-test/fitnesse/FitNesseRoot/CellBase/CellBaseCompleteSuite/HSapiensTests/TranscriptTests.wiki old mode 100644 new mode 100755 diff --git a/cellbase-test/fitnesse/FitNesseRoot/CellBase/CellBaseCompleteSuite/HSapiensTests/VariantTests.wiki b/cellbase-test/fitnesse/FitNesseRoot/CellBase/CellBaseCompleteSuite/HSapiensTests/VariantTests.wiki old mode 100644 new mode 100755 diff --git a/cellbase-test/fitnesse/FitNesseRoot/CellBase/CellBaseCompleteSuite/HSapiensTests/VariationTests.wiki b/cellbase-test/fitnesse/FitNesseRoot/CellBase/CellBaseCompleteSuite/HSapiensTests/VariationTests.wiki old mode 100644 new mode 100755 diff --git a/cellbase-test/fitnesse/FitNesseRoot/CellBase/CellBaseCompleteSuite/HSapiensTests/XrefTests.wiki b/cellbase-test/fitnesse/FitNesseRoot/CellBase/CellBaseCompleteSuite/HSapiensTests/XrefTests.wiki old mode 100644 new mode 100755 diff --git a/cellbase-test/fitnesse/FitNesseRoot/CellBase/CellBaseCompleteSuite/SuiteSetUp.wiki b/cellbase-test/fitnesse/FitNesseRoot/CellBase/CellBaseCompleteSuite/SuiteSetUp.wiki old mode 100644 new mode 100755 index 05ad09705e..2ac7b7a7c2 --- a/cellbase-test/fitnesse/FitNesseRoot/CellBase/CellBaseCompleteSuite/SuiteSetUp.wiki +++ b/cellbase-test/fitnesse/FitNesseRoot/CellBase/CellBaseCompleteSuite/SuiteSetUp.wiki @@ -14,13 +14,8 @@ Test |smartrics.rest.fitnesse.fixture| !|Table: Rest Fixture | http://bioinfoint.hpc.cam.ac.uk/| -<<<<<<< HEAD -|let|baseURL|const|http://${TEST_HOST}/${CELLBASE_WAR}/webservices/rest/${CELLBASE_VERSION}|http://bioinfodev.hpc.cam.ac.uk/cellbase-4.6.0-SNAPSHOT/webservices/rest/v4| -|let|baseURL_hsapiens|const|http://${TEST_HOST}/${CELLBASE_WAR}/webservices/rest/${CELLBASE_VERSION}/hsapiens|http://bioinfodev.hpc.cam.ac.uk/cellbase-4.6.0-SNAPSHOT/webservices/rest/v4/hsapiens| -======= |let|baseURL|const|http://${TEST_HOST}/${CELLBASE_WAR}/webservices/rest/${CELLBASE_VERSION}|http://bioinfodev.hpc.cam.ac.uk/cellbase-4.5.5/webservices/rest/v4| |let|baseURL_hsapiens|const|http://${TEST_HOST}/${CELLBASE_WAR}/webservices/rest/${CELLBASE_VERSION}/hsapiens|http://bioinfodev.hpc.cam.ac.uk/cellbase-4.5.5/webservices/rest/v4/hsapiens| ->>>>>>> hotfix-4.5.x |let|useCache|const|false|false| | Table: Rest Fixture Config | with-compareJSON.js | diff --git a/cellbase-test/fitnesse/FitNesseRoot/CellBase/content.txt b/cellbase-test/fitnesse/FitNesseRoot/CellBase/content.txt old mode 100644 new mode 100755 diff --git a/cellbase-test/fitnesse/FitNesseRoot/CellBase/properties.xml b/cellbase-test/fitnesse/FitNesseRoot/CellBase/properties.xml old mode 100644 new mode 100755 diff --git a/cellbase-test/fitnesse/FitNesseRoot/FrontPage/content.txt b/cellbase-test/fitnesse/FitNesseRoot/FrontPage/content.txt old mode 100644 new mode 100755 diff --git a/cellbase-test/fitnesse/FitNesseRoot/FrontPage/properties.xml b/cellbase-test/fitnesse/FitNesseRoot/FrontPage/properties.xml old mode 100644 new mode 100755 diff --git a/cellbase-test/fitnesse/FitNesseRoot/PageFooter/content.txt b/cellbase-test/fitnesse/FitNesseRoot/PageFooter/content.txt old mode 100644 new mode 100755 diff --git a/cellbase-test/fitnesse/FitNesseRoot/PageFooter/properties.xml b/cellbase-test/fitnesse/FitNesseRoot/PageFooter/properties.xml old mode 100644 new mode 100755 diff --git a/cellbase-test/fitnesse/FitNesseRoot/PageHeader/content.txt b/cellbase-test/fitnesse/FitNesseRoot/PageHeader/content.txt old mode 100644 new mode 100755 diff --git a/cellbase-test/fitnesse/FitNesseRoot/PageHeader/properties.xml b/cellbase-test/fitnesse/FitNesseRoot/PageHeader/properties.xml old mode 100644 new mode 100755 diff --git a/cellbase-test/fitnesse/FitNesseRoot/RecentChanges.wiki b/cellbase-test/fitnesse/FitNesseRoot/RecentChanges.wiki old mode 100644 new mode 100755 diff --git a/cellbase-test/fitnesse/FitNesseRoot/TemplateLibrary/StaticPage/content.txt b/cellbase-test/fitnesse/FitNesseRoot/TemplateLibrary/StaticPage/content.txt old mode 100644 new mode 100755 diff --git a/cellbase-test/fitnesse/FitNesseRoot/TemplateLibrary/StaticPage/properties.xml b/cellbase-test/fitnesse/FitNesseRoot/TemplateLibrary/StaticPage/properties.xml old mode 100644 new mode 100755 diff --git a/cellbase-test/fitnesse/FitNesseRoot/TemplateLibrary/SuitePage/content.txt b/cellbase-test/fitnesse/FitNesseRoot/TemplateLibrary/SuitePage/content.txt old mode 100644 new mode 100755 diff --git a/cellbase-test/fitnesse/FitNesseRoot/TemplateLibrary/SuitePage/properties.xml b/cellbase-test/fitnesse/FitNesseRoot/TemplateLibrary/SuitePage/properties.xml old mode 100644 new mode 100755 diff --git a/cellbase-test/fitnesse/FitNesseRoot/TemplateLibrary/TestPage/content.txt b/cellbase-test/fitnesse/FitNesseRoot/TemplateLibrary/TestPage/content.txt old mode 100644 new mode 100755 diff --git a/cellbase-test/fitnesse/FitNesseRoot/TemplateLibrary/TestPage/properties.xml b/cellbase-test/fitnesse/FitNesseRoot/TemplateLibrary/TestPage/properties.xml old mode 100644 new mode 100755 diff --git a/cellbase-test/fitnesse/FitNesseRoot/TemplateLibrary/content.txt b/cellbase-test/fitnesse/FitNesseRoot/TemplateLibrary/content.txt old mode 100644 new mode 100755 diff --git a/cellbase-test/fitnesse/FitNesseRoot/TemplateLibrary/properties.xml b/cellbase-test/fitnesse/FitNesseRoot/TemplateLibrary/properties.xml old mode 100644 new mode 100755 diff --git a/cellbase-test/fitnesse/FitNesseRoot/files/javascript/compareJSON.js b/cellbase-test/fitnesse/FitNesseRoot/files/javascript/compareJSON.js old mode 100644 new mode 100755 diff --git a/cellbase-test/fitnesse/FitNesseRoot/files/javascript/contains.js b/cellbase-test/fitnesse/FitNesseRoot/files/javascript/contains.js old mode 100644 new mode 100755 diff --git a/cellbase-test/fitnesse/FitNesseRoot/files/javascript/isPresent.js b/cellbase-test/fitnesse/FitNesseRoot/files/javascript/isPresent.js old mode 100644 new mode 100755 diff --git a/cellbase-test/fitnesse/FitNesseRoot/properties b/cellbase-test/fitnesse/FitNesseRoot/properties old mode 100644 new mode 100755 diff --git a/cellbase-test/pom.xml b/cellbase-test/pom.xml old mode 100644 new mode 100755 diff --git a/cellbase-web/Gruntfile.js b/cellbase-web/Gruntfile.js old mode 100644 new mode 100755 diff --git a/cellbase-web/LICENSE b/cellbase-web/LICENSE old mode 100644 new mode 100755 diff --git a/cellbase-web/bower.json b/cellbase-web/bower.json old mode 100644 new mode 100755 diff --git a/cellbase-web/lib/ChemDoodle/ChemDoodleWeb.css b/cellbase-web/lib/ChemDoodle/ChemDoodleWeb.css old mode 100644 new mode 100755 diff --git a/cellbase-web/lib/ChemDoodle/ChemDoodleWeb.js b/cellbase-web/lib/ChemDoodle/ChemDoodleWeb.js old mode 100644 new mode 100755 diff --git a/cellbase-web/lib/jsorolla b/cellbase-web/lib/jsorolla index bb4156e230..c9ba7f9ece 160000 --- a/cellbase-web/lib/jsorolla +++ b/cellbase-web/lib/jsorolla @@ -1 +1 @@ -Subproject commit bb4156e2301ba4e0b3fb49aba9d945faf4fa604a +Subproject commit c9ba7f9eced52be0048a270b7fb885ed91314ff0 diff --git a/cellbase-web/package.json b/cellbase-web/package.json old mode 100644 new mode 100755 diff --git a/cellbase-web/src/cellbase-web.html b/cellbase-web/src/cellbase-web.html old mode 100644 new mode 100755 diff --git a/cellbase-web/src/components/common/cellbase-active-filters.html b/cellbase-web/src/components/common/cellbase-active-filters.html old mode 100644 new mode 100755 diff --git a/cellbase-web/src/components/common/cellbase-filter-toolbar.html b/cellbase-web/src/components/common/cellbase-filter-toolbar.html old mode 100644 new mode 100755 diff --git a/cellbase-web/src/components/common/cellbase-options-list.html b/cellbase-web/src/components/common/cellbase-options-list.html old mode 100644 new mode 100755 diff --git a/cellbase-web/src/components/core/cellbase-gene-filter.html b/cellbase-web/src/components/core/cellbase-gene-filter.html old mode 100644 new mode 100755 diff --git a/cellbase-web/src/components/core/cellbase-gene-panel.html b/cellbase-web/src/components/core/cellbase-gene-panel.html old mode 100644 new mode 100755 diff --git a/cellbase-web/src/components/core/cellbase-gene-view.html b/cellbase-web/src/components/core/cellbase-gene-view.html old mode 100644 new mode 100755 diff --git a/cellbase-web/src/components/core/cellbase-genomic-filter.html b/cellbase-web/src/components/core/cellbase-genomic-filter.html old mode 100644 new mode 100755 diff --git a/cellbase-web/src/components/core/cellbase-genomic-panel.html b/cellbase-web/src/components/core/cellbase-genomic-panel.html old mode 100644 new mode 100755 diff --git a/cellbase-web/src/components/core/cellbase-genomic-view.html b/cellbase-web/src/components/core/cellbase-genomic-view.html old mode 100644 new mode 100755 diff --git a/cellbase-web/src/components/core/cellbase-regulation-filter.html b/cellbase-web/src/components/core/cellbase-regulation-filter.html old mode 100644 new mode 100755 diff --git a/cellbase-web/src/components/core/cellbase-regulation-panel.html b/cellbase-web/src/components/core/cellbase-regulation-panel.html old mode 100644 new mode 100755 diff --git a/cellbase-web/src/components/old/cellbase-biotype-options.html b/cellbase-web/src/components/old/cellbase-biotype-options.html old mode 100644 new mode 100755 diff --git a/cellbase-web/src/components/old/cellbase-consequence-types-options.html b/cellbase-web/src/components/old/cellbase-consequence-types-options.html old mode 100644 new mode 100755 diff --git a/cellbase-web/src/components/shared/cellbase-species-menu.html b/cellbase-web/src/components/shared/cellbase-species-menu.html old mode 100644 new mode 100755 diff --git a/cellbase-web/src/components/variation/cellbase-clinical-filter.html b/cellbase-web/src/components/variation/cellbase-clinical-filter.html old mode 100644 new mode 100755 diff --git a/cellbase-web/src/components/variation/cellbase-clinical-panel.html b/cellbase-web/src/components/variation/cellbase-clinical-panel.html old mode 100644 new mode 100755 diff --git a/cellbase-web/src/components/variation/cellbase-clinical-view.html b/cellbase-web/src/components/variation/cellbase-clinical-view.html old mode 100644 new mode 100755 diff --git a/cellbase-web/src/components/variation/cellbase-variantannotation-filter.html b/cellbase-web/src/components/variation/cellbase-variantannotation-filter.html old mode 100644 new mode 100755 diff --git a/cellbase-web/src/components/variation/cellbase-variantannotation-panel.html b/cellbase-web/src/components/variation/cellbase-variantannotation-panel.html old mode 100644 new mode 100755 diff --git a/cellbase-web/src/components/variation/cellbase-variation-filter.html b/cellbase-web/src/components/variation/cellbase-variation-filter.html old mode 100644 new mode 100755 diff --git a/cellbase-web/src/components/variation/cellbase-variation-panel.html b/cellbase-web/src/components/variation/cellbase-variation-panel.html old mode 100644 new mode 100755 diff --git a/cellbase-web/src/components/variation/cellbase-variation-view.html b/cellbase-web/src/components/variation/cellbase-variation-view.html old mode 100644 new mode 100755 diff --git a/cellbase-web/src/config.js b/cellbase-web/src/config.js old mode 100644 new mode 100755 diff --git a/cellbase-web/src/index.html b/cellbase-web/src/index.html old mode 100644 new mode 100755 diff --git a/cellbase-web/src/jso-styles.html b/cellbase-web/src/jso-styles.html old mode 100644 new mode 100755 diff --git a/cellbase-web/src/test.html b/cellbase-web/src/test.html old mode 100644 new mode 100755 diff --git a/checkstyle.xml b/checkstyle.xml old mode 100644 new mode 100755 diff --git a/clients/R/.Rbuildignore b/clients/R/.Rbuildignore old mode 100644 new mode 100755 diff --git a/clients/R/.travis.yml b/clients/R/.travis.yml old mode 100644 new mode 100755 diff --git a/clients/R/DESCRIPTION b/clients/R/DESCRIPTION old mode 100644 new mode 100755 diff --git a/clients/R/NAMESPACE b/clients/R/NAMESPACE old mode 100644 new mode 100755 diff --git a/clients/R/NEWS b/clients/R/NEWS old mode 100644 new mode 100755 diff --git a/clients/R/R/AllClasses.R b/clients/R/R/AllClasses.R old mode 100644 new mode 100755 diff --git a/clients/R/R/AllGenerics.R b/clients/R/R/AllGenerics.R old mode 100644 new mode 100755 diff --git a/clients/R/R/CellBaseParam-methods.R b/clients/R/R/CellBaseParam-methods.R old mode 100644 new mode 100755 diff --git a/clients/R/R/CellBaseR-methods.R b/clients/R/R/CellBaseR-methods.R old mode 100644 new mode 100755 diff --git a/clients/R/R/cbAnnotateVcf-methods.R b/clients/R/R/cbAnnotateVcf-methods.R old mode 100644 new mode 100755 diff --git a/clients/R/R/cbChromosomeInfoClient-methods.R b/clients/R/R/cbChromosomeInfoClient-methods.R old mode 100644 new mode 100755 diff --git a/clients/R/R/cbClinicalClient-methods.R b/clients/R/R/cbClinicalClient-methods.R old mode 100644 new mode 100755 diff --git a/clients/R/R/cbData-methods.R b/clients/R/R/cbData-methods.R old mode 100644 new mode 100755 diff --git a/clients/R/R/cbGeneClient-methods.R b/clients/R/R/cbGeneClient-methods.R old mode 100644 new mode 100755 diff --git a/clients/R/R/cbGet-methods.R b/clients/R/R/cbGet-methods.R old mode 100644 new mode 100755 diff --git a/clients/R/R/cbProteinClient-methods.R b/clients/R/R/cbProteinClient-methods.R old mode 100644 new mode 100755 diff --git a/clients/R/R/cbRegionClient-methods.R b/clients/R/R/cbRegionClient-methods.R old mode 100644 new mode 100755 diff --git a/clients/R/R/cbSnpClient-methods.R b/clients/R/R/cbSnpClient-methods.R old mode 100644 new mode 100755 diff --git a/clients/R/R/cbSpeciesClient-methods.R b/clients/R/R/cbSpeciesClient-methods.R old mode 100644 new mode 100755 diff --git a/clients/R/R/cbTfbsClient-methods.R b/clients/R/R/cbTfbsClient-methods.R old mode 100644 new mode 100755 diff --git a/clients/R/R/cbTranscriptClient-methods.R b/clients/R/R/cbTranscriptClient-methods.R old mode 100644 new mode 100755 diff --git a/clients/R/R/cbVariantClient-methods.R b/clients/R/R/cbVariantClient-methods.R old mode 100644 new mode 100755 diff --git a/clients/R/R/cbXrefClient-methods.R b/clients/R/R/cbXrefClient-methods.R old mode 100644 new mode 100755 diff --git a/clients/R/R/cellbase.R b/clients/R/R/cellbase.R old mode 100644 new mode 100755 diff --git a/clients/R/R/commons.R b/clients/R/R/commons.R old mode 100644 new mode 100755 diff --git a/clients/R/R/show-methods.R b/clients/R/R/show-methods.R old mode 100644 new mode 100755 diff --git a/clients/R/R/tools.R b/clients/R/R/tools.R old mode 100644 new mode 100755 diff --git a/clients/R/README.md b/clients/R/README.md old mode 100644 new mode 100755 diff --git a/clients/R/man/Annovcf.Rd b/clients/R/man/Annovcf.Rd old mode 100644 new mode 100755 diff --git a/clients/R/man/CellBaseParam-class.Rd b/clients/R/man/CellBaseParam-class.Rd old mode 100644 new mode 100755 diff --git a/clients/R/man/CellBaseParam.Rd b/clients/R/man/CellBaseParam.Rd old mode 100644 new mode 100755 diff --git a/clients/R/man/CellBaseR-class.Rd b/clients/R/man/CellBaseR-class.Rd old mode 100644 new mode 100755 diff --git a/clients/R/man/CellBaseR.Rd b/clients/R/man/CellBaseR.Rd old mode 100644 new mode 100755 diff --git a/clients/R/man/CellBaseResponse-class.Rd b/clients/R/man/CellBaseResponse-class.Rd old mode 100644 new mode 100755 diff --git a/clients/R/man/cbAnnotateVcf-CellBaseR-method.Rd b/clients/R/man/cbAnnotateVcf-CellBaseR-method.Rd old mode 100644 new mode 100755 diff --git a/clients/R/man/cbChromosomeInfoClient-CellBaseR-method.Rd b/clients/R/man/cbChromosomeInfoClient-CellBaseR-method.Rd old mode 100644 new mode 100755 diff --git a/clients/R/man/cbClinicalClient-CellBaseR-method.Rd b/clients/R/man/cbClinicalClient-CellBaseR-method.Rd old mode 100644 new mode 100755 diff --git a/clients/R/man/cbData-CellBaseResponse-method.Rd b/clients/R/man/cbData-CellBaseResponse-method.Rd old mode 100644 new mode 100755 diff --git a/clients/R/man/cbGeneClient-CellBaseR-method.Rd b/clients/R/man/cbGeneClient-CellBaseR-method.Rd old mode 100644 new mode 100755 diff --git a/clients/R/man/cbGet-CellBaseR-method.Rd b/clients/R/man/cbGet-CellBaseR-method.Rd old mode 100644 new mode 100755 diff --git a/clients/R/man/cbHelp.Rd b/clients/R/man/cbHelp.Rd old mode 100644 new mode 100755 diff --git a/clients/R/man/cbProteinClient-CellBaseR-method.Rd b/clients/R/man/cbProteinClient-CellBaseR-method.Rd old mode 100644 new mode 100755 diff --git a/clients/R/man/cbRegionClient-CellBaseR-method.Rd b/clients/R/man/cbRegionClient-CellBaseR-method.Rd old mode 100644 new mode 100755 diff --git a/clients/R/man/cbSnpClient-CellBaseR-method.Rd b/clients/R/man/cbSnpClient-CellBaseR-method.Rd old mode 100644 new mode 100755 diff --git a/clients/R/man/cbSpeciesClient-CellBaseR-method.Rd b/clients/R/man/cbSpeciesClient-CellBaseR-method.Rd old mode 100644 new mode 100755 diff --git a/clients/R/man/cbSpeciesClient.Rd b/clients/R/man/cbSpeciesClient.Rd old mode 100644 new mode 100755 diff --git a/clients/R/man/cbTfbsClient-CellBaseR-method.Rd b/clients/R/man/cbTfbsClient-CellBaseR-method.Rd old mode 100644 new mode 100755 diff --git a/clients/R/man/cbTranscriptClient-CellBaseR-method.Rd b/clients/R/man/cbTranscriptClient-CellBaseR-method.Rd old mode 100644 new mode 100755 diff --git a/clients/R/man/cbVariantClient-CellBaseR-method.Rd b/clients/R/man/cbVariantClient-CellBaseR-method.Rd old mode 100644 new mode 100755 diff --git a/clients/R/man/cbXrefClient-CellBaseR-method.Rd b/clients/R/man/cbXrefClient-CellBaseR-method.Rd old mode 100644 new mode 100755 diff --git a/clients/R/man/cellbaseR-package.Rd b/clients/R/man/cellbaseR-package.Rd old mode 100644 new mode 100755 diff --git a/clients/R/man/createGeneModel.Rd b/clients/R/man/createGeneModel.Rd old mode 100644 new mode 100755 diff --git a/clients/R/man/show-CellBaseParam-method.Rd b/clients/R/man/show-CellBaseParam-method.Rd old mode 100644 new mode 100755 diff --git a/clients/R/man/show-CellBaseR-method.Rd b/clients/R/man/show-CellBaseR-method.Rd old mode 100644 new mode 100755 diff --git a/clients/R/man/show-CellBaseResponse-method.Rd b/clients/R/man/show-CellBaseResponse-method.Rd old mode 100644 new mode 100755 diff --git a/clients/R/vignettes/cellbaseR.Rmd b/clients/R/vignettes/cellbaseR.Rmd old mode 100644 new mode 100755 diff --git a/clients/python/Dockerfile b/clients/python/Dockerfile old mode 100644 new mode 100755 diff --git a/clients/python/HISTORY.rst b/clients/python/HISTORY.rst old mode 100644 new mode 100755 diff --git a/clients/python/LICENSE.txt b/clients/python/LICENSE.txt old mode 100644 new mode 100755 diff --git a/clients/python/pycellbase/commons.py b/clients/python/pycellbase/commons.py old mode 100644 new mode 100755 diff --git a/clients/python/requirements.txt b/clients/python/requirements.txt old mode 100644 new mode 100755 diff --git a/clients/python/setup.cfg b/clients/python/setup.cfg old mode 100644 new mode 100755 diff --git a/clients/python/tests/test_cbcclient.py b/clients/python/tests/test_cbcclient.py old mode 100644 new mode 100755 diff --git a/clients/python/tests/test_cbconfig.py b/clients/python/tests/test_cbconfig.py old mode 100644 new mode 100755 diff --git a/clients/python/tests/test_commons.py b/clients/python/tests/test_commons.py old mode 100644 new mode 100755 diff --git a/clients/python/tests/testresources/config.json b/clients/python/tests/testresources/config.json old mode 100644 new mode 100755 diff --git a/clients/python/tests/testresources/config.yml b/clients/python/tests/testresources/config.yml old mode 100644 new mode 100755 diff --git a/clients/python/tools/cbtools.py b/clients/python/tools/cbtools.py old mode 100644 new mode 100755 diff --git a/clients/python/use_case.ipynb b/clients/python/use_case.ipynb old mode 100644 new mode 100755 diff --git a/pom.xml b/pom.xml old mode 100644 new mode 100755 index cd579a4370..320a2e3008 --- a/pom.xml +++ b/pom.xml @@ -25,7 +25,12 @@ 4.8.1 1.8 3.7.0 +<<<<<<< HEAD + 3.6 + 1.4.3 +======= 1.5.3 +>>>>>>> a06ad91c3ea228e658c3495fc957d56b2572a9be 0.1.0 2.9.8 3.1.0 diff --git a/regulatory_region.test.json b/regulatory_region.test.json old mode 100644 new mode 100755