diff --git a/Model/lib/conifer/roles/conifer/vars/default.yml b/Model/lib/conifer/roles/conifer/vars/default.yml index db98b7ff6..c107f1587 100644 --- a/Model/lib/conifer/roles/conifer/vars/default.yml +++ b/Model/lib/conifer/roles/conifer/vars/default.yml @@ -34,24 +34,27 @@ _host_frontends: w2: '' _userdb_link_map: - apicomms: prods.login_comment - apicommn: prodn.login_comment - apicommbetas: betas.login_comment - apicommbetan: betan.login_comment - apicommdevs: devs.login_comment - apicommdevn: devn.login_comment + apicomms: prods.login_comment + apicommn: prodn.login_comment + apicommbetas: betas.login_comment + 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 - cecommn: ceprodn.login_comment - cecommdevs: cedevs.login_comment - cecommdevn: cedevn.login_comment - userdb: vm.userdb + cecomms: ceprods.login_comment + cecommn: ceprodn.login_comment + cecommdevs: cedevs.login_comment + cecommdevn: cedevn.login_comment + cecommd: cedevn.login_comment # local dev + userdb: vm.userdb _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 diff --git a/Model/pom.xml b/Model/pom.xml index ef6e468b5..0cce40c58 100644 --- a/Model/pom.xml +++ b/Model/pom.xml @@ -82,7 +82,7 @@ javax.servlet - servlet-api + javax.servlet-api provided @@ -151,10 +151,11 @@ + junit diff --git a/Model/src/main/java/org/eupathdb/common/db/EuPathDbDriverInitializer.java b/Model/src/main/java/org/eupathdb/common/db/EuPathDbDriverInitializer.java index f968117d2..21737d84d 100644 --- a/Model/src/main/java/org/eupathdb/common/db/EuPathDbDriverInitializer.java +++ b/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); diff --git a/Site/dashboard/autoload.php b/Site/dashboard/autoload.php new file mode 100644 index 000000000..50cd4f92e --- /dev/null +++ b/Site/dashboard/autoload.php @@ -0,0 +1,18 @@ + array( - 'module' => "view/databaseInfo.php", - 'tab' => 1), - 'Database Connection Pool' => array( - 'module' => "view/dbConnectionPool.php", - 'tab' => 0), - 'WDK State' => array( - 'module' => "view/stateInfo.php", - 'tab' => 1), - 'Configuration' => array( - 'module' => "view/configurationInfo.php", - 'tab' => 1), - 'Tomcat' => array( - 'module' => "view/tomcatInfo.php", - 'tab' => 1), - 'Apache' => array( - 'module' => "view/apacheInfo.php", - 'tab' => 1), - 'Proxy' => array( - 'module' => "view/proxyInfo.php", - 'tab' => 1), - 'Build' => array( - 'module' => "view/buildInfo.php", - 'tab' => 1), - 'Announcements' => array( - 'module' => "/cgi-bin/admin/messageConsole.pl", - 'tab' => 1), - 'Performance' => array( - 'module' => 'view/performance.php', - 'tab' => 1), - 'Services' => array( - 'module' => 'view/services.php', - 'tab' => 1), - 'JSLint' => array( - 'module' => 'view/jslint.php', - 'tab' => 0), - 'Logger' => array( - 'module' => "view/logger.php", - 'tab' => 0), - 'About' => array( - 'module' => "view/about.php", - 'tab' => 0), - ); -?> +return [ + 'Databases' => [ + 'module' => "view/databaseInfo.php", + 'tab' => 1 + ], + 'DB Connection Pool' => [ + 'module' => "view/dbConnectionPool.php", + 'tab' => 0 + ], + 'WDK State' => [ + 'module' => "view/stateInfo.php", + 'tab' => 1 + ], + 'Configuration' => [ + 'module' => "view/configurationInfo.php", + 'tab' => 1 + ], + 'Tomcat' => [ + 'module' => "view/tomcatInfo.php", + 'tab' => 1 + ], + 'HTTP Server' => [ + 'module' => "view/serverInfo.php", + 'tab' => 1 + ], + 'Proxy' => [ + 'module' => "view/proxyInfo.php", + 'tab' => 1 + ], + 'Build' => [ + 'module' => "view/buildInfo.php", + 'tab' => 1 + ], + 'Announcements' => [ + 'module' => "/cgi-bin/admin/messageConsole.pl", + 'tab' => 1 + ], + 'Performance' => [ + 'module' => 'view/performance.php', + 'tab' => 1 + ], + 'Services' => [ + 'module' => 'view/services.php', + 'tab' => 1 + ], + 'JSLint' => [ + 'module' => 'view/jslint.php', + 'tab' => 0 + ], + 'Logger' => [ + 'module' => "view/logger.php", + 'tab' => 0 + ], + 'About' => [ + 'module' => "view/about.php", + 'tab' => 0 + ], +]; diff --git a/Site/dashboard/head.php.inc b/Site/dashboard/head.php.inc index ffc71a97c..055a73d68 100644 --- a/Site/dashboard/head.php.inc +++ b/Site/dashboard/head.php.inc @@ -1,25 +1,25 @@ - <?php print $_SERVER['HTTP_HOST'] ?> /dashboard - + <?=$_SERVER['HTTP_HOST']?>/dashboard + - - - - - - - - - + + + + + + + + + - + diff --git a/Site/dashboard/index.php b/Site/dashboard/index.php index ea8aa7672..95d30f883 100644 --- a/Site/dashboard/index.php +++ b/Site/dashboard/index.php @@ -1,79 +1,94 @@ - - - - + + + + + + +