wad-lab 1.2.1 → 1.2.2

package/bin/index.js

@@ -41,47 +41,85 @@ const frontendOptions = [
   { name: 'vue-axios-interceptor (Vue 3 + Axios Interceptors + Toast Alerts)', value: 'vue-axios-interceptor' }
 ];
 
+const featuredTemplates = [
+  {
+    key: '1',
+    value: 'fullstack-springboot-vue',
+    name: '[1] fullstack-springboot-vue (Spring Boot 2-Model API + Selectable Vue Frontend)',
+    desc: 'Complete stack: 2-model Spring Boot backend + matching Vue frontend (Router/Pinia/Props)'
+  },
+  {
+    key: '2',
+    value: 'springboot-2model-1controller-api',
+    name: '[2] springboot-2model-1controller-api (2 Models Dept & Emp, 2 Repos, 1 Service)',
+    desc: 'Extensible 2-model Spring Boot architecture (Department + Employee) with full CRUD & PATCH'
+  },
+  {
+    key: '3',
+    value: 'springboot-mongo-aggregation-join',
+    name: '[3] springboot-mongo-aggregation-join ($lookup JOIN, @Query, @Aggregation)',
+    desc: 'MongoDB $lookup multi-collection JOIN, pipeline stages ($match/$group), and @Query filters'
+  },
+  {
+    key: '4',
+    value: 'vue-axios-router-pinia-props',
+    name: '[4] vue-axios-router-pinia-props (Matching Frontend: Router + Pinia + Props/Emits)',
+    desc: 'Matching frontend for 2-model backend: Vue Router + Pinia centralized store + Props/Emits'
+  },
+  {
+    key: '5',
+    value: 'vue-axios-router-props',
+    name: '[5] vue-axios-router-props (Matching Frontend: Router Views + Props/Emits)',
+    desc: 'Matching frontend for 2-model backend: Vue Router pages + reusable components with Props/Emits'
+  },
+  {
+    key: '6',
+    value: 'servlet-jdbc',
+    name: '[6] servlet-jdbc (Tomcat 9 + MySQL Database Connection via JDBC)',
+    desc: 'Tomcat Servlet with MySQL Driver, JDBC connection, SQL statement execution, and HTML table'
+  },
+  {
+    key: '7',
+    value: 'servlet-flow',
+    name: '[7] servlet-flow (Tomcat 9 Execution Flow with GET/POST Form — No DB)',
+    desc: 'Pure servlet without DB: HTML form submission, doGet / doPost processing, and response render'
+  }
+];
+
 const categories = [
   {
     id: 'fullstack',
     title: 'Fullstack Web Applications',
-    icon: '🌐',
     desc: 'Integrated Spring Boot + MongoDB + Vue 3 apps'
   },
   {
     id: 'springboot',
     title: 'Spring Boot Backend APIs',
-    icon: '🍃',
     desc: 'REST APIs, MongoDB, Aggregations, Join & MockMvc'
   },
   {
     id: 'servlet',
     title: 'Java Servlets & Tomcat 9',
-    icon: '☕',
     desc: 'Classic Tomcat Servlets, JDBC, Sessions & Web.xml'
   },
   {
     id: 'vue-axios',
     title: 'Vue 3 + Axios HTTP Variants',
-    icon: '⚡',
     desc: 'All 10+ architectural combinations of Vue 3 with Axios'
   },
   {
     id: 'vue-core',
     title: 'Vue 3 Core Portals & State',
-    icon: '🎨',
     desc: 'Router, Pinia, Native Fetch & Complete UI Portals'
   },
   {
     id: 'games',
     title: 'Interactive Games (JS & Vue)',
-    icon: '🎮',
     desc: 'Logic, DOM & State Management Games'
   },
   {
     id: 'html-css',
     title: 'HTML5 & CSS3 Foundations',
-    icon: '📄',
     desc: 'Form Validation, DOM Manipulation & 50 CSS Properties'
   }
 ];
@@ -385,7 +423,7 @@ const templates = [
 const PAGE_SIZE = 12;
 const templatesRoot = path.join(__dirname, '..', 'templates');
 
-let currentView = 'MAIN'; // 'MAIN' | 'CATEGORY' | 'SEARCH' | 'ALL'
+let currentView = 'MAIN'; // 'MAIN' | 'CATEGORY_LIST' | 'CATEGORY' | 'SEARCH' | 'ALL'
 let activeCategory = null;
 let searchQuery = '';
 let selectedIndex = 0;
@@ -394,19 +432,29 @@ let isPrompting = false;
 
 function getActiveItemList() {
   if (currentView === 'MAIN') {
-    const list = categories.map((cat, idx) => {
+    const list = featuredTemplates.map(f => ({
+      type: 'featured',
+      id: f.value,
+      name: f.name,
+      desc: f.desc
+    }));
+    list.push({ type: 'action', id: 'categories', name: '[C] Browse by Category (7 Groups, 56 Templates)', desc: 'Explore all 56 templates categorized into 7 groups' });
+    list.push({ type: 'action', id: 'search', name: '[S] Search by keyword across all 56 templates', desc: 'Type any keyword to find templates instantly' });
+    list.push({ type: 'action', id: 'all_view', name: '[L] View all 56 templates (grouped catalog)', desc: 'Browse the entire catalog with section dividers' });
+    list.push({ type: 'action', id: 'unpack_all', name: '[A] Unpack all 56 templates in 1-click', desc: 'Copy every single template into target folder' });
+    return list;
+  }
+
+  if (currentView === 'CATEGORY_LIST') {
+    return categories.map((cat, idx) => {
       const count = templates.filter(t => t.category === cat.id).length;
       return {
-        type: 'category',
+        type: 'cat_entry',
         id: cat.id,
-        name: `[${idx + 1}] ${cat.icon} ${cat.title} (${count} templates)`,
+        name: `[${idx + 1}] ${cat.title} (${count} templates)`,
         desc: cat.desc
       };
     });
-    list.push({ type: 'action', id: 'search', name: '[S] 🔍 Search templates by keyword...', desc: 'Quickly find templates by typing name or topic' });
-    list.push({ type: 'action', id: 'all_view', name: '[L] 📋 View all 56 templates (grouped)', desc: 'Browse the full catalog with section headers' });
-    list.push({ type: 'action', id: 'unpack_all', name: '[A] 📦 Unpack all 56 templates in 1-click', desc: 'Copy all 56 templates into target folder' });
-    return list;
   }
 
   if (currentView === 'CATEGORY') {
@@ -435,33 +483,59 @@ function renderScreen() {
 
   if (currentView === 'MAIN') {
     console.log('========================================================');
-    console.log('             🚀 WAD LAB STARTER TEMPLATES              ');
-    console.log('         56 Exam-Ready & Lab-Tested Templates          ');
+    console.log('              WAD LAB STARTER TEMPLATES                 ');
+    console.log('         Exam Quick-Start & 56 Ready Templates          ');
     console.log('========================================================\n');
-    console.log('Navigate with [UP / DOWN] arrow keys');
-    console.log('Press [ENTER] or press [1-7] to enter a category');
-    console.log('Press [S] to Search, [A] to Unpack All, [Ctrl+C] to Exit\n');
+    console.log('CORE EXAM STARTERS:');
+    console.log('  Press [1-7] for instant pick, or navigate with [UP / DOWN]');
+    console.log('  [SPACE] Select | [ENTER] Confirm | [C] Categories | [S] Search | [A] All\n');
 
     const items = getActiveItemList();
     items.forEach((item, idx) => {
-      if (item.id === 'search') {
-        console.log('  ----------------------------------------------------');
+      if (item.id === 'categories') {
+        console.log('\nFULL CATALOG & EXPLORATION:');
       }
       const isCursor = idx === selectedIndex;
-      const prefix = isCursor ? '  👉 ' : '     ';
+      const isChecked = selectedValues.has(item.id);
+      const box = item.type === 'featured' ? (isChecked ? '[x] ' : '[ ] ') : '';
+      const prefix = isCursor ? ' > ' : '   ';
+      console.log(prefix + box + item.name);
+    });
+
+    const activeItem = items[selectedIndex];
+    if (activeItem && activeItem.desc) {
+      console.log('\n  Info: ' + activeItem.desc);
+    }
+    if (selectedValues.size > 0) {
+      console.log(`\n  Selected: ${selectedValues.size} template(s) [Press ENTER to proceed]`);
+    }
+    return;
+  }
+
+  if (currentView === 'CATEGORY_LIST') {
+    console.log('========================================================');
+    console.log('  Browse Templates by Category (56 Total)');
+    console.log('========================================================\n');
+    console.log('  Press [1-7] or [ENTER] to open category');
+    console.log('  [B / ESC] Back to Main Menu\n');
+
+    const items = getActiveItemList();
+    items.forEach((item, idx) => {
+      const isCursor = idx === selectedIndex;
+      const prefix = isCursor ? ' > ' : '   ';
       console.log(prefix + item.name);
     });
 
     const activeItem = items[selectedIndex];
     if (activeItem && activeItem.desc) {
-      console.log('\n  ℹ️  ' + activeItem.desc);
+      console.log('\n  Info: ' + activeItem.desc);
     }
     return;
   }
 
   if (currentView === 'CATEGORY') {
     console.log('========================================================');
-    console.log(`  ${activeCategory.icon} ${activeCategory.title}`);
+    console.log(`  ${activeCategory.title}`);
     console.log(`  ${activeCategory.desc}`);
     console.log('========================================================\n');
     console.log('  [SPACE] Select / Deselect (multi-select supported)');
@@ -479,20 +553,20 @@ function renderScreen() {
     const end = Math.min(start + PAGE_SIZE, total);
 
     if (start > 0) {
-      console.log(`     ▲ (${start} more above)`);
+      console.log(`     ^ (${start} more above)`);
     }
 
     for (let i = start; i < end; i++) {
       const t = items[i];
       const isCursor = i === selectedIndex;
       const isChecked = selectedValues.has(t.value);
-      const box = isChecked ? '[✓]' : '[ ]';
-      const prefix = isCursor ? ' 👉 ' : '    ';
+      const box = isChecked ? '[x]' : '[ ]';
+      const prefix = isCursor ? ' > ' : '   ';
       console.log(prefix + box + ' ' + t.name);
     }
 
     if (end < total) {
-      console.log(`     ▼ (${total - end} more below)`);
+      console.log(`     v (${total - end} more below)`);
     }
 
     const selCount = selectedValues.size;
@@ -502,7 +576,7 @@ function renderScreen() {
 
   if (currentView === 'SEARCH') {
     console.log('========================================================');
-    console.log('  🔍 Instant Template Search');
+    console.log('  Instant Template Search');
     console.log('========================================================');
     console.log(`  Query: "${searchQuery}" (type letters/numbers, Backspace to delete)`);
     console.log('  [SPACE] Select | [ENTER] Confirm | [ESC] Back\n');
@@ -510,7 +584,7 @@ function renderScreen() {
     const items = getActiveItemList();
     if (!searchQuery.trim()) {
       console.log('  Start typing to search across all 56 templates...');
-      console.log('  Try keywords: "mongo", "join", "props", "servlet", "pinia", "game"\n');
+      console.log('  Try keywords: "join", "2model", "props", "servlet", "pinia", "mongo"\n');
       return;
     }
 
@@ -528,20 +602,20 @@ function renderScreen() {
     const end = Math.min(start + PAGE_SIZE, total);
 
     if (start > 0) {
-      console.log(`     ▲ (${start} more above)`);
+      console.log(`     ^ (${start} more above)`);
     }
 
     for (let i = start; i < end; i++) {
       const t = items[i];
       const isCursor = i === selectedIndex;
       const isChecked = selectedValues.has(t.value);
-      const box = isChecked ? '[✓]' : '[ ]';
-      const prefix = isCursor ? ' 👉 ' : '    ';
+      const box = isChecked ? '[x]' : '[ ]';
+      const prefix = isCursor ? ' > ' : '   ';
       console.log(prefix + box + ' ' + t.name);
     }
 
     if (end < total) {
-      console.log(`     ▼ (${total - end} more below)`);
+      console.log(`     v (${total - end} more below)`);
     }
 
     console.log(`\n  Matches: ${total} | Selected: ${selectedValues.size}`);
@@ -550,7 +624,7 @@ function renderScreen() {
 
   if (currentView === 'ALL') {
     console.log('========================================================');
-    console.log('  📋 Full Catalog: All 56 Templates');
+    console.log('  Full Catalog: All 56 Templates');
     console.log('========================================================\n');
     console.log('  [SPACE] Select / Deselect | [ENTER] Confirm | [ESC] Back\n');
 
@@ -565,7 +639,7 @@ function renderScreen() {
     const end = Math.min(start + PAGE_SIZE, total);
 
     if (start > 0) {
-      console.log(`     ▲ (${start} more above)`);
+      console.log(`     ^ (${start} more above)`);
     }
 
     let lastCat = null;
@@ -574,19 +648,19 @@ function renderScreen() {
       if (t.category !== lastCat) {
         const catObj = categories.find(c => c.id === t.category);
         if (catObj) {
-          console.log(`  --- ${catObj.icon} ${catObj.title} ---`);
+          console.log(`  --- ${catObj.title} ---`);
         }
         lastCat = t.category;
       }
       const isCursor = i === selectedIndex;
       const isChecked = selectedValues.has(t.value);
-      const box = isChecked ? '[✓]' : '[ ]';
-      const prefix = isCursor ? ' 👉 ' : '    ';
+      const box = isChecked ? '[x]' : '[ ]';
+      const prefix = isCursor ? ' > ' : '   ';
       console.log(prefix + box + ' ' + t.name);
     }
 
     if (end < total) {
-      console.log(`     ▼ (${total - end} more below)`);
+      console.log(`     v (${total - end} more below)`);
     }
 
     console.log(`\n  [${selectedIndex + 1}/${total}] Selected: ${selectedValues.size}`);
@@ -650,7 +724,7 @@ function promptFolderName(choices) {
 
       if (isAll) {
         copyDirRecursive(templatesRoot, destDir);
-        console.log('\n✨ Successfully unpacked ALL 56 templates into: ' + destDir);
+        console.log('\nSuccessfully unpacked ALL 56 templates into: ' + destDir);
       } else {
         choices.forEach(c => {
           if (c === 'fullstack-springboot-vue') {
@@ -680,7 +754,7 @@ function promptFolderName(choices) {
             console.log('Unpacked [' + c + '] into: ' + dest);
           }
         });
-        console.log('\n✨ Successfully unpacked all chosen templates into: ' + destDir);
+        console.log('\nSuccessfully unpacked all chosen templates into: ' + destDir);
       }
       process.exit(0);
     });
@@ -748,6 +822,10 @@ function startInteractive() {
       } else if (key.name === 'down') {
         selectedIndex = (selectedIndex + 1) % items.length;
         renderScreen();
+      } else if (str === 'c' || str === 'C') {
+        currentView = 'CATEGORY_LIST';
+        selectedIndex = 0;
+        renderScreen();
       } else if (str === 's' || str === 'S') {
         currentView = 'SEARCH';
         searchQuery = '';
@@ -761,15 +839,30 @@ function startInteractive() {
         renderScreen();
       } else if (str >= '1' && str <= '7') {
         const num = parseInt(str, 10);
-        activeCategory = categories[num - 1];
-        currentView = 'CATEGORY';
-        selectedIndex = 0;
-        renderScreen();
+        const target = featuredTemplates[num - 1];
+        if (target) {
+          promptFolderName([target.value]);
+        }
+      } else if (key.name === 'space') {
+        const item = items[selectedIndex];
+        if (item.type === 'featured') {
+          if (selectedValues.has(item.id)) {
+            selectedValues.delete(item.id);
+          } else {
+            selectedValues.add(item.id);
+          }
+          renderScreen();
+        }
       } else if (key.name === 'return' || key.name === 'enter') {
         const item = items[selectedIndex];
-        if (item.type === 'category') {
-          activeCategory = categories.find(c => c.id === item.id);
-          currentView = 'CATEGORY';
+        if (selectedValues.size > 0) {
+          promptFolderName(Array.from(selectedValues));
+          return;
+        }
+        if (item.type === 'featured') {
+          promptFolderName([item.id]);
+        } else if (item.id === 'categories') {
+          currentView = 'CATEGORY_LIST';
           selectedIndex = 0;
           renderScreen();
         } else if (item.id === 'search') {
@@ -788,6 +881,36 @@ function startInteractive() {
       return;
     }
 
+    // CATEGORY_LIST VIEW INPUT
+    if (currentView === 'CATEGORY_LIST') {
+      if (key.name === 'escape' || key.name === 'left' || str === 'b' || str === 'B') {
+        currentView = 'MAIN';
+        selectedIndex = 0;
+        renderScreen();
+        return;
+      }
+      if (key.name === 'up') {
+        selectedIndex = (selectedIndex - 1 + items.length) % items.length;
+        renderScreen();
+      } else if (key.name === 'down') {
+        selectedIndex = (selectedIndex + 1) % items.length;
+        renderScreen();
+      } else if (str >= '1' && str <= '7') {
+        const num = parseInt(str, 10);
+        activeCategory = categories[num - 1];
+        currentView = 'CATEGORY';
+        selectedIndex = 0;
+        renderScreen();
+      } else if (key.name === 'return' || key.name === 'enter') {
+        const item = items[selectedIndex];
+        activeCategory = categories.find(c => c.id === item.id);
+        currentView = 'CATEGORY';
+        selectedIndex = 0;
+        renderScreen();
+      }
+      return;
+    }
+
     // SEARCH VIEW INPUT
     if (currentView === 'SEARCH') {
       if (key.name === 'escape') {
@@ -863,7 +986,7 @@ function startInteractive() {
     // CATEGORY / ALL VIEW INPUT
     if (currentView === 'CATEGORY' || currentView === 'ALL') {
       if (key.name === 'escape' || key.name === 'left' || str === 'b' || str === 'B') {
-        currentView = 'MAIN';
+        currentView = currentView === 'CATEGORY' ? 'CATEGORY_LIST' : 'MAIN';
         selectedIndex = 0;
         renderScreen();
         return;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wad-lab",
-  "version": "1.2.1",
+  "version": "1.2.2",
   "description": "Interactive CLI for WAD Lab starter templates compatible with Node 12+",
   "bin": {
     "wad-lab": "bin/index.js"

package/templates/servlet-basic/script.sh

@@ -0,0 +1,89 @@
+#!/usr/bin/env bash
+# Deploy a servlet/web app folder to Tomcat 9, compile servlets, and start Tomcat.
+# Usage:
+#   ./script.sh                  (runs in foreground, displays logs, press Ctrl+C to stop)
+#   ./script.sh -d               (runs in background daemon mode)
+#   ./script.sh [app-dir] [-d]
+set -euo pipefail
+
+DAEMON_MODE=false
+APP_ARG=""
+for arg in "$@"; do
+  if [ "$arg" = "-d" ] || [ "$arg" = "--daemon" ]; then
+    DAEMON_MODE=true
+  elif [ -z "$APP_ARG" ]; then
+    APP_ARG="$arg"
+  fi
+done
+
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+APP_DIR="$(cd "${APP_ARG:-$SCRIPT_DIR}" && pwd)"
+APP_NAME="$(basename "$APP_DIR")"
+
+# ---- locate Tomcat 9 (CATALINA_HOME, Desktop, Home, WSL /mnt/c, Git Bash /c, or /opt)
+TOMCAT_HOME="${CATALINA_HOME:-}"
+if [ -z "$TOMCAT_HOME" ]; then
+  for d in "$HOME"/Desktop/apache-tomcat-9* "$HOME"/Desktop/*tomcat*9* "$HOME"/Desktop/*omcat*            "$HOME"/apache-tomcat-9* "$HOME"/*tomcat*            /mnt/c/apache-tomcat-9* /mnt/c/apache-tomcat*            /c/apache-tomcat-9* /c/apache-tomcat*            /opt/apache-tomcat-9* /opt/apache-tomcat* /usr/local/apache-tomcat*            "$APP_DIR"/../*tomcat*; do
+    if [ -x "$d/bin/catalina.sh" ] || [ -f "$d/bin/catalina.sh" ]; then
+      TOMCAT_HOME="$d"
+      break
+    fi
+  done
+fi
+
+[ -n "$TOMCAT_HOME" ] || { echo "Tomcat not found in Desktop, Home, /mnt/c, or /opt. Set CATALINA_HOME=/path/to/tomcat and retry."; exit 1; }
+export CATALINA_HOME="$TOMCAT_HOME"
+chmod +x "$TOMCAT_HOME"/bin/*.sh 2>/dev/null || true
+echo "Tomcat : $TOMCAT_HOME"
+echo "App    : $APP_NAME ($APP_DIR)"
+
+# ---- stop Tomcat if it's already running (ignore errors)
+"$TOMCAT_HOME/bin/shutdown.sh" >/dev/null 2>&1 || true
+sleep 2
+
+# ---- copy the app into webapps (fresh copy, remove old exploded copy)
+DEST="$TOMCAT_HOME/webapps/$APP_NAME"
+rm -rf "$DEST"
+mkdir -p "$DEST"
+cp -r "$APP_DIR"/. "$DEST"/
+
+# ---- compile servlets (if any .java files exist)
+SRC_DIR="$DEST/WEB-INF/src"
+[ -d "$SRC_DIR" ] || SRC_DIR="$DEST/WEB-INF"
+mapfile -t JAVA_FILES < <(find "$SRC_DIR" -name '*.java' 2>/dev/null || true)
+if [ "${#JAVA_FILES[@]}" -gt 0 ]; then
+  mkdir -p "$DEST/WEB-INF/classes"
+  if command -v cygpath >/dev/null 2>&1; then
+    CP_PARTS=()
+    for j in "$TOMCAT_HOME"/lib/*.jar; do
+      [ -f "$j" ] && CP_PARTS+=("$(cygpath -w "$j")")
+    done
+    if [ -d "$DEST/WEB-INF/lib" ]; then
+      for j in "$DEST"/WEB-INF/lib/*.jar; do
+        [ -f "$j" ] && CP_PARTS+=("$(cygpath -w "$j")")
+      done
+    fi
+    CP="$(IFS=";"; echo "${CP_PARTS[*]}")"
+  else
+    CP="$TOMCAT_HOME/lib/*"
+    [ -d "$DEST/WEB-INF/lib" ] && CP="$CP:$DEST/WEB-INF/lib/*"
+  fi
+  echo "Compiling ${#JAVA_FILES[@]} Java file(s)..."
+  javac -cp "$CP" -d "$DEST/WEB-INF/classes" "${JAVA_FILES[@]}"
+else
+  echo "No .java files found, skipping compile."
+fi
+
+# ---- start Tomcat
+if [ "$DAEMON_MODE" = true ]; then
+  "$TOMCAT_HOME/bin/startup.sh"
+  echo
+  echo "Started in background. Open: http://localhost:8080/$APP_NAME/"
+  echo "Logs : tail -f $TOMCAT_HOME/logs/catalina.out"
+else
+  echo
+  echo "Started. Open: http://localhost:8080/$APP_NAME/"
+  echo "Press Ctrl+C to stop."
+  echo
+  exec "$TOMCAT_HOME/bin/catalina.sh" run
+fi

package/templates/servlet-flow/script.sh

@@ -0,0 +1,89 @@
+#!/usr/bin/env bash
+# Deploy a servlet/web app folder to Tomcat 9, compile servlets, and start Tomcat.
+# Usage:
+#   ./script.sh                  (runs in foreground, displays logs, press Ctrl+C to stop)
+#   ./script.sh -d               (runs in background daemon mode)
+#   ./script.sh [app-dir] [-d]
+set -euo pipefail
+
+DAEMON_MODE=false
+APP_ARG=""
+for arg in "$@"; do
+  if [ "$arg" = "-d" ] || [ "$arg" = "--daemon" ]; then
+    DAEMON_MODE=true
+  elif [ -z "$APP_ARG" ]; then
+    APP_ARG="$arg"
+  fi
+done
+
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+APP_DIR="$(cd "${APP_ARG:-$SCRIPT_DIR}" && pwd)"
+APP_NAME="$(basename "$APP_DIR")"
+
+# ---- locate Tomcat 9 (CATALINA_HOME, Desktop, Home, WSL /mnt/c, Git Bash /c, or /opt)
+TOMCAT_HOME="${CATALINA_HOME:-}"
+if [ -z "$TOMCAT_HOME" ]; then
+  for d in "$HOME"/Desktop/apache-tomcat-9* "$HOME"/Desktop/*tomcat*9* "$HOME"/Desktop/*omcat*            "$HOME"/apache-tomcat-9* "$HOME"/*tomcat*            /mnt/c/apache-tomcat-9* /mnt/c/apache-tomcat*            /c/apache-tomcat-9* /c/apache-tomcat*            /opt/apache-tomcat-9* /opt/apache-tomcat* /usr/local/apache-tomcat*            "$APP_DIR"/../*tomcat*; do
+    if [ -x "$d/bin/catalina.sh" ] || [ -f "$d/bin/catalina.sh" ]; then
+      TOMCAT_HOME="$d"
+      break
+    fi
+  done
+fi
+
+[ -n "$TOMCAT_HOME" ] || { echo "Tomcat not found in Desktop, Home, /mnt/c, or /opt. Set CATALINA_HOME=/path/to/tomcat and retry."; exit 1; }
+export CATALINA_HOME="$TOMCAT_HOME"
+chmod +x "$TOMCAT_HOME"/bin/*.sh 2>/dev/null || true
+echo "Tomcat : $TOMCAT_HOME"
+echo "App    : $APP_NAME ($APP_DIR)"
+
+# ---- stop Tomcat if it's already running (ignore errors)
+"$TOMCAT_HOME/bin/shutdown.sh" >/dev/null 2>&1 || true
+sleep 2
+
+# ---- copy the app into webapps (fresh copy, remove old exploded copy)
+DEST="$TOMCAT_HOME/webapps/$APP_NAME"
+rm -rf "$DEST"
+mkdir -p "$DEST"
+cp -r "$APP_DIR"/. "$DEST"/
+
+# ---- compile servlets (if any .java files exist)
+SRC_DIR="$DEST/WEB-INF/src"
+[ -d "$SRC_DIR" ] || SRC_DIR="$DEST/WEB-INF"
+mapfile -t JAVA_FILES < <(find "$SRC_DIR" -name '*.java' 2>/dev/null || true)
+if [ "${#JAVA_FILES[@]}" -gt 0 ]; then
+  mkdir -p "$DEST/WEB-INF/classes"
+  if command -v cygpath >/dev/null 2>&1; then
+    CP_PARTS=()
+    for j in "$TOMCAT_HOME"/lib/*.jar; do
+      [ -f "$j" ] && CP_PARTS+=("$(cygpath -w "$j")")
+    done
+    if [ -d "$DEST/WEB-INF/lib" ]; then
+      for j in "$DEST"/WEB-INF/lib/*.jar; do
+        [ -f "$j" ] && CP_PARTS+=("$(cygpath -w "$j")")
+      done
+    fi
+    CP="$(IFS=";"; echo "${CP_PARTS[*]}")"
+  else
+    CP="$TOMCAT_HOME/lib/*"
+    [ -d "$DEST/WEB-INF/lib" ] && CP="$CP:$DEST/WEB-INF/lib/*"
+  fi
+  echo "Compiling ${#JAVA_FILES[@]} Java file(s)..."
+  javac -cp "$CP" -d "$DEST/WEB-INF/classes" "${JAVA_FILES[@]}"
+else
+  echo "No .java files found, skipping compile."
+fi
+
+# ---- start Tomcat
+if [ "$DAEMON_MODE" = true ]; then
+  "$TOMCAT_HOME/bin/startup.sh"
+  echo
+  echo "Started in background. Open: http://localhost:8080/$APP_NAME/"
+  echo "Logs : tail -f $TOMCAT_HOME/logs/catalina.out"
+else
+  echo
+  echo "Started. Open: http://localhost:8080/$APP_NAME/"
+  echo "Press Ctrl+C to stop."
+  echo
+  exec "$TOMCAT_HOME/bin/catalina.sh" run
+fi

package/templates/servlet-jdbc/script.sh

@@ -0,0 +1,89 @@
+#!/usr/bin/env bash
+# Deploy a servlet/web app folder to Tomcat 9, compile servlets, and start Tomcat.
+# Usage:
+#   ./script.sh                  (runs in foreground, displays logs, press Ctrl+C to stop)
+#   ./script.sh -d               (runs in background daemon mode)
+#   ./script.sh [app-dir] [-d]
+set -euo pipefail
+
+DAEMON_MODE=false
+APP_ARG=""
+for arg in "$@"; do
+  if [ "$arg" = "-d" ] || [ "$arg" = "--daemon" ]; then
+    DAEMON_MODE=true
+  elif [ -z "$APP_ARG" ]; then
+    APP_ARG="$arg"
+  fi
+done
+
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+APP_DIR="$(cd "${APP_ARG:-$SCRIPT_DIR}" && pwd)"
+APP_NAME="$(basename "$APP_DIR")"
+
+# ---- locate Tomcat 9 (CATALINA_HOME, Desktop, Home, WSL /mnt/c, Git Bash /c, or /opt)
+TOMCAT_HOME="${CATALINA_HOME:-}"
+if [ -z "$TOMCAT_HOME" ]; then
+  for d in "$HOME"/Desktop/apache-tomcat-9* "$HOME"/Desktop/*tomcat*9* "$HOME"/Desktop/*omcat*            "$HOME"/apache-tomcat-9* "$HOME"/*tomcat*            /mnt/c/apache-tomcat-9* /mnt/c/apache-tomcat*            /c/apache-tomcat-9* /c/apache-tomcat*            /opt/apache-tomcat-9* /opt/apache-tomcat* /usr/local/apache-tomcat*            "$APP_DIR"/../*tomcat*; do
+    if [ -x "$d/bin/catalina.sh" ] || [ -f "$d/bin/catalina.sh" ]; then
+      TOMCAT_HOME="$d"
+      break
+    fi
+  done
+fi
+
+[ -n "$TOMCAT_HOME" ] || { echo "Tomcat not found in Desktop, Home, /mnt/c, or /opt. Set CATALINA_HOME=/path/to/tomcat and retry."; exit 1; }
+export CATALINA_HOME="$TOMCAT_HOME"
+chmod +x "$TOMCAT_HOME"/bin/*.sh 2>/dev/null || true
+echo "Tomcat : $TOMCAT_HOME"
+echo "App    : $APP_NAME ($APP_DIR)"
+
+# ---- stop Tomcat if it's already running (ignore errors)
+"$TOMCAT_HOME/bin/shutdown.sh" >/dev/null 2>&1 || true
+sleep 2
+
+# ---- copy the app into webapps (fresh copy, remove old exploded copy)
+DEST="$TOMCAT_HOME/webapps/$APP_NAME"
+rm -rf "$DEST"
+mkdir -p "$DEST"
+cp -r "$APP_DIR"/. "$DEST"/
+
+# ---- compile servlets (if any .java files exist)
+SRC_DIR="$DEST/WEB-INF/src"
+[ -d "$SRC_DIR" ] || SRC_DIR="$DEST/WEB-INF"
+mapfile -t JAVA_FILES < <(find "$SRC_DIR" -name '*.java' 2>/dev/null || true)
+if [ "${#JAVA_FILES[@]}" -gt 0 ]; then
+  mkdir -p "$DEST/WEB-INF/classes"
+  if command -v cygpath >/dev/null 2>&1; then
+    CP_PARTS=()
+    for j in "$TOMCAT_HOME"/lib/*.jar; do
+      [ -f "$j" ] && CP_PARTS+=("$(cygpath -w "$j")")
+    done
+    if [ -d "$DEST/WEB-INF/lib" ]; then
+      for j in "$DEST"/WEB-INF/lib/*.jar; do
+        [ -f "$j" ] && CP_PARTS+=("$(cygpath -w "$j")")
+      done
+    fi
+    CP="$(IFS=";"; echo "${CP_PARTS[*]}")"
+  else
+    CP="$TOMCAT_HOME/lib/*"
+    [ -d "$DEST/WEB-INF/lib" ] && CP="$CP:$DEST/WEB-INF/lib/*"
+  fi
+  echo "Compiling ${#JAVA_FILES[@]} Java file(s)..."
+  javac -cp "$CP" -d "$DEST/WEB-INF/classes" "${JAVA_FILES[@]}"
+else
+  echo "No .java files found, skipping compile."
+fi
+
+# ---- start Tomcat
+if [ "$DAEMON_MODE" = true ]; then
+  "$TOMCAT_HOME/bin/startup.sh"
+  echo
+  echo "Started in background. Open: http://localhost:8080/$APP_NAME/"
+  echo "Logs : tail -f $TOMCAT_HOME/logs/catalina.out"
+else
+  echo
+  echo "Started. Open: http://localhost:8080/$APP_NAME/"
+  echo "Press Ctrl+C to stop."
+  echo
+  exec "$TOMCAT_HOME/bin/catalina.sh" run
+fi

package/templates/servlet-session-tracking/script.sh

@@ -0,0 +1,89 @@
+#!/usr/bin/env bash
+# Deploy a servlet/web app folder to Tomcat 9, compile servlets, and start Tomcat.
+# Usage:
+#   ./script.sh                  (runs in foreground, displays logs, press Ctrl+C to stop)
+#   ./script.sh -d               (runs in background daemon mode)
+#   ./script.sh [app-dir] [-d]
+set -euo pipefail
+
+DAEMON_MODE=false
+APP_ARG=""
+for arg in "$@"; do
+  if [ "$arg" = "-d" ] || [ "$arg" = "--daemon" ]; then
+    DAEMON_MODE=true
+  elif [ -z "$APP_ARG" ]; then
+    APP_ARG="$arg"
+  fi
+done
+
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+APP_DIR="$(cd "${APP_ARG:-$SCRIPT_DIR}" && pwd)"
+APP_NAME="$(basename "$APP_DIR")"
+
+# ---- locate Tomcat 9 (CATALINA_HOME, Desktop, Home, WSL /mnt/c, Git Bash /c, or /opt)
+TOMCAT_HOME="${CATALINA_HOME:-}"
+if [ -z "$TOMCAT_HOME" ]; then
+  for d in "$HOME"/Desktop/apache-tomcat-9* "$HOME"/Desktop/*tomcat*9* "$HOME"/Desktop/*omcat*            "$HOME"/apache-tomcat-9* "$HOME"/*tomcat*            /mnt/c/apache-tomcat-9* /mnt/c/apache-tomcat*            /c/apache-tomcat-9* /c/apache-tomcat*            /opt/apache-tomcat-9* /opt/apache-tomcat* /usr/local/apache-tomcat*            "$APP_DIR"/../*tomcat*; do
+    if [ -x "$d/bin/catalina.sh" ] || [ -f "$d/bin/catalina.sh" ]; then
+      TOMCAT_HOME="$d"
+      break
+    fi
+  done
+fi
+
+[ -n "$TOMCAT_HOME" ] || { echo "Tomcat not found in Desktop, Home, /mnt/c, or /opt. Set CATALINA_HOME=/path/to/tomcat and retry."; exit 1; }
+export CATALINA_HOME="$TOMCAT_HOME"
+chmod +x "$TOMCAT_HOME"/bin/*.sh 2>/dev/null || true
+echo "Tomcat : $TOMCAT_HOME"
+echo "App    : $APP_NAME ($APP_DIR)"
+
+# ---- stop Tomcat if it's already running (ignore errors)
+"$TOMCAT_HOME/bin/shutdown.sh" >/dev/null 2>&1 || true
+sleep 2
+
+# ---- copy the app into webapps (fresh copy, remove old exploded copy)
+DEST="$TOMCAT_HOME/webapps/$APP_NAME"
+rm -rf "$DEST"
+mkdir -p "$DEST"
+cp -r "$APP_DIR"/. "$DEST"/
+
+# ---- compile servlets (if any .java files exist)
+SRC_DIR="$DEST/WEB-INF/src"
+[ -d "$SRC_DIR" ] || SRC_DIR="$DEST/WEB-INF"
+mapfile -t JAVA_FILES < <(find "$SRC_DIR" -name '*.java' 2>/dev/null || true)
+if [ "${#JAVA_FILES[@]}" -gt 0 ]; then
+  mkdir -p "$DEST/WEB-INF/classes"
+  if command -v cygpath >/dev/null 2>&1; then
+    CP_PARTS=()
+    for j in "$TOMCAT_HOME"/lib/*.jar; do
+      [ -f "$j" ] && CP_PARTS+=("$(cygpath -w "$j")")
+    done
+    if [ -d "$DEST/WEB-INF/lib" ]; then
+      for j in "$DEST"/WEB-INF/lib/*.jar; do
+        [ -f "$j" ] && CP_PARTS+=("$(cygpath -w "$j")")
+      done
+    fi
+    CP="$(IFS=";"; echo "${CP_PARTS[*]}")"
+  else
+    CP="$TOMCAT_HOME/lib/*"
+    [ -d "$DEST/WEB-INF/lib" ] && CP="$CP:$DEST/WEB-INF/lib/*"
+  fi
+  echo "Compiling ${#JAVA_FILES[@]} Java file(s)..."
+  javac -cp "$CP" -d "$DEST/WEB-INF/classes" "${JAVA_FILES[@]}"
+else
+  echo "No .java files found, skipping compile."
+fi
+
+# ---- start Tomcat
+if [ "$DAEMON_MODE" = true ]; then
+  "$TOMCAT_HOME/bin/startup.sh"
+  echo
+  echo "Started in background. Open: http://localhost:8080/$APP_NAME/"
+  echo "Logs : tail -f $TOMCAT_HOME/logs/catalina.out"
+else
+  echo
+  echo "Started. Open: http://localhost:8080/$APP_NAME/"
+  echo "Press Ctrl+C to stop."
+  echo
+  exec "$TOMCAT_HOME/bin/catalina.sh" run
+fi

package/templates/servlet-voter-eligibility/script.sh

@@ -0,0 +1,89 @@
+#!/usr/bin/env bash
+# Deploy a servlet/web app folder to Tomcat 9, compile servlets, and start Tomcat.
+# Usage:
+#   ./script.sh                  (runs in foreground, displays logs, press Ctrl+C to stop)
+#   ./script.sh -d               (runs in background daemon mode)
+#   ./script.sh [app-dir] [-d]
+set -euo pipefail
+
+DAEMON_MODE=false
+APP_ARG=""
+for arg in "$@"; do
+  if [ "$arg" = "-d" ] || [ "$arg" = "--daemon" ]; then
+    DAEMON_MODE=true
+  elif [ -z "$APP_ARG" ]; then
+    APP_ARG="$arg"
+  fi
+done
+
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+APP_DIR="$(cd "${APP_ARG:-$SCRIPT_DIR}" && pwd)"
+APP_NAME="$(basename "$APP_DIR")"
+
+# ---- locate Tomcat 9 (CATALINA_HOME, Desktop, Home, WSL /mnt/c, Git Bash /c, or /opt)
+TOMCAT_HOME="${CATALINA_HOME:-}"
+if [ -z "$TOMCAT_HOME" ]; then
+  for d in "$HOME"/Desktop/apache-tomcat-9* "$HOME"/Desktop/*tomcat*9* "$HOME"/Desktop/*omcat*            "$HOME"/apache-tomcat-9* "$HOME"/*tomcat*            /mnt/c/apache-tomcat-9* /mnt/c/apache-tomcat*            /c/apache-tomcat-9* /c/apache-tomcat*            /opt/apache-tomcat-9* /opt/apache-tomcat* /usr/local/apache-tomcat*            "$APP_DIR"/../*tomcat*; do
+    if [ -x "$d/bin/catalina.sh" ] || [ -f "$d/bin/catalina.sh" ]; then
+      TOMCAT_HOME="$d"
+      break
+    fi
+  done
+fi
+
+[ -n "$TOMCAT_HOME" ] || { echo "Tomcat not found in Desktop, Home, /mnt/c, or /opt. Set CATALINA_HOME=/path/to/tomcat and retry."; exit 1; }
+export CATALINA_HOME="$TOMCAT_HOME"
+chmod +x "$TOMCAT_HOME"/bin/*.sh 2>/dev/null || true
+echo "Tomcat : $TOMCAT_HOME"
+echo "App    : $APP_NAME ($APP_DIR)"
+
+# ---- stop Tomcat if it's already running (ignore errors)
+"$TOMCAT_HOME/bin/shutdown.sh" >/dev/null 2>&1 || true
+sleep 2
+
+# ---- copy the app into webapps (fresh copy, remove old exploded copy)
+DEST="$TOMCAT_HOME/webapps/$APP_NAME"
+rm -rf "$DEST"
+mkdir -p "$DEST"
+cp -r "$APP_DIR"/. "$DEST"/
+
+# ---- compile servlets (if any .java files exist)
+SRC_DIR="$DEST/WEB-INF/src"
+[ -d "$SRC_DIR" ] || SRC_DIR="$DEST/WEB-INF"
+mapfile -t JAVA_FILES < <(find "$SRC_DIR" -name '*.java' 2>/dev/null || true)
+if [ "${#JAVA_FILES[@]}" -gt 0 ]; then
+  mkdir -p "$DEST/WEB-INF/classes"
+  if command -v cygpath >/dev/null 2>&1; then
+    CP_PARTS=()
+    for j in "$TOMCAT_HOME"/lib/*.jar; do
+      [ -f "$j" ] && CP_PARTS+=("$(cygpath -w "$j")")
+    done
+    if [ -d "$DEST/WEB-INF/lib" ]; then
+      for j in "$DEST"/WEB-INF/lib/*.jar; do
+        [ -f "$j" ] && CP_PARTS+=("$(cygpath -w "$j")")
+      done
+    fi
+    CP="$(IFS=";"; echo "${CP_PARTS[*]}")"
+  else
+    CP="$TOMCAT_HOME/lib/*"
+    [ -d "$DEST/WEB-INF/lib" ] && CP="$CP:$DEST/WEB-INF/lib/*"
+  fi
+  echo "Compiling ${#JAVA_FILES[@]} Java file(s)..."
+  javac -cp "$CP" -d "$DEST/WEB-INF/classes" "${JAVA_FILES[@]}"
+else
+  echo "No .java files found, skipping compile."
+fi
+
+# ---- start Tomcat
+if [ "$DAEMON_MODE" = true ]; then
+  "$TOMCAT_HOME/bin/startup.sh"
+  echo
+  echo "Started in background. Open: http://localhost:8080/$APP_NAME/"
+  echo "Logs : tail -f $TOMCAT_HOME/logs/catalina.out"
+else
+  echo
+  echo "Started. Open: http://localhost:8080/$APP_NAME/"
+  echo "Press Ctrl+C to stop."
+  echo
+  exec "$TOMCAT_HOME/bin/catalina.sh" run
+fi