0.4.4 Update

create table for operator blacklist exceptions
add readonly frontend column for exceptions to operator blacklist
create tables for storing trend data
create page to search for trends
create trend data collection function
create button to toggle developer mode
unregister PostgreSQL driver on contextDestroyed

Author: cvogt729

config/BUILD_DETAILS

@@ -19,6 +19,8 @@ commonbaseutils-2.0.3
 commonexceptions-8.5.002
 core-8.5.002
 datatable-8.5.002
+directaccess-8.5.002
+directaccess-api-8.5.002
 extensionsupport-api-8.5.002
 jsch-0.2.11-sources
 postgresql-42.6.0-sources

config/RUNTIME_DEPS

@@ -6,5 +6,7 @@ file:core:modules\core
 file:common:modules\common
 file:commonexceptions:modules\commonexceptions
 file:commonbaseutils:bin\lib
+file:directaccess:modules\directaccess
+file:directaccess-api:modules\directaccess
 url:postgresql:https://repo1.maven.org/maven2/org/postgresql/postgresql/42.6.0/postgresql-42.6.0-sources.jar
 url:jsch:https://repo1.maven.org/maven2/com/github/mwiede/jsch/0.2.11/jsch-0.2.11-sources.jar

root/info.xml

@@ -1,7 +1,7 @@
 <extension version="1">
   <name>PostgreSQL_Connect</name>
   <description>Periodically synchronizes data to an external PostgreSQL database.</description>
-  <version>0.4.3</version>
+  <version>0.4.4</version>
   <vendor>Automatic Controls Equipment Systems, Inc.</vendor>
   <system-menu-provider>aces.webctrl.postgresql.web.SystemMenuEditor</system-menu-provider>
 </extension>

root/webapp/WEB-INF/web.xml

@@ -55,6 +55,15 @@
     <url-pattern>/LocalOperators</url-pattern>
   </servlet-mapping>
 
+  <servlet>
+    <servlet-name>FindTrendsPage</servlet-name>
+    <servlet-class>aces.webctrl.postgresql.web.FindTrendsPage</servlet-class>
+  </servlet>
+  <servlet-mapping>
+    <servlet-name>FindTrendsPage</servlet-name>
+    <url-pattern>/FindTrends</url-pattern>
+  </servlet-mapping>
+
   <security-constraint>
     <web-resource-collection>
       <web-resource-name>WEB</web-resource-name>

src/aces/webctrl/postgresql/core/Container.java

@@ -0,0 +1,10 @@
+package aces.webctrl.postgresql.core;
+public class Container<T> {
+  public volatile T x;
+  public Container(){
+    x = null;
+  }
+  public Container(T x){
+    this.x = x;
+  }
+}

src/aces/webctrl/postgresql/core/HelperAPI.java

@@ -27,6 +27,24 @@ public static boolean logout(Set<String> usernames){
     }
     return false;
   }
+  /**
+   * Toggles developer mode for all sessions corresponding to the given user.
+   * @return whether developer mode is enabled
+   */
+  public static boolean toggleDevMode(String username) throws Throwable {
+    boolean first = true;
+    boolean dev = false;
+    for (final UserSession session:UserSession.getAllUserSessions()){
+      if (username.equalsIgnoreCase(session.getOperator().getLoginName())){
+        if (first){
+          first = false;
+          dev = !session.getIsDeveloperEnabledFlag();
+        }
+        session.setIsDeveloper(dev);
+      }
+    }
+    return dev;
+  }
   /**
    * @return a collection of all local WebCTRL operators where usernames are mapped to display names, or {@code null} if an error occurs.
    */

src/aces/webctrl/postgresql/core/Initializer.java

@@ -1,8 +1,11 @@
 package aces.webctrl.postgresql.core;
 import java.nio.file.*;
+import java.sql.*;
 import javax.servlet.*;
+import java.util.*;
 import java.util.concurrent.*;
 import com.controlj.green.addonsupport.*;
+import com.controlj.green.addonsupport.access.*;
 import com.controlj.green.common.CJProduct;
 public class Initializer implements ServletContextListener {
   /** Name of the addon used for auto udpates */
@@ -45,6 +48,8 @@ public class Initializer implements ServletContextListener {
   private volatile static long nextSave = 0;
   /** Stores log messages before sending them to the database. */
   public final static ConcurrentLinkedQueue<LogMessage> logCache = new ConcurrentLinkedQueue<LogMessage>();
+  /** Root system connection to the database. */
+  private volatile static SystemConnection con = null;
   /**
    * Entry point of this add-on.
    */
@@ -119,13 +124,13 @@ public void run(){
   @Override public void contextDestroyed(ServletContextEvent sce){
     stop = true;
     if (mainThread==null){
-      Config.save();
+      handleDestruction();
     }else{
       mainThread.interrupt();
       synchronized (syncNotifier){
         syncNotifier.notifyAll();
       }
-      Config.save();
+      handleDestruction();
       //Wait for the primary processing thread to terminate.
       while (true){
         try{
@@ -137,6 +142,23 @@ public void run(){
     log("Execution terminated.");
     new Sync(Event.SHUTDOWN);
   }
+  private static void handleDestruction(){
+    Config.save();
+    // We deregister the PostgreSQL driver so that Tomcat does not complain
+    final ClassLoader cl = Thread.currentThread().getContextClassLoader();
+    final Enumeration<Driver> drivers = DriverManager.getDrivers();
+    Driver driver;
+    while (drivers.hasMoreElements()) {
+      driver = drivers.nextElement();
+      if (driver.getClass().getClassLoader()==cl) {
+        try{
+          DriverManager.deregisterDriver(driver);
+        }catch(Throwable t){
+          log(t);
+        }
+      }
+    }
+  }
   /**
    * Tells the processing thread to invoke a synchronization event ASAP.
    */
@@ -146,6 +168,15 @@ public static void syncNow(){
       syncNotifier.notifyAll();
     }
   }
+  /**
+   * @return the root system connection used by this application.
+   */
+  public static SystemConnection getConnection(){
+    if (con==null){
+      con = DirectAccess.getDirectAccess().getRootSystemConnection();
+    }
+    return con;
+  }
   /**
    * @return the name of this application.
    */