[Springframework-cvs] spring/samples/jpetstore/war/WEB-INF dataAccessContext-jta.xml,1.8,1.9

[Juergen H. <jho...@us...>]

Update of /cvsroot/springframework/spring/samples/jpetstore/war/WEB-INF
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12827/samples/jpetstore/war/WEB-INF

Modified Files:
	dataAccessContext-jta.xml 
Log Message:
use new "jndi-name" syntax

Index: dataAccessContext-jta.xml
===================================================================
RCS file: /cvsroot/springframework/spring/samples/jpetstore/war/WEB-INF/dataAccessContext-jta.xml,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** dataAccessContext-jta.xml	12 Dec 2005 05:33:07 -0000	1.8
--- dataAccessContext-jta.xml	19 Apr 2006 21:42:10 -0000	1.9
***************
*** 1,4 ****
  <?xml version="1.0" encoding="UTF-8"?>
- <!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
  
  <!--
--- 1,3 ----
***************
*** 11,15 ****
    - JTA support in the container, and on pre-configured container DataSources.
    -
!   - This version also uses the jndi:xxx namespace introduced in Spring 2.0
    - to configured JNDI referenced objects.
    -->
--- 10,14 ----
    - JTA support in the container, and on pre-configured container DataSources.
    -
!   - This version also uses the "jndi:" namespace introduced in Spring 2.0
    - to configured JNDI referenced objects.
    -->
***************
*** 25,34 ****
  	<!-- Refers to the main database, containing product and account data -->
  	<!-- (see dataAccessContext-local.xml for an alternative) -->
! 	<jndi:lookup id="dataSource" jndiName="java:comp/env/jdbc/jpetstore"/>
  
  	<!-- Additional JNDI DataSource for J2EE environments -->
  	<!-- Refers to the order database, containing order data -->
  	<!-- (see dataAccessContext-local.xml for an alternative) -->
! 	<jndi:lookup id="dataSource" jndiName="java:comp/env/jdbc/jpetstore-order"/>
  
  	<!-- Transaction manager that delegates to JTA (for a transactional JNDI DataSource) -->
--- 24,33 ----
  	<!-- Refers to the main database, containing product and account data -->
  	<!-- (see dataAccessContext-local.xml for an alternative) -->
! 	<jndi:lookup id="dataSource" jndi-name="java:comp/env/jdbc/jpetstore"/>
  
  	<!-- Additional JNDI DataSource for J2EE environments -->
  	<!-- Refers to the order database, containing order data -->
  	<!-- (see dataAccessContext-local.xml for an alternative) -->
! 	<jndi:lookup id="orderDataSource" jndi-name="java:comp/env/jdbc/jpetstore-order"/>
  
  	<!-- Transaction manager that delegates to JTA (for a transactional JNDI DataSource) -->