Updates for v4.3_20201209 release

CBIIT · Dec 10, 2020 · 64d0ea9 · 64d0ea9
1 parent 0bd4d73
commit 64d0ea9
Show file tree

Hide file tree

Showing 3 changed files with 201 additions and 127 deletions.
diff --git 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
@@ -1765,8 +1765,6 @@
             </bean>
         </property>
     </bean>
-
-
     <bean name="dfciCreb5DataLocatonReader" class="org.springframework.batch.item.file.MultiResourceItemReader">
         <property name="resources" value="${dfci.creb5.data.locaton}"/>
         <property name="delegate">
@@ -1794,23 +1792,40 @@
             </bean>
         </property>
     </bean>
-    <bean name="ucsf1KrasSlDrugScreenResistanceReader" class="org.springframework.batch.item.file.MultiResourceItemReader">
-        <property name="resources" value="${ucsf1.kras.sl.drug.screen.resistance.data.location}" />
+    <bean name="ucsf1KrasSlDrugScreenReader" class="org.springframework.batch.item.file.MultiResourceItemReader">
+        <property name="resources" value="${ucsf1.kras.sl.drug.screen.data.location}" />
         <property name="delegate">
             <bean class="org.springframework.batch.item.file.FlatFileItemReader">
-                <property name="lineMapper" ref="ucsf1KrasSlDrugScreenResistanceLineMapper" />
+                <property name="lineMapper" ref="ucsf1KrasSlDrugScreenLineMapper" />
                 <property name="linesToSkip" value="7" />
             </bean>
         </property>
     </bean>
-    <bean name="ucsf1KrasSlDrugScreenSensitivityReader" class="org.springframework.batch.item.file.MultiResourceItemReader">
-        <property name="resources" value="${ucsf1.kras.sl.drug.screen.sensitivity.data.location}" />
+    <bean name="columbiaOncosigPpiNetworksReader" class="org.springframework.batch.item.file.MultiResourceItemReader">
+        <property name="resources" value="${columbia.oncosig.ppi.networks.data.location}" />
         <property name="delegate">
             <bean class="org.springframework.batch.item.file.FlatFileItemReader">
-                <property name="lineMapper" ref="ucsf1KrasSlDrugScreenSensitivityLineMapper" />
+                <property name="lineMapper" ref="columbiaOncosigPpiNetworksLineMapper" />
+                <property name="linesToSkip" value="7" />
+            </bean>
+        </property>
+    </bean>
+    <bean name="columbiaOncosigShrnaKnockdownReader" class="org.springframework.batch.item.file.MultiResourceItemReader">
+        <property name="resources" value="${columbia.oncosig.shrna.knockdown.data.location}" />
+        <property name="delegate">
+            <bean class="org.springframework.batch.item.file.FlatFileItemReader">
+                <property name="lineMapper" ref="columbiaOncosigShrnaKnockdownLineMapper" />
+                <property name="linesToSkip" value="7" />
+            </bean>
+        </property>
+    </bean>
+    <bean name="dfciCreb5StoryReader" class="org.springframework.batch.item.file.MultiResourceItemReader">
+        <property name="resources" value="${dfci.creb5.story.data.location}" />
+        <property name="delegate">
+            <bean class="org.springframework.batch.item.file.FlatFileItemReader">
+                <property name="lineMapper" ref="dfciCreb5StoryLineMapper" />
                 <property name="linesToSkip" value="7" />
             </bean>
         </property>
     </bean>
-
 </beans>