Upgraded all libraries, switched to npm, upgraded angular and jdk21

portal_database/pom.xml

@@ -11,7 +11,6 @@
 
 	<properties>
 		<main.basedir>${project.parent.basedir}</main.basedir>
-		<mysql.version>8.0.11</mysql.version>
 	</properties>
 
 	<artifactId>portal_database</artifactId>
@@ -41,23 +40,23 @@
 					<!-- Fix up Netbeans-generated JPA entity classes -->
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-antrun-plugin</artifactId>
-					<version>1.8</version>
+					<version>3.2.0</version>
 					<executions>
 						<execution>
 							<configuration>
 								<target>
-									<echo>Set author to NGAS</echo>
+									<echo>Set author to Locusworks</echo>
 									<replaceregexp byline="true">
 										<regexp pattern=".*@author.*" />
-										<substitution expression=" * @author NGAS" />
+										<substitution expression=" * @author Locusworks" />
 										<fileset
-											dir="src/main/java/com/ngas/portal/database/entities">
+											dir="src/main/java/net/locusworks/portal/database/entities">
 											<include name="*.java" />
 										</fileset>
 									</replaceregexp>
 									<echo>Set LF line endings</echo>
 									<fixcrlf
-										srcdir="src/main/java/com/ngas/portal/database/entities"
+										srcdir="src/main/java/net/locusworks/portal/database/entities"
 										eol="lf" includes="*.java" />
 								</target>
 							</configuration>
@@ -73,42 +72,15 @@
 	</build>
 
 	<dependencies>
-		<dependency>
-			<groupId>javax.transaction</groupId>
-			<artifactId>jta</artifactId>
-			<version>1.1</version>
-		</dependency>
-
-		<dependency>
-			<groupId>mysql</groupId>
-			<artifactId>mysql-connector-java</artifactId>
-			<version>${mysql.version}</version>
-			<exclusions>
-				<exclusion>
-					<groupId>com.google.protobuf</groupId>
-					<artifactId>protobuf-java</artifactId>
-				</exclusion>
-			</exclusions>
-		</dependency>
-
-		<dependency>
-			<groupId>org.hibernate</groupId>
-			<artifactId>hibernate-core</artifactId>
-			<version>${hibernate.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.hibernate</groupId>
-			<artifactId>hibernate-entitymanager</artifactId>
-			<version>${hibernate.version}</version>
-		</dependency>
-
-		<!-- https://mvnrepository.com/artifact/org.springframework/spring-orm -->
-		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-orm</artifactId>
-			<version>${spring.version}</version>
-		</dependency>
-
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-data-jpa</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>com.mysql</groupId>
+			<artifactId>mysql-connector-j</artifactId>
+			<scope>runtime</scope>
+		</dependency>
 	</dependencies>
 
-</project>
+</project>

portal_database/src/main/java/net/locusworks/portal/database/config/PortalBeanConfiguration.java

@@ -11,14 +11,13 @@ import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.DependsOn;
 import org.springframework.context.annotation.Primary;
 import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
-import org.springframework.orm.hibernate5.LocalSessionFactoryBean;
 import org.springframework.orm.jpa.JpaTransactionManager;
 import org.springframework.orm.jpa.JpaVendorAdapter;
 import org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean;
-import org.springframework.orm.jpa.vendor.Database;
-import org.springframework.orm.jpa.vendor.HibernateJpaVendorAdapter;
+import org.springframework.orm.jpa.vendor.HibernateJpaVendorAdapter;
 import org.springframework.transaction.PlatformTransactionManager;
-import org.springframework.transaction.annotation.EnableTransactionManagement;
+import org.springframework.transaction.annotation.EnableTransactionManagement;
+
 
 /***
  * Spring bean configuration for the database.
@@ -56,9 +55,9 @@ public class PortalBeanConfiguration {
     hibernateProperties.setProperty("hibernate.connection.useUnicode", "true");
   }
   
-  @Autowired
-  private DataSource dataSource;
-
+  @Autowired
+  private DataSource dataSource;
+
   /**
    * Create the entity manager factory bean used in the database connection
    * @return entityManagerFactoryBean
@@ -76,19 +75,6 @@ public class PortalBeanConfiguration {
     return lef;
   }
 
-  /**
-   * Create the session factory bean
-   * @return sessionFactoryBean
-   */
-  @Bean
-  public LocalSessionFactoryBean portalSessionFactory() {
-    LocalSessionFactoryBean sessionBean = new LocalSessionFactoryBean();
-    sessionBean.setDataSource(dataSource);
-    sessionBean.setPackagesToScan(PACKAGES_TO_SCAN);
-    sessionBean.setHibernateProperties(hibernateProperties);
-    return sessionBean;
-  }
-
   /**
    * Create the JPA Vendor adaptor bean that is used in the entity manager factory
    * @return jpaVendorAdaptor
@@ -99,8 +85,7 @@ public class PortalBeanConfiguration {
     HibernateJpaVendorAdapter hibernateJpaVendorAdapter = new HibernateJpaVendorAdapter();
     hibernateJpaVendorAdapter.setShowSql(false);
     hibernateJpaVendorAdapter.setGenerateDdl(false);
-    hibernateJpaVendorAdapter.setDatabase(Database.MYSQL);
-    return hibernateJpaVendorAdapter;
+    return hibernateJpaVendorAdapter;
   }
 
   /**
@@ -112,6 +97,6 @@ public class PortalBeanConfiguration {
   public PlatformTransactionManager portalTransactionManager() {
     JpaTransactionManager manager = new JpaTransactionManager();
     manager.setEntityManagerFactory(portalEntityManagerFactory().getObject());
-    return new JpaTransactionManager();
+    return manager;
   }
 }

portal_database/src/main/java/net/locusworks/portal/database/entities/ApplicationLog.java

@@ -7,21 +7,21 @@ package net.locusworks.portal.database.entities;
 
 import java.io.Serializable;
 import java.util.Date;
-import javax.persistence.Basic;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.NamedQueries;
-import javax.persistence.NamedQuery;
-import javax.persistence.Table;
-import javax.persistence.Temporal;
-import javax.persistence.TemporalType;
+import jakarta.persistence.Basic;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.NamedQueries;
+import jakarta.persistence.NamedQuery;
+import jakarta.persistence.Table;
+import org.hibernate.annotations.JdbcTypeCode;
+import org.hibernate.type.SqlTypes;
 
 /**
  *
- * @author NGAS
+ * @author Locusworks
  */
 @Entity
 @Table(name = "application_log", catalog = "portal", schema = "")
@@ -52,7 +52,7 @@ public class ApplicationLog implements Serializable {
   private String ipAddress;
   @Basic(optional = false)
   @Column(name = "timestamp")
-  @Temporal(TemporalType.TIMESTAMP)
+  @JdbcTypeCode(SqlTypes.TIMESTAMP)
   private Date timestamp;
 
   public ApplicationLog() {

portal_database/src/main/java/net/locusworks/portal/database/entities/ApplicationUser.java

@@ -8,24 +8,24 @@ package net.locusworks.portal.database.entities;
 import java.io.Serializable;
 import java.util.Date;
 import java.util.List;
-import javax.persistence.Basic;
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.NamedQueries;
-import javax.persistence.NamedQuery;
-import javax.persistence.OneToMany;
-import javax.persistence.OneToOne;
-import javax.persistence.Table;
-import javax.persistence.Temporal;
-import javax.persistence.TemporalType;
+import jakarta.persistence.Basic;
+import jakarta.persistence.CascadeType;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.NamedQueries;
+import jakarta.persistence.NamedQuery;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.OneToOne;
+import jakarta.persistence.Table;
+import org.hibernate.annotations.JdbcTypeCode;
+import org.hibernate.type.SqlTypes;
 
 /**
  *
- * @author NGAS
+ * @author Locusworks
  */
 @Entity
 @Table(name = "application_user", catalog = "portal", schema = "")
@@ -44,11 +44,11 @@ public class ApplicationUser implements Serializable {
   private String emailAddressTxt;
   @Basic(optional = false)
   @Column(name = "effective_date")
-  @Temporal(TemporalType.DATE)
+  @JdbcTypeCode(SqlTypes.DATE)
   private Date effectiveDate;
   @Basic(optional = false)
   @Column(name = "expiration_date")
-  @Temporal(TemporalType.DATE)
+  @JdbcTypeCode(SqlTypes.DATE)
   private Date expirationDate;
   @OneToMany(cascade = CascadeType.ALL, mappedBy = "createdBy")
   private List<ScriptEnvironmentVariable> scriptEnvironmentVariableList;

portal_database/src/main/java/net/locusworks/portal/database/entities/CredentialType.java

@@ -7,21 +7,21 @@ package net.locusworks.portal.database.entities;
 
 import java.io.Serializable;
 import java.util.List;
-import javax.persistence.Basic;
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.NamedQueries;
-import javax.persistence.NamedQuery;
-import javax.persistence.OneToMany;
-import javax.persistence.Table;
+import jakarta.persistence.Basic;
+import jakarta.persistence.CascadeType;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.NamedQueries;
+import jakarta.persistence.NamedQuery;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.Table;
 
 /**
  *
- * @author NGAS
+ * @author Locusworks
  */
 @Entity
 @Table(name = "credential_type", catalog = "portal", schema = "")

portal_database/src/main/java/net/locusworks/portal/database/entities/Credentials.java

@@ -8,25 +8,25 @@ package net.locusworks.portal.database.entities;
 import java.io.Serializable;
 import java.util.Date;
 import java.util.List;
-import javax.persistence.Basic;
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.NamedQueries;
-import javax.persistence.NamedQuery;
-import javax.persistence.OneToMany;
-import javax.persistence.Table;
-import javax.persistence.Temporal;
-import javax.persistence.TemporalType;
+import jakarta.persistence.Basic;
+import jakarta.persistence.CascadeType;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.NamedQueries;
+import jakarta.persistence.NamedQuery;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.Table;
+import org.hibernate.annotations.JdbcTypeCode;
+import org.hibernate.type.SqlTypes;
 
 /**
  *
- * @author NGAS
+ * @author Locusworks
  */
 @Entity
 @Table(name = "credentials", catalog = "portal", schema = "")
@@ -48,7 +48,7 @@ public class Credentials implements Serializable {
   private int referenceId;
   @Basic(optional = false)
   @Column(name = "date_added")
-  @Temporal(TemporalType.TIMESTAMP)
+  @JdbcTypeCode(SqlTypes.TIMESTAMP)
   private Date dateAdded;
   @OneToMany(cascade = CascadeType.ALL, mappedBy = "credentials")
   private List<ScriptRemote> scriptRemoteList;

portal_database/src/main/java/net/locusworks/portal/database/entities/EmailTemplate.java

@@ -8,26 +8,26 @@ package net.locusworks.portal.database.entities;
 import java.io.Serializable;
 import java.util.Date;
 import java.util.List;
-import javax.persistence.Basic;
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.Lob;
-import javax.persistence.ManyToOne;
-import javax.persistence.NamedQueries;
-import javax.persistence.NamedQuery;
-import javax.persistence.OneToMany;
-import javax.persistence.Table;
-import javax.persistence.Temporal;
-import javax.persistence.TemporalType;
+import jakarta.persistence.Basic;
+import jakarta.persistence.CascadeType;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.Lob;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.NamedQueries;
+import jakarta.persistence.NamedQuery;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.Table;
+import org.hibernate.annotations.JdbcTypeCode;
+import org.hibernate.type.SqlTypes;
 
 /**
  *
- * @author NGAS
+ * @author Locusworks
  */
 @Entity
 @Table(name = "email_template", catalog = "portal", schema = "")
@@ -53,7 +53,7 @@ public class EmailTemplate implements Serializable {
   private byte[] emailMessage;
   @Basic(optional = false)
   @Column(name = "date_created")
-  @Temporal(TemporalType.DATE)
+  @JdbcTypeCode(SqlTypes.DATE)
   private Date dateCreated;
   @OneToMany(cascade = CascadeType.ALL, mappedBy = "emailTemplate")
   private List<ScriptEmail> scriptEmailList;

portal_database/src/main/java/net/locusworks/portal/database/entities/EnvironmentVariable.java

@@ -7,23 +7,23 @@ package net.locusworks.portal.database.entities;
 
 import java.io.Serializable;
 import java.util.Date;
-import javax.persistence.Basic;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.NamedQueries;
-import javax.persistence.NamedQuery;
-import javax.persistence.Table;
-import javax.persistence.Temporal;
-import javax.persistence.TemporalType;
+import jakarta.persistence.Basic;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.NamedQueries;
+import jakarta.persistence.NamedQuery;
+import jakarta.persistence.Table;
+import org.hibernate.annotations.JdbcTypeCode;
+import org.hibernate.type.SqlTypes;
 
 /**
  *
- * @author NGAS
+ * @author Locusworks
  */
 @Entity
 @Table(name = "environment_variable", catalog = "portal", schema = "")
@@ -45,11 +45,11 @@ public class EnvironmentVariable implements Serializable {
   private String value;
   @Basic(optional = false)
   @Column(name = "last_updated")
-  @Temporal(TemporalType.TIMESTAMP)
+  @JdbcTypeCode(SqlTypes.TIMESTAMP)
   private Date lastUpdated;
   @Basic(optional = false)
   @Column(name = "date_created")
-  @Temporal(TemporalType.TIMESTAMP)
+  @JdbcTypeCode(SqlTypes.TIMESTAMP)
   private Date dateCreated;
   @JoinColumn(name = "created_by", referencedColumnName = "id")
   @ManyToOne(optional = false)

portal_database/src/main/java/net/locusworks/portal/database/entities/GitRepo.java

@@ -7,23 +7,23 @@ package net.locusworks.portal.database.entities;
 
 import java.io.Serializable;
 import java.util.Date;
-import javax.persistence.Basic;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.NamedQueries;
-import javax.persistence.NamedQuery;
-import javax.persistence.Table;
-import javax.persistence.Temporal;
-import javax.persistence.TemporalType;
+import jakarta.persistence.Basic;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.NamedQueries;
+import jakarta.persistence.NamedQuery;
+import jakarta.persistence.Table;
+import org.hibernate.annotations.JdbcTypeCode;
+import org.hibernate.type.SqlTypes;
 
 /**
  *
- * @author NGAS
+ * @author Locusworks
  */
 @Entity
 @Table(name = "git_repo", catalog = "portal", schema = "")
@@ -51,11 +51,11 @@ public class GitRepo implements Serializable {
   private String branch;
   @Basic(optional = false)
   @Column(name = "last_updated")
-  @Temporal(TemporalType.TIMESTAMP)
+  @JdbcTypeCode(SqlTypes.TIMESTAMP)
   private Date lastUpdated;
   @Basic(optional = false)
   @Column(name = "dated_created")
-  @Temporal(TemporalType.DATE)
+  @JdbcTypeCode(SqlTypes.DATE)
   private Date datedCreated;
   @JoinColumn(name = "credentials", referencedColumnName = "id")
   @ManyToOne(optional = false)

portal_database/src/main/java/net/locusworks/portal/database/entities/HashType.java

@@ -7,21 +7,21 @@ package net.locusworks.portal.database.entities;
 
 import java.io.Serializable;
 import java.util.Date;
-import javax.persistence.Basic;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.NamedQueries;
-import javax.persistence.NamedQuery;
-import javax.persistence.Table;
-import javax.persistence.Temporal;
-import javax.persistence.TemporalType;
+import jakarta.persistence.Basic;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.NamedQueries;
+import jakarta.persistence.NamedQuery;
+import jakarta.persistence.Table;
+import org.hibernate.annotations.JdbcTypeCode;
+import org.hibernate.type.SqlTypes;
 
 /**
  *
- * @author NGAS
+ * @author Locusworks
  */
 @Entity
 @Table(name = "hash_type", catalog = "portal", schema = "")
@@ -46,11 +46,11 @@ public class HashType implements Serializable {
   private short valid;
   @Basic(optional = false)
   @Column(name = "last_modified")
-  @Temporal(TemporalType.DATE)
+  @JdbcTypeCode(SqlTypes.DATE)
   private Date lastModified;
   @Basic(optional = false)
   @Column(name = "date_created")
-  @Temporal(TemporalType.DATE)
+  @JdbcTypeCode(SqlTypes.DATE)
   private Date dateCreated;
 
   public HashType() {

portal_database/src/main/java/net/locusworks/portal/database/entities/KeyValue.java

@@ -7,24 +7,24 @@ package net.locusworks.portal.database.entities;
 
 import java.io.Serializable;
 import java.util.Date;
-import javax.persistence.Basic;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.Lob;
-import javax.persistence.ManyToOne;
-import javax.persistence.NamedQueries;
-import javax.persistence.NamedQuery;
-import javax.persistence.Table;
-import javax.persistence.Temporal;
-import javax.persistence.TemporalType;
+import jakarta.persistence.Basic;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.Lob;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.NamedQueries;
+import jakarta.persistence.NamedQuery;
+import jakarta.persistence.Table;
+import org.hibernate.annotations.JdbcTypeCode;
+import org.hibernate.type.SqlTypes;
 
 /**
  *
- * @author NGAS
+ * @author Locusworks
  */
 @Entity
 @Table(name = "key_value", catalog = "portal", schema = "")
@@ -47,7 +47,7 @@ public class KeyValue implements Serializable {
   private byte[] referenceValue;
   @Basic(optional = false)
   @Column(name = "date_created")
-  @Temporal(TemporalType.TIMESTAMP)
+  @JdbcTypeCode(SqlTypes.TIMESTAMP)
   private Date dateCreated;
   @JoinColumn(name = "created_by", referencedColumnName = "id")
   @ManyToOne(optional = false)

portal_database/src/main/java/net/locusworks/portal/database/entities/Keyword.java

@@ -7,23 +7,23 @@ package net.locusworks.portal.database.entities;
 
 import java.io.Serializable;
 import java.util.Date;
-import javax.persistence.Basic;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.NamedQueries;
-import javax.persistence.NamedQuery;
-import javax.persistence.Table;
-import javax.persistence.Temporal;
-import javax.persistence.TemporalType;
+import jakarta.persistence.Basic;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.NamedQueries;
+import jakarta.persistence.NamedQuery;
+import jakarta.persistence.Table;
+import org.hibernate.annotations.JdbcTypeCode;
+import org.hibernate.type.SqlTypes;
 
 /**
  *
- * @author NGAS
+ * @author Locusworks
  */
 @Entity
 @Table(name = "keyword", catalog = "portal", schema = "")
@@ -42,7 +42,7 @@ public class Keyword implements Serializable {
   private String keyword;
   @Basic(optional = false)
   @Column(name = "date_created")
-  @Temporal(TemporalType.DATE)
+  @JdbcTypeCode(SqlTypes.DATE)
   private Date dateCreated;
   @JoinColumn(name = "created_by", referencedColumnName = "id")
   @ManyToOne(optional = false)

portal_database/src/main/java/net/locusworks/portal/database/entities/Password.java

@@ -7,23 +7,23 @@ package net.locusworks.portal.database.entities;
 
 import java.io.Serializable;
 import java.util.Date;
-import javax.persistence.Basic;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.NamedQueries;
-import javax.persistence.NamedQuery;
-import javax.persistence.Table;
-import javax.persistence.Temporal;
-import javax.persistence.TemporalType;
+import jakarta.persistence.Basic;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.NamedQueries;
+import jakarta.persistence.NamedQuery;
+import jakarta.persistence.Table;
+import org.hibernate.annotations.JdbcTypeCode;
+import org.hibernate.type.SqlTypes;
 
 /**
  *
- * @author NGAS
+ * @author Locusworks
  */
 @Entity
 @Table(name = "password", catalog = "portal", schema = "")
@@ -51,7 +51,7 @@ public class Password implements Serializable {
   private String password;
   @Basic(optional = false)
   @Column(name = "date_created")
-  @Temporal(TemporalType.DATE)
+  @JdbcTypeCode(SqlTypes.DATE)
   private Date dateCreated;
   @JoinColumn(name = "created_by", referencedColumnName = "id")
   @ManyToOne(optional = false)

portal_database/src/main/java/net/locusworks/portal/database/entities/Permission.java

@@ -8,25 +8,25 @@ package net.locusworks.portal.database.entities;
 import java.io.Serializable;
 import java.util.Date;
 import java.util.List;
-import javax.persistence.Basic;
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.NamedQueries;
-import javax.persistence.NamedQuery;
-import javax.persistence.OneToMany;
-import javax.persistence.Table;
-import javax.persistence.Temporal;
-import javax.persistence.TemporalType;
+import jakarta.persistence.Basic;
+import jakarta.persistence.CascadeType;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.NamedQueries;
+import jakarta.persistence.NamedQuery;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.Table;
+import org.hibernate.annotations.JdbcTypeCode;
+import org.hibernate.type.SqlTypes;
 
 /**
  *
- * @author NGAS
+ * @author Locusworks
  */
 @Entity
 @Table(name = "permission", catalog = "portal", schema = "")
@@ -48,11 +48,11 @@ public class Permission implements Serializable {
   private String displayName;
   @Basic(optional = false)
   @Column(name = "date_created")
-  @Temporal(TemporalType.DATE)
+  @JdbcTypeCode(SqlTypes.DATE)
   private Date dateCreated;
   @Basic(optional = false)
   @Column(name = "last_updated")
-  @Temporal(TemporalType.DATE)
+  @JdbcTypeCode(SqlTypes.DATE)
   private Date lastUpdated;
   @OneToMany(cascade = CascadeType.ALL, mappedBy = "permission")
   private List<PermissionGroupPermission> permissionGroupPermissionList;

portal_database/src/main/java/net/locusworks/portal/database/entities/PermissionCategory.java

@@ -8,23 +8,23 @@ package net.locusworks.portal.database.entities;
 import java.io.Serializable;
 import java.util.Date;
 import java.util.List;
-import javax.persistence.Basic;
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.NamedQueries;
-import javax.persistence.NamedQuery;
-import javax.persistence.OneToMany;
-import javax.persistence.Table;
-import javax.persistence.Temporal;
-import javax.persistence.TemporalType;
+import jakarta.persistence.Basic;
+import jakarta.persistence.CascadeType;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.NamedQueries;
+import jakarta.persistence.NamedQuery;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.Table;
+import org.hibernate.annotations.JdbcTypeCode;
+import org.hibernate.type.SqlTypes;
 
 /**
  *
- * @author NGAS
+ * @author Locusworks
  */
 @Entity
 @Table(name = "permission_category", catalog = "portal", schema = "")
@@ -46,7 +46,7 @@ public class PermissionCategory implements Serializable {
   private String displayName;
   @Basic(optional = false)
   @Column(name = "date_created")
-  @Temporal(TemporalType.DATE)
+  @JdbcTypeCode(SqlTypes.DATE)
   private Date dateCreated;
   @Basic(optional = false)
   @Column(name = "last_updated")

portal_database/src/main/java/net/locusworks/portal/database/entities/PermissionGroup.java

@@ -8,23 +8,23 @@ package net.locusworks.portal.database.entities;
 import java.io.Serializable;
 import java.util.Date;
 import java.util.List;
-import javax.persistence.Basic;
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.NamedQueries;
-import javax.persistence.NamedQuery;
-import javax.persistence.OneToMany;
-import javax.persistence.Table;
-import javax.persistence.Temporal;
-import javax.persistence.TemporalType;
+import jakarta.persistence.Basic;
+import jakarta.persistence.CascadeType;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.NamedQueries;
+import jakarta.persistence.NamedQuery;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.Table;
+import org.hibernate.annotations.JdbcTypeCode;
+import org.hibernate.type.SqlTypes;
 
 /**
  *
- * @author NGAS
+ * @author Locusworks
  */
 @Entity
 @Table(name = "permission_group", catalog = "portal", schema = "")
@@ -49,11 +49,11 @@ public class PermissionGroup implements Serializable {
   private short enabled;
   @Basic(optional = false)
   @Column(name = "date_created")
-  @Temporal(TemporalType.DATE)
+  @JdbcTypeCode(SqlTypes.DATE)
   private Date dateCreated;
   @Basic(optional = false)
   @Column(name = "last_modified")
-  @Temporal(TemporalType.DATE)
+  @JdbcTypeCode(SqlTypes.DATE)
   private Date lastModified;
   @OneToMany(cascade = CascadeType.ALL, mappedBy = "permissionGroup")
   private List<UserAttribute> userAttributeList;

portal_database/src/main/java/net/locusworks/portal/database/entities/PermissionGroupPermission.java

@@ -7,23 +7,23 @@ package net.locusworks.portal.database.entities;
 
 import java.io.Serializable;
 import java.util.Date;
-import javax.persistence.Basic;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.NamedQueries;
-import javax.persistence.NamedQuery;
-import javax.persistence.Table;
-import javax.persistence.Temporal;
-import javax.persistence.TemporalType;
+import jakarta.persistence.Basic;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.NamedQueries;
+import jakarta.persistence.NamedQuery;
+import jakarta.persistence.Table;
+import org.hibernate.annotations.JdbcTypeCode;
+import org.hibernate.type.SqlTypes;
 
 /**
  *
- * @author NGAS
+ * @author Locusworks
  */
 @Entity
 @Table(name = "permission_group_permission", catalog = "portal", schema = "")
@@ -42,11 +42,11 @@ public class PermissionGroupPermission implements Serializable {
   private short allowed;
   @Basic(optional = false)
   @Column(name = "date_created")
-  @Temporal(TemporalType.DATE)
+  @JdbcTypeCode(SqlTypes.DATE)
   private Date dateCreated;
   @Basic(optional = false)
   @Column(name = "last_modified")
-  @Temporal(TemporalType.DATE)
+  @JdbcTypeCode(SqlTypes.DATE)
   private Date lastModified;
   @JoinColumn(name = "permission", referencedColumnName = "id")
   @ManyToOne(optional = false)

portal_database/src/main/java/net/locusworks/portal/database/entities/ResourceFile.java

@@ -7,23 +7,23 @@ package net.locusworks.portal.database.entities;
 
 import java.io.Serializable;
 import java.util.Date;
-import javax.persistence.Basic;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.NamedQueries;
-import javax.persistence.NamedQuery;
-import javax.persistence.Table;
-import javax.persistence.Temporal;
-import javax.persistence.TemporalType;
+import jakarta.persistence.Basic;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.NamedQueries;
+import jakarta.persistence.NamedQuery;
+import jakarta.persistence.Table;
+import org.hibernate.annotations.JdbcTypeCode;
+import org.hibernate.type.SqlTypes;
 
 /**
  *
- * @author NGAS
+ * @author Locusworks
  */
 @Entity
 @Table(name = "resource_file", catalog = "portal", schema = "")
@@ -51,7 +51,7 @@ public class ResourceFile implements Serializable {
   private short valid;
   @Basic(optional = false)
   @Column(name = "date_created")
-  @Temporal(TemporalType.DATE)
+  @JdbcTypeCode(SqlTypes.DATE)
   private Date dateCreated;
   @JoinColumn(name = "script_result", referencedColumnName = "id")
   @ManyToOne

portal_database/src/main/java/net/locusworks/portal/database/entities/ScheduleFrequency.java

@@ -7,21 +7,21 @@ package net.locusworks.portal.database.entities;
 
 import java.io.Serializable;
 import java.util.List;
-import javax.persistence.Basic;
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.NamedQueries;
-import javax.persistence.NamedQuery;
-import javax.persistence.OneToMany;
-import javax.persistence.Table;
+import jakarta.persistence.Basic;
+import jakarta.persistence.CascadeType;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.NamedQueries;
+import jakarta.persistence.NamedQuery;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.Table;
 
 /**
  *
- * @author NGAS
+ * @author Locusworks
  */
 @Entity
 @Table(name = "schedule_frequency", catalog = "portal", schema = "")

portal_database/src/main/java/net/locusworks/portal/database/entities/Script.java

@@ -8,25 +8,25 @@ package net.locusworks.portal.database.entities;
 import java.io.Serializable;
 import java.util.Date;
 import java.util.List;
-import javax.persistence.Basic;
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.NamedQueries;
-import javax.persistence.NamedQuery;
-import javax.persistence.OneToMany;
-import javax.persistence.Table;
-import javax.persistence.Temporal;
-import javax.persistence.TemporalType;
+import jakarta.persistence.Basic;
+import jakarta.persistence.CascadeType;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.NamedQueries;
+import jakarta.persistence.NamedQuery;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.Table;
+import org.hibernate.annotations.JdbcTypeCode;
+import org.hibernate.type.SqlTypes;
 
 /**
  *
- * @author NGAS
+ * @author Locusworks
  */
 @Entity
 @Table(name = "script", catalog = "portal", schema = "")
@@ -52,7 +52,7 @@ public class Script implements Serializable {
   private String outputDirectory;
   @Basic(optional = false)
   @Column(name = "date_created")
-  @Temporal(TemporalType.DATE)
+  @JdbcTypeCode(SqlTypes.DATE)
   private Date dateCreated;
   @OneToMany(cascade = CascadeType.ALL, mappedBy = "script")
   private List<ScriptEnvironmentVariable> scriptEnvironmentVariableList;

portal_database/src/main/java/net/locusworks/portal/database/entities/ScriptChain.java

@@ -6,21 +6,21 @@
 package net.locusworks.portal.database.entities;
 
 import java.io.Serializable;
-import javax.persistence.Basic;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.NamedQueries;
-import javax.persistence.NamedQuery;
-import javax.persistence.Table;
+import jakarta.persistence.Basic;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.NamedQueries;
+import jakarta.persistence.NamedQuery;
+import jakarta.persistence.Table;
 
 /**
  *
- * @author NGAS
+ * @author Locusworks
  */
 @Entity
 @Table(name = "script_chain", catalog = "portal", schema = "")

portal_database/src/main/java/net/locusworks/portal/database/entities/ScriptEmail.java

@@ -8,25 +8,25 @@ package net.locusworks.portal.database.entities;
 import java.io.Serializable;
 import java.util.Date;
 import java.util.List;
-import javax.persistence.Basic;
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.NamedQueries;
-import javax.persistence.NamedQuery;
-import javax.persistence.OneToMany;
-import javax.persistence.Table;
-import javax.persistence.Temporal;
-import javax.persistence.TemporalType;
+import jakarta.persistence.Basic;
+import jakarta.persistence.CascadeType;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.NamedQueries;
+import jakarta.persistence.NamedQuery;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.Table;
+import org.hibernate.annotations.JdbcTypeCode;
+import org.hibernate.type.SqlTypes;
 
 /**
  *
- * @author NGAS
+ * @author Locusworks
  */
 @Entity
 @Table(name = "script_email", catalog = "portal", schema = "")
@@ -42,7 +42,7 @@ public class ScriptEmail implements Serializable {
   private Integer id;
   @Basic(optional = false)
   @Column(name = "date_created")
-  @Temporal(TemporalType.DATE)
+  @JdbcTypeCode(SqlTypes.DATE)
   private Date dateCreated;
   @JoinColumn(name = "email_template", referencedColumnName = "id")
   @ManyToOne(optional = false)

portal_database/src/main/java/net/locusworks/portal/database/entities/ScriptEmailRecipient.java

@@ -7,23 +7,23 @@ package net.locusworks.portal.database.entities;
 
 import java.io.Serializable;
 import java.util.Date;
-import javax.persistence.Basic;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.NamedQueries;
-import javax.persistence.NamedQuery;
-import javax.persistence.Table;
-import javax.persistence.Temporal;
-import javax.persistence.TemporalType;
+import jakarta.persistence.Basic;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.NamedQueries;
+import jakarta.persistence.NamedQuery;
+import jakarta.persistence.Table;
+import org.hibernate.annotations.JdbcTypeCode;
+import org.hibernate.type.SqlTypes;
 
 /**
  *
- * @author NGAS
+ * @author Locusworks
  */
 @Entity
 @Table(name = "script_email_recipient", catalog = "portal", schema = "")
@@ -39,7 +39,7 @@ public class ScriptEmailRecipient implements Serializable {
   private Integer id;
   @Basic(optional = false)
   @Column(name = "date_created")
-  @Temporal(TemporalType.DATE)
+  @JdbcTypeCode(SqlTypes.DATE)
   private Date dateCreated;
   @JoinColumn(name = "recipient", referencedColumnName = "id")
   @ManyToOne(optional = false)

portal_database/src/main/java/net/locusworks/portal/database/entities/ScriptEnvironmentVariable.java

@@ -7,23 +7,23 @@ package net.locusworks.portal.database.entities;
 
 import java.io.Serializable;
 import java.util.Date;
-import javax.persistence.Basic;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.NamedQueries;
-import javax.persistence.NamedQuery;
-import javax.persistence.Table;
-import javax.persistence.Temporal;
-import javax.persistence.TemporalType;
+import jakarta.persistence.Basic;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.NamedQueries;
+import jakarta.persistence.NamedQuery;
+import jakarta.persistence.Table;
+import org.hibernate.annotations.JdbcTypeCode;
+import org.hibernate.type.SqlTypes;
 
 /**
  *
- * @author NGAS
+ * @author Locusworks
  */
 @Entity
 @Table(name = "script_environment_variable", catalog = "portal", schema = "")
@@ -45,11 +45,11 @@ public class ScriptEnvironmentVariable implements Serializable {
   private String value;
   @Basic(optional = false)
   @Column(name = "last_updated")
-  @Temporal(TemporalType.TIMESTAMP)
+  @JdbcTypeCode(SqlTypes.TIMESTAMP)
   private Date lastUpdated;
   @Basic(optional = false)
   @Column(name = "date_created")
-  @Temporal(TemporalType.TIMESTAMP)
+  @JdbcTypeCode(SqlTypes.TIMESTAMP)
   private Date dateCreated;
   @JoinColumn(name = "created_by", referencedColumnName = "id")
   @ManyToOne(optional = false)

portal_database/src/main/java/net/locusworks/portal/database/entities/ScriptParameter.java

@@ -6,21 +6,21 @@
 package net.locusworks.portal.database.entities;
 
 import java.io.Serializable;
-import javax.persistence.Basic;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.NamedQueries;
-import javax.persistence.NamedQuery;
-import javax.persistence.Table;
+import jakarta.persistence.Basic;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.NamedQueries;
+import jakarta.persistence.NamedQuery;
+import jakarta.persistence.Table;
 
 /**
  *
- * @author NGAS
+ * @author Locusworks
  */
 @Entity
 @Table(name = "script_parameter", catalog = "portal", schema = "")

portal_database/src/main/java/net/locusworks/portal/database/entities/ScriptRemote.java

@@ -6,21 +6,21 @@
 package net.locusworks.portal.database.entities;
 
 import java.io.Serializable;
-import javax.persistence.Basic;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.NamedQueries;
-import javax.persistence.NamedQuery;
-import javax.persistence.Table;
+import jakarta.persistence.Basic;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.NamedQueries;
+import jakarta.persistence.NamedQuery;
+import jakarta.persistence.Table;
 
 /**
  *
- * @author NGAS
+ * @author Locusworks
  */
 @Entity
 @Table(name = "script_remote", catalog = "portal", schema = "")

portal_database/src/main/java/net/locusworks/portal/database/entities/ScriptSchedule.java

@@ -8,25 +8,25 @@ package net.locusworks.portal.database.entities;
 import java.io.Serializable;
 import java.util.Date;
 import java.util.List;
-import javax.persistence.Basic;
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.NamedQueries;
-import javax.persistence.NamedQuery;
-import javax.persistence.OneToMany;
-import javax.persistence.Table;
-import javax.persistence.Temporal;
-import javax.persistence.TemporalType;
+import jakarta.persistence.Basic;
+import jakarta.persistence.CascadeType;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.NamedQueries;
+import jakarta.persistence.NamedQuery;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.Table;
+import org.hibernate.annotations.JdbcTypeCode;
+import org.hibernate.type.SqlTypes;
 
 /**
  *
- * @author NGAS
+ * @author Locusworks
  */
 @Entity
 @Table(name = "script_schedule", catalog = "portal", schema = "")
@@ -45,17 +45,17 @@ public class ScriptSchedule implements Serializable {
   private String jobId;
   @Basic(optional = false)
   @Column(name = "start_datetime")
-  @Temporal(TemporalType.TIMESTAMP)
+  @JdbcTypeCode(SqlTypes.TIMESTAMP)
   private Date startDatetime;
   @Column(name = "end_datetime")
-  @Temporal(TemporalType.TIMESTAMP)
+  @JdbcTypeCode(SqlTypes.TIMESTAMP)
   private Date endDatetime;
   @Column(name = "max_executions")
   private Integer maxExecutions;
   @Column(name = "current_execution_count")
   private Integer currentExecutionCount;
   @Column(name = "last_run")
-  @Temporal(TemporalType.TIMESTAMP)
+  @JdbcTypeCode(SqlTypes.TIMESTAMP)
   private Date lastRun;
   @Column(name = "execution_status")
   private Integer executionStatus;

portal_database/src/main/java/net/locusworks/portal/database/entities/ScriptScheduleResults.java

@@ -8,25 +8,25 @@ package net.locusworks.portal.database.entities;
 import java.io.Serializable;
 import java.util.Date;
 import java.util.List;
-import javax.persistence.Basic;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.Lob;
-import javax.persistence.ManyToOne;
-import javax.persistence.NamedQueries;
-import javax.persistence.NamedQuery;
-import javax.persistence.OneToMany;
-import javax.persistence.Table;
-import javax.persistence.Temporal;
-import javax.persistence.TemporalType;
+import jakarta.persistence.Basic;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.Lob;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.NamedQueries;
+import jakarta.persistence.NamedQuery;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.Table;
+import org.hibernate.annotations.JdbcTypeCode;
+import org.hibernate.type.SqlTypes;
 
 /**
  *
- * @author NGAS
+ * @author Locusworks
  */
 @Entity
 @Table(name = "script_schedule_results", catalog = "portal", schema = "")
@@ -49,11 +49,11 @@ public class ScriptScheduleResults implements Serializable {
   private byte[] results;
   @Basic(optional = false)
   @Column(name = "start_time")
-  @Temporal(TemporalType.TIMESTAMP)
+  @JdbcTypeCode(SqlTypes.TIMESTAMP)
   private Date startTime;
   @Basic(optional = false)
   @Column(name = "end_time")
-  @Temporal(TemporalType.TIMESTAMP)
+  @JdbcTypeCode(SqlTypes.TIMESTAMP)
   private Date endTime;
   @OneToMany(mappedBy = "scriptResult")
   private List<ResourceFile> resourceFileList;

portal_database/src/main/java/net/locusworks/portal/database/entities/ScriptScp.java

@@ -7,23 +7,23 @@ package net.locusworks.portal.database.entities;
 
 import java.io.Serializable;
 import java.util.Date;
-import javax.persistence.Basic;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.NamedQueries;
-import javax.persistence.NamedQuery;
-import javax.persistence.Table;
-import javax.persistence.Temporal;
-import javax.persistence.TemporalType;
+import jakarta.persistence.Basic;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.NamedQueries;
+import jakarta.persistence.NamedQuery;
+import jakarta.persistence.Table;
+import org.hibernate.annotations.JdbcTypeCode;
+import org.hibernate.type.SqlTypes;
 
 /**
  *
- * @author NGAS
+ * @author Locusworks
  */
 @Entity
 @Table(name = "script_scp", catalog = "portal", schema = "")
@@ -53,11 +53,11 @@ public class ScriptScp implements Serializable {
   private String dataRegex;
   @Basic(optional = false)
   @Column(name = "last_updated")
-  @Temporal(TemporalType.TIMESTAMP)
+  @JdbcTypeCode(SqlTypes.TIMESTAMP)
   private Date lastUpdated;
   @Basic(optional = false)
   @Column(name = "date_created")
-  @Temporal(TemporalType.TIMESTAMP)
+  @JdbcTypeCode(SqlTypes.TIMESTAMP)
   private Date dateCreated;
   @JoinColumn(name = "script", referencedColumnName = "id")
   @ManyToOne(optional = false)

portal_database/src/main/java/net/locusworks/portal/database/entities/ScriptType.java

@@ -7,21 +7,21 @@ package net.locusworks.portal.database.entities;
 
 import java.io.Serializable;
 import java.util.List;
-import javax.persistence.Basic;
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.NamedQueries;
-import javax.persistence.NamedQuery;
-import javax.persistence.OneToMany;
-import javax.persistence.Table;
+import jakarta.persistence.Basic;
+import jakarta.persistence.CascadeType;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.NamedQueries;
+import jakarta.persistence.NamedQuery;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.Table;
 
 /**
  *
- * @author NGAS
+ * @author Locusworks
  */
 @Entity
 @Table(name = "script_type", catalog = "portal", schema = "")

portal_database/src/main/java/net/locusworks/portal/database/entities/SshKey.java

@@ -7,24 +7,24 @@ package net.locusworks.portal.database.entities;
 
 import java.io.Serializable;
 import java.util.Date;
-import javax.persistence.Basic;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.Lob;
-import javax.persistence.ManyToOne;
-import javax.persistence.NamedQueries;
-import javax.persistence.NamedQuery;
-import javax.persistence.Table;
-import javax.persistence.Temporal;
-import javax.persistence.TemporalType;
+import jakarta.persistence.Basic;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.Lob;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.NamedQueries;
+import jakarta.persistence.NamedQuery;
+import jakarta.persistence.Table;
+import org.hibernate.annotations.JdbcTypeCode;
+import org.hibernate.type.SqlTypes;
 
 /**
  *
- * @author NGAS
+ * @author Locusworks
  */
 @Entity
 @Table(name = "ssh_key", catalog = "portal", schema = "")
@@ -55,7 +55,7 @@ public class SshKey implements Serializable {
   private String passphrase;
   @Basic(optional = false)
   @Column(name = "date_created")
-  @Temporal(TemporalType.DATE)
+  @JdbcTypeCode(SqlTypes.DATE)
   private Date dateCreated;
   @JoinColumn(name = "created_by", referencedColumnName = "id")
   @ManyToOne(optional = false)

portal_database/src/main/java/net/locusworks/portal/database/entities/UserAttribute.java

@@ -6,22 +6,22 @@
 package net.locusworks.portal.database.entities;
 
 import java.io.Serializable;
-import javax.persistence.Basic;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.NamedQueries;
-import javax.persistence.NamedQuery;
-import javax.persistence.OneToOne;
-import javax.persistence.Table;
+import jakarta.persistence.Basic;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.NamedQueries;
+import jakarta.persistence.NamedQuery;
+import jakarta.persistence.OneToOne;
+import jakarta.persistence.Table;
 
 /**
  *
- * @author NGAS
+ * @author Locusworks
  */
 @Entity
 @Table(name = "user_attribute", catalog = "portal", schema = "")

portal_database/src/main/java/net/locusworks/portal/database/entities/UserPasswordTracking.java

@@ -7,23 +7,23 @@ package net.locusworks.portal.database.entities;
 
 import java.io.Serializable;
 import java.util.Date;
-import javax.persistence.Basic;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.NamedQueries;
-import javax.persistence.NamedQuery;
-import javax.persistence.Table;
-import javax.persistence.Temporal;
-import javax.persistence.TemporalType;
+import jakarta.persistence.Basic;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.NamedQueries;
+import jakarta.persistence.NamedQuery;
+import jakarta.persistence.Table;
+import org.hibernate.annotations.JdbcTypeCode;
+import org.hibernate.type.SqlTypes;
 
 /**
  *
- * @author NGAS
+ * @author Locusworks
  */
 @Entity
 @Table(name = "user_password_tracking", catalog = "portal", schema = "")
@@ -42,11 +42,11 @@ public class UserPasswordTracking implements Serializable {
   private String passwordTxt;
   @Basic(optional = false)
   @Column(name = "effective_date")
-  @Temporal(TemporalType.DATE)
+  @JdbcTypeCode(SqlTypes.DATE)
   private Date effectiveDate;
   @Basic(optional = false)
   @Column(name = "expiration_date")
-  @Temporal(TemporalType.DATE)
+  @JdbcTypeCode(SqlTypes.DATE)
   private Date expirationDate;
   @JoinColumn(name = "application_user", referencedColumnName = "id")
   @ManyToOne(optional = false)

portal_database/src/main/java/net/locusworks/portal/database/entities/package-info.java

@@ -1,6 +1,6 @@
 /**
  * Package contains all the JPO Entities that map to the database
- * @author NGAS
+ * @author Locusworks
  * @since 1.0.0-RELEASE
  * @version 1.0
  */

portal_database/src/main/java/net/locusworks/portal/database/migration/PortalMigration.java

@@ -17,14 +17,24 @@ public class PortalMigration {
    * @param dataSource the Datasource to use for the migration
    * @return Flyway migration item
    */
-  public static Flyway getFlyway(DataSource dataSource) {
-    Flyway flyway = new Flyway();
-    flyway.setTable("_flyway_migration");
-    flyway.setSchemas("portal");
-    flyway.setLocations("database/migration");
-    flyway.setOutOfOrder(false);
-    flyway.setDataSource(dataSource);
-    return flyway;
-  }
+  public static Flyway getFlyway(DataSource dataSource) {
+    var configuration = Flyway.configure()
+        .table("_flyway_migration")
+        .schemas("portal")
+        .outOfOrder(false)
+        .dataSource(dataSource);
+    try (var connection = dataSource.getConnection()) {
+      if (connection.getMetaData().getDatabaseProductName().startsWith("H2")) {
+        configuration.locations(
+            "classpath:database/migration/MySQL/Tables",
+            "classpath:database/migration/MySQL/Data");
+      } else {
+        configuration.locations("classpath:database/migration");
+      }
+    } catch (Exception ex) {
+      throw new IllegalStateException("Unable to identify database for migrations", ex);
+    }
+    return configuration.load();
+  }
 
 }

portal_database/src/main/java/net/locusworks/portal/database/repos/CredentialsRepository.java

@@ -1,26 +1,18 @@
 package net.locusworks.portal.database.repos;
 
-import java.math.BigInteger;
-import java.util.List;
-import java.util.Set;
+import java.util.List;
+import java.util.Set;
 
 import org.springframework.data.jpa.repository.Modifying;
 import org.springframework.data.jpa.repository.Query;
-import org.springframework.data.jpa.repository.query.Procedure;
-import org.springframework.data.repository.CrudRepository;
-import org.springframework.data.repository.query.Param;
+import org.springframework.data.repository.CrudRepository;
+import org.springframework.data.repository.query.Param;
 import org.springframework.transaction.annotation.Transactional;
 
 import net.locusworks.portal.database.entities.Credentials;
 
 public interface CredentialsRepository extends CrudRepository<Credentials, Integer> {
   
-  public static final String CRED_IN_USE_PROC = "credentials_in_use";
-  public static final String CRED_COUNT_PROC = "credential_count";
-  public static final String CRED_UUID_IN_PARAM = "cred_uuid";
-  public static final String CRED_USE_OUT_PARA = "cred_use";
-  public static final String CRED_COUNT_OUT_PARAM = "cred_count";
-  
   @Query("SELECT sc FROM Credentials sc WHERE sc.id = ?1")
   Credentials findOne(Integer id);
 
@@ -29,11 +21,15 @@ public interface CredentialsRepository extends CrudRepository<Credentials, Integ
   @Query("SELECT sc FROM Credentials sc")
   List<Credentials> findAll();
   
-  @Procedure(procedureName=CRED_IN_USE_PROC, outputParameterName=CRED_USE_OUT_PARA)
-  boolean inUse(@Param(CRED_UUID_IN_PARAM) String uuid);
-  
-  @Procedure(procedureName=CRED_COUNT_PROC, outputParameterName=CRED_COUNT_OUT_PARAM)
-  BigInteger credentialCount(@Param(CRED_UUID_IN_PARAM) String uuid);
+  @Query(value = """
+      SELECT
+        (SELECT COUNT(*) FROM git_repo WHERE credentials = c.id) +
+        (SELECT COUNT(*) FROM script_remote WHERE credentials = c.id) +
+        (SELECT COUNT(*) FROM script_scp WHERE from_credentials = c.id OR to_credentials = c.id)
+      FROM credentials c
+      WHERE c.uuid = :uuid
+      """, nativeQuery = true)
+  long credentialCount(@Param("uuid") String uuid);
   
   @Modifying
   @Transactional

portal_database/src/main/java/net/locusworks/portal/database/repos/EmailTemplateRepository.java

@@ -3,7 +3,7 @@ package net.locusworks.portal.database.repos;
 import java.util.List;
 import java.util.Set;
 
-import javax.transaction.Transactional;
+import jakarta.transaction.Transactional;
 
 import org.springframework.data.jpa.repository.Modifying;
 import org.springframework.data.jpa.repository.Query;

portal_database/src/main/java/net/locusworks/portal/database/repos/KeyValueRepository.java

@@ -3,7 +3,7 @@ package net.locusworks.portal.database.repos;
 import java.util.List;
 import java.util.Set;
 
-import javax.transaction.Transactional;
+import jakarta.transaction.Transactional;
 
 import org.springframework.data.jpa.repository.Modifying;
 import org.springframework.data.jpa.repository.Query;

portal_database/src/main/java/net/locusworks/portal/database/repos/ScriptRemoteRepository.java

@@ -2,7 +2,7 @@ package net.locusworks.portal.database.repos;
 
 import java.util.Set;
 
-import javax.transaction.Transactional;
+import jakarta.transaction.Transactional;
 
 import org.springframework.data.jpa.repository.Modifying;
 import org.springframework.data.jpa.repository.Query;

portal_database/src/main/java/net/locusworks/portal/database/repos/ScriptRepository.java

@@ -7,7 +7,7 @@ import java.util.Set;
 import org.springframework.data.jpa.repository.Modifying;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.CrudRepository;
-import org.springframework.lang.Nullable;
+import org.jspecify.annotations.Nullable;
 import org.springframework.transaction.annotation.Transactional;
 
 import net.locusworks.portal.database.entities.Script;

portal_database/src/main/java/net/locusworks/portal/database/repos/ScriptScpRepository.java

@@ -2,7 +2,7 @@ package net.locusworks.portal.database.repos;
 
 import java.util.Set;
 
-import javax.transaction.Transactional;
+import jakarta.transaction.Transactional;
 
 import org.springframework.data.jpa.repository.Modifying;
 import org.springframework.data.jpa.repository.Query;

portal_database/src/main/resources/META-INF/persistence.xml

@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<persistence version="2.1" xmlns="http://xmlns.jcp.org/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/persistence http://xmlns.jcp.org/xml/ns/persistence/persistence_2_1.xsd">
-  <persistence-unit name="portal_pu" transaction-type="RESOURCE_LOCAL">
-    <provider>org.hibernate.ejb.HibernatePersistence</provider>
-    <class>net.locusworks.portal.database.entities.ApplicationLog</class>
-    <class>net.locusworks.portal.database.entities.ApplicationUser</class>
-    <class>net.locusworks.portal.database.entities.Credentials</class>
-    <class>net.locusworks.portal.database.entities.EnvironmentVariable</class>
-    <class>net.locusworks.portal.database.entities.GitRepo</class>
-    <class>net.locusworks.portal.database.entities.HashType</class>
-    <class>net.locusworks.portal.database.entities.Keyword</class>
-    <class>net.locusworks.portal.database.entities.Password</class>
-    <class>net.locusworks.portal.database.entities.Permission</class>
-    <class>net.locusworks.portal.database.entities.PermissionCategory</class>
-    <class>net.locusworks.portal.database.entities.PermissionGroup</class>
-    <class>net.locusworks.portal.database.entities.PermissionGroupPermission</class>
-    <class>net.locusworks.portal.database.entities.ResourceFile</class>
-    <class>net.locusworks.portal.database.entities.ScheduleFrequency</class>
-    <class>net.locusworks.portal.database.entities.Script</class>
-    <class>net.locusworks.portal.database.entities.ScriptChain</class>
-    <class>net.locusworks.portal.database.entities.ScriptEnvironmentVariable</class>
-    <class>net.locusworks.portal.database.entities.ScriptParameter</class>
-    <class>net.locusworks.portal.database.entities.ScriptRemote</class>
-    <class>net.locusworks.portal.database.entities.ScriptSchedule</class>
-    <class>net.locusworks.portal.database.entities.ScriptScheduleResults</class>
-    <class>net.locusworks.portal.database.entities.ScriptScp</class>
-    <class>net.locusworks.portal.database.entities.ScriptType</class>
-    <class>net.locusworks.portal.database.entities.SshKey</class>
-    <class>net.locusworks.portal.database.entities.UserAttribute</class>
-    <class>net.locusworks.portal.database.entities.UserPasswordTracking</class>
-    <class>net.locusworks.portal.database.entities.CredentialType</class>
-    <class>net.locusworks.portal.database.entities.KeyValue</class>
-    <class>net.locusworks.portal.database.entities.EmailTemplate</class>
-    <class>net.locusworks.portal.database.entities.ScriptEmail</class>
-    <class>net.locusworks.portal.database.entities.ScriptEmailRecipient</class>
-    <properties>
-      <property name="javax.persistence.jdbc.url" value=""/>
-      <property name="javax.persistence.jdbc.user" value=""/>
-      <property name="javax.persistence.jdbc.driver" value=""/>
-      <property name="javax.persistence.jdbc.password" value=""/>
-    </properties>
-  </persistence-unit>
-</persistence>

portal_database/src/main/resources/database/migration/MySQL/Data/V01_000_002__admin_user_create.sql

@@ -1,6 +1,6 @@
 INSERT ignore INTO portal.application_user (id, email_address_txt, effective_date, expiration_date)
 values
-(null, 'portalAdmin@locusworks.net', CURDATE(), '9999/12/31');
+(null, 'portalAdmin@locusworks.net', CURDATE(), '9999-12-31');
 
 commit;
 
@@ -17,6 +17,6 @@ INSERT ignore INTO portal.user_password_tracking (id, application_user, password
 values
 (null,  
 (select id from portal.application_user where email_address_txt = 'portalAdmin@locusworks.net'), 
-'1000:9284df482920e9660aacca58f3a2ca7713d1e369e81e5d13:bf409cc87063667241984e044a1f8f798f18511b4242013d', curdate(), '9999/12/31');
+'1000:9284df482920e9660aacca58f3a2ca7713d1e369e81e5d13:bf409cc87063667241984e044a1f8f798f18511b4242013d', curdate(), '9999-12-31');
 
-commit;
+commit;

portal_database/src/main/resources/database/migration/MySQL/Tables/V01_000_000__portal_tables.sql

@@ -7,7 +7,7 @@ CREATE TABLE portal.application_log (
   ip_address varchar(45) NOT NULL COMMENT 'IP address of where the event came from',
   timestamp datetime NOT NULL,
   PRIMARY KEY (id),
-  UNIQUE KEY id_UNIQUE (id)
+  UNIQUE KEY application_log_id_UNIQUE (id)
 ) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4 COMMENT='Application logs';
 
 CREATE TABLE portal.permission_category (
@@ -17,7 +17,7 @@ CREATE TABLE portal.permission_category (
   date_created date NOT NULL COMMENT 'Date the permission category was created',
   last_updated varchar(45) NOT NULL COMMENT 'Last update time of the category',
   PRIMARY KEY (id),
-  UNIQUE KEY name (name)
+  UNIQUE KEY permission_category_name_UNIQUE (name)
 ) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4 COMMENT='Category the permission belongs to';
 
 CREATE TABLE portal.permission (
@@ -28,7 +28,7 @@ CREATE TABLE portal.permission (
   date_created date NOT NULL,
   last_updated date NOT NULL,
   PRIMARY KEY (id),
-  UNIQUE KEY name (name),
+  UNIQUE KEY permission_name_UNIQUE (name),
   KEY p_pc_fk_idx (permission_category),
   CONSTRAINT p_pc_fk FOREIGN KEY (permission_category) REFERENCES permission_category (id) ON DELETE NO ACTION ON UPDATE CASCADE
 ) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4 COMMENT='available permissions';
@@ -41,7 +41,7 @@ CREATE TABLE portal.permission_group (
   date_created date NOT NULL,
   last_modified date NOT NULL,
   PRIMARY KEY (id),
-  UNIQUE KEY name_UNIQUE (name)
+  UNIQUE KEY permission_group_name_UNIQUE (name)
 ) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4 COMMENT='permission group definitions';
 
 CREATE TABLE portal.permission_group_permission (
@@ -121,7 +121,7 @@ CREATE TABLE portal.password (
   date_created date NOT NULL COMMENT 'Date the credentials were added',
   PRIMARY KEY (id),
   UNIQUE KEY credential_name_UNIQUE (name),
-  UNIQUE KEY uuid_UNIQUE (uuid),
+  UNIQUE KEY password_uuid_UNIQUE (uuid),
   KEY pgc_au_fk_idx (created_by),
   CONSTRAINT pgc_au_fk FOREIGN KEY (created_by) REFERENCES application_user (id) ON UPDATE CASCADE ON DELETE RESTRICT
 ) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4 COMMENT='username and password for git repo';
@@ -137,7 +137,7 @@ CREATE TABLE portal.ssh_key (
   date_created date NOT NULL COMMENT 'Date the credentials were added',
   PRIMARY KEY (id),
   UNIQUE KEY ssh_key_name_UNIQUE (name),
-  UNIQUE KEY uuid_UNIQUE (uuid),
+  UNIQUE KEY ssh_key_uuid_UNIQUE (uuid),
   KEY pgsk_au_fk_idx (created_by),
   CONSTRAINT pgsk_au_fk FOREIGN KEY (created_by) REFERENCES application_user (id) ON UPDATE CASCADE ON DELETE RESTRICT
 ) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4 COMMENT='ssh key and passphrase for the git repo';
@@ -153,7 +153,7 @@ CREATE TABLE portal.git_repo (
   last_updated datetime NOT NULL COMMENT 'last time directory was updated',
   dated_created date NOT NULL COMMENT 'date the git repo was created',
   PRIMARY KEY (id),
-  UNIQUE KEY name_UNIQUE (name),
+  UNIQUE KEY git_repo_name_UNIQUE (name),
   KEY pg_au_fk_idx (created_by),
   KEY gr_c_fk_idx (credentials),
   CONSTRAINT gr_c_fk FOREIGN KEY (credentials) REFERENCES credentials (id) ON UPDATE CASCADE ON DELETE RESTRICT,
@@ -235,7 +235,7 @@ CREATE TABLE portal.script_schedule (
   execution_status int(11) DEFAULT NULL COMMENT 'status of the last execution',
   finished tinyint(4) NOT NULL DEFAULT '0' COMMENT 'Indiciated if the script has finished its execution run',
   PRIMARY KEY (id),
-  UNIQUE KEY uuid_UNIQUE (job_id),
+  UNIQUE KEY script_schedule_uuid_UNIQUE (job_id),
   KEY s_ss_fk_idx (script),
   KEY s_sf_fk_idx (frequency),
   CONSTRAINT s_sf_fk FOREIGN KEY (frequency) REFERENCES schedule_frequency (id) ON DELETE NO ACTION ON UPDATE NO ACTION,
@@ -297,7 +297,7 @@ CREATE TABLE portal.script_chain (
   execute_after_min int(11) DEFAULT NULL COMMENT 'number of minutes after parent finishes the child should execute',
   PRIMARY KEY (id),
   UNIQUE KEY unique_sp_sc_es (parent_script,child_script,exit_status),
-  KEY s_sp_fk_idx (parent_script),
+  KEY script_chain_parent_fk_idx (parent_script),
   KEY sc_s_fk_idx (child_script),
   CONSTRAINT sc_s_fk FOREIGN KEY (child_script) REFERENCES script (id) ON DELETE CASCADE ON UPDATE CASCADE,
   CONSTRAINT sp_s_fk FOREIGN KEY (parent_script) REFERENCES script (id) ON DELETE CASCADE ON UPDATE CASCADE
@@ -312,7 +312,7 @@ CREATE TABLE portal.script_environment_variable (
   last_updated datetime NOT NULL COMMENT 'last time environment variable was updated',
   date_created datetime NOT NULL COMMENT 'date the environment variable was created',
   PRIMARY KEY (id),
-  UNIQUE KEY id_UNIQUE (id),
+  UNIQUE KEY script_environment_variable_id_UNIQUE (id),
   UNIQUE KEY name_script_UNIQUE (name,script),
   KEY sev_au_fk_idx (created_by),
   KEY sev_s_fk_idx (script),
@@ -329,7 +329,7 @@ CREATE TABLE portal.resource_file (
   script_result int(11) DEFAULT NULL COMMENT 'the script that retrived and stored the file',
   date_created date NOT NULL,
   PRIMARY KEY (id),
-  UNIQUE KEY id_UNIQUE (id),
+  UNIQUE KEY resource_file_id_UNIQUE (id),
   KEY s_sr_ak_idx (script_result),
   CONSTRAINT s_sr_ak FOREIGN KEY (script_result) REFERENCES script_schedule_results (id) ON UPDATE CASCADE
 ) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;
@@ -342,8 +342,8 @@ CREATE TABLE portal.environment_variable (
   last_updated datetime NOT NULL COMMENT 'last time environment variable was updated',
   date_created datetime NOT NULL COMMENT 'date the environment variable was created',
   PRIMARY KEY (id),
-  UNIQUE KEY id_UNIQUE (id),
-  UNIQUE KEY name_UNIQUE (name),
+  UNIQUE KEY environment_variable_id_UNIQUE (id),
+  UNIQUE KEY environment_variable_name_UNIQUE (name),
   KEY ev_au_fk_idx (created_by),
   CONSTRAINT ev_au_fk FOREIGN KEY (created_by) REFERENCES application_user (id) ON DELETE NO ACTION ON UPDATE NO ACTION
 ) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4 COMMENT='Global System Environment variables for scripts to use outside what is already establed by the server.';