-
Notifications
You must be signed in to change notification settings - Fork 35
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
feat: update oba version to
2.5.12-cs
- Loading branch information
Showing
7 changed files
with
220 additions
and
115 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,40 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <!-- | ||
| Licensed to the Apache Software Foundation (ASF) under one or more | ||
| contributor license agreements. See the NOTICE file distributed with | ||
| this work for additional information regarding copyright ownership. | ||
| The ASF licenses this file to You under the Apache License, Version 2.0 | ||
| (the "License"); you may not use this file except in compliance with | ||
| the License. You may obtain a copy of the License at | ||
| http://www.apache.org/licenses/LICENSE-2.0 | ||
| Unless required by applicable law or agreed to in writing, software | ||
| distributed under the License is distributed on an "AS IS" BASIS, | ||
| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| See the License for the specific language governing permissions and | ||
| limitations under the License. | ||
| --> | ||
| <!-- The contents of this file will be loaded for each web application --> | ||
| <Context> | ||
|
|
||
| <!-- Default set of monitored resources. If one of these changes, the --> | ||
| <!-- web application will be reloaded. --> | ||
| <WatchedResource>WEB-INF/web.xml</WatchedResource> | ||
| <WatchedResource>${catalina.base}/conf/web.xml</WatchedResource> | ||
|
|
||
| <!-- Uncomment this to disable session persistence across Tomcat restarts --> | ||
| <!-- | ||
| <Manager pathname="" /> | ||
| --> | ||
| <Resource name="jdbc/appDB" | ||
| auth="Container" | ||
| type="javax.sql.DataSource" | ||
| maxTotal="100" | ||
| maxIdle="30" | ||
| maxWaitMillis="10000" | ||
| username="${JDBC_USER}" | ||
| password="${JDBC_PASSWORD}" | ||
| driverClassName="com.mysql.cj.jdbc.Driver" | ||
| url="${JDBC_URL}"/> | ||
| </Context> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
97 changes: 60 additions & 37 deletions
97
oba/config/onebusaway-enterprise-acta-webapp-data-sources.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,59 +1,82 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <beans | ||
| xmlns="http://www.springframework.org/schema/beans" | ||
| xmlns:aop="http://www.springframework.org/schema/aop" | ||
| xmlns:context="http://www.springframework.org/schema/context" | ||
| xmlns:jee="http://www.springframework.org/schema/jee" | ||
| xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" | ||
| 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"> | ||
| <!-- | ||
| Copyright (c) 2011 Metropolitan Transportation Authority | ||
| Licensed under the Apache License, Version 2.0 (the "License"); | ||
| you may not use this file except in compliance with the License. | ||
| You may obtain a copy of the License at | ||
| http://www.apache.org/licenses/LICENSE-2.0 | ||
| Unless required by applicable law or agreed to in writing, software | ||
| distributed under the License is distributed on an "AS IS" BASIS, | ||
| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| See the License for the specific language governing permissions and | ||
| limitations under the License. | ||
| --> | ||
| <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 | ||
| 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" /> | ||
| <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> | ||
|
|
||
| <!-- Google map related beans, automatically generated by the `bootstrap.sh`--> | ||
| <bean id="configurationServiceClient" class="org.onebusaway.util.impl.configuration.ConfigurationServiceClientFileImpl"> | ||
| </bean> | ||
| <bean class="org.onebusaway.transit_data_federation.services.WebIntervalFactory" /> | ||
|
|
||
| <!-- Database Configuration --> | ||
| <bean id="dataSource" class="org.springframework.jdbc.datasource.DriverManagerDataSource"> | ||
| <property name="driverClassName" value="com.mysql.cj.jdbc.Driver" /> | ||
| <property name="url" value="${JDBC_URL}" /> | ||
| <property name="username" value="${JDBC_USER}" /> | ||
| <property name="password" value="${JDBC_PASSWORD}" /> | ||
|
|
||
| <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" /> | ||
|
|
||
| <bean id="serviceAreaServiceImpl" class="org.onebusaway.presentation.impl.ServiceAreaServiceImpl"> | ||
| <property name="calculateDefaultBoundsFromAgencyCoverage" value="true" /> | ||
|
|
||
|
|
||
| <!-- Other Stuff: --> | ||
| <bean id="serviceAreaServiceImpl" class="org.onebusaway.presentation.impl.ServiceAreaServiceImpl" /> | ||
| <bean id="externalGeocoderImpl" | ||
| class="org.onebusaway.geocoder.enterprise.impl.EnterpriseGoogleGeocoderImpl" depends-on="serviceAreaServiceImpl"> | ||
| </bean> | ||
|
|
||
| <bean class="org.onebusaway.container.spring.PropertyOverrideConfigurer"> | ||
| <property name="properties"> | ||
| <props> | ||
| <prop key="cacheManager.cacheManagerName">org.onebusaway.nyc_webapp.cacheManager</prop> | ||
| <prop key="cacheManager.cacheManagerName">org.onebusaway.onebusaway-enterprise-acta-webapp.cacheManager</prop> | ||
| </props> | ||
| </property> | ||
| </bean> | ||
|
|
||
| <!-- Google map related beans, automatically generated by the `bootstrap.sh`--> | ||
| <bean id="configurationServiceClient" class="org.onebusaway.util.impl.configuration.ConfigurationServiceClientFileImpl"> | ||
| </bean> | ||
|
|
||
| <bean id="siriCacheService" class="org.onebusaway.presentation.services.cachecontrol.SiriCacheServiceImpl"> | ||
| <bean id="siriCacheService" | ||
| class="org.onebusaway.presentation.services.cachecontrol.SiriCacheServiceImpl"> | ||
| <property name="disabled" value="true" /> | ||
| </bean> | ||
|
|
||
| <bean id="searchServiceImpl" class="org.onebusaway.presentation.impl.search.SearchServiceImpl" /> | ||
| <bean id="enterpriseGeocoderImpl" class="org.onebusaway.geocoder.enterprise.impl.EnterpriseGoogleGeocoderImpl" /> | ||
| </beans> | ||
|
|
||
| </beans> |
Oops, something went wrong.