cleanup from merge

OneBusAway · Jan 1, 2024 · 7b4f427 · 7b4f427
1 parent 58d42e7
commit 7b4f427
Show file tree

Hide file tree

Showing 17 changed files with 62 additions and 129 deletions.
diff --git a/...dmin-webapp/src/main/java/org/onebusaway/admin/service/impl/BundleRequestServiceImpl.java b/...dmin-webapp/src/main/java/org/onebusaway/admin/service/impl/BundleRequestServiceImpl.java
@@ -57,7 +57,7 @@ public class BundleRequestServiceImpl implements BundleRequestService, ServletCo
   @Autowired
   private BundleBuildingService _bundleService;
 
-  @Autowired
+  @Autowired(required = false)
   public void setEmailService(EmailService service) {
     _emailService = service;
   }
@@ -154,7 +154,8 @@ public void sendEmail(BundleBuildRequest request, BundleBuildResponse response)
     	msg.append(getResultLink(request.getBundleName(), response.getId(),
     			request.getBundleStartDateString(), request.getBundleEndDateString()));
     	String subject = "Bundle Build " + response.getId() + " complete";
-    	_emailService.send(request.getEmailAddress(), from, subject, msg);
+      if (_emailService != null)
+    	  _emailService.send(request.getEmailAddress(), from, subject, msg);
     }
   }
 

diff --git a/onebusaway-admin-webapp/src/main/resources/data-sources.xml b/onebusaway-admin-webapp/src/main/resources/data-sources.xml
@@ -49,35 +49,6 @@
         <property name="password" value="root" />
     </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">
@@ -91,49 +62,20 @@
 
 
     <!--  Email connection -->
-     <bean id="mailSession"
-          class="org.springframework.jndi.JndiObjectFactoryBean">
-      <property name="jndiName"
-                value="java:comp/env/mail/Session"/> 
-      <property name="lookupOnStartup"
-                value="true"/>   
-      <property name="cache"
-                value="true"/>   
-    </bean> 
+<!--     <bean id="mailSession"-->
+<!--          class="org.springframework.jndi.JndiObjectFactoryBean">-->
+<!--      <property name="jndiName"-->
+<!--                value="java:comp/env/mail/Session"/> -->
+<!--      <property name="lookupOnStartup"-->
+<!--                value="true"/>   -->
+<!--      <property name="cache"-->
+<!--                value="true"/>   -->
+<!--    </bean> -->
 
-    <bean id="mailSender" class="org.springframework.mail.javamail.JavaMailSenderImpl">
-    	<property name="session" ref="mailSession"/> 
-	</bean>
+<!--    <bean id="mailSender" class="org.springframework.mail.javamail.JavaMailSenderImpl">-->
+<!--    	<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: -->
 
@@ -166,6 +108,15 @@
     <property name="properties">
       <props>
         <prop key="cacheManager.cacheManagerName">org.onebusaway.nyc.admin.cacheManager</prop>
+          <!-- this configuration sets up the bundle builder paths -->
+          <!-- please create these paths on disk -->
+          <prop key="bundleStager.builtBundleDirectory">/opt/oba/bundles/builder</prop>
+          <prop key="bundleStager.stagedBundleDirectory">/opt/oba/bundles/staged</prop>
+          <prop key="bundleDeploySource.masterBundleDirectoryPathname">/opt/oba/bundles/active</prop>
+          <prop key="bundleDeployer.deployBundleDirectory">/opt/oba/bundles/active</prop>
+          <prop key="configurationServiceClient.configFile">/opt/oba/admin-config.json</prop>
+          <prop key="parametersServiceImpl.configFile">/opt/oba/admin-config.json</prop>
+
 <!--         <prop key="rssServiceAlertsService.defaultAgencyId">1</prop> -->
 <!--         <prop key="rssServiceAlertsService.alertSource">WMATA</prop> -->
 <!--         <prop key="rssServiceAlertsService.serviceStatusUrlString">http://www.metroalerts.info/rss.aspx?bus</prop> -->
@@ -186,7 +137,7 @@
 
 	<bean id="agencyMetadataSessionFactory"
 		class="org.springframework.orm.hibernate5.LocalSessionFactoryBean">
-		<property name="dataSource" ref="agencyMetadataDataSource" />
+		<property name="dataSource" ref="dataSource" />
 		<property name="annotatedClasses">
 			<list>
 				<value>org.onebusaway.agency_metadata.model.AgencyMetadata</value>
@@ -207,7 +158,7 @@
 	</bean>
      <bean id="bundleBuildResponseSessionFactory"
     class="org.springframework.orm.hibernate5.LocalSessionFactoryBean">
-    <property name="dataSource" ref="bundleBuildResponseDataSource" />
+    <property name="dataSource" ref="dataSource" />
     <property name="annotatedClasses">
       <list>
         <value>org.onebusaway.admin.model.BundleBuildResponse</value>
@@ -228,7 +179,7 @@
   </bean>
 
   <bean id="gtfsRealtimeArchiveSessionFactory" class="org.springframework.orm.hibernate5.LocalSessionFactoryBean">
-    <property name="dataSource" ref="gtfsRealtimeArchiveDataSource" />
+    <property name="dataSource" ref="dataSource" />
     <property name="annotatedClasses">
       <list>
         <value>org.onebusaway.admin.service.bundle.task.model.GtfsBundleInfo</value>
@@ -256,7 +207,7 @@
 
     <bean id="assignmentSessionFactory"
           class="org.springframework.orm.hibernate5.LocalSessionFactoryBean">
-        <property name="dataSource" ref="assignedVehicleDataSource" />
+        <property name="dataSource" ref="dataSource" />
         <property name="annotatedClasses">
             <list>
                 <value>org.onebusaway.admin.model.assignments.Assignment</value>

diff --git a/onebusaway-admin-webapp/src/main/resources/log4j2.xml b/onebusaway-admin-webapp/src/main/resources/log4j2.xml
@@ -21,8 +21,8 @@
 
 	<!-- 0 or more appender elements -->
 	<Appenders>
-		<RollingFile name="ROLL" fileName="/var/log/tomcat8/admin-webapp.log"
-					 filePattern="/var/log/tomcat8/admin-webapp.%d{yyyy-MM-dd}-%i.log.gz">
+		<RollingFile name="ROLL" fileName="/opt/oba/logs/admin-webapp.log"
+					 filePattern="/opt/oba/logs/admin-webapp.%d{yyyy-MM-dd}-%i.log.gz">
 			<PatternLayout>
 				<Pattern>%d{ISO8601} %-5p [%F:%L] : %m%n</Pattern>
 			</PatternLayout>

diff --git a/...dmin-webapp/src/main/resources/org/onebusaway/admin/webapp/application-context-webapp.xml b/...dmin-webapp/src/main/resources/org/onebusaway/admin/webapp/application-context-webapp.xml
@@ -149,8 +149,9 @@
    <bean id="diffService" class="org.onebusaway.admin.service.impl.DiffServiceImpl" >
      <property name="configurationServiceClient" ref="configurationServiceClient" />
    </bean>
-
-   <bean id="emailService" class="org.onebusaway.admin.service.impl.EmailServiceImpl" />
+
+    <!-- this requires mail.jar be added to tomcat -->
+<!--   <bean id="emailService" class="org.onebusaway.admin.service.impl.EmailServiceImpl" />-->
 
    <bean id="bundleRequestService" class="org.onebusaway.admin.service.impl.BundleRequestServiceImpl" />
 

diff --git a/onebusaway-admin-webapp/src/main/webapp/WEB-INF/web.xml b/onebusaway-admin-webapp/src/main/webapp/WEB-INF/web.xml
@@ -21,33 +21,13 @@
 
   <display-name>onebusaway-admin-webapp</display-name>
 
-  <resource-ref>
-    <description>User DB Connection</description>
-    <res-ref-name>jdbc/appDB</res-ref-name>
-    <res-type>javax.sql.DataSource</res-type>
-    <res-auth>Container</res-auth>
-  </resource-ref>
-
-  <resource-ref>
-    <description>Metadata DB Connection</description>
-    <res-ref-name>jdbc/agencyMetadataDB</res-ref-name>
-    <res-type>javax.sql.DataSource</res-type>
-    <res-auth>Container</res-auth>
-  </resource-ref>
-
-  <resource-ref>
-    <description>Archive DB Connection</description>
-    <res-ref-name>jdbc/archiveDB</res-ref-name>
-    <res-type>javax.sql.DataSource</res-type>
-    <res-auth>Container</res-auth>
-  </resource-ref>
-
-  <resource-ref>
-    <description>SES Connection</description>
-    <res-ref-name>mail/Session</res-ref-name>
-    <res-type>javax.mail.Session</res-type>
-    <res-auth>Container</res-auth>
-  </resource-ref>
+    <!-- uncomment for email -->
+<!--  <resource-ref>-->
+<!--    <description>SES Connection</description>-->
+<!--    <res-ref-name>mail/Session</res-ref-name>-->
+<!--    <res-type>javax.mail.Session</res-type>-->
+<!--    <res-auth>Container</res-auth>-->
+<!--  </resource-ref>-->
 
   <context-param>
     <param-name>contextConfigLocation</param-name>

diff --git a/onebusaway-api-webapp/src/main/resources/log4j2.xml b/onebusaway-api-webapp/src/main/resources/log4j2.xml
@@ -21,8 +21,8 @@
 
 	<!-- 0 or more appender elements -->
 	<Appenders>
-		<RollingFile name="ROLL" fileName="/var/log/tomcat8/api-webapp.log"
-					 filePattern="/var/log/tomcat8/api-webapp.%d{yyyy-MM-dd}-%i.log.gz">
+		<RollingFile name="ROLL" fileName="/opt/oba/logs/api-webapp.log"
+					 filePattern="/opt/oba/logs/api-webapp.%d{yyyy-MM-dd}-%i.log.gz">
 			<PatternLayout>
 				<Pattern>%d{ISO8601} %-5p [%F:%L] : %m%n</Pattern>
 			</PatternLayout>

diff --git a/onebusaway-enterprise-acta-webapp/src/main/resources/log4j2.xml b/onebusaway-enterprise-acta-webapp/src/main/resources/log4j2.xml
@@ -21,8 +21,8 @@
 
     <!-- 0 or more appender elements -->
     <Appenders>
-        <RollingFile name="ROLL" fileName="/var/log/tomcat8/acta-webapp.log"
-                     filePattern="/var/log/tomcat8/acta-webapp.%d{yyyy-MM-dd}-%i.log.gz">
+        <RollingFile name="ROLL" fileName="/opt/oba/logs/acta-webapp.log"
+                     filePattern="/opt/oba/logs/acta-webapp.%d{yyyy-MM-dd}-%i.log.gz">
             <PatternLayout>
                 <Pattern>%d{ISO8601} %-5p [%F:%L] : %m%n</Pattern>
             </PatternLayout>

diff --git a/onebusaway-gtfs-realtime-archiver/src/main/resources/log4j2.xml b/onebusaway-gtfs-realtime-archiver/src/main/resources/log4j2.xml
@@ -21,8 +21,8 @@
 
     <!-- 0 or more appender elements -->
     <Appenders>
-        <RollingFile name="ROLL" fileName="/var/log/tomcat8/archiver.log"
-                     filePattern="/var/log/tomcat8/archiver.%d{yyyy-MM-dd}-%i.log.gz">
+        <RollingFile name="ROLL" fileName="/opt/oba/logs/archiver.log"
+                     filePattern="/opt/oba/logs/archiver.%d{yyyy-MM-dd}-%i.log.gz">
             <PatternLayout>
                 <Pattern>%d{ISO8601} %-5p [%F:%L] : %m%n</Pattern>
             </PatternLayout>

diff --git a/onebusaway-nextbus-api-webapp/src/main/resources/log4j2.xml b/onebusaway-nextbus-api-webapp/src/main/resources/log4j2.xml
@@ -21,8 +21,8 @@
 
     <!-- 0 or more appender elements -->
     <Appenders>
-        <RollingFile name="ROLL" fileName="/var/log/tomcat8/nextbus-api-webapp.log"
-                     filePattern="/var/log/tomcat8/nextbus-api-webapp.%d{yyyy-MM-dd}-%i.log.gz">
+        <RollingFile name="ROLL" fileName="/opt/oba/logs/nextbus-api-webapp.log"
+                     filePattern="/opt/oba/logs/nextbus-api-webapp.%d{yyyy-MM-dd}-%i.log.gz">
             <PatternLayout>
                 <Pattern>%d{ISO8601} %-5p [%F:%L] : %m%n</Pattern>
             </PatternLayout>

diff --git a/onebusaway-phone-webapp/src/main/resources/log4j2.xml b/onebusaway-phone-webapp/src/main/resources/log4j2.xml
@@ -21,8 +21,8 @@
 
     <!-- 0 or more appender elements -->
     <Appenders>
-        <RollingFile name="ROLL" fileName="/var/log/tomcat8/phone-webapp.log"
-                     filePattern="/var/log/tomcat8/phone-webapp.%d{yyyy-MM-dd}-%i.log.gz">
+        <RollingFile name="ROLL" fileName="/opt/oba/logs/phone-webapp.log"
+                     filePattern="/opt/oba/logs/phone-webapp.%d{yyyy-MM-dd}-%i.log.gz">
             <PatternLayout>
                 <Pattern>%d{ISO8601} %-5p [%F:%L] : %m%n</Pattern>
             </PatternLayout>

diff --git a/onebusaway-phone/src/main/resources/log4j2.xml b/onebusaway-phone/src/main/resources/log4j2.xml
@@ -21,8 +21,8 @@
 
     <!-- 0 or more appender elements -->
     <Appenders>
-        <RollingFile name="ROLL" fileName="/var/log/tomcat8/phone.log"
-                     filePattern="/var/log/tomcat8/phone.%d{yyyy-MM-dd}-%i.log.gz">
+        <RollingFile name="ROLL" fileName="/opt/oba/logs/phone.log"
+                     filePattern="/opt/oba/logs/phone.%d{yyyy-MM-dd}-%i.log.gz">
             <PatternLayout>
                 <Pattern>%d{ISO8601} %-5p [%F:%L] : %m%n</Pattern>
             </PatternLayout>

diff --git a/onebusaway-presentation/src/main/resources/log4j2.xml b/onebusaway-presentation/src/main/resources/log4j2.xml
@@ -21,8 +21,8 @@
 
     <!-- 0 or more appender elements -->
     <Appenders>
-        <RollingFile name="ROLL" fileName="/var/log/tomcat8/presentation.log"
-                     filePattern="/var/log/tomcat8/presentation.%d{yyyy-MM-dd}-%i.log.gz">
+        <RollingFile name="ROLL" fileName="/opt/oba/logs/presentation.log"
+                     filePattern="/opt/oba/logs/presentation.%d{yyyy-MM-dd}-%i.log.gz">
             <PatternLayout>
                 <Pattern>%d{ISO8601} %-5p [%F:%L] : %m%n</Pattern>
             </PatternLayout>

diff --git a/onebusaway-sms-webapp/src/main/resources/log4j.xml b/onebusaway-sms-webapp/src/main/resources/log4j.xml
@@ -26,7 +26,7 @@
 
     <appender name="ROLL" class="org.apache.log4j.rolling.RollingFileAppender">
         <rollingPolicy class="org.apache.log4j.rolling.TimeBasedRollingPolicy">
-            <param name="FileNamePattern" value="/var/log/tomcat8/sms.%d.log" />
+            <param name="FileNamePattern" value="/opt/oba/logs/sms.%d.log" />
         </rollingPolicy>
 
         <layout class="org.apache.log4j.PatternLayout">

diff --git a/onebusaway-sms-webapp/src/main/resources/log4j2.xml b/onebusaway-sms-webapp/src/main/resources/log4j2.xml
@@ -21,8 +21,8 @@
 
     <!-- 0 or more appender elements -->
     <Appenders>
-        <RollingFile name="ROLL" fileName="/var/log/tomcat8/sms.log"
-                     filePattern="/var/log/tomcat8/sms.%d{yyyy-MM-dd}-%i.log.gz">
+        <RollingFile name="ROLL" fileName="/opt/oba/logs/sms.log"
+                     filePattern="/opt/oba/logs/sms.%d{yyyy-MM-dd}-%i.log.gz">
             <PatternLayout>
                 <Pattern>%d{ISO8601} %-5p [%F:%L] : %m%n</Pattern>
             </PatternLayout>

diff --git a/onebusaway-transit-data-federation-webapp/src/main/resources/data-sources.xml b/onebusaway-transit-data-federation-webapp/src/main/resources/data-sources.xml
@@ -46,7 +46,7 @@ http://www.springframework.org/schema/context http://www.springframework.org/sch
     </bean>
 
     <bean id="bundleManagementService" class="org.onebusaway.transit_data_federation.impl.bundle.BundleManagementServiceImpl">
-      <property name="bundleStoreRoot" value="/var/lib/oba/tds/bundle" />
+      <property name="bundleStoreRoot" value="/opt/oba/tds/bundle" />
       <property name="standaloneMode" value="false" />
     </bean>
 

diff --git a/onebusaway-transit-data-federation-webapp/src/main/resources/log4j2.xml b/onebusaway-transit-data-federation-webapp/src/main/resources/log4j2.xml
@@ -21,8 +21,8 @@
 
     <!-- 0 or more appender elements -->
     <Appenders>
-        <RollingFile name="ROLL" fileName="/var/log/tomcat8/transit-data-federation-webapp.log"
-                     filePattern="/var/log/tomcat8/transit-data-federation-webapp.%d{yyyy-MM-dd}-%i.log.gz">
+        <RollingFile name="ROLL" fileName="/opt/oba/logs/transit-data-federation-webapp.log"
+                     filePattern="/opt/oba/logs/transit-data-federation-webapp.%d{yyyy-MM-dd}-%i.log.gz">
             <PatternLayout>
                 <Pattern>%d{ISO8601} %-5p [%F:%L] : %m%n</Pattern>
             </PatternLayout>

diff --git a/onebusaway-twilio-webapp/src/main/resources/log4j2.xml b/onebusaway-twilio-webapp/src/main/resources/log4j2.xml
@@ -21,8 +21,8 @@
 
     <!-- 0 or more appender elements -->
     <Appenders>
-        <RollingFile name="ROLL" fileName="/var/log/tomcat8/twilio.log"
-                     filePattern="/var/log/tomcat8/twilio.%d{yyyy-MM-dd}-%i.log.gz">
+        <RollingFile name="ROLL" fileName="/opt/oba/logs/twilio.log"
+                     filePattern="/opt/oba/logs/twilio.%d{yyyy-MM-dd}-%i.log.gz">
             <PatternLayout>
                 <Pattern>%d{ISO8601} %-5p [%F:%L] : %m%n</Pattern>
             </PatternLayout>