v10.0 Alpha

New -Integration of Emailchemy (https://weirdkid.com/emailchemy-for-epadd/) for importing and exporting emails in formats different to Mbox. -The option to list uploaded sidecar files and to delete sidecar files. -The option to add Premis events manually. -Checksums are calculated using SHA256 in addition to MD5. -Premis data is exported in JSON format in addition to XML format. Fixed Fixed the issue of the search not working with terms containing diacritics.
ePADD · Jan 18, 2023 · 6ad383c · 6ad383c
1 parent 2e04227
commit 6ad383c
Show file tree

Hide file tree

Showing 29 changed files with 176 additions and 107 deletions.
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/WebContent/about.jsp b/WebContent/about.jsp
@@ -53,7 +53,7 @@
 <div style="margin-left:160px;margin-right:160px">
 <p>
     The ePADD software client is browser-based and compatible with Chrome and Firefox. It is optimized for Windows 10,
-    OS X 10.13, and Ubuntu 16.04 machines, using Java 8.
+    OS X 10.13, and Ubuntu 16.04 machines, using Java 12.
 
     <%--[note on link to user manual]--%>
 

diff --git a/WebContent/collection-detail.jsp b/WebContent/collection-detail.jsp
@@ -112,6 +112,7 @@
         if(fetchStats!=null) {
             for (FetchStats fs : fetchStats) {
                 fm = new Archive.FileMetadata();
+                //Only one entry per pst and format = PST
                 fm.fileID = "Collection/File/" + StringUtils.leftPad(""+count, 4, "0");
                 fm.fileFormat = "MBOX";
                 fm.notes="";

diff --git a/pom-common.xml b/pom-common.xml
@@ -39,10 +39,23 @@
 			<artifactId>libsvm</artifactId>
 			<version>3.17</version>
 		</dependency>
+<!--		<dependency>-->
+<!--			<groupId>com.sun.xml.bind</groupId>-->
+<!--			<artifactId>jaxb-impl</artifactId>-->
+<!--			<version>2.2.5-b10</version>-->
+<!--		</dependency>-->
+		<dependency>
+			<groupId>jakarta.xml.bind</groupId>
+			<artifactId>jakarta.xml.bind-api</artifactId>
+			<version>3.0.0</version>
+		</dependency>
+
+		<!-- JAXB RI, Jakarta XML Binding -->
 		<dependency>
 			<groupId>com.sun.xml.bind</groupId>
 			<artifactId>jaxb-impl</artifactId>
-			<version>2.2.5-b10</version>
+			<version>3.0.0</version>
+			<scope>runtime</scope>
 		</dependency>
 		<dependency>
 			<groupId>javax.servlet</groupId>
@@ -336,11 +349,11 @@
 			<artifactId>groovy</artifactId>
 			<version>3.0.8</version>
 		</dependency>
-		<dependency>
-			<groupId>javax.xml.bind</groupId>
-			<artifactId>jaxb-api</artifactId>
-			<version>2.3.1</version>
-		</dependency>
+<!--		<dependency>-->
+<!--			<groupId>javax.xml.bind</groupId>-->
+<!--			<artifactId>jaxb-api</artifactId>-->
+<!--			<version>2.3.1</version>-->
+<!--		</dependency>-->
 		<dependency>
 			<groupId>junit</groupId>
 			<artifactId>junit</artifactId>

diff --git a/pom.xml b/pom.xml
@@ -156,10 +156,15 @@
             <version>2.0.0</version>
       </dependency>
       <dependency>
-          <groupId>com.sun.xml.bind</groupId>
-          <artifactId>jaxb-impl</artifactId>
-          <version>2.2.5-b10</version>
-      </dependency>
+          <groupId>jakarta.xml.bind</groupId>
+          <artifactId>jakarta.xml.bind-api</artifactId>
+          <version>3.0.0</version>
+      </dependency>
+<!--      <dependency>-->
+<!--          <groupId>com.sun.xml.bind</groupId>-->
+<!--          <artifactId>jaxb-impl</artifactId>-->
+<!--          <version>2.2.5-b10</version>-->
+<!--      </dependency>-->
       <dependency>
           <groupId>org.codehaus.groovy</groupId>
           <artifactId>groovy</artifactId>

diff --git a/src/java/edu/stanford/epadd/Version.java b/src/java/edu/stanford/epadd/Version.java
@@ -1,5 +1,5 @@
 package edu.stanford.epadd;
-public class Version {  public static final String version = "Release 9.0";
+public class Version {  public static final String version = "Release 10-alpha";
 //public static final String buildInfo = "Built by tech at Jun 25, 2021 10:28 PM on Mac OS X 10.16 x86_64 ";
 public static final String buildInfo = "";
 

diff --git a/src/java/edu/stanford/epadd/util/EmailConvert.java b/src/java/edu/stanford/epadd/util/EmailConvert.java
@@ -95,7 +95,7 @@ public static String getLicenseStatus() {
 //
 //            return "License active";
 //        }
-
+//return "License active";
        if (licenseStatus.endsWith("."))
        {
            licenseStatus = licenseStatus.substring(0, licenseStatus.length() -1);
@@ -189,7 +189,9 @@ public void onCancel() {
 //                //operationinfo object
 //                Consumer<StatusProvider> setStatusProvider = statusProvider -> this.setStatusProvider(statusProvider);
 //                cancelSetOwnerAddress(setStatusProvider);
-                converter.interrupt();
+                if (converter != null) {
+                    converter.interrupt();
+                }
             }
         };
         JSPHelper.setOperationInfo(request.getSession(), opID, opinfo);

diff --git a/src/java/edu/stanford/muse/email/EmailFetcherThread.java b/src/java/edu/stanford/muse/email/EmailFetcherThread.java
@@ -1636,7 +1636,7 @@ public void run() {
                         fileName = nonMboxFileName;
                         pathOnDisk = emailStore.displayName;
                         if (new File(emailStore.displayName).isDirectory()) {
-                            pathOnDisk = pathOnDisk + fileName;
+                            pathOnDisk = pathOnDisk + File.separatorChar + fileName;
                         }
                     } else {
                         eventType = EpaddEvent.EventType.MBOX_INGEST;

diff --git a/src/java/edu/stanford/muse/email/FolderInfo.java b/src/java/edu/stanford/muse/email/FolderInfo.java
@@ -149,7 +149,11 @@ public static String removeTmpPartOfPath(String pathOfTmpMboxFile) {
 		return s;
 	}
 
-	public String toString()
+    public static boolean includesTmpPath(String string) {
+		return string.contains(EmailConvert.getTmpDir());
+    }
+
+    public String toString()
 	{
 		return accountKey + ":" + shortName + " messages:" + messageCount; // + " lastUID:" + lastSeenUID;
 	}

diff --git a/src/java/edu/stanford/muse/epaddpremis/Agent.java b/src/java/edu/stanford/muse/epaddpremis/Agent.java
@@ -1,6 +1,6 @@
 package edu.stanford.muse.epaddpremis;
 
-import javax.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlElement;
 import java.io.Serializable;
 
 public class Agent implements Serializable {

diff --git a/src/java/edu/stanford/muse/epaddpremis/EpaddEvent.java b/src/java/edu/stanford/muse/epaddpremis/EpaddEvent.java
@@ -8,9 +8,9 @@
 import edu.stanford.epadd.Version;
 import org.json.JSONObject;
 
-import javax.xml.bind.annotation.*;
-import javax.xml.bind.annotation.adapters.XmlAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import jakarta.xml.bind.annotation.*;
+import jakarta.xml.bind.annotation.adapters.XmlAdapter;
+import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 import java.io.Serializable;
 import java.time.ZonedDateTime;
 import java.time.format.DateTimeFormatter;

diff --git a/src/java/edu/stanford/muse/epaddpremis/EpaddPremis.java b/src/java/edu/stanford/muse/epaddpremis/EpaddPremis.java
@@ -23,32 +23,29 @@
 import edu.stanford.muse.util.Util;
 import edu.stanford.muse.webapp.ModeConfig;
 import gov.loc.repository.bagit.domain.Bag;
+import jakarta.xml.bind.JAXBContext;
+import jakarta.xml.bind.JAXBException;
+import jakarta.xml.bind.Marshaller;
+import jakarta.xml.bind.Unmarshaller;
+import jakarta.xml.bind.annotation.XmlAttribute;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlTransient;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import org.json.JSONObject;
-// 2022-10-19
 import org.json.JSONException;
+import org.json.JSONObject;
 import org.json.XML;
 
 import javax.xml.XMLConstants;
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.JAXBException;
-import javax.xml.bind.Marshaller;
-import javax.xml.bind.Unmarshaller;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlTransient;
 import javax.xml.validation.Schema;
 import javax.xml.validation.SchemaFactory;
 import java.io.*;
-
 import java.nio.file.Path;
 import java.nio.file.Paths;
+import java.time.ZonedDateTime;
 import java.util.ArrayList;
 import java.util.List;
-// 2022-11-03
-import java.time.ZonedDateTime;
 
 @XmlRootElement(name = "premis")
 public class EpaddPremis implements Serializable {

diff --git a/src/java/edu/stanford/muse/epaddpremis/IntellectualEntity.java b/src/java/edu/stanford/muse/epaddpremis/IntellectualEntity.java
@@ -3,8 +3,8 @@
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlTransient;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlTransient;
 import java.io.Serializable;
 import java.util.*;
 

diff --git a/src/java/edu/stanford/muse/epaddpremis/PremisRights.java b/src/java/edu/stanford/muse/epaddpremis/PremisRights.java
@@ -1,7 +1,7 @@
 package edu.stanford.muse.epaddpremis;
 
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlAttribute;
+import jakarta.xml.bind.annotation.XmlElement;
 import java.io.Serializable;
 
 public class PremisRights implements Serializable {

diff --git a/src/java/edu/stanford/muse/epaddpremis/PreservationLevel.java b/src/java/edu/stanford/muse/epaddpremis/PreservationLevel.java
@@ -3,12 +3,12 @@
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlTransient;
-import javax.xml.bind.annotation.XmlValue;
-import javax.xml.bind.annotation.adapters.XmlAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import jakarta.xml.bind.annotation.XmlAttribute;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlTransient;
+import jakarta.xml.bind.annotation.XmlValue;
+import jakarta.xml.bind.annotation.adapters.XmlAdapter;
+import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 import java.io.Serializable;
 import java.time.ZonedDateTime;
 import java.time.format.DateTimeFormatter;

diff --git a/src/java/edu/stanford/muse/epaddpremis/Relationship.java b/src/java/edu/stanford/muse/epaddpremis/Relationship.java
@@ -2,11 +2,11 @@
 
 import edu.stanford.muse.epaddpremis.premisfile.File;
 
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlValue;
-import javax.xml.bind.annotation.adapters.XmlAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import jakarta.xml.bind.annotation.XmlAttribute;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlValue;
+import jakarta.xml.bind.annotation.adapters.XmlAdapter;
+import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 import java.io.Serializable;
 
 public class Relationship implements Serializable {

diff --git a/src/java/edu/stanford/muse/epaddpremis/SignificantProperties.java b/src/java/edu/stanford/muse/epaddpremis/SignificantProperties.java
@@ -3,8 +3,8 @@
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlTransient;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlTransient;
 import java.io.Serializable;
 import java.util.HashSet;
 import java.util.Set;

diff --git a/src/java/edu/stanford/muse/epaddpremis/package-info.java b/src/java/edu/stanford/muse/epaddpremis/package-info.java
@@ -11,6 +11,6 @@
 
 package edu.stanford.muse.epaddpremis;
 
-import javax.xml.bind.annotation.XmlNs;
-import javax.xml.bind.annotation.XmlNsForm;
-import javax.xml.bind.annotation.XmlSchema;
+import jakarta.xml.bind.annotation.XmlNs;
+import jakarta.xml.bind.annotation.XmlNsForm;
+import jakarta.xml.bind.annotation.XmlSchema;
diff --git a/src/java/edu/stanford/muse/epaddpremis/premisfile/File.java b/src/java/edu/stanford/muse/epaddpremis/premisfile/File.java
@@ -7,10 +7,10 @@
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlTransient;
-import javax.xml.bind.annotation.XmlValue;
+import jakarta.xml.bind.annotation.XmlAttribute;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlTransient;
+import jakarta.xml.bind.annotation.XmlValue;
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.List;

diff --git a/src/java/edu/stanford/muse/epaddpremis/premisfile/Fixity.java b/src/java/edu/stanford/muse/epaddpremis/premisfile/Fixity.java
@@ -2,9 +2,9 @@
 
 import edu.stanford.epadd.Version;
 
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlValue;
+import jakarta.xml.bind.annotation.XmlAttribute;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlValue;
 import java.io.Serializable;
 
 public class Fixity  implements Serializable {

diff --git a/src/java/edu/stanford/muse/epaddpremis/premisfile/Format.java b/src/java/edu/stanford/muse/epaddpremis/premisfile/Format.java
@@ -1,6 +1,6 @@
 package edu.stanford.muse.epaddpremis.premisfile;
 
-import javax.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlElement;
 import java.io.Serializable;
 
 public class Format  implements Serializable {

diff --git a/src/java/edu/stanford/muse/epaddpremis/premisfile/ObjectCharacteristics.java b/src/java/edu/stanford/muse/epaddpremis/premisfile/ObjectCharacteristics.java
@@ -4,10 +4,10 @@
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlTransient;
-import javax.xml.bind.annotation.adapters.XmlAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlTransient;
+import jakarta.xml.bind.annotation.adapters.XmlAdapter;
+import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;

diff --git a/src/java/edu/stanford/muse/epaddpremis/premisfile/RelationshipFile.java b/src/java/edu/stanford/muse/epaddpremis/premisfile/RelationshipFile.java
@@ -1,10 +1,10 @@
 package edu.stanford.muse.epaddpremis.premisfile;
 
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlValue;
-import javax.xml.bind.annotation.adapters.XmlAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import jakarta.xml.bind.annotation.XmlAttribute;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlValue;
+import jakarta.xml.bind.annotation.adapters.XmlAdapter;
+import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 import java.io.Serializable;
 
 public class RelationshipFile implements Serializable {

diff --git a/src/java/edu/stanford/muse/epaddpremis/premisfile/SignificantPropertiesFile.java b/src/java/edu/stanford/muse/epaddpremis/premisfile/SignificantPropertiesFile.java
@@ -3,10 +3,10 @@
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlTransient;
-import javax.xml.bind.annotation.adapters.XmlAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlTransient;
+import jakarta.xml.bind.annotation.adapters.XmlAdapter;
+import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 import java.io.Serializable;
 import java.util.HashSet;
 import java.util.Set;

diff --git a/src/java/edu/stanford/muse/epaddpremis/premisfile/package-info.java b/src/java/edu/stanford/muse/epaddpremis/premisfile/package-info.java
@@ -9,6 +9,6 @@
 
 package edu.stanford.muse.epaddpremis.premisfile;
 
-import javax.xml.bind.annotation.XmlNs;
-import javax.xml.bind.annotation.XmlNsForm;
-import javax.xml.bind.annotation.XmlSchema;
+import jakarta.xml.bind.annotation.XmlNs;
+import jakarta.xml.bind.annotation.XmlNsForm;
+import jakarta.xml.bind.annotation.XmlSchema;