Index: branches/APPDEV-3950-Migrate_Main_Frame_properties_To_JNDI/WEB-INF/web.xml
===================================================================
diff -u -r178 -r196
--- branches/APPDEV-3950-Migrate_Main_Frame_properties_To_JNDI/WEB-INF/web.xml	(.../web.xml)	(revision 178)
+++ branches/APPDEV-3950-Migrate_Main_Frame_properties_To_JNDI/WEB-INF/web.xml	(.../web.xml)	(revision 196)
@@ -208,7 +208,7 @@
 
   <resource-ref>
       <description>DB Connection</description>
-      <res-ref-name>jdbc</res-ref-name>
+      <res-ref-name>jdbc/showcase</res-ref-name>
       <res-type>javax.sql.DataSource</res-type>
       <res-auth>Container</res-auth>
   </resource-ref>
Index: branches/APPDEV-3950-Migrate_Main_Frame_properties_To_JNDI/WEB-INF/src/com/showcase/util/BaseDAO.java
===================================================================
diff -u -r178 -r196
--- branches/APPDEV-3950-Migrate_Main_Frame_properties_To_JNDI/WEB-INF/src/com/showcase/util/BaseDAO.java	(.../BaseDAO.java)	(revision 178)
+++ branches/APPDEV-3950-Migrate_Main_Frame_properties_To_JNDI/WEB-INF/src/com/showcase/util/BaseDAO.java	(.../BaseDAO.java)	(revision 196)
@@ -26,7 +26,7 @@
 
 			Context envCtx = (Context) ctx.lookup("java:comp/env");
 			//Look up our data source
-			DataSource ds = (DataSource) envCtx.lookup("jdbc");
+			DataSource ds = (DataSource) envCtx.lookup("jdbc/showcase");
 
 			if (ds != null) {
 				conn = ds.getConnection();
Index: branches/APPDEV-3950-Migrate_Main_Frame_properties_To_JNDI/documentation/notes.txt
===================================================================
diff -u -r178 -r196
--- branches/APPDEV-3950-Migrate_Main_Frame_properties_To_JNDI/documentation/notes.txt	(.../notes.txt)	(revision 178)
+++ branches/APPDEV-3950-Migrate_Main_Frame_properties_To_JNDI/documentation/notes.txt	(.../notes.txt)	(revision 196)
@@ -17,7 +17,7 @@
 make sure that the first line doesn't close itself (singleton).
 
 <Context path="/showcase" reloadable="true" docBase="C:\projects\showcase.lemansnet.com" >
-	<Resource name="jdbc"
+	<Resource name="jdbc/showcase"
 		auth="Container"
 		type="javax.sql.DataSource"
 		factory="org.apache.tomcat.dbcp.dbcp.BasicDataSourceFactory"
@@ -42,4 +42,4 @@
 Things to do before deploy
 -------------------------------
 1) Check JMainframeImpl.java to see connection to mainframe
-2) Check web.xml for ip address of the domain controller
\ No newline at end of file
+2) Check web.xml for ip address of the domain controller