Author: [log in to unmask]
Date: Thu Feb 11 16:46:15 2016
New Revision: 4205
Log:
Update to use hps_run_db_v2 instead of dev.
Modified:
webapps/trunk/run-webapp/src/main/java/org/hps/webapps/run/DatabaseUtilities.java
webapps/trunk/run-webapp/src/main/webapp/showEpics.jsp
webapps/trunk/run-webapp/src/main/webapp/showRun.jsp
webapps/trunk/run-webapp/src/main/webapp/showRunTable.jsp
webapps/trunk/run-webapp/src/main/webapp/showSummary.jsp
Modified: webapps/trunk/run-webapp/src/main/java/org/hps/webapps/run/DatabaseUtilities.java
=============================================================================
--- webapps/trunk/run-webapp/src/main/java/org/hps/webapps/run/DatabaseUtilities.java (original)
+++ webapps/trunk/run-webapp/src/main/java/org/hps/webapps/run/DatabaseUtilities.java Thu Feb 11 16:46:15 2016
@@ -11,7 +11,7 @@
*/
public final class DatabaseUtilities {
- private static String DATASOURCE_CONTEXT = "java:comp/env/jdbc/hps_run_db";
+ private static String DATASOURCE_CONTEXT = "java:comp/env/jdbc/hps_run_db_v2";
static DataSource getDataSource() {
DataSource dataSource = null;
Modified: webapps/trunk/run-webapp/src/main/webapp/showEpics.jsp
=============================================================================
--- webapps/trunk/run-webapp/src/main/webapp/showEpics.jsp (original)
+++ webapps/trunk/run-webapp/src/main/webapp/showEpics.jsp Thu Feb 11 16:46:15 2016
@@ -1,5 +1,5 @@
-<%@ page contentType="text/html"
- import="java.util.*,java.text.SimpleDateFormat,org.hps.record.epics.*,org.hps.run.database.*"%>
+<%@page contentType="text/html" import="java.util.*,java.text.SimpleDateFormat,org.hps.record.epics.*,org.hps.run.database.*"%>
+
<!DOCTYPE html>
<html>
<link rel="stylesheet" href="${pageContext.request.contextPath}/css/style.css" />
Modified: webapps/trunk/run-webapp/src/main/webapp/showRun.jsp
=============================================================================
--- webapps/trunk/run-webapp/src/main/webapp/showRun.jsp (original)
+++ webapps/trunk/run-webapp/src/main/webapp/showRun.jsp Thu Feb 11 16:46:15 2016
@@ -12,7 +12,7 @@
<%@include file="header.jspf"%>
<div class="content">
- <iframe class="nav" name="runSummaryFrame" frameBorder="0" src="runSummary?run=<c:out value="${run}"/>" height="100%" width="30%"></iframe>
+ <iframe class="nav" name="runSummaryFrame" frameBorder="0" src="runSummary?run=<c:out value="${run}"/>" height="100%" width="25%"></iframe>
<iframe class="data" name="dataFrame" frameBorder="0" src="" height="100%" width="68%"></iframe>
</div>
Modified: webapps/trunk/run-webapp/src/main/webapp/showRunTable.jsp
=============================================================================
--- webapps/trunk/run-webapp/src/main/webapp/showRunTable.jsp (original)
+++ webapps/trunk/run-webapp/src/main/webapp/showRunTable.jsp Thu Feb 11 16:46:15 2016
@@ -49,7 +49,7 @@
</tr>
</thead>
<tbody>
- <sql:query dataSource="jdbc/hps_run_db" var="result">
+ <sql:query dataSource="jdbc/hps_run_db_v2" var="result">
SELECT * FROM run_summaries;
</sql:query>
<c:forEach var="row" items="${result.rows}">
Modified: webapps/trunk/run-webapp/src/main/webapp/showSummary.jsp
=============================================================================
--- webapps/trunk/run-webapp/src/main/webapp/showSummary.jsp (original)
+++ webapps/trunk/run-webapp/src/main/webapp/showSummary.jsp Thu Feb 11 16:46:15 2016
@@ -20,7 +20,7 @@
</head>
<body>
- <sql:query dataSource="jdbc/hps_run_db" var="result">
+ <sql:query dataSource="jdbc/hps_run_db_v2" var="result">
SELECT * FROM run_summaries WHERE run = ?;
<sql:param value="${run}" />
</sql:query>
