J21tc9

Model/lib/conifer/roles/conifer/vars/default.yml

@@ -40,6 +40,7 @@ _userdb_link_map:
   apicommbetan: betan.login_comment
   apicommdevs: devs.login_comment
   apicommdevn: devn.login_comment
+  apicommd: devn.login_comment  # local dev
   apicommlegacys: legacys.login_comment
   apicommlegacyn: legacyn.login_comment
   cecomms:     ceprods.login_comment
@@ -51,7 +52,8 @@ _userdb_link_map:
 _acctdb_link_map:
   acctdbn: acctdbN.profile
   acctdbs: acctdbS.profile
-  acctdb:  vm.acctdb # savm
+  acctdb: acctdbN.profile  # local dev
+#  acctdb:  vm.acctdb # savm
 
 modelconfig_modelName: =c= WDK model name, e.g. ToxoDB
 

Model/pom.xml

@@ -82,7 +82,7 @@
 
     <dependency>
       <groupId>javax.servlet</groupId>
-      <artifactId>servlet-api</artifactId>
+      <artifactId>javax.servlet-api</artifactId>
       <scope>provided</scope>
     </dependency>
 
@@ -151,10 +151,11 @@
     </dependency>
 
     <!-- Contains context listener used to prevent classloader memory leaks (used by web.xmls) -->
+    <!-- This is throwing errors and want to eliminate it as a possible error cause
     <dependency>
       <groupId>se.jiderhamn.classloader-leak-prevention</groupId>
-      <artifactId>classloader-leak-prevention-servlet</artifactId>
-    </dependency>
+      <artifactId>classloader-leak-prevention-servlet3</artifactId>
+    </dependency>-->
 
     <dependency>
       <groupId>junit</groupId>

Model/src/main/java/org/eupathdb/common/db/EuPathDbDriverInitializer.java

@@ -5,6 +5,7 @@
 import java.util.Properties;
 
 import org.apache.log4j.Logger;
+import org.gusdb.fgputil.db.platform.SupportedPlatform;
 import org.gusdb.fgputil.db.pool.ConnectionPoolConfig;
 import org.gusdb.fgputil.db.pool.DbDriverInitializer;
 import org.gusdb.fgputil.db.runner.SQLRunner;
@@ -55,8 +56,10 @@ public void closeConnection(Connection connection, ConnectionPoolConfig dbConfig
     if (dbConfig instanceof ModelConfigAppDB) {
       connection.setAutoCommit(true);
       ModelConfigAppDB appDbConfig = (ModelConfigAppDB)dbConfig;
-      closeDbLink(connection, appDbConfig.getUserDbLink());
-      closeDbLink(connection, appDbConfig.getAcctDbLink());
+      if (appDbConfig.getPlatformEnum() == SupportedPlatform.ORACLE) {
+        closeDbLink(connection, appDbConfig.getUserDbLink());
+        closeDbLink(connection, appDbConfig.getAcctDbLink());
+      }
     }
     // set auto-commit back to what it was
     connection.setAutoCommit(incomingAutoCommit);