From 2eaf4983a1822ab052d4af60217583ac18b9a671 Mon Sep 17 00:00:00 2001
From: Cyrille Le Clerc <cyrille@cyrilleleclerc.com>
Date: Mon, 1 Jul 2013 12:13:29 +0200
Subject: [PATCH] Introduce a "jee" Spring profile to retrieve the datasource
with a JNDI lookup.
---
src/main/resources/spring/datasource-config.xml | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
diff --git a/src/main/resources/spring/datasource-config.xml b/src/main/resources/spring/datasource-config.xml
index 5cd214b..f741299 100644
--- a/src/main/resources/spring/datasource-config.xml
+++ b/src/main/resources/spring/datasource-config.xml
@@ -6,12 +6,15 @@
xmlns:p="http://www.springframework.org/schema/p"
xmlns:context="http://www.springframework.org/schema/context"
xmlns:jdbc="http://www.springframework.org/schema/jdbc"
+ xmlns:jee="http://www.springframework.org/schema/jee"
xsi:schemaLocation="http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans.xsd
http://www.springframework.org/schema/context
http://www.springframework.org/schema/context/spring-context.xsd
http://www.springframework.org/schema/jdbc
- http://www.springframework.org/schema/jdbc/spring-jdbc.xsd">
+ http://www.springframework.org/schema/jdbc/spring-jdbc.xsd
+ http://www.springframework.org/schema/jee
+ http://www.springframework.org/schema/jee/spring-jee.xsd">
<!-- ========================= DATASOURCE DEFINITION ========================= -->
@@ -26,11 +29,6 @@
p:driverClassName="${jdbc.driverClassName}" p:url="${jdbc.url}"
p:username="${jdbc.username}" p:password="${jdbc.password}"/>
- <!-- JNDI DataSource for JEE environments -->
- <!--
- <jee:jndi-lookup id="dataSource" jndi-name="java:comp/env/jdbc/petclinic"/>
- -->
-
<!-- Database initializer. If any of the script fails, the initialization stops. -->
<!-- As an alternative, for embedded databases see <jdbc:embedded-database/>. -->
<jdbc:initialize-database data-source="dataSource">
@@ -38,4 +36,8 @@
<jdbc:script location="${jdbc.dataLocation}"/>
</jdbc:initialize-database>
+ <beans profile="javaee" >
+ <!-- JNDI DataSource for JEE environments -->
+ <jee:jndi-lookup id="dataSource" jndi-name="java:comp/env/jdbc/petclinic"/>
+ </beans>
</beans>
\ No newline at end of file
--
GitLab