From e051452ec0db14838f1cc95dd08a4bdd37c659fb Mon Sep 17 00:00:00 2001
From: Jared Koester <jkoester@camsys.com>
Date: Wed, 12 Jan 2022 10:37:32 -0500
Subject: [PATCH] Update data sources

Updates to data sources for admin, api, and enterprise
---
 .../src/main/resources/data-sources.xml       | 150 ++++++++++++++++++
 .../src/main/resources/data-sources.xml       |  60 +++----
 .../src/main/resources/data-sources.xml       |  66 ++++----
 3 files changed, 213 insertions(+), 63 deletions(-)

diff --git a/onebusaway-admin-webapp/src/main/resources/data-sources.xml b/onebusaway-admin-webapp/src/main/resources/data-sources.xml
index b0a32df8d2..d5c52f9f5c 100644
--- a/onebusaway-admin-webapp/src/main/resources/data-sources.xml
+++ b/onebusaway-admin-webapp/src/main/resources/data-sources.xml
@@ -45,6 +45,35 @@
                 value="true" />
     </bean>
 
+    <!-- Database Connection Configuration for Agency Metadata -->
+    <bean id="agencyMetadataDataSource"
+          class="org.springframework.jndi.JndiObjectFactoryBean">
+        <property name="jndiName"
+                  value="java:comp/env/jdbc/agencyMetadataDB"/>
+        <property name="lookupOnStartup"
+                  value="true"/>
+        <property name="cache"
+                  value="true"/>
+        <property name="proxyInterface"
+                  value="javax.sql.DataSource"/>
+        <property name="resourceRef"
+                  value="true" />
+    </bean>
+    <!-- Database Connection Configuration for Bundle Build Response -->
+    <bean id="bundleBuildResponseDataSource"
+          class="org.springframework.jndi.JndiObjectFactoryBean">
+        <property name="jndiName"
+                  value="java:comp/env/jdbc/appDB"/>
+        <property name="lookupOnStartup"
+                  value="true"/>
+        <property name="cache"
+                  value="true"/>
+        <property name="proxyInterface"
+                  value="javax.sql.DataSource"/>
+        <property name="resourceRef"
+                  value="true" />
+    </bean>
+
     <alias name="dataSource" alias="mutableDataSource" />
     <bean id="sessionFactory" class="org.springframework.orm.hibernate5.LocalSessionFactoryBean"
           primary="true">
@@ -72,6 +101,35 @@
     	<property name="session" ref="mailSession"/> 
 	</bean>
     
+    <!-- Database Connection Configuration for retrieving archived data -->
+    <bean id="gtfsRealtimeArchiveDataSource"
+          class="org.springframework.jndi.JndiObjectFactoryBean">
+      <property name="jndiName"
+                value="java:comp/env/jdbc/archiveDB"/>
+      <property name="lookupOnStartup"
+                value="true"/>
+      <property name="cache"
+                value="true"/>
+      <property name="proxyInterface"
+                value="javax.sql.DataSource"/>
+      <property name="resourceRef"
+                value="true" />
+    </bean>
+
+    <!-- Database Connection Configuration for retrieving assigned vehicle data -->
+    <bean id="assignedVehicleDataSource"
+          class="org.springframework.jndi.JndiObjectFactoryBean">
+        <property name="jndiName"
+                  value="java:comp/env/jdbc/appDB"/>
+        <property name="lookupOnStartup"
+                  value="true"/>
+        <property name="cache"
+                  value="true"/>
+        <property name="proxyInterface"
+                  value="javax.sql.DataSource"/>
+        <property name="resourceRef"
+                  value="true" />
+    </bean>
 
 <!-- Other Stuff: -->
 
@@ -122,7 +180,99 @@
         </property> 
     </bean>
     
+	<bean id="agencyMetadataSessionFactory"
+		class="org.springframework.orm.hibernate5.LocalSessionFactoryBean">
+		<property name="dataSource" ref="agencyMetadataDataSource" />
+		<property name="annotatedClasses">
+			<list>
+				<value>org.onebusaway.agency_metadata.model.AgencyMetadata</value>
+				<value>org.onebusaway.agency_metadata.service.AgencyMetadataDaoImpl</value>
+			</list>
+		</property>
+		<property name="hibernateProperties">
+			<props>
+				<prop key="hibernate.dialect">org.hibernate.dialect.MySQLDialect</prop>
+				<prop key="hibernate.connection.pool_size">1</prop>
+				<!--<prop key="hibernate.current_session_context_class">thread</prop>-->
+				<prop key="hibernate.cache.provider_class">org.hibernate.cache.internal.NoCachingRegionFactory</prop>
+				<prop key="hibernate.show_sql">false</prop>
+				<prop key="hibernate.hbm2ddl.auto">update</prop>
+				<prop key="hibernate.jdbc.batch_size">1000</prop>
+			</props>
+		</property>
+	</bean>
+     <bean id="bundleBuildResponseSessionFactory"
+    class="org.springframework.orm.hibernate5.LocalSessionFactoryBean">
+    <property name="dataSource" ref="bundleBuildResponseDataSource" />
+    <property name="annotatedClasses">
+      <list>
+        <value>org.onebusaway.admin.model.BundleBuildResponse</value>
+        <value>org.onebusaway.admin.service.bundle.impl.BundleBuildResponseDaoImpl</value>
+      </list>
+    </property>
+    <property name="hibernateProperties">
+      <props>
+        <prop key="hibernate.dialect">org.hibernate.dialect.MySQLDialect</prop>
+        <prop key="hibernate.connection.pool_size">1</prop>
+        <!--<prop key="hibernate.current_session_context_class">thread</prop>-->
+        <prop key="hibernate.cache.provider_class">org.hibernate.cache.internal.NoCachingRegionFactory</prop>
+        <prop key="hibernate.show_sql">false</prop>
+        <prop key="hibernate.hbm2ddl.auto">update</prop>
+        <prop key="hibernate.jdbc.batch_size">1000</prop>
+      </props>
+    </property>
+  </bean>
+
+  <bean id="gtfsRealtimeArchiveSessionFactory" class="org.springframework.orm.hibernate5.LocalSessionFactoryBean">
+    <property name="dataSource" ref="gtfsRealtimeArchiveDataSource" />
+    <property name="annotatedClasses">
+      <list>
+        <value>org.onebusaway.admin.service.bundle.task.model.GtfsBundleInfo</value>
+        <value>org.onebusaway.admin.service.bundle.impl.GtfsArchiveDaoImpl</value>
+      </list>
+    </property>
+    <property name="hibernateProperties">
+      <props>
+        <prop key="hibernate.connection.pool_size">1</prop>
+        <!--<prop key="hibernate.current_session_context_class">thread</prop>-->
+        <prop key="hibernate.cache.provider_class">org.hibernate.cache.internal.NoCachingRegionFactory</prop>
+        <prop key="hibernate.show_sql">false</prop>
+        <prop key="hibernate.hbm2ddl.auto">none</prop>
+        <prop key="hibernate.jdbc.batch_size">1000</prop>
+        <prop key="hibernate.order_inserts">false</prop>
+        <prop key="hibernate.order_updates">false</prop>
+      </props>
+    </property>
+    <property name="mappingResources">
+      <list>
+        <value>org/onebusaway/gtfs/model/GtfsArchiveMapping.hibernate.xml</value>
+      </list>
+    </property>
+  </bean>
 
+    <bean id="assignmentSessionFactory"
+          class="org.springframework.orm.hibernate5.LocalSessionFactoryBean">
+        <property name="dataSource" ref="assignedVehicleDataSource" />
+        <property name="annotatedClasses">
+            <list>
+                <value>org.onebusaway.admin.model.assignments.Assignment</value>
+                <value>org.onebusaway.admin.model.assignments.AssignmentConfig</value>
+                <value>org.onebusaway.admin.service.assignments.impl.AssignmentDaoImpl</value>
+                <value>org.onebusaway.admin.service.assignments.impl.AssignmentConfigDaoImpl</value>
+            </list>
+        </property>
+        <property name="hibernateProperties">
+            <props>
+                <prop key="hibernate.dialect">org.hibernate.dialect.MySQLDialect</prop>
+                <prop key="hibernate.connection.pool_size">1</prop>
+                <!--<prop key="hibernate.current_session_context_class">thread</prop>-->
+                <prop key="hibernate.cache.provider_class">org.hibernate.cache.internal.NoCachingRegionFactory</prop>
+                <prop key="hibernate.show_sql">false</prop>
+                <prop key="hibernate.hbm2ddl.auto">update</prop>
+                <prop key="hibernate.jdbc.batch_size">1000</prop>
+            </props>
+        </property>
+    </bean>
 
 	<!-- quartz scheduling for PingJob -->
 	<bean name="pingJob" class="org.springframework.scheduling.quartz.JobDetailFactoryBean">
diff --git a/onebusaway-api-webapp/src/main/resources/data-sources.xml b/onebusaway-api-webapp/src/main/resources/data-sources.xml
index f3368985b2..5e87142aa8 100644
--- a/onebusaway-api-webapp/src/main/resources/data-sources.xml
+++ b/onebusaway-api-webapp/src/main/resources/data-sources.xml
@@ -17,8 +17,8 @@
 
 -->
 <beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:context="http://www.springframework.org/schema/context"
-    xsi:schemaLocation="
+       xmlns:context="http://www.springframework.org/schema/context"
+       xsi:schemaLocation="
         http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
         http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-2.5.xsd">
 
@@ -29,33 +29,33 @@
     </bean>
 
     <bean id="apiKeyValidationService" class="org.onebusaway.users.impl.validation.KeyValidationServiceImpl"/>
-    
-     <!-- Database Configuration -->
+
+    <!-- Database Configuration -->
     <bean id="dataSource"
           class="org.springframework.jndi.JndiObjectFactoryBean">
-      <property name="jndiName"
-                value="java:comp/env/jdbc/appDB"/>   
-      <property name="lookupOnStartup"
-                value="true"/>   
-      <property name="cache"
-                value="true"/>   
-      <property name="proxyInterface"
-                value="javax.sql.DataSource"/>   
-      <property name="resourceRef"
-                value="true" />
-    </bean>   
-        <bean id="agencyMetadataDataSource"
+        <property name="jndiName"
+                  value="java:comp/env/jdbc/appDB"/>
+        <property name="lookupOnStartup"
+                  value="true"/>
+        <property name="cache"
+                  value="true"/>
+        <property name="proxyInterface"
+                  value="javax.sql.DataSource"/>
+        <property name="resourceRef"
+                  value="true" />
+    </bean>
+    <bean id="agencyMetadataDataSource"
           class="org.springframework.jndi.JndiObjectFactoryBean">
-      <property name="jndiName"
-                value="java:comp/env/jdbc/appDB"/>
-      <property name="lookupOnStartup"
-                value="true"/>
-      <property name="cache"
-                value="true"/>
-      <property name="proxyInterface"
-                value="javax.sql.DataSource"/>
-      <property name="resourceRef"
-                value="true" />
+        <property name="jndiName"
+                  value="java:comp/env/jdbc/appDB"/>
+        <property name="lookupOnStartup"
+                  value="true"/>
+        <property name="cache"
+                  value="true"/>
+        <property name="proxyInterface"
+                  value="javax.sql.DataSource"/>
+        <property name="resourceRef"
+                  value="true" />
     </bean>
     <bean id="agencyMetadataSessionFactory"
         class="org.springframework.orm.hibernate5.LocalSessionFactoryBean">
@@ -78,12 +78,12 @@
             </props>
         </property>
     </bean>
-    
-     <bean class="org.onebusaway.container.spring.PropertyOverrideConfigurer">
+
+    <bean class="org.onebusaway.container.spring.PropertyOverrideConfigurer">
         <property name="properties">
             <props>
                 <prop key="cacheManager.cacheManagerName">org.onebusaway.api_webapp.cacheManager</prop>
             </props>
         </property>
-    </bean>   
-</beans>
+    </bean>
+</beans>
\ No newline at end of file
diff --git a/onebusaway-enterprise-webapp/src/main/resources/data-sources.xml b/onebusaway-enterprise-webapp/src/main/resources/data-sources.xml
index 4e4507291a..f7b6f8014d 100644
--- a/onebusaway-enterprise-webapp/src/main/resources/data-sources.xml
+++ b/onebusaway-enterprise-webapp/src/main/resources/data-sources.xml
@@ -16,52 +16,52 @@
     limitations under the License.
 
 -->
-<beans xmlns="http://www.springframework.org/schema/beans" 
+<beans xmlns="http://www.springframework.org/schema/beans"
 	   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xmlns:context="http://www.springframework.org/schema/context" 
-       xmlns:aop="http://www.springframework.org/schema/aop"
-       xmlns:jee="http://www.springframework.org/schema/jee"
-       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
+	   xmlns:context="http://www.springframework.org/schema/context"
+	   xmlns:aop="http://www.springframework.org/schema/aop"
+	   xmlns:jee="http://www.springframework.org/schema/jee"
+	   xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
         http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.0.xsd
         http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-3.0.xsd
         http://www.springframework.org/schema/jee http://www.springframework.org/schema/jee/spring-jee-3.0.xsd">
 
 
-    <!-- Transit Data Service -->
-    
-    <bean id="transitDataService" class="org.springframework.remoting.caucho.HessianProxyFactoryBean">
-    	<property name="serviceUrl" value="http://localhost:8080/onebusaway-transit-data-federation-webapp/remoting/transit-data-service" />
-    	<property name="serviceInterface" value="org.onebusaway.transit_data.services.TransitDataService" />
-  	</bean>
-	
-	<bean id="configurationServiceClient" class="org.onebusaway.util.impl.configuration.ConfigurationServiceClientFileImpl" >
-      	<constructor-arg type="java.lang.String" value="/var/lib/obanyc/config.json"/>
-    </bean>
+	<!-- Transit Data Service -->
+
+	<bean id="transitDataService" class="org.springframework.remoting.caucho.HessianProxyFactoryBean">
+		<property name="serviceUrl" value="http://localhost:8080/onebusaway-transit-data-federation-webapp/remoting/transit-data-service" />
+		<property name="serviceInterface" value="org.onebusaway.transit_data.services.TransitDataService" />
+	</bean>
 
-    <!-- Database Configuration -->
+	<bean id="configurationServiceClient" class="org.onebusaway.util.impl.configuration.ConfigurationServiceClientFileImpl" >
+		<constructor-arg type="java.lang.String" value="/var/lib/obanyc/config.json"/>
+	</bean>
 
-    <bean id="dataSource"
-          class="org.springframework.jndi.JndiObjectFactoryBean">
-      <property name="jndiName"
-                value="java:comp/env/jdbc/appDB"/>   
-      <property name="lookupOnStartup"
-                value="true"/>   
-      <property name="cache"
-                value="true"/>   
-      <property name="proxyInterface"
-                value="javax.sql.DataSource"/>   
-      <property name="resourceRef"
-                value="true" />
-    </bean>
+	<!-- Database Configuration -->
+
+	<bean id="dataSource"
+		  class="org.springframework.jndi.JndiObjectFactoryBean">
+		<property name="jndiName"
+				  value="java:comp/env/jdbc/appDB"/>
+		<property name="lookupOnStartup"
+				  value="true"/>
+		<property name="cache"
+				  value="true"/>
+		<property name="proxyInterface"
+				  value="javax.sql.DataSource"/>
+		<property name="resourceRef"
+				  value="true" />
+	</bean>
 
-    <alias name="dataSource" alias="mutableDataSource" />
+	<alias name="dataSource" alias="mutableDataSource" />
 
 
 
 	<!-- Other Stuff: -->
 	<bean id="serviceAreaServiceImpl" class="org.onebusaway.presentation.impl.ServiceAreaServiceImpl" />
 	<bean id="externalGeocoderImpl"
-		class="org.onebusaway.geocoder.enterprise.impl.EnterpriseGoogleGeocoderImpl" depends-on="serviceAreaServiceImpl">
+		  class="org.onebusaway.geocoder.enterprise.impl.EnterpriseGoogleGeocoderImpl" depends-on="serviceAreaServiceImpl">
 	</bean>
 
 	<bean class="org.onebusaway.container.spring.PropertyOverrideConfigurer">
@@ -73,7 +73,7 @@
 	</bean>
 
 	<bean id="siriCacheService"
-		class="org.onebusaway.presentation.services.cachecontrol.SiriCacheServiceImpl">
+		  class="org.onebusaway.presentation.services.cachecontrol.SiriCacheServiceImpl">
 		<property name="disabled" value="${siri.cache.disabled}" />
 	</bean>
 	<!--
@@ -92,4 +92,4 @@
 	</bean>
     -->
 	<import resource="classpath:branded-sources.xml" />
-</beans>
+</beans>
\ No newline at end of file