Skip to content

Commit dddbe3a

Browse files
mearvkmearvk
committed
Science Commit 5.
1 parent 319ac85 commit dddbe3a

10 files changed

Lines changed: 18 additions & 18 deletions

File tree

‎modules/black/presidential/Brarner.M.Alete/shutdown.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ set -e
88

99
SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
1010
BMA_ROOT="$SCRIPT_DIR"
11-
TOMCAT_HOME="${1:-${CATALINA_HOME:-/opt/tomcat}}"
11+
TOMCAT_HOME="${1:-${CATALINA_HOME:-/home/mearvk/tomcat}}"
1212
CONTEXT="brarner.m.alete"
1313
DEPLOY_DIR="$TOMCAT_HOME/webapps/$CONTEXT"
1414
STOP_TOMCAT=false

‎scripts/compile-all-modules.sh‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ echo ""
1919
echo "[1/6] Core sources (source/)..."
2020
find "$ROOT/source" -name "*.java" > /tmp/nwe-core.txt
2121
javac -d "$OUT" -cp "$CP" \
22-
-sourcepath "$ROOT/source:$ROOT/modules/fbi/source:$ROOT/modules/cia/source:$ROOT/modules/nsa/source:$ROOT/modules/duke/source:$ROOT/modules/library/source:$ROOT/modules/gray/source:$ROOT/modules/gray.a85/source:$ROOT/modules/black" \
22+
-sourcepath "$ROOT/source:$ROOT/modules/fbi/source:$ROOT/modules/cia/source:$ROOT/modules/nsa/source:$ROOT/modules/duke/source:$ROOT/modules/library/source:$ROOT/modules/gray/source:$ROOT/modules/gray.a85/source:$ROOT/modules/red/Futures/source" \
2323
@/tmp/nwe-core.txt 2>&1 | grep -i error || echo " OK"
2424
rm -f /tmp/nwe-core.txt
2525

@@ -44,9 +44,9 @@ javac -d "$OUT" -cp "$CP" \
4444

4545
# 4. Futures (DemocraticAIServer)
4646
echo "[4/6] Futures (DemocraticAIServer)..."
47-
find "$ROOT/modules/black/red/Futures/source" -name "*.java" > /tmp/futures.txt 2>/dev/null
47+
find "$ROOT/modules/red/Futures/source" -name "*.java" > /tmp/futures.txt 2>/dev/null
4848
if [ -s /tmp/futures.txt ]; then
49-
javac -d "$OUT" -cp "$CP" -sourcepath "$ROOT/source:$ROOT/modules/black" @/tmp/futures.txt 2>&1 | grep -i error || echo " OK"
49+
javac -d "$OUT" -cp "$CP" -sourcepath "$ROOT/source:$ROOT/modules/red/Futures/source" @/tmp/futures.txt 2>&1 | grep -i error || echo " OK"
5050
else
5151
echo " SKIP (no source found)"
5252
fi

‎scripts/fix-missing-deploy-scripts.sh‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,15 @@ PROJECT_ROOT="$(cd "$(dirname "$0")/.." && pwd)"
99
echo "[*] Creating missing deploy scripts for nested-repo modules..."
1010

1111
# ── Futures deploy-local.sh ──────────────────────────────────────────────────
12-
FUTURES_DIR="$PROJECT_ROOT/modules/black/red/Futures/servlets"
12+
FUTURES_DIR="$PROJECT_ROOT/modules/red/Futures/servlets"
1313
mkdir -p "$FUTURES_DIR/servlet/src/main/webapp/WEB-INF"
1414
if [ ! -f "$FUTURES_DIR/deploy-local.sh" ]; then
1515
cat > "$FUTURES_DIR/deploy-local.sh" << 'EOF'
1616
#!/bin/bash
1717
set -e
1818
SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
1919
WEBAPP_SRC="$SCRIPT_DIR/servlet/src/main/webapp"
20-
TOMCAT_HOME="${1:-${CATALINA_HOME:-/opt/tomcat}}"
20+
TOMCAT_HOME="${1:-${CATALINA_HOME:-/home/mearvk/tomcat}}"
2121
DEPLOY_DIR="$TOMCAT_HOME/webapps/futures"
2222
echo "[*] Deploying Futures™ to $DEPLOY_DIR"
2323
mkdir -p "$DEPLOY_DIR/WEB-INF/lib"
@@ -32,15 +32,15 @@ echo " [SKIP] Already exists: $FUTURES_DIR/deploy-local.sh"
3232
fi
3333

3434
# ── GDGH deploy-local.sh ────────────────────────────────────────────────────
35-
GDGH_DIR="$PROJECT_ROOT/modules/black/presidential/Green.Durham.Grass.and.Herb/servlets"
35+
GDGH_DIR="$PROJECT_ROOT/modules/Green.Durham.Grass.and.Herb/servlets"
3636
mkdir -p "$GDGH_DIR/servlet/src/main/webapp/WEB-INF"
3737
if [ ! -f "$GDGH_DIR/deploy-local.sh" ]; then
3838
cat > "$GDGH_DIR/deploy-local.sh" << 'EOF'
3939
#!/bin/bash
4040
set -e
4141
SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
4242
WEBAPP_SRC="$SCRIPT_DIR/servlet/src/main/webapp"
43-
TOMCAT_HOME="${1:-${CATALINA_HOME:-/opt/tomcat}}"
43+
TOMCAT_HOME="${1:-${CATALINA_HOME:-/home/mearvk/tomcat}}"
4444
DEPLOY_DIR="$TOMCAT_HOME/webapps/gdgh"
4545
echo "[*] Deploying Green.Durham.Grass.and.Herb™ to $DEPLOY_DIR"
4646
mkdir -p "$DEPLOY_DIR/WEB-INF/lib"

‎scripts/generate-website.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -469,7 +469,7 @@ cat > "$INSTALL_DIR/deploy-local.sh" << 'DEPLOYEOF'
469469
SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
470470
MOD_ROOT="$(dirname "$SCRIPT_DIR")"
471471
WEBAPP_SRC="$MOD_ROOT/servlets/servlet/src/main/webapp"
472-
TOMCAT_HOME="${CATALINA_HOME:-/opt/tomcat}"
472+
TOMCAT_HOME="${CATALINA_HOME:-/home/mearvk/tomcat}"
473473
DEPLOYEOF
474474

475475
cat >> "$INSTALL_DIR/deploy-local.sh" << DEPLOYEOF2

‎scripts/shutdown-all.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
set -uo pipefail
1212

1313
PROJECT_ROOT="$(cd "$(dirname "$0")/.." && pwd)"
14-
TOMCAT_HOME="${1:-${CATALINA_HOME:-/opt/tomcat}}"
14+
TOMCAT_HOME="${1:-${CATALINA_HOME:-/home/mearvk/tomcat}}"
1515
STOP_TOMCAT="${2:-}"
1616

1717
echo ""

‎scripts/web/deploy-missing.sh‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
set -e
55

66
PROJECT_ROOT="$(cd "$(dirname "$0")/../.." && pwd)"
7-
TOMCAT_HOME="${CATALINA_HOME:-/opt/tomcat}"
7+
TOMCAT_HOME="${CATALINA_HOME:-/home/mearvk/tomcat}"
88
WEBAPPS="$TOMCAT_HOME/webapps"
99

1010
deploy() {
@@ -20,8 +20,8 @@ deploy() {
2020
echo "[*] Deploying missing webapps..."
2121

2222
deploy "ae6e66" "$PROJECT_ROOT/modules/AE6E66/servlets/servlet/src/main/webapp"
23-
deploy "futures" "$PROJECT_ROOT/modules/black/red/Futures/servlets/servlet/src/main/webapp"
24-
deploy "gdgh" "$PROJECT_ROOT/modules/black/presidential/Green.Durham.Grass.and.Herb/servlets/servlet/src/main/webapp"
25-
deploy "california-nsa" "$PROJECT_ROOT/california/nsa/servlets/servlet/src/main/webapp"
23+
deploy "futures" "$PROJECT_ROOT/modules/red/Futures/servlets/servlet/src/main/webapp"
24+
deploy "gdgh" "$PROJECT_ROOT/modules/Green.Durham.Grass.and.Herb/servlets/servlet/src/main/webapp"
25+
deploy "california-nsa" "$PROJECT_ROOT/modules/nsa/servlets/servlet/src/main/webapp"
2626

2727
echo "[*] Done. Verify: curl -s -o /dev/null -w '%{http_code}' http://localhost:8080/ae6e66/"

‎scripts/web/patch-webinf-and-ssl.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ echo ""
6666
echo "[2/2] SSL Certificate Verification..."
6767

6868
# Check Tomcat SSL (port 8443 or configured HTTPS)
69-
TOMCAT_HOME="${CATALINA_HOME:-/opt/tomcat}"
69+
TOMCAT_HOME="${CATALINA_HOME:-/home/mearvk/tomcat}"
7070
TOMCAT_SSL_CONF="$TOMCAT_HOME/conf/server.xml"
7171
DOMAINS=("lauradei.us" "localhost")
7272

‎scripts/web/post-clone.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ echo "[*] Configuring MySQL root for JDBC (caching_sha2_password)..."
3333
sudo mysql -e "ALTER USER 'root'@'localhost' IDENTIFIED WITH caching_sha2_password BY '\$\$Ironman1'; FLUSH PRIVILEGES;" 2>/dev/null || true
3434

3535
# 4. Ensure Tomcat
36-
TOMCAT_HOME="/opt/tomcat"
36+
TOMCAT_HOME="/home/mearvk/tomcat"
3737
if [ ! -f "$TOMCAT_HOME/bin/catalina.sh" ]; then
3838
echo "[*] Installing Tomcat 11..."
3939
cd /tmp && curl -sfLO "https://archive.apache.org/dist/tomcat/tomcat-11/v11.0.2/bin/apache-tomcat-11.0.2.tar.gz"

‎scripts/web/run-module.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ case "$MODULE_ID" in
1717
;;
1818
futures)
1919
echo "[*] Running Futures pipeline..."
20-
cd "$PROJECT_ROOT" && java -cp "modules/black/red/Futures/source:modules/black/red/Futures/jars/*" source.Main
20+
cd "$PROJECT_ROOT" && java -cp "modules/red/Futures/source:modules/red/Futures/jars/*" source.Main
2121
;;
2222
strernary)
2323
echo "[*] Starting Strernary server..."

‎scripts/web/web-deploy-config.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
Edit this file to enable/disable modules before running deploy scripts.
66
-->
77
<web-deploy>
8-
<tomcat-home>/opt/tomcat</tomcat-home>
8+
<tomcat-home>/home/mearvk/tomcat</tomcat-home>
99
<mysql-host>127.0.0.1</mysql-host>
1010
<mysql-port>3306</mysql-port>
1111
<mysql-user>root</mysql-user>

0 commit comments

Comments
 (0)