From 7fe4669f21501124eee4c9c5ee83c5117a416296 Mon Sep 17 00:00:00 2001
From: "Kevin S. Clarke" <ksclarke@ksclarke.io>
Date: Mon, 11 Nov 2024 23:57:14 -0500
Subject: [PATCH] Refactor packages

---
 pom.xml                                                |  8 +++-----
 src/main/docker/Dockerfile                             |  4 ++--
 .../freelibrary/{jsh4jvp3 => iiif/webrepl}/Config.java |  2 +-
 .../{jsh4jvp3 => iiif/webrepl}/DiagConsumer.java       |  2 +-
 .../freelibrary/{jsh4jvp3 => iiif/webrepl}/Server.java | 10 +++++-----
 .../freelibrary/{jsh4jvp3 => iiif/webrepl}/Status.java |  2 +-
 .../{jsh4jvp3 => iiif/webrepl}/WebResource.java        |  2 +-
 .../{jsh4jpv3 => iiif/webrepl}/ServerIT.java           |  4 +---
 8 files changed, 15 insertions(+), 19 deletions(-)
 rename src/main/java/info/freelibrary/{jsh4jvp3 => iiif/webrepl}/Config.java (94%)
 rename src/main/java/info/freelibrary/{jsh4jvp3 => iiif/webrepl}/DiagConsumer.java (98%)
 rename src/main/java/info/freelibrary/{jsh4jvp3 => iiif/webrepl}/Server.java (97%)
 rename src/main/java/info/freelibrary/{jsh4jvp3 => iiif/webrepl}/Status.java (96%)
 rename src/main/java/info/freelibrary/{jsh4jvp3 => iiif/webrepl}/WebResource.java (97%)
 rename src/test/java/info/freelibrary/{jsh4jpv3 => iiif/webrepl}/ServerIT.java (98%)

diff --git a/pom.xml b/pom.xml
index 827dd771..bb190a3a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,11 +6,11 @@
 
   <modelVersion>4.0.0</modelVersion>
 
-  <artifactId>jsh4jpv3</artifactId>
+  <artifactId>jpv3-webrepl</artifactId>
   <packaging>jar</packaging>
   <version>${revision}</version>
 
-  <name>jsh4jpv3</name>
+  <name>jpv3-webrepl</name>
   <description>A JShell service to evaluate JPv3 scripts</description>
   <url>http://projects.freelibrary.info/jiiify-presentation</url>
 
@@ -149,7 +149,7 @@
               </filters>
               <transformers>
                 <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
-                  <mainClass>info.freelibrary.jsh4jvp3.Server</mainClass>
+                  <mainClass>info.freelibrary.iiif.webrepl.Server</mainClass>
                 </transformer>
               </transformers>
             </configuration>
@@ -257,8 +257,6 @@
                     <platform>linux/amd64</platform>
                     <platform>linux/arm64/v8</platform>
                   </platforms>
-                  <!-- Multi-arch builds don't work on GA because containerd isn't supported (cf. reason number two on
-                  https://github.com/fabric8io/docker-maven-plugin/issues/1557#issuecomment-1325203489) -->
                   <attestations>
                     <sbom>${docker.sbom}</sbom>
                     <provenance>${docker.provenance}</provenance>
diff --git a/src/main/docker/Dockerfile b/src/main/docker/Dockerfile
index e502d8fa..bf60e099 100644
--- a/src/main/docker/Dockerfile
+++ b/src/main/docker/Dockerfile
@@ -8,11 +8,11 @@ RUN apk add --no-cache nano curl && \
   addgroup -S jpv3 && \
   adduser -S jpv3 -G jpv3 -s bash
 
-COPY --chown=jpv3:jpv3 --chmod=0400 "maven/jsh4jpv3-${project.version}-uber.jar" "/opt/jpv3.jar"
+COPY --chown=jpv3:jpv3 --chmod=0400 "maven/${project.name}-${project.version}-uber.jar" "/opt/${project.name}.jar"
 COPY --chown=jpv3:jpv3 --chmod=0400 "imports.jsh" "/etc/jshell/imports.jsh"
 
 EXPOSE 8888
 
 USER jpv3
 
-CMD ["sh", "-c", "exec java ${JAVA_OPTS} -jar /opt/jpv3.jar"]
+CMD ["sh", "-c", "exec java ${JAVA_OPTS} -jar /opt/${project.name}.jar"]
diff --git a/src/main/java/info/freelibrary/jsh4jvp3/Config.java b/src/main/java/info/freelibrary/iiif/webrepl/Config.java
similarity index 94%
rename from src/main/java/info/freelibrary/jsh4jvp3/Config.java
rename to src/main/java/info/freelibrary/iiif/webrepl/Config.java
index 99aa0576..9c5d8364 100644
--- a/src/main/java/info/freelibrary/jsh4jvp3/Config.java
+++ b/src/main/java/info/freelibrary/iiif/webrepl/Config.java
@@ -1,5 +1,5 @@
 
-package info.freelibrary.jsh4jvp3;
+package info.freelibrary.iiif.webrepl;
 
 /**
  * The application's configuration variables.
diff --git a/src/main/java/info/freelibrary/jsh4jvp3/DiagConsumer.java b/src/main/java/info/freelibrary/iiif/webrepl/DiagConsumer.java
similarity index 98%
rename from src/main/java/info/freelibrary/jsh4jvp3/DiagConsumer.java
rename to src/main/java/info/freelibrary/iiif/webrepl/DiagConsumer.java
index 285c7a3f..ac88cfe4 100644
--- a/src/main/java/info/freelibrary/jsh4jvp3/DiagConsumer.java
+++ b/src/main/java/info/freelibrary/iiif/webrepl/DiagConsumer.java
@@ -1,5 +1,5 @@
 
-package info.freelibrary.jsh4jvp3;
+package info.freelibrary.iiif.webrepl;
 
 import static info.freelibrary.util.Constants.EOL;
 
diff --git a/src/main/java/info/freelibrary/jsh4jvp3/Server.java b/src/main/java/info/freelibrary/iiif/webrepl/Server.java
similarity index 97%
rename from src/main/java/info/freelibrary/jsh4jvp3/Server.java
rename to src/main/java/info/freelibrary/iiif/webrepl/Server.java
index 6a04db24..308afd32 100644
--- a/src/main/java/info/freelibrary/jsh4jvp3/Server.java
+++ b/src/main/java/info/freelibrary/iiif/webrepl/Server.java
@@ -1,9 +1,9 @@
 
-package info.freelibrary.jsh4jvp3;
+package info.freelibrary.iiif.webrepl;
 
-import static info.freelibrary.jsh4jvp3.Status.METHOD_NOT_ALLOWED;
-import static info.freelibrary.jsh4jvp3.Status.NOT_FOUND;
-import static info.freelibrary.jsh4jvp3.Status.OK;
+import static info.freelibrary.iiif.webrepl.Status.METHOD_NOT_ALLOWED;
+import static info.freelibrary.iiif.webrepl.Status.NOT_FOUND;
+import static info.freelibrary.iiif.webrepl.Status.OK;
 import static info.freelibrary.util.Constants.EMPTY;
 import static info.freelibrary.util.Constants.EOL;
 import static info.freelibrary.util.Constants.INADDR_ANY;
@@ -338,7 +338,7 @@ private String getJarClasspath() throws ClassNotFoundException, URISyntaxExcepti
          * @param aBody A response body
          * @return The newly constructed response
          */
-        private Response getResponse(final info.freelibrary.jsh4jvp3.Status aEnum, final List<Header> aHeaderList,
+        private Response getResponse(final info.freelibrary.iiif.webrepl.Status aEnum, final List<Header> aHeaderList,
                 final byte[] aBody) {
             return new Response(aEnum.getCode(), aEnum.getMessage(), aHeaderList, aBody);
         }
diff --git a/src/main/java/info/freelibrary/jsh4jvp3/Status.java b/src/main/java/info/freelibrary/iiif/webrepl/Status.java
similarity index 96%
rename from src/main/java/info/freelibrary/jsh4jvp3/Status.java
rename to src/main/java/info/freelibrary/iiif/webrepl/Status.java
index 9f4c4c1e..635a8c54 100644
--- a/src/main/java/info/freelibrary/jsh4jvp3/Status.java
+++ b/src/main/java/info/freelibrary/iiif/webrepl/Status.java
@@ -1,5 +1,5 @@
 
-package info.freelibrary.jsh4jvp3;
+package info.freelibrary.iiif.webrepl;
 
 /**
  * An encapsulation of HTTP response information.
diff --git a/src/main/java/info/freelibrary/jsh4jvp3/WebResource.java b/src/main/java/info/freelibrary/iiif/webrepl/WebResource.java
similarity index 97%
rename from src/main/java/info/freelibrary/jsh4jvp3/WebResource.java
rename to src/main/java/info/freelibrary/iiif/webrepl/WebResource.java
index b477cd10..85cdc4e8 100644
--- a/src/main/java/info/freelibrary/jsh4jvp3/WebResource.java
+++ b/src/main/java/info/freelibrary/iiif/webrepl/WebResource.java
@@ -1,5 +1,5 @@
 
-package info.freelibrary.jsh4jvp3;
+package info.freelibrary.iiif.webrepl;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
diff --git a/src/test/java/info/freelibrary/jsh4jpv3/ServerIT.java b/src/test/java/info/freelibrary/iiif/webrepl/ServerIT.java
similarity index 98%
rename from src/test/java/info/freelibrary/jsh4jpv3/ServerIT.java
rename to src/test/java/info/freelibrary/iiif/webrepl/ServerIT.java
index 2e15bd6a..e659da05 100644
--- a/src/test/java/info/freelibrary/jsh4jpv3/ServerIT.java
+++ b/src/test/java/info/freelibrary/iiif/webrepl/ServerIT.java
@@ -1,5 +1,5 @@
 
-package info.freelibrary.jsh4jpv3;
+package info.freelibrary.iiif.webrepl;
 
 import static info.freelibrary.util.Constants.INADDR_ANY;
 import static java.nio.charset.StandardCharsets.UTF_8;
@@ -25,8 +25,6 @@
 import info.freelibrary.util.StringUtils;
 import info.freelibrary.util.ThrowingConsumer;
 
-import info.freelibrary.jsh4jvp3.Status;
-
 /**
  * A test of the server's endpoints.
  */