From 64d0ea99fddb0ea7b3be2c7d471b8c58430d9d52 Mon Sep 17 00:00:00 2001 From: Yiwen He Date: Thu, 10 Dec 2020 16:28:05 -0500 Subject: [PATCH] Updates for v4.3_20201209 release --- .../META-INF/spring/admin.properties | 7 +- .../observationDataApplicationContext.xml | 33 +- ...bservationDataSharedApplicationContext.xml | 288 +++++++++++------- 3 files changed, 201 insertions(+), 127 deletions(-) diff --git a/admin/src/main/resources/META-INF/spring/admin.properties b/admin/src/main/resources/META-INF/spring/admin.properties index a57e3edb..998c2ab6 100644 --- a/admin/src/main/resources/META-INF/spring/admin.properties +++ b/admin/src/main/resources/META-INF/spring/admin.properties @@ -223,9 +223,10 @@ broad.por.data.location=file:${CTD2_DATA_HOME}/submissions/20200422-broad_por/20 dfci.creb5.data.locaton=file:${CTD2_DATA_HOME}/submissions/20200528-dfci_creb5/20200528-dfci_creb5.txt dfci.mrt.vulnerablility.data.location=file:${CTD2_DATA_HOME}/submissions/20200601-dfci_mrt_vulnerability/20200601-dfci_mrt_vulnerability.txt dfci.shoc2.data.location=file:${CTD2_DATA_HOME}/submissions/20200601-dfci_shoc2/20200601-dfci_shoc2.txt -ucsf1.kras.sl.drug.screen.resistance.data.location=file:${CTD2_DATA_HOME}/submissions/20200807-ucsf1_kras_sl_drug_screen-resistance/20200807-ucsf1_kras_sl_drug_screen-resistance.txt -ucsf1.kras.sl.drug.screen.sensitivity.data.location=file:${CTD2_DATA_HOME}/submissions/20200807-ucsf1_kras_sl_drug_screen-sensitivity/20200807-ucsf1_kras_sl_drug_screen-sensitivity.txt - +ucsf1.kras.sl.drug.screen.data.location=file:${CTD2_DATA_HOME}/submissions/20200807-ucsf1_kras_sl_drug_screen/20200807-ucsf1_kras_sl_drug_screen.txt +columbia.oncosig.ppi.networks.data.location=file:${CTD2_DATA_HOME}/submissions/20201028-columbia_oncosig_ppi_networks/20201028-columbia_oncosig_ppi_networks.txt +columbia.oncosig.shrna.knockdown.data.location=file:${CTD2_DATA_HOME}/submissions/20201028-columbia_oncosig_shrna_knockdown/20201028-columbia_oncosig_shrna_knockdown.txt +dfci.creb5.story.data.location=file:${CTD2_DATA_HOME}/submissions/20201111-dfci_creb5_story/20201111-dfci_creb5_story.txt diff --git a/admin/src/main/resources/META-INF/spring/observationDataApplicationContext.xml b/admin/src/main/resources/META-INF/spring/observationDataApplicationContext.xml index 3480fb25..3a0775a1 100644 --- a/admin/src/main/resources/META-INF/spring/observationDataApplicationContext.xml +++ b/admin/src/main/resources/META-INF/spring/observationDataApplicationContext.xml @@ -1765,8 +1765,6 @@ - - @@ -1794,23 +1792,40 @@ - - + + - + - - + + - + + + + + + + + + + + + + + + + + + + - diff --git a/admin/src/main/resources/META-INF/spring/observationDataSharedApplicationContext.xml b/admin/src/main/resources/META-INF/spring/observationDataSharedApplicationContext.xml index c3604878..f2b727be 100644 --- a/admin/src/main/resources/META-INF/spring/observationDataSharedApplicationContext.xml +++ b/admin/src/main/resources/META-INF/spring/observationDataSharedApplicationContext.xml @@ -997,24 +997,31 @@ - + - - + - + - + - + + + + + + + + + + + - - @@ -2589,8 +2596,6 @@ - - @@ -2734,6 +2739,7 @@ + @@ -2742,6 +2748,7 @@ + @@ -2750,6 +2757,7 @@ + @@ -2758,6 +2766,7 @@ + @@ -2766,6 +2775,7 @@ + @@ -2774,6 +2784,7 @@ + @@ -2782,6 +2793,7 @@ + @@ -2790,6 +2802,7 @@ + @@ -2799,23 +2812,44 @@ - + - + - + - + - + + - + - + - + + + + + + + + + + + + + + + + + + + + + @@ -4746,105 +4780,129 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +