Skip to content

Commit bd7d572

Browse files
mearvkmearvk
committed
Science Commit 5.
1 parent 64e3d6a commit bd7d572

9 files changed

Lines changed: 123 additions & 15 deletions

File tree

‎modules/black/presidential/Brarner.M.Alete/install/deploy-remote-linux.sh‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -171,6 +171,37 @@ fi
171171
ssh $SSH_OPTS "$REMOTE_USER@$REMOTE_HOST" "chown -R tomcat:tomcat /opt/tomcat/webapps/${TOMCAT_CONTEXT}* && systemctl restart tomcat"
172172
echo "[*] Tomcat restarted with new deployment"
173173

174+
# ─── Ensure db.properties on remote for JSP pages ───
175+
echo "[*] Configuring database credentials for JSP pages..."
176+
DB_PROPS_LOCAL="$WEBAPP_SRC/WEB-INF/db.properties"
177+
DB_PROPS_REMOTE="/opt/tomcat/webapps/${TOMCAT_CONTEXT}/WEB-INF/db.properties"
178+
179+
if [ -f "$DB_PROPS_LOCAL" ]; then
180+
scp -o ConnectTimeout=10 -o BatchMode=yes "$DB_PROPS_LOCAL" "$REMOTE_USER@$REMOTE_HOST:$DB_PROPS_REMOTE"
181+
else
182+
# Prompt for remote DB credentials
183+
echo " JSP pages need MySQL credentials on the remote server."
184+
read -rp " Remote MySQL username [root]: " R_DB_USER
185+
R_DB_USER="${R_DB_USER:-root}"
186+
read -rsp " Remote MySQL password: " R_DB_PASS
187+
echo ""
188+
read -rp " Remote MySQL host [localhost]: " R_DB_HOST
189+
R_DB_HOST="${R_DB_HOST:-localhost}"
190+
read -rp " Remote MySQL port [3306]: " R_DB_PORT
191+
R_DB_PORT="${R_DB_PORT:-3306}"
192+
193+
ssh $SSH_OPTS "$REMOTE_USER@$REMOTE_HOST" "cat > $DB_PROPS_REMOTE <<'DBEOF'
194+
# BMA Database Configuration — written by deploy script
195+
db.driver=com.mysql.cj.jdbc.Driver
196+
db.url=jdbc:mysql://${R_DB_HOST}:${R_DB_PORT}/BrarnerScience
197+
db.user=${R_DB_USER}
198+
db.password=${R_DB_PASS}
199+
DBEOF
200+
"
201+
fi
202+
ssh $SSH_OPTS "$REMOTE_USER@$REMOTE_HOST" "chmod 600 $DB_PROPS_REMOTE && chown tomcat:tomcat $DB_PROPS_REMOTE"
203+
echo "[✓] db.properties configured for JSP database access"
204+
174205
# ─── Deploy static copy for Apache (images served directly) ───
175206
echo "[*] Deploying static assets to ${REMOTE_PATH}..."
176207
ssh $SSH_OPTS "$REMOTE_USER@$REMOTE_HOST" "mkdir -p ${REMOTE_PATH}/{images,css}"

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

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,8 +73,36 @@ port=${DB_PORT}
7373
EOF
7474
chmod 600 "$MY_CNF"
7575
echo "[✓] Wrote $MY_CNF"
76+
77+
# Write db.properties for JSP pages
78+
DB_PROPS="$WEBAPP_SRC/WEB-INF/db.properties"
79+
mkdir -p "$(dirname "$DB_PROPS")"
80+
cat > "$DB_PROPS" <<EOF
81+
# BMA Database Configuration — written by install script
82+
db.driver=com.mysql.cj.jdbc.Driver
83+
db.url=jdbc:mysql://${DB_HOST}:${DB_PORT}/BrarnerScience
84+
db.user=${DB_USER}
85+
db.password=${DB_PASS}
86+
EOF
87+
chmod 600 "$DB_PROPS"
88+
echo "[✓] Wrote $DB_PROPS (JSP database credentials)"
7689
else
7790
echo "[*] MySQL credentials: $MY_CNF (exists)"
91+
92+
# Ensure db.properties stays in sync
93+
DB_PROPS="$WEBAPP_SRC/WEB-INF/db.properties"
94+
if [ ! -f "$DB_PROPS" ]; then
95+
source <(grep -E '^(user|password|host|port)' "$MY_CNF" | sed 's/^/DB_/' | sed 's/=\(.*\)/="\1"/')
96+
cat > "$DB_PROPS" <<EOF
97+
# BMA Database Configuration — synced from .my.cnf
98+
db.driver=com.mysql.cj.jdbc.Driver
99+
db.url=jdbc:mysql://${DB_host:-localhost}:${DB_port:-3306}/BrarnerScience
100+
db.user=${DB_user:-root}
101+
db.password=${DB_password:-}
102+
EOF
103+
chmod 600 "$DB_PROPS"
104+
echo "[✓] Synced $DB_PROPS from .my.cnf"
105+
fi
78106
fi
79107

80108
# ─── Download JARs if needed ───

‎modules/black/presidential/Brarner.M.Alete/servlets/servlet/src/main/webapp/WEB-INF/db-connect.jsp‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
<%-- db-connect.jsp — Reads WEB-INF/db.properties, sets conn variable --%>
2+
<%@ page import="java.sql.*, java.util.Properties, java.io.InputStream" %>
3+
<%
4+
Properties dbProps = new Properties();
5+
InputStream dbIn = application.getResourceAsStream("/WEB-INF/db.properties");
6+
if (dbIn != null) { dbProps.load(dbIn); dbIn.close(); }
7+
String dbDriver = dbProps.getProperty("db.driver", "com.mysql.cj.jdbc.Driver");
8+
String dbUrl = dbProps.getProperty("db.url", "jdbc:mysql://localhost:3306/BrarnerScience");
9+
String dbUser = dbProps.getProperty("db.user", "root");
10+
String dbPass = dbProps.getProperty("db.password", "");
11+
Class.forName(dbDriver);
12+
Connection conn = DriverManager.getConnection(dbUrl, dbUser, dbPass);
13+
%>

‎modules/black/presidential/Brarner.M.Alete/servlets/servlet/src/main/webapp/WEB-INF/db.properties‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
# BMA Database Configuration — written by install/deploy scripts
2+
# Read by JSP pages at runtime for server-side JDBC connections
3+
db.driver=com.mysql.cj.jdbc.Driver
4+
db.url=jdbc:mysql://localhost:3306/BrarnerScience
5+
db.user=root
6+
db.password=

‎modules/black/presidential/Brarner.M.Alete/servlets/servlet/src/main/webapp/art.jsp‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<%@ page contentType="text/html;charset=UTF-8" language="java" %>
2-
<%@ page import="java.sql.*" %>
2+
<%@ page import="java.sql.*, java.util.Properties, java.io.InputStream" %>
33
<!DOCTYPE html>
44
<html lang="en">
55
<head>
@@ -36,8 +36,14 @@
3636
<%
3737
Connection conn = null;
3838
try {
39-
Class.forName("com.mysql.cj.jdbc.Driver");
40-
conn = DriverManager.getConnection("jdbc:mysql://localhost:3306/BrarnerScience", "root", "");
39+
Properties dbProps = new Properties();
40+
InputStream dbIn = application.getResourceAsStream("/WEB-INF/db.properties");
41+
if (dbIn != null) { dbProps.load(dbIn); dbIn.close(); }
42+
Class.forName(dbProps.getProperty("db.driver", "com.mysql.cj.jdbc.Driver"));
43+
conn = DriverManager.getConnection(
44+
dbProps.getProperty("db.url", "jdbc:mysql://localhost:3306/BrarnerScience"),
45+
dbProps.getProperty("db.user", "root"),
46+
dbProps.getProperty("db.password", ""));
4147
4248
String museum = request.getParameter("museum");
4349
if (museum != null && !museum.isEmpty()) {

‎modules/black/presidential/Brarner.M.Alete/servlets/servlet/src/main/webapp/postal.jsp‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<%@ page contentType="text/html;charset=UTF-8" language="java" %>
2-
<%@ page import="java.sql.*" %>
2+
<%@ page import="java.sql.*, java.util.Properties, java.io.InputStream" %>
33
<!DOCTYPE html>
44
<html lang="en">
55
<head>
@@ -37,8 +37,14 @@
3737
String stateFilter = request.getParameter("state");
3838
Connection conn = null;
3939
try {
40-
Class.forName("com.mysql.cj.jdbc.Driver");
41-
conn = DriverManager.getConnection("jdbc:mysql://localhost:3306/BrarnerScience", "root", "");
40+
Properties dbProps = new Properties();
41+
InputStream dbIn = application.getResourceAsStream("/WEB-INF/db.properties");
42+
if (dbIn != null) { dbProps.load(dbIn); dbIn.close(); }
43+
Class.forName(dbProps.getProperty("db.driver", "com.mysql.cj.jdbc.Driver"));
44+
conn = DriverManager.getConnection(
45+
dbProps.getProperty("db.url", "jdbc:mysql://localhost:3306/BrarnerScience"),
46+
dbProps.getProperty("db.user", "root"),
47+
dbProps.getProperty("db.password", ""));
4248
4349
if (stateFilter != null && !stateFilter.isEmpty()) {
4450
PreparedStatement ps = conn.prepareStatement(

‎modules/black/presidential/Brarner.M.Alete/servlets/servlet/src/main/webapp/science.jsp‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<%@ page contentType="text/html;charset=UTF-8" language="java" %>
2-
<%@ page import="java.sql.*" %>
2+
<%@ page import="java.sql.*, java.util.Properties, java.io.InputStream" %>
33
<!DOCTYPE html>
44
<html lang="en">
55
<head>
@@ -36,8 +36,14 @@
3636
<%
3737
Connection conn = null;
3838
try {
39-
Class.forName("com.mysql.cj.jdbc.Driver");
40-
conn = DriverManager.getConnection("jdbc:mysql://localhost:3306/BrarnerScience", "root", "");
39+
Properties dbProps = new Properties();
40+
InputStream dbIn = application.getResourceAsStream("/WEB-INF/db.properties");
41+
if (dbIn != null) { dbProps.load(dbIn); dbIn.close(); }
42+
Class.forName(dbProps.getProperty("db.driver", "com.mysql.cj.jdbc.Driver"));
43+
conn = DriverManager.getConnection(
44+
dbProps.getProperty("db.url", "jdbc:mysql://localhost:3306/BrarnerScience"),
45+
dbProps.getProperty("db.user", "root"),
46+
dbProps.getProperty("db.password", ""));
4147
4248
String source = request.getParameter("source");
4349
if (source != null && !source.isEmpty()) {

‎modules/black/presidential/Brarner.M.Alete/servlets/servlet/src/main/webapp/species.jsp‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<%@ page contentType="text/html;charset=UTF-8" language="java" %>
2-
<%@ page import="java.sql.*" %>
2+
<%@ page import="java.sql.*, java.util.Properties, java.io.InputStream" %>
33
<!DOCTYPE html>
44
<html lang="en">
55
<head>
@@ -65,8 +65,14 @@
6565
6666
Connection conn = null;
6767
try {
68-
Class.forName("com.mysql.cj.jdbc.Driver");
69-
conn = DriverManager.getConnection("jdbc:mysql://localhost:3306/BrarnerScience", "root", "");
68+
Properties dbProps = new Properties();
69+
InputStream dbIn = application.getResourceAsStream("/WEB-INF/db.properties");
70+
if (dbIn != null) { dbProps.load(dbIn); dbIn.close(); }
71+
String dbUrl = dbProps.getProperty("db.url", "jdbc:mysql://localhost:3306/BrarnerScience");
72+
String dbUser = dbProps.getProperty("db.user", "root");
73+
String dbPass = dbProps.getProperty("db.password", "");
74+
Class.forName(dbProps.getProperty("db.driver", "com.mysql.cj.jdbc.Driver"));
75+
conn = DriverManager.getConnection(dbUrl, dbUser, dbPass);
7076
7177
// Classes for selected kingdom
7278
PreparedStatement psClass = conn.prepareStatement(

‎modules/black/presidential/Brarner.M.Alete/servlets/servlet/src/main/webapp/status.jsp‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<%@ page contentType="text/html;charset=UTF-8" language="java" %>
2-
<%@ page import="java.sql.*" %>
2+
<%@ page import="java.sql.*, java.util.Properties, java.io.InputStream" %>
33
<!DOCTYPE html>
44
<html lang="en">
55
<head>
@@ -39,8 +39,14 @@
3939
String dbStatus = "Offline";
4040
String dbVersion = "";
4141
try {
42-
Class.forName("com.mysql.cj.jdbc.Driver");
43-
conn = DriverManager.getConnection("jdbc:mysql://localhost:3306/BrarnerScience", "root", "");
42+
Properties dbProps = new Properties();
43+
InputStream dbIn = application.getResourceAsStream("/WEB-INF/db.properties");
44+
if (dbIn != null) { dbProps.load(dbIn); dbIn.close(); }
45+
Class.forName(dbProps.getProperty("db.driver", "com.mysql.cj.jdbc.Driver"));
46+
conn = DriverManager.getConnection(
47+
dbProps.getProperty("db.url", "jdbc:mysql://localhost:3306/BrarnerScience"),
48+
dbProps.getProperty("db.user", "root"),
49+
dbProps.getProperty("db.password", ""));
4450
DatabaseMetaData md = conn.getMetaData();
4551
dbStatus = "Online";
4652
dbVersion = md.getDatabaseProductName() + " " + md.getDatabaseProductVersion();

0 commit comments

Comments
 (0)