diff --git a/Assignment 2.odt b/Assignment 2.odt new file mode 100644 index 0000000..2c97ffa Binary files /dev/null and b/Assignment 2.odt differ diff --git a/pom.xml b/pom.xml index 412df04..f175e4a 100644 --- a/pom.xml +++ b/pom.xml @@ -9,8 +9,8 @@ 0.69.420 - 17 - 17 + 11 + 11 UTF-8 diff --git a/src/main/java/client/Client.java b/src/main/java/client/Client.java index 2c7fa5d..250a400 100644 --- a/src/main/java/client/Client.java +++ b/src/main/java/client/Client.java @@ -19,7 +19,7 @@ public class Client { private final Socket serverConnection; private final DataOutputStream out; private final DataInputStream in; - private OTelUtils.SexyContainer ot = OTelUtils.create("CumClient"); // Computational Unit Machine Client + private OTelUtils.SexyContainer ot = OTelUtils.create("Client"); // Computational Unit Machine Client private final Tracer tracer; private final Scope sc; private final Span s; @@ -45,6 +45,11 @@ public class Client { ot.tp.forceFlush(); ot.bp.forceFlush(); ot.ox.flush(); +// try { +// Thread.sleep((long)(Math.random() * 10)); +// } catch (InterruptedException e) { +// throw new RuntimeException(e); +// } return this; } diff --git a/src/main/java/server/Server.java b/src/main/java/server/Server.java index 5c965aa..6a11bf8 100644 --- a/src/main/java/server/Server.java +++ b/src/main/java/server/Server.java @@ -24,7 +24,7 @@ public class Server { public static volatile boolean running = true; - private static final OTelUtils.SexyContainer ot = OTelUtils.create("CumServer"); + private static final OTelUtils.SexyContainer ot = OTelUtils.create("Server"); public Server() { Tracer main = ot.ot.getTracer("Main Server", "0.69"); diff --git a/target/classes/client/ChunkedCompressedChecksumFileWriter.class b/target/classes/client/ChunkedCompressedChecksumFileWriter.class index 12bf04b..bc4a222 100644 Binary files a/target/classes/client/ChunkedCompressedChecksumFileWriter.class and b/target/classes/client/ChunkedCompressedChecksumFileWriter.class differ diff --git a/target/classes/client/Client.class b/target/classes/client/Client.class index 3dc6628..808140f 100644 Binary files a/target/classes/client/Client.class and b/target/classes/client/Client.class differ diff --git a/target/classes/server/ChunkedCompressedChecksumFileReader.class b/target/classes/server/ChunkedCompressedChecksumFileReader.class index 70c0d61..2d930e4 100644 Binary files a/target/classes/server/ChunkedCompressedChecksumFileReader.class and b/target/classes/server/ChunkedCompressedChecksumFileReader.class differ diff --git a/target/classes/server/Connection.class b/target/classes/server/Connection.class index f9a1f18..29f8ae3 100644 Binary files a/target/classes/server/Connection.class and b/target/classes/server/Connection.class differ diff --git a/target/classes/server/FileHeader.class b/target/classes/server/FileHeader.class index 1365438..cdc1aa3 100644 Binary files a/target/classes/server/FileHeader.class and b/target/classes/server/FileHeader.class differ diff --git a/target/classes/server/Server.class b/target/classes/server/Server.class index ac33088..bc07903 100644 Binary files a/target/classes/server/Server.class and b/target/classes/server/Server.class differ diff --git a/target/classes/shared/ArrayData.class b/target/classes/shared/ArrayData.class index 40925d0..6712a7d 100644 Binary files a/target/classes/shared/ArrayData.class and b/target/classes/shared/ArrayData.class differ diff --git a/target/classes/shared/ExceptionLogger.class b/target/classes/shared/ExceptionLogger.class index 9a93928..86132cd 100644 Binary files a/target/classes/shared/ExceptionLogger.class and b/target/classes/shared/ExceptionLogger.class differ diff --git a/target/classes/shared/FileUtil$COMMAND.class b/target/classes/shared/FileUtil$COMMAND.class index d487116..0330f96 100644 Binary files a/target/classes/shared/FileUtil$COMMAND.class and b/target/classes/shared/FileUtil$COMMAND.class differ diff --git a/target/classes/shared/FileUtil$InvalidUsageException.class b/target/classes/shared/FileUtil$InvalidUsageException.class index 341c4a9..fcbeea7 100644 Binary files a/target/classes/shared/FileUtil$InvalidUsageException.class and b/target/classes/shared/FileUtil$InvalidUsageException.class differ diff --git a/target/classes/shared/FileUtil.class b/target/classes/shared/FileUtil.class index c3bc57c..e2fe305 100644 Binary files a/target/classes/shared/FileUtil.class and b/target/classes/shared/FileUtil.class differ diff --git a/target/classes/shared/OTelUtils$SexyContainer.class b/target/classes/shared/OTelUtils$SexyContainer.class index f5c625e..6e7929c 100644 Binary files a/target/classes/shared/OTelUtils$SexyContainer.class and b/target/classes/shared/OTelUtils$SexyContainer.class differ diff --git a/target/classes/shared/OTelUtils.class b/target/classes/shared/OTelUtils.class index ff5a11f..7853de3 100644 Binary files a/target/classes/shared/OTelUtils.class and b/target/classes/shared/OTelUtils.class differ diff --git a/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst b/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst index eccd196..1e78f8b 100644 --- a/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst +++ b/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst @@ -1,10 +1,10 @@ shared/ExceptionLogger.class shared/OTelUtils$SexyContainer.class shared/FileUtil.class -server/Server.class server/Connection.class -shared/ArrayData.class +server/Server.class server/ChunkedCompressedChecksumFileReader.class +shared/ArrayData.class client/ChunkedCompressedChecksumFileWriter.class shared/FileUtil$InvalidUsageException.class shared/OTelUtils.class diff --git a/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst b/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst index b46b305..130d29b 100644 --- a/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst +++ b/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst @@ -2,9 +2,9 @@ /home/brett/Documents/Brock/CS 3P95/Assignments/Assignment 2 Java/src/main/java/server/FileHeader.java /home/brett/Documents/Brock/CS 3P95/Assignments/Assignment 2 Java/src/main/java/client/ChunkedCompressedChecksumFileWriter.java /home/brett/Documents/Brock/CS 3P95/Assignments/Assignment 2 Java/src/main/java/server/ChunkedCompressedChecksumFileReader.java -/home/brett/Documents/Brock/CS 3P95/Assignments/Assignment 2 Java/src/main/java/shared/ArrayData.java -/home/brett/Documents/Brock/CS 3P95/Assignments/Assignment 2 Java/src/main/java/server/Server.java /home/brett/Documents/Brock/CS 3P95/Assignments/Assignment 2 Java/src/main/java/server/Connection.java -/home/brett/Documents/Brock/CS 3P95/Assignments/Assignment 2 Java/src/main/java/shared/OTelUtils.java +/home/brett/Documents/Brock/CS 3P95/Assignments/Assignment 2 Java/src/main/java/server/Server.java +/home/brett/Documents/Brock/CS 3P95/Assignments/Assignment 2 Java/src/main/java/shared/ArrayData.java /home/brett/Documents/Brock/CS 3P95/Assignments/Assignment 2 Java/src/main/java/shared/ExceptionLogger.java +/home/brett/Documents/Brock/CS 3P95/Assignments/Assignment 2 Java/src/main/java/shared/OTelUtils.java /home/brett/Documents/Brock/CS 3P95/Assignments/Assignment 2 Java/src/main/java/shared/FileUtil.java