From 61c58d534188e822f23b9bc643b9424e8f4f4482 Mon Sep 17 00:00:00 2001
From: Thomas Walker Lynch <xtujpz@reasoningtechnology.com>
Date: Sun, 13 Oct 2024 05:18:13 +0000
Subject: [PATCH] refactoring class Graph, updating project structure

---
 .../{#Ariandne.groovy# => Ariandne2.groovy}   |   0
 developer/{javac => deprecated}/Graph.java    |   0
 developer/{javac => deprecated}/Label.java    |   0
 developer/{javac => deprecated}/Token.java    |   0
 developer/javac/File.java                     |  73 ++++++
 developer/javac/Graph.javax                   |  82 +++++++
 developer/shell/build                         |   3 -
 developer/tool/clean                          |  19 --
 developer/tool/clean_all                      |  23 --
 developer/tool/clean_javac                    |  19 ++
 developer/tool/clean_make                     |  27 +++
 developer/tool/{clean_dist => clean_release}  |  18 +-
 developer/tool/env                            |  45 ++--
 developer/tool/make                           |  19 +-
 developer/tool/release                        |  25 +-
 document/directory_naming.html                | 227 ++++++++++--------
 {release_candidate => release}/.githolder     |   0
 {release_candidate => release}/black          |   0
 {release_candidate => release}/blue           |   0
 {release_candidate => release}/green          |   0
 tester/javac/TestBench.java                   |  29 +++
 tester/tool/env                               |  32 +++
 tester/tool/env_tester                        |  12 -
 tester/tool/{make.sh => make}                 |   8 +-
 tool/{env_administrator => env}               |  10 +-
 tool/env_base                                 |  23 --
 tool/env_developer                            |  31 ---
 tool/env_tester                               |  26 --
 tool_shared/bespoke/deprecate                 |  20 ++
 tool_shared/bespoke/env                       |  46 ++++
 tool_shared/bespoke/temp                      |  24 ++
 tool_shared/bespoke/version                   |   6 +-
 tool_shared/bespoke/wipe_replease             |  17 ++
 33 files changed, 571 insertions(+), 293 deletions(-)
 rename developer/deprecated/{#Ariandne.groovy# => Ariandne2.groovy} (100%)
 rename developer/{javac => deprecated}/Graph.java (100%)
 rename developer/{javac => deprecated}/Label.java (100%)
 rename developer/{javac => deprecated}/Token.java (100%)
 create mode 100644 developer/javac/File.java
 create mode 100644 developer/javac/Graph.javax
 delete mode 100755 developer/shell/build
 delete mode 100755 developer/tool/clean
 delete mode 100755 developer/tool/clean_all
 create mode 100755 developer/tool/clean_javac
 create mode 100755 developer/tool/clean_make
 rename developer/tool/{clean_dist => clean_release} (50%)
 rename {release_candidate => release}/.githolder (100%)
 rename {release_candidate => release}/black (100%)
 rename {release_candidate => release}/blue (100%)
 rename {release_candidate => release}/green (100%)
 create mode 100644 tester/javac/TestBench.java
 create mode 100644 tester/tool/env
 delete mode 100644 tester/tool/env_tester
 rename tester/tool/{make.sh => make} (50%)
 rename tool/{env_administrator => env} (71%)
 delete mode 100644 tool/env_base
 delete mode 100644 tool/env_developer
 delete mode 100644 tool/env_tester
 create mode 100755 tool_shared/bespoke/deprecate
 create mode 100644 tool_shared/bespoke/env
 create mode 100644 tool_shared/bespoke/temp
 create mode 100755 tool_shared/bespoke/wipe_replease

diff --git a/developer/deprecated/#Ariandne.groovy# b/developer/deprecated/Ariandne2.groovy
similarity index 100%
rename from developer/deprecated/#Ariandne.groovy#
rename to developer/deprecated/Ariandne2.groovy
diff --git a/developer/javac/Graph.java b/developer/deprecated/Graph.java
similarity index 100%
rename from developer/javac/Graph.java
rename to developer/deprecated/Graph.java
diff --git a/developer/javac/Label.java b/developer/deprecated/Label.java
similarity index 100%
rename from developer/javac/Label.java
rename to developer/deprecated/Label.java
diff --git a/developer/javac/Token.java b/developer/deprecated/Token.java
similarity index 100%
rename from developer/javac/Token.java
rename to developer/deprecated/Token.java
diff --git a/developer/javac/File.java b/developer/javac/File.java
new file mode 100644
index 0000000..d3cd0b4
--- /dev/null
+++ b/developer/javac/File.java
@@ -0,0 +1,73 @@
+package Ariadne;
+
+import java.io.*;
+import java.nio.file.*;
+import java.util.*;
+
+public class File {
+  static boolean debug = false;
+
+  public static Map<String, String> unpack_file_path(String file_fp) {
+    if (debug) System.out.println("unpack_file_path::file_fp: " + file_fp);
+
+    // Use java.io.File explicitly to avoid conflict with the custom File class
+    java.io.File file = new java.io.File(file_fp);
+    String parent_dp = (file.getParent() != null) ? file.getParent() : "";
+
+    if (!parent_dp.isEmpty() && !parent_dp.endsWith(java.io.File.separator)) {
+      parent_dp += java.io.File.separator;
+    }
+
+    String file_fn = file.getName();
+    String file_fn_base = file_fn;
+    String file_fn_ext = "";
+
+    int last_index = file_fn.lastIndexOf('.');
+    if (last_index > 0) {
+      file_fn_base = file_fn.substring(0, last_index);
+      if (last_index + 1 < file_fn.length()) {
+        file_fn_ext = file_fn.substring(last_index + 1);
+      }
+    }
+
+    Map<String, String> ret_val = new HashMap<>();
+    ret_val.put("dp", parent_dp);
+    ret_val.put("fn", file_fn);
+    ret_val.put("fn_base", file_fn_base);
+    ret_val.put("fn_ext", file_fn_ext);
+
+    if (debug) System.out.println("unpack_file_path::ret_val: " + ret_val);
+
+    return ret_val;
+  }
+
+  public static boolean file_exists_q(String fp_string) {
+    Path fp_object = Paths.get(fp_string);
+    return Files.exists(fp_object);
+  }
+
+  /*
+    Given a target_fp and a list of list of dependency_fp.
+
+    Returns false if either the target is newer than all the dependencies, or one
+    of the specified files is missing. Otherwise returns true.
+  */
+  public static boolean newer_than_all(String target_fp_string, List<String> dependency_fp_list) throws IOException {
+    Path target_fp_object = Paths.get(target_fp_string);
+    if (!Files.exists(target_fp_object)) return false;
+
+    long target_last_modified_time = Files.getLastModifiedTime(target_fp_object).toMillis();
+
+    return dependency_fp_list.stream().allMatch(dependency_fp -> {
+      try {
+        Path dependency_fp_object = Paths.get(dependency_fp);
+        if (!Files.exists(dependency_fp_object)) return false;
+        long dependency_last_modified_time = Files.getLastModifiedTime(dependency_fp_object).toMillis();
+        return target_last_modified_time > dependency_last_modified_time;
+      } catch (IOException e) {
+        return false;
+      }
+    });
+  }
+
+}
diff --git a/developer/javac/Graph.javax b/developer/javac/Graph.javax
new file mode 100644
index 0000000..8da55d1
--- /dev/null
+++ b/developer/javac/Graph.javax
@@ -0,0 +1,82 @@
+package Ariadne;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class Graph {
+
+  /*--------------------------------------------------------------------------------
+   type aliases
+  */
+  public class TokenSet extends HashSet<Token>{}
+  public class LabelList extends ArrayList<Label> {}
+  public interface Node extends Map<Label ,Object>{}
+  public interface NodeList extends List<Node>{}
+  public interface RecognizerF extends Function<Label ,Node>{}
+  public class RecognizerFList extends ArrayList<RecognizerF> {}
+
+  /*--------------------------------------------------------------------------------
+    constructors
+  */
+  public AriadneGraph(Map<Label ,Node> node_map ,RecognizerFList recognizer_f_list){
+    if (node_map == null && recognizer_f_list == null) {
+      System.err.println("AriadneGraph: At least one of 'node_map' (Map) or 'recognizer_f_list' (List) must be provided.");
+      System.exit(1);
+    }
+
+    // Initialize each of node_map and recognizer_f_list to empty collections if null
+    this.node_map = (node_map != null) ? node_map : new HashMap<Label ,Node>();
+    this.recognizer_f_list = (recognizer_f_list != null) ? recognizer_f_list : new RecognizerFList();
+  }
+
+
+
+  /*--------------------------------------------------------------------------------
+   instance data 
+  */
+  private static boolean debug = true;
+  private Map<Label ,Node> node_map;
+  private RecognizerFList recognizer_f_list;
+
+
+    // Internal map to store nodes, with labels as keys
+    private Map<Label, Node> node_map;
+
+    // Constructor to initialize the node map
+    public Graph(Map<Label, Node> node_map) {
+        if (node_map == null) {
+            this.node_map = new HashMap<>();
+        } else {
+            this.node_map = node_map;
+        }
+    }
+
+    // Lookup method to find a node by its label
+    public Node lookup(Label node_label, boolean verbose) {
+        if (node_label == null || node_label.isEmpty()) {
+            if (verbose) {
+                System.out.println("lookup:: given node_label is null or empty.");
+            }
+            return null;
+        }
+
+        // Try to retrieve the node from the map
+        Node node = this.node_map.get(node_label);
+
+        if (verbose) {
+            if (node != null) {
+                System.out.println("lookup:: found node: " + node);
+            } else {
+                System.out.println("lookup:: node not found for label: " + node_label);
+            }
+        }
+
+        return node;
+    }
+
+    // Overloaded lookup method with default verbosity (true)
+    public Node lookup(Label node_label) {
+        return lookup(node_label, true);
+    }
+
+}
diff --git a/developer/shell/build b/developer/shell/build
deleted file mode 100755
index 7477f8e..0000000
--- a/developer/shell/build
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/env bash
-
-java BuildGraph "$@"
diff --git a/developer/tool/clean b/developer/tool/clean
deleted file mode 100755
index f061336..0000000
--- a/developer/tool/clean
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/bash
-
-# Ensure REPO_HOME and ENV_DEV_BUILD are set
-if [ -z "$REPO_HOME" ]; then
-  echo "release:: REPO_HOME is not set."
-  exit 1
-fi
-
-if [ -z "$ENV_DEV_BUILD" ]; then
-  echo "release:: ENV_DEV_BUILD is not set."
-  exit 1
-fi
-
-set -x
-cd "$REPO_HOME"/developer
-rm -rf scratch_pad/*
-set +x
-
-echo "clean complete."
diff --git a/developer/tool/clean_all b/developer/tool/clean_all
deleted file mode 100755
index 79fbc8f..0000000
--- a/developer/tool/clean_all
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/bash
-
-# Ensure REPO_HOME and ENV_DEV_BUILD are set
-if [ -z "$REPO_HOME" ]; then
-  echo "release:: REPO_HOME is not set."
-  exit 1
-fi
-
-if [ -z "$ENV_DEV_BUILD" ]; then
-  echo "release:: ENV_DEV_BUILD is not set."
-  exit 1
-fi
-
-wrapper=build
-
-set -x
-cd "$REPO_HOME"/developer
-rm -rf scratch_pad/*
-rm -f jvm/Ariadne.jar
-rm -f shell/{$wrapper}
-set +x
-
-echo "clean_all complete."
diff --git a/developer/tool/clean_javac b/developer/tool/clean_javac
new file mode 100755
index 0000000..58109d4
--- /dev/null
+++ b/developer/tool/clean_javac
@@ -0,0 +1,19 @@
+#!/bin/bash
+# remove  all files created by make's call to `javac`
+
+script_name=$(basename ${BASH_SOURCE[0]})
+if [ -z "$REPO_HOME" ]; then
+  echo "$script_name:: REPO_HOME is not set."
+  exit 1
+fi
+if [ -z "$ENV_DEVELOPER_LOCAL" ]; then
+  echo "release:: ENV_DEV_BUILD is not set."
+  exit 1
+fi
+
+set -x
+cd "$REPO_HOME"/developer
+rm -rf scratch_pad/*
+set +x
+
+echo "$script_name done."
diff --git a/developer/tool/clean_make b/developer/tool/clean_make
new file mode 100755
index 0000000..fbdec11
--- /dev/null
+++ b/developer/tool/clean_make
@@ -0,0 +1,27 @@
+#!/bin/bash
+# remove all files made by `make`
+
+script_name=$(basename ${BASH_SOURCE[0]})
+error=false
+if [ -z "$REPO_HOME" ]; then
+  echo "$script_name:: REPO_HOME is not set."
+  error=true
+fi
+if [ -z "$ENV_DEVELOPER_LOCAL" ]; then
+  echo "$script_name:: ENV_DEV_BUILD is not set."
+  error=true
+fi
+if [ error ]; then
+  exit 1
+fi
+
+wrapper=build
+
+set -x
+cd "$REPO_HOME"/developer
+rm -rf scratch_pad/*
+rm -f jvm/Ariadne.jar
+rm -f shell/{$wrapper}
+set +x
+
+echo "$script_name done."
diff --git a/developer/tool/clean_dist b/developer/tool/clean_release
similarity index 50%
rename from developer/tool/clean_dist
rename to developer/tool/clean_release
index 91c23c3..c358078 100755
--- a/developer/tool/clean_dist
+++ b/developer/tool/clean_release
@@ -1,13 +1,17 @@
 #!/bin/bash
+# remove file made by `make` and by `release`
 
-# Ensure REPO_HOME and ENV_DEV_BUILD are set
+script_name=$(basename ${BASH_SOURCE[0]})
+error=false
 if [ -z "$REPO_HOME" ]; then
-  echo "release:: REPO_HOME is not set."
-  exit 1
+  echo "$script_name:: REPO_HOME is not set."
+  error=true
 fi
-
-if [ -z "$ENV_DEV_BUILD" ]; then
-  echo "release:: ENV_DEV_BUILD is not set."
+if [ -z "$ENV_DEVELOPER_LOCAL" ]; then
+  echo "$script_name:: ENV_DEV_BUILD is not set."
+  error=true
+fi
+if [ error ]; then
   exit 1
 fi
 
@@ -24,4 +28,4 @@ rm -f "$release_dir"/Ariadne.jar
 rm -f "$release_dir"/{$wrapper}
 set +x
 
-echo "clean_dist complete."
+echo "$script_name done."
diff --git a/developer/tool/env b/developer/tool/env
index cf656f3..3b03a8f 100644
--- a/developer/tool/env
+++ b/developer/tool/env
@@ -1,46 +1,49 @@
 #!/usr/bin/env bash
 
-echo "REOP_HOME/developer/tool/env"
+## input guards
 
-# The build environment. 
-#
-env_error=false
-if [[ "${BASH_SOURCE[0]}" == "$0" ]]; then
-  echo "env_build:: This script must be sourced, not executed."
-  env_error=true
-fi
-if [ -z "$ENV_DEVELOPER" ]; then
-  echo "env_build:: script can only be run from the developer environment"
-  env_error=true
+# instead of bailing, we will go fetch what we need
+env_should_be="tool_shared/bespoke/env"
+if [ "$ENV" != "$env_should_be" ]; then
+  source "$REPO_HOME"/"$env_should_be"
 fi
-if [ "$env_error" = true ]; then
+
+if [[ "${BASH_SOURCE[0]}" == "$0" ]]; then
+  echo "$script_name:: This script must be sourced, not executed."
   exit 1
 fi
 
-# goovy use has been deprecated
-# export GROOVY_HOME="$REPO_HOME/tool_shared/third_party/groovy-4.0.9"
+## so we can do the build
+
+cd "$REPO_HOME"/developer/
+
+export ENV=$(script_fp)
+export PROJECT="$PROJECT"_developer
 
-# third party tools we will use
-export JAVA_HOME="$REPO_HOME/tool_shared/third_party/jdk-11"
 export PATH=\
+"$REPO_HOME"/developer/tool/\
+:"$REPO_HOME"/tool_shared/bespoke/\
 "$JAVA_HOME"/bin\
 :"$PATH"
 
-# where the tool build finds its class files:
+## so we can run locally the stuff we built,
+
 export CLASSPATH=\
 "$REPO_HOME"/developer/jvm\
 :"$REPO_HOME"/developer/jvm/Ariadne.jar\
 :"$JAVA_HOME"/lib\
 :"$CLASSPATH"
 
-# after we building the tool we might want to run it
-# the shell directory holds the bash UI wrappers
 export PATH=\
 "$REPO_HOME"/developer/shell\
 :"$PATH"
 
-export ENV_DEV_BUILD=true
-echo "${BASH_SOURCE[0]}" "complete"
+## misc
+
+# make .githolder and .gitignore visible
+alias ls="ls -a"
+
+echo "$ENV complete."
 
 
 
diff --git a/developer/tool/make b/developer/tool/make
index 4040acb..a345dd9 100755
--- a/developer/tool/make
+++ b/developer/tool/make
@@ -1,7 +1,8 @@
 #!/bin/env bash
 
-if [ -z "$ENV_DEVELOPER" ]; then
-  echo "make_PaintIt:: script can only be run from the developer environment"
+script_name=$(basename ${BASH_SOURCE[0]})
+if [ -z "$ENV_DEVELOPER_LOCAL" ]; then
+  echo "$script_name:: script can only be run from the developer environment"
   return 1
 fi
 
@@ -34,12 +35,14 @@ mkdir -p shell
 
 wrapper=build
 for file in $wrapper;do
-  cat > shell/$file << EOL
-  #!/bin/bash
-  java com/ReasoningTechnology/Ariadne/$file
-  EOL
-  chmod +x shell/$file
+
+cat > shell/$file << EOL
+#!/bin/bash
+java com/ReasoningTechnology/Ariadne/$file
+EOL
+chmod +x shell/$file
+
 done
 
-echo "make done"
+echo "$script_name done."
 
diff --git a/developer/tool/release b/developer/tool/release
index 1edfafd..2675ba9 100755
--- a/developer/tool/release
+++ b/developer/tool/release
@@ -1,20 +1,23 @@
 #!/bin/bash
 
-# Ensure REPO_HOME and ENV_DEV_BUILD are set
+script_name=$(basename ${BASH_SOURCE[0]})
 if [ -z "$REPO_HOME" ]; then
-  echo "release:: REPO_HOME is not set."
+  echo "$script_name:: REPO_HOME is not set."
   exit 1
 fi
 
-if [ -z "$ENV_DEV_BUILD" ]; then
-  echo "release:: ENV_DEV_BUILD is not set."
+if [ -z "$ENV_LOCAL_DEVELOPER" ]; then
+  echo "$script_name:: ENV_DEV_BUILD is not set."
   exit 1
 fi
 
-# Define release directory
-release_dir="$REPO_HOME/release_candidate"
+release_dir="$REPO_HOME/release"
+shell_dir="$REPO_HOME/developer/shell"
+Ariadne_jar_fp="$REPO_HOME/developer/jvm/Ariadne.jar"
+wrapper=build
+
+
 
-# Create release directory if it doesn't exist
 if [ ! -d "$release_dir" ]; then
   mkdir -p "$release_dir"
 fi
@@ -42,16 +45,12 @@ install_file() {
  
 echo "Starting release process..."
 
-# Paths to shell wrappers and JAR file
-shell_dir="$REPO_HOME/developer/shell"
-Ariadne_jar_fp="$REPO_HOME/developer/jvm/Ariadne.jar"
-
 # Install the JAR file
 install_file "$Ariadne_jar_fp" "$release_dir" "ug+r"
 
 # Install shell wrappers
-for wrapper in black blue green; do
+for wrapper in $wrapper; do
   install_file "$shell_dir/$wrapper" "$release_dir" "ug+r+x"
 done
 
-echo "Release process completed successfully."
+echo "$script_name done."
diff --git a/document/directory_naming.html b/document/directory_naming.html
index 105bbc3..92e1703 100644
--- a/document/directory_naming.html
+++ b/document/directory_naming.html
@@ -3,52 +3,78 @@
 <head>
   <meta charset="UTF-8">
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
+  <link href="https://fonts.googleapis.com/css2?family=Noto+Sans+JP&display=swap" rel="stylesheet">
+
   <title>Directory Structure Description</title>
-  <style>
-    body {
-      background-color: hsl(0, 0%, 0%);
-      color: hsl(42, 100%, 80%);
-      font-family: monospace;
-      padding: 20px;
-      margin: 0;
-    }
-    .page {
-      padding: 20px;
-      margin: 20px auto;
-      max-width: 800px;
-      background-color: hsl(0, 0%, 10%);
-      box-shadow: 0 0 10px hsl(42, 100%, 50%);
-    }
-    ul, li {
-      list-style-type: none;
-    }
-    li::before {
-      content: "📁 ";
-      margin-right: 5px;
-    }
-    li {
-      margin-bottom: 5px;
-    }
-    .description {
-      margin-left: 10px;
-      color: hsl(42, 100%, 60%);
-    }
-    h1 {
-      text-align: center;
-      color: hsl(42, 100%, 80%);
-      text-transform: uppercase;
-      margin-bottom: 20px;
-    }
-    h2 {
-      color: hsl(42, 100%, 80%);
-      text-transform: uppercase;
-      margin-top: 40px;
-    }
-    p {
-      color: hsl(42, 100%, 70%);
-      margin-bottom: 20px;
-    }
-  </style>
+<style>
+  html {
+    font-size: 16px; /* This will be the base for rem units */
+  }
+
+  body {
+    font-family: 'Noto Sans JP', Arial, sans-serif;
+    background-color: hsl(0, 0%, 10%);
+    color: hsl(42, 100%, 80%);
+    padding: 2rem;
+    margin: 0;
+  }
+
+  .page {
+    padding: 1.25rem; /* 20px */
+    margin: 1.25rem auto; /* 20px */
+    max-width: 46.875rem; /* 750px */
+    background-color: hsl(0, 0%, 0%);
+    box-shadow: 0 0 0.625rem hsl(42, 100%, 50%); /* 10px */
+  }
+
+  ul, li {
+    font-size: 1rem; /* Keeping default font size */
+    list-style-type: none;
+  }
+
+  li::before {
+    content: "📁 ";
+    margin-right: 0.3125rem; /* 5px */
+  }
+
+  li {
+    margin-bottom: 0.3125rem; /* 5px */
+  }
+
+  .description {
+    margin-left: 0.625rem; /* 10px */
+    color: hsl(42, 100%, 75%);
+  }
+
+  code {
+    font-family: 'Courier New', Courier, monospace;
+    background-color: hsl(0, 0%, 25%);
+    color: hsl(42, 100%, 90%);
+    padding: 0.125rem 0.25rem; /* 2px 4px */
+    border-radius: 0.1875rem; /* 3px */
+    font-size: 90%;
+  }
+
+  h1 {
+    text-align: center;
+    color: hsl(42, 100%, 84%);
+    text-transform: uppercase;
+    margin-bottom: 1.25rem; /* 20px */
+  }
+
+  h2 {
+    color: hsl(42, 100%, 84%);
+    text-transform: uppercase;
+    margin-top: 2.5rem; /* 40px */
+  }
+
+  p {
+    color: hsl(42, 100%, 90%);
+    margin-bottom: 1.25rem; /* 20px */
+    text-align: justify;
+  }
+</style>
+
 </head>
 <body>
 
@@ -58,58 +84,57 @@
     <h2>Reference</h2>
 
     <ul>
-      <li>/var/user_data/Thomas-developer/Ariadne</li>
+      <li>Ariadne/<span class="description">aka REPO_HOME, top level owned by the project administrator.</span></li>
       <ul>
-        <li>developer/ <span class="description">The workspace for developers to organize source code, build scripts, and development-specific tools.</span></li>
+        <li>developer/ <span class="description">Workspace for the developer. Has the source code, build scripts, and development-specific tools.</span></li>
         <ul>
-          <li>deprecated/ <span class="description">Archived files and older versions no longer in active use.</span></li>
-          <li>document/ <span class="description">Developer-level documentation for building and understanding the project.</span></li>
-          <li>javac/ <span class="description">Java source files prepared for compilation.</span></li>
-          <li>jvm/ <span class="description">Compiled Java bytecode files for the project.</span></li>
-          <li>scratch_pad/ <span class="description">Temporary storage for intermediate files during development.</span></li>
-          <li>shell/ <span class="description">Shell scripts intended to be part of the project release or build automation.</span></li>
-          <li>tool/ <span class="description">Developer-specific tools used for building or managing development tasks.</span></li>
+          <li>deprecated/ <span class="description">Files and older versions being viewed, perhaps part of a refactoring effort.</span></li>
+          <li>document/ <span class="description">Documentation on developing and building the project.</span></li>
+          <li>javac/ <span class="description">Java source files for compilation.</span></li>
+          <li>jvm/ <span class="description">Compiled Java bytecode files for the project, typically a jar for a Java project.</span></li>
+          <li>scratch_pad/ <span class="description">Temporary storage typically for intermediate files created during build.</span></li>
+          <li>shell/ <span class="description">Shell scripts intended to be part of the project release. (These are not tools.)</span></li>
+          <li>tool/ <span class="description">Tools created by the developer, used for development tasks.</span></li>
         </ul>
-        <li>document/ <span class="description">Top-level project documentation for project managers or contributors.</span></li>
-        <li>release_candidate/ <span class="description">Builds and packages ready for testing and release preparation.</span></li>
-        <li>scratch_pad/ <span class="description">Temporary storage for project management tasks.</span></li>
-        <li>tester/ <span class="description">Files and tools for managing and running test environments.</span></li>
+        <li>document/ <span class="description">General documentation about the project.</span></li>
+        <li>release/ <span class="description">Release candidate for testing. Becomes the release on the release branch.</span></li>
+        <li>scratch_pad/ <span class="description">Temporary storage for project administration tasks.</span></li>
+        <li>tester/ <span class="description">Workspace for the tester. Has the test bench, tests, and test scripts.</span></li>
         <ul>
-          <li>document/ <span class="description">Test-specific documentation for procedures and setups.</span></li>
+          <li>document/ <span class="description">Test-specific documentation.</span></li>
           <li>test0/ <span class="description">Test case 0 environment and associated scripts.</span></li>
           <li>test1/ <span class="description">Test case 1 environment and associated scripts.</span></li>
           <li>test2/ <span class="description">Test case 2 environment and associated scripts.</span></li>
           <li>tool/ <span class="description">Tools needed for testing and managing the test environment.</span></li>
         </ul>
-        <li>tool/ <span class="description">Project management/administration specific tools.</span></li>
+        <li>tool/ <span class="description">Project administration specific tools.</span></li>
         <li>tool_shared/ <span class="description">Tools shared across project roles.</span></li>
         <ul>
-          <li>bespoke/ <span class="description">Tools developed specifically for this project.</span></li>
+          <li>bespoke/ <span class="description">Shared tools developed within this project.</span></li>
           <li>customized/ <span class="description">Modified versions of third-party tools adapted for the project.</span></li>
           <li>document/ <span class="description">Documentation related to shared tools and setup.</span></li>
-          <li>third_party/ <span class="description">Tools sourced from third-party vendors or open-source projects.</span></li>
+          <li>third_party/ <span class="description">Shared tools sourced from third-party vendors or open-source projects. These have their own independent licenses,</span></li>
         </ul>
         <li>LICENSE.txt <span class="description">The project license detailing usage and distribution terms.</span></li>
         <li>README.md <span class="description">A general overview and introduction to the project.</span></li>
       </ul>
     </ul>
 
-
     <h2>Name origin and rationale</h2>
 
-    <p>Typically, developers and project administrators do not employ a semantic
-      system for naming directories, but more commonly use conventional
-      placeholder names. The intended purpose of files in a directory with a
-      placeholder name then must be inferred from experience or inspection of
-      the files, or learned from other people or from documents.</p>
+    <p>Developers and project administrators typically do not employ a semantic system for
+      naming directories, but more commonly use conventional placeholder
+      names. The intended purpose of files in a directory with a placeholder
+      name then must be inferred from experience or inspection of the files, or
+      learned from documents or other people.</p>
 
-    <p>For example, a directory named 'exe/' probably derives its name from the
+    <p>For example, a directory named <code>exe/</code> probably derives its name from the
       fact that the contained files have their executable permission bit set;
       however, such a directory will not contain all such files.  There might
-      even be some files in an `exe/` directory that do not have their
-      executable permission bit set. The two concepts being an `exe/` file
-      (i.e. being a file in an `exe/` directory) and being an executable file
-      are not identical. The actual intended meaning of being an `exe/` file
+      even be some files in an <code>exe/</code> directory that do not have their
+      executable permission bit set. The two concepts being an <code>exe/</code> file
+      (i.e. being a file in an <code>exe/</code> directory) and being an executable file
+      are not identical. The actual intended meaning of being an <code>exe/</code> file
       will sometimes be that the contained files are applications available to a
       user, or that they are tools available for use in a project.
     </p>
@@ -118,39 +143,45 @@
       property-based file system. In such a system a number of files and
       agents are defined. Then we can ask questions about their relationships.
       Files with a relationship to the developer are collected, and this
-      becomes the `developer/` directory. In a similar manner we get the
-      directories, `tester/', and `javac/`.  In this latter case the
+      becomes the <code>developer/</code> directory. In a similar manner we get the
+      directories, <code>tester/</code>, and <code>javac/</code>.  In this latter case the
       agent is a compiler rather than a role.
       </p>
       
-    <p>However, when attempting applying this method in practice it became
-      apparent that the recognition of relationships was insufficient.  Consider
-      the directories `deprecated` and `scratch_pad`. There is no
-      'Mr. Deprecated' or 'Mr. Scratch_Pad' who the contained files are
-      for. (And this conclusion is not for the lack of trying. Even mythological
-      beings did not suffice as agents.) Rather than saying a file has a
-      relationship with an agent, these properties (directory names) are states
-      imposed by decree by an agent on a file.  Perhaps the developer, has
+    <p>When attempting to apply the <code>is-for</code> property in practice it
+      became apparent that using this sole property was insufficient.  Consider
+      the directories <code>deprecated/</code> and <code>scratch_pad/</code>. There is no
+      <em>Mr. Deprecated</em> or <em>Mr. Scratch_Pad</em> who the contained
+      files are for. (And this conclusion is not for the lack of trying. Even
+      mythological beings did not suffice as agents.) Rather than being for an
+      agent, the files collected in such a directory have in common a state of
+      being that was imposed upon them by decree.  Perhaps the developer, has
       decreed that a file is now deprecated, or a build script has decreed that
       it is a scratch_pad file. Such decrees are typically more dynamic than the
       relationship properties. Also, these properties are disconnected from the
-      contents of the file.  When, for example, we say a file is for the java
-      compiler we can surmise something about its contents. However when we say
-      a file is `deprecated` we can surmise nothing about its contents.
+      contents of the file.  When, for example, a file has the property of being
+      for the java compiler, we gain some information about its contents. In the
+      universe of possible messages sent through a file, such a file will
+      contain text that is proposed to be java syntax conforming. In contrast,
+      when we learn that a file is <code>deprecated/</code> we gain no
+      information about the contents of the file, because any file can
+      be <code>deprecated</code>, independent of its contents.
       </p>
 
     <p>To understand a directory name within this system, one can imagine
       reading said name as part of a sentence that integrates the
-      property. Consider two property names: 'is-a' and 'is-for'. For example,
-      "Each file in the <code>document/</code> directory is a document," or
-      "Each file in the <code>developer/</code> directory is for the developer."
-      Although the property name is not carried over to the conventional file
-      system, we can typically infer what it must be. It is beyond the scope of
-      discussion here, but in actuality, our collections are defined by
-      predicates that are given a file's properties and relationships as
-      arguments, where the predicate resolves to true if and only if the file
-      belongs to the collection. Now wouldn't that be interesting if we
-      instead derived a probability?
+      property. Consider two property names: <code>is-a</code>
+      and <code>is-for</code>. For example, "Each file in
+      the <code>document/</code> directory <code>is-a</code> document," or "Each
+      file in the <code>developer/</code> directory <code>is-for</code> the
+      developer."  Although the property name is not carried over from the
+      property based file system to the conventional file system, we can
+      typically infer what it must have been. (It is beyond the scope of
+      discussion here, but in actuality, property based file system collections
+      are defined by predicates. Each predicate is given a file's properties and
+      relationships as arguments, then resolves to true if and only if the file
+      belongs to the collection. Now wouldn't that be interesting if we instead
+      derived a probability?)
     </p>
 
     <p>It is uncommon for a property value to be plural. While it is not
@@ -159,8 +190,8 @@
       property. Hence when we make a file collection based on a shared property,
       then carry that over as a directory name in a conventional file system,
       the resulting directory name will often be singular.  This pattern can be
-      observed in the case of the `document/` directory, as shown in the prior
-      paragraph.
+      observed in the case of the <code>document/</code> directory, as shown in
+      the prior paragraph.
     </p>
 
   </div>
diff --git a/release_candidate/.githolder b/release/.githolder
similarity index 100%
rename from release_candidate/.githolder
rename to release/.githolder
diff --git a/release_candidate/black b/release/black
similarity index 100%
rename from release_candidate/black
rename to release/black
diff --git a/release_candidate/blue b/release/blue
similarity index 100%
rename from release_candidate/blue
rename to release/blue
diff --git a/release_candidate/green b/release/green
similarity index 100%
rename from release_candidate/green
rename to release/green
diff --git a/tester/javac/TestBench.java b/tester/javac/TestBench.java
new file mode 100644
index 0000000..0a9de3d
--- /dev/null
+++ b/tester/javac/TestBench.java
@@ -0,0 +1,29 @@
+import java.util.Map;
+
+public class TestBench {
+
+  public static void runTest_Map(Map<String, Boolean> test_map){
+    int totalTest_Map = test_map.size();
+    int passedTest_Map = 0;
+    int failedTest_Map = 0;
+
+    for( Map.Entry<String, Boolean> test : test_map.entrySet() ){
+      try{
+        if( test.getValue() ){
+          passedTest_Map++;
+        } else{
+          System.out.println( "failed: " + test.getKey() );
+          failedTest_Map++;
+        }
+      } catch(Exception e){
+        System.out.println( "failed: " + test.getKey() );
+        failedTest_Map++;
+      }
+    }
+
+    System.out.println("Total test_map run: " + totalTest_Map);
+    System.out.println("Total test_map passed: " + passedTest_Map);
+    System.out.println("Total test_map failed: " + failedTest_Map);
+  }
+
+}
diff --git a/tester/tool/env b/tester/tool/env
new file mode 100644
index 0000000..a630a47
--- /dev/null
+++ b/tester/tool/env
@@ -0,0 +1,32 @@
+#!/usr/bin/env bash
+
+## input guards
+
+# instead of bailing, we will go fetch what we need
+env_should_be="tool_shared/bespoke/env"
+if [ "$ENV" != "$env_should_be" ]; then
+  source "$REPO_HOME"/"$env_should_be"
+fi
+
+if [[ "${BASH_SOURCE[0]}" == "$0" ]]; then
+  echo "$script_name:: This script must be sourced, not executed."
+  exit 1
+fi
+
+cd "$REPO_HOME"/tester/
+
+export ENV=$(script_fp)
+export PROJECT="$PROJECT"_tester
+
+export PATH=\
+"$REPO_HOME"/tester/tool/\
+:"$REPO_HOME"/tool_shared/bespoke/\
+"$JAVA_HOME"/bin\
+:"$PATH"
+
+export CLASSPATH=\
+:"$REPO_HOME"/developer/release/Ariadne.jar\
+:"$JAVA_HOME"/lib\
+:"$CLASSPATH"
+
+echo "$ENV complete."
diff --git a/tester/tool/env_tester b/tester/tool/env_tester
deleted file mode 100644
index eb6b6c7..0000000
--- a/tester/tool/env_tester
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/usr/bin/env bash
-# environment common to all tests
-# each test directory also has an environment
-
-export JAVA_HOME="$REPO_HOME/tool/jdk-11"
-export GROOVY_HOME="$REPO_HOME/tool/groovy-4.0.9"
-
-export PATH=\
-"$REPO_HOME"/release_candidate\
-:"$JAVA_HOME"/bin\
-:"$GROOVY_HOME"/bin\
-:"$PATH"
diff --git a/tester/tool/make.sh b/tester/tool/make
similarity index 50%
rename from tester/tool/make.sh
rename to tester/tool/make
index 4ecb729..c9aca35 100755
--- a/tester/tool/make.sh
+++ b/tester/tool/make
@@ -1,10 +1,12 @@
 #!/bin/env bash
 
-if [ -z "$ENV_TESTER" ]; then
+script_name=$(basename ${BASH_SOURCE[0]})
+if [ -z "$ENV_TESTER_LOCAL" ]; then
   echo "make.sh:: script can only be run in the tester  environment"
   env_error=true
 fi
 
-set -x
 
-groovyc TestGraph.groovy
+
+
+echo "$script_name done."
diff --git a/tool/env_administrator b/tool/env
similarity index 71%
rename from tool/env_administrator
rename to tool/env
index b85bd37..830913d 100644
--- a/tool/env_administrator
+++ b/tool/env
@@ -1,9 +1,9 @@
 #!/usr/bin/env bash
 
-# Ensure the script is sourced
+script_name=$(basename ${BASH_SOURCE[0]})
 if [[ "${BASH_SOURCE[0]}" == "$0" ]]; then
-  echo "This script must be sourced, not executed. Exiting."
-  return 1
+  echo "$script_name must be sourced, not executed. Exiting."
+  exit 1
 fi
 
 if [ -z "$ENV_BASE" ]; then
@@ -22,6 +22,6 @@ export PATH=\
 # no sneaky hidden files
 alias ls="ls -a"
 
-
 export ENV_PM=true
-echo "${BASH_SOURCE[0]}" "complete"
+echo "$script_name done."
+
diff --git a/tool/env_base b/tool/env_base
deleted file mode 100644
index ff49183..0000000
--- a/tool/env_base
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/usr/bin/env bash
-
-# Ensure the script is sourced
-if [[ "${BASH_SOURCE[0]}" == "$0" ]]; then
-  echo "This script must be sourced, not executed. Exiting."
-  return 1
-fi
-
-# These are things set by the `repo` command found in the `resource` project,
-# but if you don't have that, then source this into the environment.
-
-script_path="$(dirname "$(realpath "${BASH_SOURCE[0]}")")"
-export REPO_HOME="${script_path%/*}/"
-export PROJECT=$(basename "$REPO_HOME")
-
-PPS1="\n[$PROJECT]\n\u@\h§$(pwd)§\n> "
-PPS2=">> "
-
-echo REPO_HOME "$REPO_HOME"
-echo PROJECT "$PROJECT"
-echo "${BASH_SOURCE[0]}" "complete"
-
-export ENV_BASE=true
diff --git a/tool/env_developer b/tool/env_developer
deleted file mode 100644
index b1c5ffa..0000000
--- a/tool/env_developer
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/usr/bin/env bash
-
-# Ensure the script is sourced
-if [[ "${BASH_SOURCE[0]}" == "$0" ]]; then
-  echo "This script must be sourced, not executed. Exiting."
-  return 1
-fi
-
-if [ -z "$ENV_BASE" ]; then
-  script_path="$(dirname "$(realpath "${BASH_SOURCE[0]}")")"
-  source "${script_path}/env_base"
-fi
-
-PROJECT="$PROJECT"_developer
-
-export PATH=\
-"$REPO_HOME"/developer/tool/\
-:"$REPO_HOME"/tool_shared/bespoke/\
-:"$PATH"
-
-# so the .gitignore files can be seen:
-alias ls="ls -a"
-
-cd "$REPO_HOME"/developer/
-export ENV_DEVELOPER=true
-source tool/env
-
-echo "${BASH_SOURCE[0]}" "complete"
-
-
-
diff --git a/tool/env_tester b/tool/env_tester
deleted file mode 100644
index 7a52fe9..0000000
--- a/tool/env_tester
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/usr/bin/env bash
-
-# Ensure the script is sourced
-if [[ "${BASH_SOURCE[0]}" == "$0" ]]; then
-  echo "This script must be sourced, not executed. Exiting."
-  return 1
-fi
-
-# Check if REPO_HOME is set, if not source env_base
-if [ -z "$ENV_BASE" ]; then
-  script_path="$(dirname "$(realpath "${BASH_SOURCE[0]}")")"
-  source "${script_path}/env_base"
-fi
-
-PROJECT="$PROJECT"_TESTER
-
-export PATH=\
-"$REPO_HOME"/tester/executor/\
-:"$REPO_HOME"/tool_shared/bespoke/\
-:"$PATH"
-
-cd "$REPO_HOME"/tester/
-export ENV_TESTER=true
-source tool/env
-
-echo "${BASH_SOURCE[0]}" "complete"
diff --git a/tool_shared/bespoke/deprecate b/tool_shared/bespoke/deprecate
new file mode 100755
index 0000000..821e7ab
--- /dev/null
+++ b/tool_shared/bespoke/deprecate
@@ -0,0 +1,20 @@
+#!/bin/bash
+
+# cp subtree at <source> under file path <destination>, and make all the copied
+# files read-only. The intended use case is for moving files to a `deprecated`
+# directory. This helps prevent subsequent accidental editing.
+
+SCRIPT_NAME=$(basename "$0")
+if [ "$#" -lt 2 ]; then
+  echo "Usage: $SCRIPT_NAME <source> <destination>"
+  exit 1
+fi
+SRC="$1"
+DEST="$2"
+
+mkdir -p "$DEST"
+mv "$SRC" "$DEST"
+
+# make stuff readonly
+cd "$DEST" || exit
+chmod -R u-w,go-rwx "$DEST"
diff --git a/tool_shared/bespoke/env b/tool_shared/bespoke/env
new file mode 100644
index 0000000..1939b29
--- /dev/null
+++ b/tool_shared/bespoke/env
@@ -0,0 +1,46 @@
+#!/usr/bin/env bash
+# environment shared by entire project
+
+# Path to this script
+script_path="$(dirname "$(realpath "${BASH_SOURCE[0]}")")"
+
+
+
+# Path to the repo is two directories up
+export REPO_HOME="${script_path%/*/*}/"
+
+# script name and path relative to the top of the project
+script_fn(){
+  echo "$(basename ${BASH_SOURCE[0]})"
+}
+script_fp(){
+  echo "$(realpath --relative-to="$REPO_HOME" "$script_path")/$(script_fn)"
+}
+export -f script_fn script_fp
+
+# REPO_HOME relative file path to this script
+# Calling the function correctly without braces
+export ENV=$(script_fp)
+
+# this script must be sourced, sort of like Python activate
+if [[ "${BASH_SOURCE[0]}" == "$0" ]]; then
+  echo "$ENV must be sourced, not executed. Exiting."
+  exit 1
+fi
+
+export PROJECT=$(basename "$REPO_HOME")
+
+# Third party tool(s) that the project admin kindly installed.
+# The developer and tester should use these links to find them.
+export JAVA_HOME="$REPO_HOME/tool_shared/third_party/jdk-11"
+
+# set the shell prompt to show the project
+PPS1="\n[$PROJECT]\n\u@\h§$(pwd)§\n> "
+PPS2=">> "
+
+echo ENV "$ENV"
+echo REPO_HOME "$REPO_HOME"
+echo PROJECT "$PROJECT"
+echo "$ENV completed."
+
+
diff --git a/tool_shared/bespoke/temp b/tool_shared/bespoke/temp
new file mode 100644
index 0000000..0a80f78
--- /dev/null
+++ b/tool_shared/bespoke/temp
@@ -0,0 +1,24 @@
+#!/usr/bin/env bash
+
+# Path to this script
+script_path="$(dirname "$(realpath "${BASH_SOURCE[0]}")")"
+
+# Path to the repo is two directories up
+export REPO_HOME="${script_path%/*/*}/"
+
+# script name and path relative to the top of the project
+script_fn(){
+  echo "$(basename ${BASH_SOURCE[0]})"
+}
+script_fp(){
+  echo "$(realpath --relative-to="$REPO_HOME" "$script_path")/$(script_fn)"
+}
+
+# REPO_HOME relative file path to this script
+# Calling the function correctly without braces
+export ENV=$(script_fp)
+
+# Output the values
+echo "Script path: $script_path"
+echo "Repo home: $REPO_HOME"
+echo "ENV: $ENV"
diff --git a/tool_shared/bespoke/version b/tool_shared/bespoke/version
index 6e696ef..a2fede5 100755
--- a/tool_shared/bespoke/version
+++ b/tool_shared/bespoke/version
@@ -1,4 +1,8 @@
 #!/bin/env bash
 
-echo 0.1
+# 0.1 pulled groovy files from GQL_to_Cypher build.gradle
+# 0.2 conversion to Java
+# 0.3 refactored, split into smaller pieces, made into package
+
+echo 0.3
 
diff --git a/tool_shared/bespoke/wipe_replease b/tool_shared/bespoke/wipe_replease
new file mode 100755
index 0000000..4b92b4b
--- /dev/null
+++ b/tool_shared/bespoke/wipe_replease
@@ -0,0 +1,17 @@
+#!/bin/bash
+# remove all files in the release directory
+set -e
+
+script_name=$(basename ${BASH_SOURCE[0]})
+if [ -z "$REPO_HOME" ]; then
+  echo "$script_name:: REPO_HOME is not set."
+  exit 1
+fi
+
+set -x
+cd "$REPO_HOME"
+rm -rf release/*
+set +x
+
+echo "$script_name done."
+
-- 
2.20.1