merge performed by Richard Peter Conflicts: cave/build/static/common/cave/etc/gfe/userPython/procedures/MergeHazards.py cave/build/static/common/cave/etc/gfe/userPython/utilities/SmartScript.py edexOsgi/build.edex/esb/conf/log4j-ingest.xml edexOsgi/build.edex/esb/conf/log4j-registry.xml edexOsgi/build.edex/esb/conf/log4j.xml edexOsgi/com.raytheon.edex.plugin.airep/res/spring/airep-ingest.xml edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-common.xml edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-request.xml edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-spring.xml edexOsgi/com.raytheon.edex.plugin.grib/res/spring.deprecated/grib-decode.xml edexOsgi/com.raytheon.edex.plugin.grib/res/spring.future/grib-decode.xml edexOsgi/com.raytheon.edex.plugin.grib/res/spring/grib-distribution.xml edexOsgi/com.raytheon.edex.plugin.modelsounding/res/spring/modelsounding-ingest.xml edexOsgi/com.raytheon.edex.plugin.pirep/res/spring/pirep-ingest.xml edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/alarms/AlertalarmStdTextProductUtil.java edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/alarms/Constants.java edexOsgi/com.raytheon.edex.plugin.taf/src/com/raytheon/edex/plugin/taf/common/ChangeGroup.java edexOsgi/com.raytheon.edex.plugin.taf/src/com/raytheon/edex/plugin/taf/common/TafRecord.java edexOsgi/com.raytheon.edex.plugin.warning/res/spring/warning-ingest.xml edexOsgi/com.raytheon.uf.common.jms/src/com/raytheon/uf/common/jms/JmsPooledConnectionFactory.java edexOsgi/com.raytheon.uf.common.jms/src/com/raytheon/uf/common/jms/JmsPooledSession.java edexOsgi/com.raytheon.uf.edex.cpgsrv/res/spring/cpgsrv-spring.xml edexOsgi/com.raytheon.uf.edex.grid.staticdata/res/spring/grid-staticdata-process.xml edexOsgi/com.raytheon.uf.edex.ohd/res/spring/ohd-common.xml edexOsgi/com.raytheon.uf.edex.ohd/res/spring/satpre-spring.xml ncep/gov.noaa.nws.ncep.common.dataplugin.nctaf/src/gov/noaa/nws/ncep/common/dataplugin/nctaf/NcTafRecord.java ncep/gov.noaa.nws.ncep.common.dataplugin.ncuair/src/gov/noaa/nws/ncep/common/dataplugin/ncuair/NcUairRecord.java ncep/gov.noaa.nws.ncep.edex.plugin.ncairep/res/spring/ncairep-ingest.xml ncep/gov.noaa.nws.ncep.edex.plugin.ncccfp/res/spring/ncccfp-ingest.xml ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/res/spring/ncgrib-distribution.xml ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/res/spring/ncgrib-ingest.xml ncep/gov.noaa.nws.ncep.edex.plugin.ncpirep/res/spring/ncpirep-ingest.xml ncep/gov.noaa.nws.ncep.edex.plugin.ncscat/res/spring/ncscat-ingest.xml ncep/gov.noaa.nws.ncep.edex.plugin.ntrans/res/spring/ntrans-ingest.xml rpms/awips2.core/Installer.ant/scripts/profile.d/awips2Ant.csh Former-commit-id:069093884f
[formerly069093884f
[formerly 889200c9eb3fbb835f8fef067476799f30a7a7e0]] Former-commit-id:ffcc34f8d4
Former-commit-id:96658d8ce0
42 lines
No EOL
1.7 KiB
XML
42 lines
No EOL
1.7 KiB
XML
<beans xmlns="http://www.springframework.org/schema/beans"
|
|
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.1.xsd">
|
|
|
|
<!-- IHFS Database Configuration-->
|
|
<bean id="ihfsDbSessionConfig" class="com.raytheon.uf.edex.database.DatabaseSessionConfiguration">
|
|
<property name="classFinder" ref="dbClassFinder"/>
|
|
<property name="includes">
|
|
<list>
|
|
<value>com.raytheon.uf.common.dataplugin.shef</value>
|
|
<value>com.raytheon.edex.plugin.shef</value>
|
|
</list>
|
|
</property>
|
|
</bean>
|
|
<bean id="ihfsSessionFactory"
|
|
class="com.raytheon.uf.edex.database.DatabaseSessionFactoryBean">
|
|
|
|
<property name="configLocation">
|
|
<value>file:///${edex.home}/conf/db/hibernateConfig/ihfs/hibernate.cfg.xml</value>
|
|
</property>
|
|
<property name="databaseSessionConfiguration" ref="ihfsDbSessionConfig"/>
|
|
</bean>
|
|
|
|
<bean id="ihfsTxManager"
|
|
class="org.springframework.orm.hibernate3.HibernateTransactionManager">
|
|
<property name="sessionFactory" ref="ihfsSessionFactory" />
|
|
</bean>
|
|
|
|
<!-- Dam Catalog Database Configuration-->
|
|
<bean id="damSessionFactory"
|
|
class="com.raytheon.uf.edex.database.DatabaseSessionFactoryBean">
|
|
<!-- No hibernate annotations should be loaded -->
|
|
<property name="configLocation">
|
|
<value>file:///${edex.home}/conf/db/hibernateConfig/damCatalog/hibernate.cfg.xml</value>
|
|
</property>
|
|
</bean>
|
|
|
|
<bean id="damTxManager"
|
|
class="org.springframework.orm.hibernate3.HibernateTransactionManager">
|
|
<property name="sessionFactory" ref="damSessionFactory" />
|
|
</bean>
|
|
</beans> |