From 422b94c5aad2a27a7b370de8da4d744f60b84c98 Mon Sep 17 00:00:00 2001 From: nestrada2 <81432763+nestrada2@users.noreply.github.com> Date: Sun, 11 Feb 2024 19:51:16 -0800 Subject: [PATCH] updated pom.xml, adding system.properties, and html files/resources --- .idea/.gitignore | 3 + .idea/compiler.xml | 18 ++ .idea/encodings.xml | 7 + .idea/jarRepositories.xml | 20 ++ .idea/misc.xml | 15 ++ .idea/vcs.xml | 6 + Procfile | 1 + pom.xml | 26 ++- .../edu/usfca/cs272/SearchEngineServer.java | 42 ++-- src/main/resources/doGet.html | 23 +++ src/main/resources/doPost.html | 19 ++ src/main/resources/getSearch.html | 189 ++++++++++++++++++ src/main/resources/log4j2.xml | 43 ++++ src/main/resources/log4j2_new.xml | 23 +++ .../resources/maven-archiver/pom.properties | 3 - .../compile/default-compile/createdFiles.lst | 27 --- .../compile/default-compile/inputFiles.lst | 18 -- system.properties | 1 + 18 files changed, 403 insertions(+), 81 deletions(-) create mode 100644 .idea/.gitignore create mode 100644 .idea/compiler.xml create mode 100644 .idea/encodings.xml create mode 100644 .idea/jarRepositories.xml create mode 100644 .idea/misc.xml create mode 100644 .idea/vcs.xml create mode 100644 Procfile create mode 100644 src/main/resources/doGet.html create mode 100644 src/main/resources/doPost.html create mode 100644 src/main/resources/getSearch.html create mode 100644 src/main/resources/log4j2.xml create mode 100644 src/main/resources/log4j2_new.xml delete mode 100644 src/main/resources/maven-archiver/pom.properties delete mode 100644 src/main/resources/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst delete mode 100644 src/main/resources/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst create mode 100644 system.properties diff --git a/.idea/.gitignore b/.idea/.gitignore new file mode 100644 index 0000000..26d3352 --- /dev/null +++ b/.idea/.gitignore @@ -0,0 +1,3 @@ +# Default ignored files +/shelf/ +/workspace.xml diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..1527046 --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml new file mode 100644 index 0000000..aa00ffa --- /dev/null +++ b/.idea/encodings.xml @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml new file mode 100644 index 0000000..712ab9d --- /dev/null +++ b/.idea/jarRepositories.xml @@ -0,0 +1,20 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..e7f9742 --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,15 @@ + + + + + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..35eb1dd --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/Procfile b/Procfile new file mode 100644 index 0000000..5b318fe --- /dev/null +++ b/Procfile @@ -0,0 +1 @@ +web: java $JAVA_OPTS -jar target/dependency/jetty-runner.jar --port $PORT target/*.jar \ No newline at end of file diff --git a/pom.xml b/pom.xml index 434a8a7..7d55efe 100644 --- a/pom.xml +++ b/pom.xml @@ -16,11 +16,11 @@ src/main/java ../project-tests/src/test/java - - - src/main/resources - - + + + + + @@ -63,6 +63,12 @@ 3.0.0-M7 + + org.apache.maven.plugins + maven-resources-plugin + 3.3.1 + + org.apache.maven.plugins maven-dependency-plugin @@ -84,6 +90,16 @@ + + + com.heroku.sdk + heroku-maven-plugin + 3.0.7 + + + rooster-search + + diff --git a/src/main/java/edu/usfca/cs272/SearchEngineServer.java b/src/main/java/edu/usfca/cs272/SearchEngineServer.java index 8b67007..1fe1540 100644 --- a/src/main/java/edu/usfca/cs272/SearchEngineServer.java +++ b/src/main/java/edu/usfca/cs272/SearchEngineServer.java @@ -1,22 +1,20 @@ package edu.usfca.cs272; -import java.io.BufferedReader; -import java.io.FileReader; -import java.io.IOException; -import java.io.PrintWriter; -import java.util.ArrayList; -import java.util.Set; - +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.apache.commons.text.StringEscapeUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.eclipse.jetty.server.Server; import org.eclipse.jetty.servlet.ServletHandler; -import jakarta.servlet.ServletException; -import jakarta.servlet.http.HttpServlet; -import jakarta.servlet.http.HttpServletRequest; -import jakarta.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.io.PrintWriter; +import java.nio.charset.StandardCharsets; +import java.util.ArrayList; +import java.util.Set; /** * A simple example of using Jetty and servlets to use an HTML form. @@ -97,7 +95,7 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response) log.info(request); // String html = fileToString("/../../../../resources/getSearch.html"); - String html = fileToString("getSearch.html"); + String html = fileToString("/getSearch.html"); processingQueryData(request, response, html); } @@ -119,7 +117,7 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response) log.info(request); // String html = fileToString("../../../../resources/doGet.html"); - String html = fileToString("resources/doGet.html"); + String html = fileToString("/doGet.html"); // Send the Response Object back to the User PrintWriter out = response.getWriter(); @@ -135,7 +133,7 @@ protected void doPost(HttpServletRequest request, HttpServletResponse response) log.info(request); // String html = fileToString("../../../../resources/doPost.html"); - String html = fileToString("resources/doPost.html"); + String html = fileToString("/doPost.html"); processingQueryData(request, response, html); } @@ -240,20 +238,8 @@ public static void processingQueryData(HttpServletRequest request, HttpServletRe public static String fileToString(String fileName) { String content = ""; - try (BufferedReader reader = new BufferedReader(new FileReader(fileName))) { - StringBuilder stringBuilder = new StringBuilder(); - String line = null; - String ls = System.getProperty("line.separator"); - while ((line = reader.readLine()) != null) { - stringBuilder.append(line); - stringBuilder.append(ls); - } - // delete the last new line separator - stringBuilder.deleteCharAt(stringBuilder.length() - 1); - reader.close(); - - content = stringBuilder.toString(); - return content; + try (var in = SearchEngineServer.class.getResourceAsStream(fileName)) { + return new String(in.readAllBytes(), StandardCharsets.UTF_8); } catch (IOException e) { // TODO Auto-generated catch block e.printStackTrace(); diff --git a/src/main/resources/doGet.html b/src/main/resources/doGet.html new file mode 100644 index 0000000..98e46e6 --- /dev/null +++ b/src/main/resources/doGet.html @@ -0,0 +1,23 @@ + + + + + + %1$s + + + +

%1$s

+ +
+

+ +

+ +

+ +

+
+ + + \ No newline at end of file diff --git a/src/main/resources/doPost.html b/src/main/resources/doPost.html new file mode 100644 index 0000000..5c646a7 --- /dev/null +++ b/src/main/resources/doPost.html @@ -0,0 +1,19 @@ + + + + + + %1$s + + + +

%1$s

+ +
+        %2$s
+        
+ +

(back to form)

+ + + \ No newline at end of file diff --git a/src/main/resources/getSearch.html b/src/main/resources/getSearch.html new file mode 100644 index 0000000..981fcae --- /dev/null +++ b/src/main/resources/getSearch.html @@ -0,0 +1,189 @@ + + + + + + + + + + + + %1$s + + + + + + +
+ + +
+ +
+ +

%1$s

+ + +
+ + +
+
+ +
+ + + + + + + + + + + + + + + + +
+ +
+ + + + +
+ +

+ + +

+ +
+ +
+ +
+        %2$s
+    
+ + + + \ No newline at end of file diff --git a/src/main/resources/log4j2.xml b/src/main/resources/log4j2.xml new file mode 100644 index 0000000..0cc61fd --- /dev/null +++ b/src/main/resources/log4j2.xml @@ -0,0 +1,43 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/main/resources/log4j2_new.xml b/src/main/resources/log4j2_new.xml new file mode 100644 index 0000000..f4081ec --- /dev/null +++ b/src/main/resources/log4j2_new.xml @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/main/resources/maven-archiver/pom.properties b/src/main/resources/maven-archiver/pom.properties deleted file mode 100644 index f659cec..0000000 --- a/src/main/resources/maven-archiver/pom.properties +++ /dev/null @@ -1,3 +0,0 @@ -artifactId=SearchEngine -groupId=edu.usfca.cs272 -version=2022-08 diff --git a/src/main/resources/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst b/src/main/resources/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst deleted file mode 100644 index fd2fb41..0000000 --- a/src/main/resources/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst +++ /dev/null @@ -1,27 +0,0 @@ -edu/usfca/cs272/MTInvertedIndex$Task.class -edu/usfca/cs272/InvertedIndex.class -edu/usfca/cs272/ReadWriteLock$SimpleWriteLock.class -edu/usfca/cs272/SearchEngineServer$SearchEnginePostServlet.class -edu/usfca/cs272/HtmlFetcher.class -edu/usfca/cs272/LinkFinder.class -edu/usfca/cs272/Driver.class -edu/usfca/cs272/Entry.class -edu/usfca/cs272/ReadWriteLock$SimpleReadLock.class -edu/usfca/cs272/PrettyJsonWriter.class -edu/usfca/cs272/ArgumentParser.class -edu/usfca/cs272/QueryReader.class -edu/usfca/cs272/ReadWriteLock.class -edu/usfca/cs272/SearchEngineServer.class -edu/usfca/cs272/WordCleaner.class -edu/usfca/cs272/HttpsFetcher.class -edu/usfca/cs272/MTQueryReader.class -edu/usfca/cs272/WorkQueue.class -edu/usfca/cs272/WorkQueue$Worker.class -edu/usfca/cs272/HtmlCleaner.class -edu/usfca/cs272/MTInvertedIndex.class -edu/usfca/cs272/MTInvertedIndex$HtmlTask.class -edu/usfca/cs272/MTQueryReader$Task.class -edu/usfca/cs272/FileFinder.class -edu/usfca/cs272/SearchEngineServer$SearchEngineGetServlet.class -edu/usfca/cs272/ReadWriteLock$SimpleLock.class -edu/usfca/cs272/WordCount.class diff --git a/src/main/resources/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst b/src/main/resources/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst deleted file mode 100644 index bbcbe91..0000000 --- a/src/main/resources/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst +++ /dev/null @@ -1,18 +0,0 @@ -/Volumes/NINO'S SSD 1/Search Engine/project-nestrada2/src/main/java/edu/usfca/cs272/QueryReader.java -/Volumes/NINO'S SSD 1/Search Engine/project-nestrada2/src/main/java/edu/usfca/cs272/ArgumentParser.java -/Volumes/NINO'S SSD 1/Search Engine/project-nestrada2/src/main/java/edu/usfca/cs272/HtmlFetcher.java -/Volumes/NINO'S SSD 1/Search Engine/project-nestrada2/src/main/java/edu/usfca/cs272/ReadWriteLock.java -/Volumes/NINO'S SSD 1/Search Engine/project-nestrada2/src/main/java/edu/usfca/cs272/LinkFinder.java -/Volumes/NINO'S SSD 1/Search Engine/project-nestrada2/src/main/java/edu/usfca/cs272/Driver.java -/Volumes/NINO'S SSD 1/Search Engine/project-nestrada2/src/main/java/edu/usfca/cs272/MTInvertedIndex.java -/Volumes/NINO'S SSD 1/Search Engine/project-nestrada2/src/main/java/edu/usfca/cs272/InvertedIndex.java -/Volumes/NINO'S SSD 1/Search Engine/project-nestrada2/src/main/java/edu/usfca/cs272/MTQueryReader.java -/Volumes/NINO'S SSD 1/Search Engine/project-nestrada2/src/main/java/edu/usfca/cs272/WorkQueue.java -/Volumes/NINO'S SSD 1/Search Engine/project-nestrada2/src/main/java/edu/usfca/cs272/HtmlCleaner.java -/Volumes/NINO'S SSD 1/Search Engine/project-nestrada2/src/main/java/edu/usfca/cs272/SearchEngineServer.java -/Volumes/NINO'S SSD 1/Search Engine/project-nestrada2/src/main/java/edu/usfca/cs272/WordCleaner.java -/Volumes/NINO'S SSD 1/Search Engine/project-nestrada2/src/main/java/edu/usfca/cs272/WordCount.java -/Volumes/NINO'S SSD 1/Search Engine/project-nestrada2/src/main/java/edu/usfca/cs272/Entry.java -/Volumes/NINO'S SSD 1/Search Engine/project-nestrada2/src/main/java/edu/usfca/cs272/FileFinder.java -/Volumes/NINO'S SSD 1/Search Engine/project-nestrada2/src/main/java/edu/usfca/cs272/PrettyJsonWriter.java -/Volumes/NINO'S SSD 1/Search Engine/project-nestrada2/src/main/java/edu/usfca/cs272/HttpsFetcher.java diff --git a/system.properties b/system.properties new file mode 100644 index 0000000..0dc726c --- /dev/null +++ b/system.properties @@ -0,0 +1 @@ +java.runtime.version=17 \ No newline at end of file