Index: 3rdParty_sources/tacitknowledge/autopatch/src/main/java/com/tacitknowledge/util/migration/jdbc/JdbcMigrationLauncherFactory.java
===================================================================
diff -u -r60fd31cb3d049512a0549ad11dbbe4ba81cae54e -r6228ef532ab695b3a588dec9f7d52c2f15f581ba
--- 3rdParty_sources/tacitknowledge/autopatch/src/main/java/com/tacitknowledge/util/migration/jdbc/JdbcMigrationLauncherFactory.java	(.../JdbcMigrationLauncherFactory.java)	(revision 60fd31cb3d049512a0549ad11dbbe4ba81cae54e)
+++ 3rdParty_sources/tacitknowledge/autopatch/src/main/java/com/tacitknowledge/util/migration/jdbc/JdbcMigrationLauncherFactory.java	(.../JdbcMigrationLauncherFactory.java)	(revision 6228ef532ab695b3a588dec9f7d52c2f15f581ba)
@@ -203,7 +203,7 @@
                     throw new IllegalArgumentException("A jndi context must be "
                             + "present to use this configuration.");
                 }
-                DataSource ds = (DataSource) ctx.lookup("java:comp/env/" + dataSource);
+                DataSource ds = (DataSource) ctx.lookup(dataSource);
                 context.setDataSource(ds);
                 log.debug("adding context with datasource " + dataSource
                         + " of type " + databaseType);
Index: 3rdParty_sources/tacitknowledge/autopatch/src/main/resources/com/tacitknowledge/util/migration/jdbc/mysql.properties
===================================================================
diff -u -r60fd31cb3d049512a0549ad11dbbe4ba81cae54e -r6228ef532ab695b3a588dec9f7d52c2f15f581ba
--- 3rdParty_sources/tacitknowledge/autopatch/src/main/resources/com/tacitknowledge/util/migration/jdbc/mysql.properties	(.../mysql.properties)	(revision 60fd31cb3d049512a0549ad11dbbe4ba81cae54e)
+++ 3rdParty_sources/tacitknowledge/autopatch/src/main/resources/com/tacitknowledge/util/migration/jdbc/mysql.properties	(.../mysql.properties)	(revision 6228ef532ab695b3a588dec9f7d52c2f15f581ba)
@@ -1,4 +1,4 @@
-supportsMultipleStatements=true
+supportsMultipleStatements=false
 
 patches.create=CREATE TABLE IF NOT EXISTS patches ( \
 	   system_name VARCHAR(30) NOT NULL \
@@ -21,4 +21,4 @@
 # the system is currently locked.
 lock.read=SELECT patch_in_progress FROM patches WHERE system_name = ? AND ( patch_in_progress <> 'F' OR patch_level in ( SELECT MAX(patch_level) FROM patches WHERE system_name = ? ))
 lock.obtain=UPDATE patches SET patch_in_progress = 'T' WHERE system_name = ? AND patch_in_progress = 'F' AND patch_level in ( SELECT max_patch_level FROM (SELECT MAX(patch_level) AS max_patch_level FROM patches WHERE system_name = ? ) AS tmptable )
-lock.release=UPDATE patches SET patch_in_progress = 'F' WHERE system_name = ? AND patch_in_progress <> 'F'
\ No newline at end of file
+lock.release=UPDATE patches SET patch_in_progress = 'F' WHERE system_name = ? AND patch_in_progress <> 'F'
Index: 3rdParty_sources/tacitknowledge/autopatch/src/test/java/com/tacitknowledge/util/migration/jdbc/DatabaseTypeTest.java
===================================================================
diff -u -r60fd31cb3d049512a0549ad11dbbe4ba81cae54e -r6228ef532ab695b3a588dec9f7d52c2f15f581ba
--- 3rdParty_sources/tacitknowledge/autopatch/src/test/java/com/tacitknowledge/util/migration/jdbc/DatabaseTypeTest.java	(.../DatabaseTypeTest.java)	(revision 60fd31cb3d049512a0549ad11dbbe4ba81cae54e)
+++ 3rdParty_sources/tacitknowledge/autopatch/src/test/java/com/tacitknowledge/util/migration/jdbc/DatabaseTypeTest.java	(.../DatabaseTypeTest.java)	(revision 6228ef532ab695b3a588dec9f7d52c2f15f581ba)
@@ -54,7 +54,7 @@
          * is what we expect before we override it.
          */
         String type = "mysql";
-        String dbTypeExpectedValue="true";
+        String dbTypeExpectedValue="false";
         DatabaseType databaseType = new DatabaseType(type);
         Properties dbProperties = new Properties();
         
Index: 3rdParty_sources/tacitknowledge/autopatch/src/test/java/com/tacitknowledge/util/migration/jdbc/WebAppServletContextFactoryTest.java
===================================================================
diff -u -r60fd31cb3d049512a0549ad11dbbe4ba81cae54e -r6228ef532ab695b3a588dec9f7d52c2f15f581ba
--- 3rdParty_sources/tacitknowledge/autopatch/src/test/java/com/tacitknowledge/util/migration/jdbc/WebAppServletContextFactoryTest.java	(.../WebAppServletContextFactoryTest.java)	(revision 60fd31cb3d049512a0549ad11dbbe4ba81cae54e)
+++ 3rdParty_sources/tacitknowledge/autopatch/src/test/java/com/tacitknowledge/util/migration/jdbc/WebAppServletContextFactoryTest.java	(.../WebAppServletContextFactoryTest.java)	(revision 6228ef532ab695b3a588dec9f7d52c2f15f581ba)
@@ -76,7 +76,7 @@
         sc.setInitParameter("migration.readonly", "true");
         sc.setInitParameter("migration.databasetype", dbType);
         sc.setInitParameter("migration.patchpath", "patches");
-        sc.setInitParameter("migration.datasource", "jdbc/testsource");
+        sc.setInitParameter("migration.datasource", "java:comp/env/jdbc/testsource");
         
         MockDataSource ds = new MockDataSource();
         InitialContext context = new InitialContext();
@@ -119,9 +119,9 @@
         sc.setInitParameter("migration.readonly", "true");
         sc.setInitParameter("migration.jdbc.systems", "system1,system2");
         sc.setInitParameter("migration.system1.databasetype", dbType1);
-        sc.setInitParameter("migration.system1.datasource", "jdbc/testsource1");
+        sc.setInitParameter("migration.system1.datasource", "java:comp/env/jdbc/testsource1");
         sc.setInitParameter("migration.system2.databasetype", dbType2);
-        sc.setInitParameter("migration.system2.datasource", "jdbc/testsource2");
+        sc.setInitParameter("migration.system2.datasource", "java:comp/env/jdbc/testsource2");
         sc.setInitParameter("migration.patchpath", "patches");
         
         MockDataSource ds = new MockDataSource();