cmailleux 2005/07/06 11:56:38 CEST
Modified files:
core/src/webapp/WEB-INF/etc/spring
applicationContext-hibernate.xml
Log:
use a datasource named jdbc/jetspeed
Revision Changes Path
1.6 +7 -2
jahia/core/src/webapp/WEB-INF/etc/spring/applicationContext-hibernate.xml
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/webapp/WEB-INF/etc/spring/applicationContext-hibernate.xml.diff?r1=1.5&r2=1.6&f=h
Index: applicationContext-hibernate.xml
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/webapp/WEB-INF/etc/spring/applicationContext-hibernate.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- applicationContext-hibernate.xml 5 Jul 2005 18:29:44 -0000 1.5
+++ applicationContext-hibernate.xml 6 Jul 2005 09:56:38 -0000 1.6
@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN"
"http://www.springframework.org/dtd/spring-beans.dtd";>
<beans>
- <bean id="dataSource" class="org.apache.commons.dbcp.BasicDataSource"
destroy-method="close">
+ <!--<bean id="dataSource"
class="org.apache.commons.dbcp.BasicDataSource" destroy-method="close">
<property name="driverClassName">
<value>com.mysql.jdbc.Driver</value>
</property>
@@ -22,6 +22,11 @@
<property
name="poolPreparedStatements"><value>true</value></property>
<property
name="maxOpenPreparedStatements"><value>50</value></property>
<property name="initialSize"><value>20</value></property>
+ </bean>-->
+ <bean id="dataSource"
class="org.springframework.jndi.JndiObjectFactoryBean">
+ <property name="jndiName">
+ <value>java:comp/env/jdbc/jetspeed</value>
+ </property>
</bean>
<bean id="sessionFactory"
class="org.springframework.orm.hibernate.LocalSessionFactoryBean">
