Skip to content

Commit 0626970

Browse files
mearvkmearvk
committed
Science Commit 5.
1 parent f0cc31a commit 0626970

14 files changed

Lines changed: 430 additions & 74 deletions

File tree

‎modules/AE6E66/servlets/deploy-local.sh‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,25 @@
11
#!/bin/bash
2-
# AE6E66™ — Deploy Local (Embedded Tomcat or /opt/tomcat)
2+
# AE6E66™ — Deploy Local (Deploy to local Tomcat)
33
# Usage: bash modules/AE6E66/servlets/deploy-local.sh [tomcat_home]
44
set -e
55

66
SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
77
AE6E66_ROOT="$(dirname "$SCRIPT_DIR")"
88
WEBAPP_SRC="$AE6E66_ROOT/servlets/servlet/src/main/webapp"
99
TOMCAT_HOME="${1:-${CATALINA_HOME:-/home/mearvk/tomcat}}"
10+
11+
# Source shared deploy library for validation
12+
_NWE="$(cd "$(dirname "$0")" && cd ../../.. 2>/dev/null && pwd)"
13+
[ -f "$_NWE/scripts/deploy-functions.sh" ] && source "$_NWE/scripts/deploy-functions.sh"
14+
if type nwe_validate_tomcat &>/dev/null; then nwe_validate_tomcat "$TOMCAT_HOME" || exit 1; fi
1015
CONTEXT="ae6e66"
1116
DEPLOY_DIR="$TOMCAT_HOME/webapps/$CONTEXT"
1217

18+
# Source shared deploy library for validation
19+
_NWE="$(cd "$(dirname "$0")" && cd ../../.. 2>/dev/null && pwd)"
20+
[ -f "$_NWE/scripts/deploy-functions.sh" ] && source "$_NWE/scripts/deploy-functions.sh"
21+
if type nwe_validate_tomcat &>/dev/null; then nwe_validate_tomcat "$TOMCAT_HOME" || exit 1; fi
22+
1323
echo "═══════════════════════════════════════════════════════════════"
1424
echo " AE6E66™ — Deploy Local"
1525
echo " Source: $WEBAPP_SRC"

‎modules/black-belt/servlets/deploy-local.sh‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@ BELT_ROOT="$(dirname "$SCRIPT_DIR")"
66
WEBAPP_SRC="$BELT_ROOT/servlets/servlet/src/main/webapp"
77
TOMCAT_HOME="${1:-${CATALINA_HOME:-/home/mearvk/tomcat}}"
88
DEPLOY_DIR="$TOMCAT_HOME/webapps/blackbelt"
9+
NWE_ROOT="$(cd "$SCRIPT_DIR/../../.." 2>/dev/null && pwd)"
10+
[ -f "$NWE_ROOT/scripts/deploy-functions.sh" ] && source "$NWE_ROOT/scripts/deploy-functions.sh"
11+
if type nwe_validate_tomcat &>/dev/null; then nwe_validate_tomcat "$TOMCAT_HOME" || exit 1; fi
912
echo "═══════════════════════════════════════════════════════════════"
1013
echo " Black Belt™ — Deploy"
1114
echo "═══════════════════════════════════════════════════════════════"

‎modules/cia/servlets/deploy-local.sh‎

Lines changed: 22 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,27 @@
11
#!/bin/bash
2+
# CaliforniaCIA™ — Deploy Local
3+
# Deploys JSP webapp to Tomcat with JDBC connector and compiled servlet classes.
4+
# Usage: bash modules/cia/servlets/deploy-local.sh [tomcat_home]
25
set -e
6+
37
SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
4-
TOMCAT_WEBAPPS="${TOMCAT_HOME:-/home/mearvk/tomcat}/webapps"
5-
SRC="$SCRIPT_DIR/servlet/src/main/webapp"
6-
echo "[*] Deploying CaliforniaCIA™ to $TOMCAT_WEBAPPS/california-cia"
7-
rm -rf "$TOMCAT_WEBAPPS/california-cia"
8-
mkdir -p "$TOMCAT_WEBAPPS/california-cia"
9-
cp -r "$SRC/"* "$TOMCAT_WEBAPPS/california-cia/"
10-
mkdir -p "$TOMCAT_WEBAPPS/california-cia/WEB-INF/lib"
8+
TOMCAT_HOME="${1:-${CATALINA_HOME:-/home/mearvk/tomcat}}"
119
NWE_ROOT="$(cd "$SCRIPT_DIR/../../.." && pwd)"
12-
JDBC_JAR=$(find "$NWE_ROOT/modules/black/presidential/Brarner.M.Alete/jars" "$NWE_ROOT/jars/mysql" -name "mysql-connector-j*.jar" -type f 2>/dev/null | head -1)
13-
[ -n "$JDBC_JAR" ] && cp "$JDBC_JAR" "$TOMCAT_WEBAPPS/california-cia/WEB-INF/lib/" && echo "[*] JDBC: $(basename "$JDBC_JAR")" || echo "[!] WARNING: mysql-connector-j not found"
14-
if command -v javac &>/dev/null; then
15-
mkdir -p "$TOMCAT_WEBAPPS/california-cia/WEB-INF/classes/com/mearvk/cia"
16-
javac -cp "${TOMCAT_HOME:-/home/mearvk/tomcat}/lib/*" -d "$TOMCAT_WEBAPPS/california-cia/WEB-INF/classes" \
17-
"$SCRIPT_DIR/servlet/src/main/java/com/mearvk/cia/"*.java 2>/dev/null || echo "[!] Servlet compilation skipped"
10+
11+
source "$NWE_ROOT/scripts/deploy-functions.sh" 2>/dev/null || true
12+
13+
if type nwe_deploy_module &>/dev/null; then
14+
nwe_deploy_module "CaliforniaCIA" "california-cia" \
15+
"$SCRIPT_DIR/servlet/src/main/webapp" \
16+
"$SCRIPT_DIR/servlet/src/main/java/com/mearvk/cia" \
17+
"$TOMCAT_HOME" "$NWE_ROOT"
18+
else
19+
DEPLOY_DIR="$TOMCAT_HOME/webapps/california-cia"
20+
echo "[*] Deploying CaliforniaCIA™ to $DEPLOY_DIR"
21+
rm -rf "$DEPLOY_DIR"
22+
mkdir -p "$DEPLOY_DIR/WEB-INF/lib"
23+
cp -r "$SCRIPT_DIR/servlet/src/main/webapp/"* "$DEPLOY_DIR/"
24+
JDBC_JAR=$(find "$NWE_ROOT/jars/mysql" -name "mysql-connector-j*.jar" -type f 2>/dev/null | head -1)
25+
[ -n "$JDBC_JAR" ] && cp "$JDBC_JAR" "$DEPLOY_DIR/WEB-INF/lib/"
26+
echo "[OK] CaliforniaCIA™ deployed at /california-cia"
1827
fi
19-
echo "[OK] CaliforniaCIA™ deployed at /california-cia"

‎modules/duke/servlets/deploy-local.sh‎

Lines changed: 65 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,70 @@
11
#!/bin/bash
2+
# DukeUniversity™ — Deploy Local
3+
# Deploys JSP webapp to Tomcat with JDBC connector and compiled servlet classes.
4+
# Usage: bash modules/duke/servlets/deploy-local.sh [tomcat_home]
25
set -e
6+
37
SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
4-
TOMCAT_WEBAPPS="${TOMCAT_HOME:-/home/mearvk/tomcat}/webapps"
5-
echo "[*] Deploying DukeUniversity™ to $TOMCAT_WEBAPPS/duke"
6-
rm -rf "$TOMCAT_WEBAPPS/duke"; mkdir -p "$TOMCAT_WEBAPPS/duke"
7-
cp -r "$SCRIPT_DIR/servlet/src/main/webapp/"* "$TOMCAT_WEBAPPS/duke/"
8-
mkdir -p "$TOMCAT_WEBAPPS/duke/WEB-INF/lib"
8+
TOMCAT_HOME="${1:-${CATALINA_HOME:-/home/mearvk/tomcat}}"
9+
CONTEXT="california-duke"
10+
DEPLOY_DIR="$TOMCAT_HOME/webapps/$CONTEXT"
911
NWE_ROOT="$(cd "$SCRIPT_DIR/../../.." && pwd)"
10-
JDBC_JAR=$(find "$NWE_ROOT/modules/black/presidential/Brarner.M.Alete/jars" "$NWE_ROOT/jars/mysql" -name "mysql-connector-j*.jar" -type f 2>/dev/null | head -1)
11-
[ -n "$JDBC_JAR" ] && cp "$JDBC_JAR" "$TOMCAT_WEBAPPS/duke/WEB-INF/lib/" && echo "[*] JDBC: $(basename "$JDBC_JAR")" || echo "[!] WARNING: mysql-connector-j not found"
12-
if command -v javac &>/dev/null; then
13-
mkdir -p "$TOMCAT_WEBAPPS/duke/WEB-INF/classes/com/mearvk/duke"
14-
javac -cp "${TOMCAT_HOME:-/home/mearvk/tomcat}/lib/*" -d "$TOMCAT_WEBAPPS/duke/WEB-INF/classes" "$SCRIPT_DIR/servlet/src/main/java/com/mearvk/duke/"*.java 2>/dev/null || true
12+
WEBAPP_SRC="$SCRIPT_DIR/servlet/src/main/webapp"
13+
14+
echo "[*] Deploying DukeUniversity™ to $DEPLOY_DIR"
15+
16+
# Validate Tomcat exists
17+
if [ ! -d "$TOMCAT_HOME/webapps" ]; then
18+
echo "[!] Tomcat not found at: $TOMCAT_HOME"
19+
echo " Set CATALINA_HOME or pass path as argument."
20+
exit 1
1521
fi
16-
echo "[OK] DukeUniversity™ deployed at /duke"
22+
23+
# Validate webapp source exists
24+
if [ ! -d "$WEBAPP_SRC" ]; then
25+
echo "[!] Webapp source not found: $WEBAPP_SRC"
26+
exit 1
27+
fi
28+
29+
# Deploy webapp (preserves Tomcat structure)
30+
rm -rf "$DEPLOY_DIR"
31+
mkdir -p "$DEPLOY_DIR/WEB-INF/lib" "$DEPLOY_DIR/WEB-INF/classes/com/mearvk/duke"
32+
cp -r "$WEBAPP_SRC/"* "$DEPLOY_DIR/"
33+
34+
# JDBC connector
35+
JDBC_JAR=$(find "$NWE_ROOT/jars/mysql" -name "mysql-connector-j*.jar" -type f 2>/dev/null | head -1)
36+
[ -z "$JDBC_JAR" ] && JDBC_JAR=$(find "$TOMCAT_HOME/lib" -name "mysql-connector-j*.jar" -type f 2>/dev/null | head -1)
37+
if [ -n "$JDBC_JAR" ]; then
38+
cp "$JDBC_JAR" "$DEPLOY_DIR/WEB-INF/lib/"
39+
echo "[✓] JDBC: $(basename "$JDBC_JAR")"
40+
else
41+
echo "[!] WARNING: mysql-connector-j not found — JSP database queries will fail"
42+
fi
43+
44+
# Compile servlets (if javac available and source exists)
45+
JAVA_SRC="$SCRIPT_DIR/servlet/src/main/java/com/mearvk/duke"
46+
if command -v javac &>/dev/null && [ -d "$JAVA_SRC" ]; then
47+
SERVLET_API=$(find "$TOMCAT_HOME/lib" -name "servlet-api.jar" -o -name "jakarta.servlet-api*.jar" 2>/dev/null | head -1)
48+
if [ -n "$SERVLET_API" ]; then
49+
find "$JAVA_SRC" -name "*.java" | xargs javac \
50+
-cp "$SERVLET_API:$DEPLOY_DIR/WEB-INF/lib/*" \
51+
-d "$DEPLOY_DIR/WEB-INF/classes" 2>&1 && echo "[✓] Servlets compiled" || echo "[!] Servlet compilation failed (non-fatal)"
52+
else
53+
echo "[--] No servlet-api.jar in $TOMCAT_HOME/lib — skipping compilation"
54+
fi
55+
fi
56+
57+
# Validate WEB-INF/web.xml exists
58+
if [ ! -f "$DEPLOY_DIR/WEB-INF/web.xml" ]; then
59+
echo "[!] WARNING: No WEB-INF/web.xml — Tomcat may not recognize this webapp"
60+
fi
61+
62+
# Validate at least one JSP exists
63+
JSP_COUNT=$(find "$DEPLOY_DIR" -name "*.jsp" 2>/dev/null | wc -l)
64+
if [ "$JSP_COUNT" -eq 0 ]; then
65+
echo "[!] WARNING: No JSP files found in deployment"
66+
else
67+
echo "[✓] JSP pages: $JSP_COUNT"
68+
fi
69+
70+
echo "[OK] DukeUniversity™ deployed at /$CONTEXT"

‎modules/fbi/servlets/deploy-local.sh‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,28 @@
11
#!/bin/bash
2-
# CaliforniaFBI™ — Deploy to local Tomcat
2+
# CaliforniaFBI™ — Deploy Local
3+
# Deploys JSP webapp to Tomcat with JDBC connector and compiled servlet classes.
4+
# Usage: bash modules/fbi/servlets/deploy-local.sh [tomcat_home]
35
set -e
4-
SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
5-
WAR_NAME="california-fbi"
6-
TOMCAT_WEBAPPS="${TOMCAT_HOME:-/home/mearvk/tomcat}/webapps"
7-
SRC="$SCRIPT_DIR/servlet/src/main/webapp"
8-
9-
echo "[*] Deploying CaliforniaFBI™ to $TOMCAT_WEBAPPS/$WAR_NAME"
106

11-
rm -rf "$TOMCAT_WEBAPPS/$WAR_NAME"
12-
mkdir -p "$TOMCAT_WEBAPPS/$WAR_NAME"
13-
cp -r "$SRC/"* "$TOMCAT_WEBAPPS/$WAR_NAME/"
14-
mkdir -p "$TOMCAT_WEBAPPS/$WAR_NAME/WEB-INF/lib"
7+
SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
8+
TOMCAT_HOME="${1:-${CATALINA_HOME:-/home/mearvk/tomcat}}"
159
NWE_ROOT="$(cd "$SCRIPT_DIR/../../.." && pwd)"
16-
JDBC_JAR=$(find "$NWE_ROOT/modules/black/presidential/Brarner.M.Alete/jars" "$NWE_ROOT/jars/mysql" -name "mysql-connector-j*.jar" -type f 2>/dev/null | head -1)
17-
[ -n "$JDBC_JAR" ] && cp "$JDBC_JAR" "$TOMCAT_WEBAPPS/$WAR_NAME/WEB-INF/lib/" && echo "[*] JDBC: $(basename "$JDBC_JAR")" || echo "[!] WARNING: mysql-connector-j not found"
1810

19-
# Compile servlets if javac available
20-
if command -v javac &>/dev/null; then
21-
CLASSES="$TOMCAT_WEBAPPS/$WAR_NAME/WEB-INF/classes/com/mearvk/fbi"
22-
mkdir -p "$CLASSES"
23-
CLASSPATH="$TOMCAT_WEBAPPS/$WAR_NAME/WEB-INF/lib/*:${TOMCAT_HOME:-/home/mearvk/tomcat}/lib/*"
24-
javac -cp "$CLASSPATH" -d "$TOMCAT_WEBAPPS/$WAR_NAME/WEB-INF/classes" \
25-
"$SCRIPT_DIR/servlet/src/main/java/com/mearvk/fbi/"*.java 2>/dev/null || echo "[!] Servlet compilation skipped (missing deps)"
26-
fi
11+
source "$NWE_ROOT/scripts/deploy-functions.sh" 2>/dev/null || true
2712

28-
echo "[OK] CaliforniaFBI™ deployed at /$WAR_NAME"
13+
if type nwe_deploy_module &>/dev/null; then
14+
nwe_deploy_module "CaliforniaFBI" "california-fbi" \
15+
"$SCRIPT_DIR/servlet/src/main/webapp" \
16+
"$SCRIPT_DIR/servlet/src/main/java/com/mearvk/fbi" \
17+
"$TOMCAT_HOME" "$NWE_ROOT"
18+
else
19+
# Fallback if shared library unavailable
20+
DEPLOY_DIR="$TOMCAT_HOME/webapps/california-fbi"
21+
echo "[*] Deploying CaliforniaFBI™ to $DEPLOY_DIR"
22+
rm -rf "$DEPLOY_DIR"
23+
mkdir -p "$DEPLOY_DIR/WEB-INF/lib"
24+
cp -r "$SCRIPT_DIR/servlet/src/main/webapp/"* "$DEPLOY_DIR/"
25+
JDBC_JAR=$(find "$NWE_ROOT/jars/mysql" -name "mysql-connector-j*.jar" -type f 2>/dev/null | head -1)
26+
[ -n "$JDBC_JAR" ] && cp "$JDBC_JAR" "$DEPLOY_DIR/WEB-INF/lib/"
27+
echo "[OK] CaliforniaFBI™ deployed at /california-fbi"
28+
fi

‎modules/gray.a85/servlets/deploy-local.sh‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@ GRAY85_ROOT="$(dirname "$SCRIPT_DIR")"
66
WEBAPP_SRC="$GRAY85_ROOT/servlets/servlet/src/main/webapp"
77
TOMCAT_HOME="${1:-${CATALINA_HOME:-/home/mearvk/tomcat}}"
88
DEPLOY_DIR="$TOMCAT_HOME/webapps/gray85-registry"
9+
NWE_ROOT="$(cd "$SCRIPT_DIR/../../.." 2>/dev/null && pwd)"
10+
[ -f "$NWE_ROOT/scripts/deploy-functions.sh" ] && source "$NWE_ROOT/scripts/deploy-functions.sh"
11+
if type nwe_validate_tomcat &>/dev/null; then nwe_validate_tomcat "$TOMCAT_HOME" || exit 1; fi
912
echo "═══════════════════════════════════════════════════════════════"
1013
echo " Gray85 Crème Registry™ — Deploy (port 10085)"
1114
echo "═══════════════════════════════════════════════════════════════"

‎modules/gray/servlets/deploy-local.sh‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@ GRAY_ROOT="$(dirname "$SCRIPT_DIR")"
66
WEBAPP_SRC="$GRAY_ROOT/servlets/servlet/src/main/webapp"
77
TOMCAT_HOME="${1:-${CATALINA_HOME:-/home/mearvk/tomcat}}"
88
DEPLOY_DIR="$TOMCAT_HOME/webapps/gray-registry"
9+
NWE_ROOT="$(cd "$SCRIPT_DIR/../../.." 2>/dev/null && pwd)"
10+
[ -f "$NWE_ROOT/scripts/deploy-functions.sh" ] && source "$NWE_ROOT/scripts/deploy-functions.sh"
11+
if type nwe_validate_tomcat &>/dev/null; then nwe_validate_tomcat "$TOMCAT_HOME" || exit 1; fi
912
echo "═══════════════════════════════════════════════════════════════"
1013
echo " GrayPortRegistry™ — Deploy (port 9999)"
1114
echo "═══════════════════════════════════════════════════════════════"

‎modules/languages/servlets/deploy-local.sh‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@ LANG_ROOT="$(dirname "$SCRIPT_DIR")"
66
WEBAPP_SRC="$LANG_ROOT/servlets/servlet/src/main/webapp"
77
TOMCAT_HOME="${1:-${CATALINA_HOME:-/home/mearvk/tomcat}}"
88
DEPLOY_DIR="$TOMCAT_HOME/webapps/languages"
9+
NWE_ROOT="$(cd "$SCRIPT_DIR/../../.." 2>/dev/null && pwd)"
10+
[ -f "$NWE_ROOT/scripts/deploy-functions.sh" ] && source "$NWE_ROOT/scripts/deploy-functions.sh"
11+
if type nwe_validate_tomcat &>/dev/null; then nwe_validate_tomcat "$TOMCAT_HOME" || exit 1; fi
912
echo "═══════════════════════════════════════════════════════════════"
1013
echo " Languages™ — Deploy (Violet — Polite Diplomacy)"
1114
echo "═══════════════════════════════════════════════════════════════"

‎modules/library/servlets/deploy-local.sh‎

Lines changed: 65 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,70 @@
11
#!/bin/bash
2+
# StanfordLibrary™ — Deploy Local
3+
# Deploys JSP webapp to Tomcat with JDBC connector and compiled servlet classes.
4+
# Usage: bash modules/library/servlets/deploy-local.sh [tomcat_home]
25
set -e
6+
37
SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
4-
TOMCAT_WEBAPPS="${TOMCAT_HOME:-/home/mearvk/tomcat}/webapps"
5-
echo "[*] Deploying StanfordLibrary™ to $TOMCAT_WEBAPPS/stanford-library"
6-
rm -rf "$TOMCAT_WEBAPPS/stanford-library"; mkdir -p "$TOMCAT_WEBAPPS/stanford-library"
7-
cp -r "$SCRIPT_DIR/servlet/src/main/webapp/"* "$TOMCAT_WEBAPPS/stanford-library/"
8-
mkdir -p "$TOMCAT_WEBAPPS/stanford-library/WEB-INF/lib"
8+
TOMCAT_HOME="${1:-${CATALINA_HOME:-/home/mearvk/tomcat}}"
9+
CONTEXT="library"
10+
DEPLOY_DIR="$TOMCAT_HOME/webapps/$CONTEXT"
911
NWE_ROOT="$(cd "$SCRIPT_DIR/../../.." && pwd)"
10-
JDBC_JAR=$(find "$NWE_ROOT/modules/black/presidential/Brarner.M.Alete/jars" "$NWE_ROOT/jars/mysql" -name "mysql-connector-j*.jar" -type f 2>/dev/null | head -1)
11-
[ -n "$JDBC_JAR" ] && cp "$JDBC_JAR" "$TOMCAT_WEBAPPS/stanford-library/WEB-INF/lib/" && echo "[*] JDBC: $(basename "$JDBC_JAR")" || echo "[!] WARNING: mysql-connector-j not found"
12-
if command -v javac &>/dev/null; then
13-
mkdir -p "$TOMCAT_WEBAPPS/stanford-library/WEB-INF/classes/com/mearvk/library"
14-
javac -cp "${TOMCAT_HOME:-/home/mearvk/tomcat}/lib/*" -d "$TOMCAT_WEBAPPS/stanford-library/WEB-INF/classes" "$SCRIPT_DIR/servlet/src/main/java/com/mearvk/library/"*.java 2>/dev/null || true
12+
WEBAPP_SRC="$SCRIPT_DIR/servlet/src/main/webapp"
13+
14+
echo "[*] Deploying StanfordLibrary™ to $DEPLOY_DIR"
15+
16+
# Validate Tomcat exists
17+
if [ ! -d "$TOMCAT_HOME/webapps" ]; then
18+
echo "[!] Tomcat not found at: $TOMCAT_HOME"
19+
echo " Set CATALINA_HOME or pass path as argument."
20+
exit 1
1521
fi
16-
echo "[OK] StanfordLibrary™ deployed at /stanford-library"
22+
23+
# Validate webapp source exists
24+
if [ ! -d "$WEBAPP_SRC" ]; then
25+
echo "[!] Webapp source not found: $WEBAPP_SRC"
26+
exit 1
27+
fi
28+
29+
# Deploy webapp
30+
rm -rf "$DEPLOY_DIR"
31+
mkdir -p "$DEPLOY_DIR/WEB-INF/lib" "$DEPLOY_DIR/WEB-INF/classes/com/mearvk/library"
32+
cp -r "$WEBAPP_SRC/"* "$DEPLOY_DIR/"
33+
34+
# JDBC connector
35+
JDBC_JAR=$(find "$NWE_ROOT/jars/mysql" -name "mysql-connector-j*.jar" -type f 2>/dev/null | head -1)
36+
[ -z "$JDBC_JAR" ] && JDBC_JAR=$(find "$TOMCAT_HOME/lib" -name "mysql-connector-j*.jar" -type f 2>/dev/null | head -1)
37+
if [ -n "$JDBC_JAR" ]; then
38+
cp "$JDBC_JAR" "$DEPLOY_DIR/WEB-INF/lib/"
39+
echo "[✓] JDBC: $(basename "$JDBC_JAR")"
40+
else
41+
echo "[!] WARNING: mysql-connector-j not found — JSP database queries will fail"
42+
fi
43+
44+
# Compile servlets
45+
JAVA_SRC="$SCRIPT_DIR/servlet/src/main/java/com/mearvk/library"
46+
if command -v javac &>/dev/null && [ -d "$JAVA_SRC" ]; then
47+
SERVLET_API=$(find "$TOMCAT_HOME/lib" -name "servlet-api.jar" -o -name "jakarta.servlet-api*.jar" 2>/dev/null | head -1)
48+
if [ -n "$SERVLET_API" ]; then
49+
find "$JAVA_SRC" -name "*.java" | xargs javac \
50+
-cp "$SERVLET_API:$DEPLOY_DIR/WEB-INF/lib/*" \
51+
-d "$DEPLOY_DIR/WEB-INF/classes" 2>&1 && echo "[✓] Servlets compiled" || echo "[!] Servlet compilation failed (non-fatal)"
52+
else
53+
echo "[--] No servlet-api.jar in $TOMCAT_HOME/lib — skipping compilation"
54+
fi
55+
fi
56+
57+
# Validate WEB-INF/web.xml
58+
if [ ! -f "$DEPLOY_DIR/WEB-INF/web.xml" ]; then
59+
echo "[!] WARNING: No WEB-INF/web.xml — Tomcat may not recognize this webapp"
60+
fi
61+
62+
# Validate JSP presence
63+
JSP_COUNT=$(find "$DEPLOY_DIR" -name "*.jsp" 2>/dev/null | wc -l)
64+
if [ "$JSP_COUNT" -eq 0 ]; then
65+
echo "[!] WARNING: No JSP files found in deployment"
66+
else
67+
echo "[✓] JSP pages: $JSP_COUNT"
68+
fi
69+
70+
echo "[OK] StanfordLibrary™ deployed at /$CONTEXT"

‎modules/nsa/servlets/deploy-local.sh‎

Lines changed: 22 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,27 @@
11
#!/bin/bash
2+
# CaliforniaNSA™ — Deploy Local
3+
# Deploys JSP webapp to Tomcat with JDBC connector and compiled servlet classes.
4+
# Usage: bash modules/nsa/servlets/deploy-local.sh [tomcat_home]
25
set -e
6+
37
SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
4-
TOMCAT_WEBAPPS="${TOMCAT_HOME:-/home/mearvk/tomcat}/webapps"
5-
SRC="$SCRIPT_DIR/servlet/src/main/webapp"
6-
echo "[*] Deploying CaliforniaNSA™ to $TOMCAT_WEBAPPS/california-nsa"
7-
rm -rf "$TOMCAT_WEBAPPS/california-nsa"
8-
mkdir -p "$TOMCAT_WEBAPPS/california-nsa"
9-
cp -r "$SRC/"* "$TOMCAT_WEBAPPS/california-nsa/"
10-
mkdir -p "$TOMCAT_WEBAPPS/california-nsa/WEB-INF/lib"
8+
TOMCAT_HOME="${1:-${CATALINA_HOME:-/home/mearvk/tomcat}}"
119
NWE_ROOT="$(cd "$SCRIPT_DIR/../../.." && pwd)"
12-
JDBC_JAR=$(find "$NWE_ROOT/modules/black/presidential/Brarner.M.Alete/jars" "$NWE_ROOT/jars/mysql" -name "mysql-connector-j*.jar" -type f 2>/dev/null | head -1)
13-
[ -n "$JDBC_JAR" ] && cp "$JDBC_JAR" "$TOMCAT_WEBAPPS/california-nsa/WEB-INF/lib/" && echo "[*] JDBC: $(basename "$JDBC_JAR")" || echo "[!] WARNING: mysql-connector-j not found"
14-
if command -v javac &>/dev/null; then
15-
mkdir -p "$TOMCAT_WEBAPPS/california-nsa/WEB-INF/classes/com/mearvk/nsa"
16-
javac -cp "${TOMCAT_HOME:-/home/mearvk/tomcat}/lib/*" -d "$TOMCAT_WEBAPPS/california-nsa/WEB-INF/classes" \
17-
"$SCRIPT_DIR/servlet/src/main/java/com/mearvk/nsa/"*.java 2>/dev/null || echo "[!] Servlet compilation skipped"
10+
11+
source "$NWE_ROOT/scripts/deploy-functions.sh" 2>/dev/null || true
12+
13+
if type nwe_deploy_module &>/dev/null; then
14+
nwe_deploy_module "CaliforniaNSA" "california-nsa" \
15+
"$SCRIPT_DIR/servlet/src/main/webapp" \
16+
"$SCRIPT_DIR/servlet/src/main/java/com/mearvk/nsa" \
17+
"$TOMCAT_HOME" "$NWE_ROOT"
18+
else
19+
DEPLOY_DIR="$TOMCAT_HOME/webapps/california-nsa"
20+
echo "[*] Deploying CaliforniaNSA™ to $DEPLOY_DIR"
21+
rm -rf "$DEPLOY_DIR"
22+
mkdir -p "$DEPLOY_DIR/WEB-INF/lib"
23+
cp -r "$SCRIPT_DIR/servlet/src/main/webapp/"* "$DEPLOY_DIR/"
24+
JDBC_JAR=$(find "$NWE_ROOT/jars/mysql" -name "mysql-connector-j*.jar" -type f 2>/dev/null | head -1)
25+
[ -n "$JDBC_JAR" ] && cp "$JDBC_JAR" "$DEPLOY_DIR/WEB-INF/lib/"
26+
echo "[OK] CaliforniaNSA™ deployed at /california-nsa"
1827
fi
19-
echo "[OK] CaliforniaNSA™ deployed at /california-nsa"

0 commit comments

Comments
 (0)