aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--tools/_util.sh8
-rw-r--r--tools/package.sh37
-rw-r--r--tools/tomcat.sh38
3 files changed, 81 insertions, 2 deletions
diff --git a/tools/_util.sh b/tools/_util.sh
index 65cba8c..8323c61 100644
--- a/tools/_util.sh
+++ b/tools/_util.sh
@@ -22,6 +22,14 @@ MAINCLASS_ui_console="market.guess.ui.console.App"
22MAINCLASS_ui_desktop="market.guess.ui.desktop.Launcher" 22MAINCLASS_ui_desktop="market.guess.ui.desktop.Launcher"
23MAINCLASS_ui_client="market.guess.ui.client.Launcher" 23MAINCLASS_ui_client="market.guess.ui.client.Launcher"
24 24
25# Exercise 3 submission: one WAR for Tomcat's webapps/ and a self-contained client directory.
26# The WAR is named after the context path the client expects (/guess-market).
27WAR_MODULE="server"
28WAR_NAME="guess-market"
29WAR_LIB_DIRS="gson jaxb"
30CLIENT="ui-client"
31CLIENT_LIB_DIRS="gson openjfx okhttp"
32
25JAVA_HOME_DIR=$(java -XshowSettings:properties -version 2>&1 | tr -d '\r' | sed -n 's/^ *java\.home = //p') 33JAVA_HOME_DIR=$(java -XshowSettings:properties -version 2>&1 | tr -d '\r' | sed -n 's/^ *java\.home = //p')
26case "$(uname -s)" in 34case "$(uname -s)" in
27 CYGWIN*|MINGW*|MSYS*) 35 CYGWIN*|MINGW*|MSYS*)
diff --git a/tools/package.sh b/tools/package.sh
index ce18f63..2569e96 100644
--- a/tools/package.sh
+++ b/tools/package.sh
@@ -33,8 +33,7 @@ echo "=== Generating executable manifests ==="
33# this line is the entire classpath at runtime. 33# this line is the entire classpath at runtime.
34for e in $EXECUTABLES; do 34for e in $EXECUTABLES; do
35 CPLINE="" 35 CPLINE=""
36 for m in $MODULES; do 36 for m in $(deps_of "$e"); do
37 [ "$m" = "$e" ] && continue
38 CPLINE="$CPLINE${CPLINE:+ }$m.jar" 37 CPLINE="$CPLINE${CPLINE:+ }$m.jar"
39 done 38 done
40 for d in $RUNTIME_LIB_DIRS; do 39 for d in $RUNTIME_LIB_DIRS; do
@@ -49,6 +48,7 @@ done
49 48
50echo "=== Packaging ===" 49echo "=== Packaging ==="
51for m in $MODULES; do 50for m in $MODULES; do
51 [ "$m" = "$WAR_MODULE" ] && continue # ships as a WAR, below
52 case " $EXECUTABLES " in 52 case " $EXECUTABLES " in
53 *" $m "*) 53 *" $m "*)
54 "$JAR" --create --file "$DIST/$m.jar" --main-class "$(mainclass_of "$m")" \ 54 "$JAR" --create --file "$DIST/$m.jar" --main-class "$(mainclass_of "$m")" \
@@ -72,6 +72,39 @@ done
72 72
73[ -f README.pdf ] && cp README.pdf "$DIST/" 73[ -f README.pdf ] && cp README.pdf "$DIST/"
74 74
75echo "=== Exercise 3: WAR ==="
76# The WAR carries everything the server needs; Tomcat only provides the servlet API.
77WARDIR="$TMP/war"
78rm -rf "$WARDIR" && mkdir -p "$WARDIR/WEB-INF/lib"
79cp -r "build/classes/$WAR_MODULE" "$WARDIR/WEB-INF/classes"
80for m in $(deps_of "$WAR_MODULE"); do
81 cp "$DIST/$m.jar" "$WARDIR/WEB-INF/lib/"
82done
83for d in $WAR_LIB_DIRS; do
84 for j in lib/"$d"/*.jar; do
85 is_shippable_jar "$j" || continue
86 cp "$j" "$WARDIR/WEB-INF/lib/"
87 done
88done
89EX3="$DIST/ex3"
90mkdir -p "$EX3"
91"$JAR" --create --file "$EX3/$WAR_NAME.war" -C "$WARDIR" .
92echo " $EX3/$WAR_NAME.war"
93"$JAR" --list --file "$EX3/$WAR_NAME.war" | grep 'WEB-INF/lib/.' | sed 's/^/ /'
94
95echo "=== Exercise 3: client directory ==="
96CDIR="$EX3/client"
97mkdir -p "$CDIR/lib"
98cp "$DIST/$CLIENT.jar" "$CDIR/"
99for m in $(deps_of "$CLIENT"); do
100 cp "$DIST/$m.jar" "$CDIR/"
101done
102for d in $CLIENT_LIB_DIRS; do
103 cp -r "$DIST/lib/$d" "$CDIR/lib/"
104done
105cp "$DIST/run-${CLIENT#ui-}.bat" "$CDIR/"
106ls "$CDIR" | sed 's/^/ /'
107
75echo "=== Manifest as it actually landed in the jar ===" 108echo "=== Manifest as it actually landed in the jar ==="
76# Cheapest check that prevents a Level-0: if Main-Class or Class-Path didn't 109# Cheapest check that prevents a Level-0: if Main-Class or Class-Path didn't
77# survive, it surfaces here instead of on the grader's machine. 110# survive, it surfaces here instead of on the grader's machine.
diff --git a/tools/tomcat.sh b/tools/tomcat.sh
new file mode 100644
index 0000000..05d38d2
--- /dev/null
+++ b/tools/tomcat.sh
@@ -0,0 +1,38 @@
1#!/bin/bash
2
3set -e
4cd "$(dirname "$0")/.."
5. tools/_util.sh
6
7WAR="build/dist/ex3/$WAR_NAME.war"
8[ -f "$WAR" ] || {
9 echo "No $WAR - run tools/package.sh first"
10 exit 1
11}
12
13TOMCAT="${CATALINA_HOME:-$(ls -d /c/tomcat/apache-tomcat-* 2>/dev/null | sort -V | tail -n 1)}"
14case "$(uname -s)" in
15 CYGWIN*|MINGW*|MSYS*) TOMCAT=$(cygpath -u "$TOMCAT" 2>/dev/null || echo "$TOMCAT") ;;
16esac
17[ -d "$TOMCAT/webapps" ] || {
18 echo "No Tomcat found. Set CATALINA_HOME to a Tomcat 10.1+ folder (the one holding webapps/)."
19 exit 1
20}
21
22rm -rf "$TOMCAT/webapps/$WAR_NAME" "$TOMCAT/webapps/$WAR_NAME.war"
23cp "$WAR" "$TOMCAT/webapps/"
24
25echo "=== Tomcat: $TOMCAT ==="
26echo " http://localhost:8080/$WAR_NAME/api/health"
27
28case "$(uname -s)" in
29 CYGWIN*|MINGW*|MSYS*)
30 export CATALINA_HOME=$(cygpath -w "$TOMCAT")
31 export JAVA_HOME=$(cygpath -w "$JAVA_HOME_DIR")
32 exec cmd //c "$CATALINA_HOME\\bin\\catalina.bat" run
33 ;;
34 export CATALINA_HOME="$TOMCAT"
35 export JAVA_HOME="$JAVA_HOME_DIR"
36 exec "$TOMCAT/bin/catalina.sh" run
37 ;;
38esac