Author: [log in to unmask]
Date: Fri Aug 28 18:26:14 2015
New Revision: 3457
Log:
Change package name in run webapp.
Added:
java/trunk/run-webapp/src/main/java/org/hps/run/
java/trunk/run-webapp/src/main/java/org/hps/run/webapp/
java/trunk/run-webapp/src/main/java/org/hps/run/webapp/DatabaseUtilities.java
- copied, changed from r3455, java/trunk/run-webapp/src/main/java/org/hps/runweb/DatabaseUtilities.java
java/trunk/run-webapp/src/main/java/org/hps/run/webapp/EpicsDataServlet.java
- copied, changed from r3455, java/trunk/run-webapp/src/main/java/org/hps/runweb/EpicsDataServlet.java
java/trunk/run-webapp/src/main/java/org/hps/run/webapp/RunSummaryServlet.java
- copied, changed from r3455, java/trunk/run-webapp/src/main/java/org/hps/runweb/RunSummaryServlet.java
java/trunk/run-webapp/src/main/java/org/hps/run/webapp/RunsServlet.java
- copied, changed from r3455, java/trunk/run-webapp/src/main/java/org/hps/runweb/RunsServlet.java
java/trunk/run-webapp/src/main/java/org/hps/run/webapp/ScalerDataServlet.java
- copied, changed from r3455, java/trunk/run-webapp/src/main/java/org/hps/runweb/ScalerDataServlet.java
Removed:
java/trunk/run-webapp/src/main/java/org/hps/runweb/DatabaseUtilities.java
java/trunk/run-webapp/src/main/java/org/hps/runweb/EpicsDataServlet.java
java/trunk/run-webapp/src/main/java/org/hps/runweb/RunSummaryServlet.java
java/trunk/run-webapp/src/main/java/org/hps/runweb/RunsServlet.java
java/trunk/run-webapp/src/main/java/org/hps/runweb/ScalerDataServlet.java
Modified:
java/trunk/run-webapp/src/main/webapp/WEB-INF/web.xml
java/trunk/run-webapp/src/main/webapp/runEpics.jsp
java/trunk/run-webapp/src/main/webapp/runSummary.jsp
java/trunk/run-webapp/src/main/webapp/runTable.jsp
Copied: java/trunk/run-webapp/src/main/java/org/hps/run/webapp/DatabaseUtilities.java (from r3455, java/trunk/run-webapp/src/main/java/org/hps/runweb/DatabaseUtilities.java)
=============================================================================
--- java/trunk/run-webapp/src/main/java/org/hps/runweb/DatabaseUtilities.java (original)
+++ java/trunk/run-webapp/src/main/java/org/hps/run/webapp/DatabaseUtilities.java Fri Aug 28 18:26:14 2015
@@ -1,4 +1,4 @@
-package org.hps.runweb;
+package org.hps.run.webapp;
import javax.naming.InitialContext;
import javax.naming.NamingException;
Copied: java/trunk/run-webapp/src/main/java/org/hps/run/webapp/EpicsDataServlet.java (from r3455, java/trunk/run-webapp/src/main/java/org/hps/runweb/EpicsDataServlet.java)
=============================================================================
--- java/trunk/run-webapp/src/main/java/org/hps/runweb/EpicsDataServlet.java (original)
+++ java/trunk/run-webapp/src/main/java/org/hps/run/webapp/EpicsDataServlet.java Fri Aug 28 18:26:14 2015
@@ -1,4 +1,4 @@
-package org.hps.runweb;
+package org.hps.run.webapp;
import java.io.IOException;
import java.sql.Connection;
Copied: java/trunk/run-webapp/src/main/java/org/hps/run/webapp/RunSummaryServlet.java (from r3455, java/trunk/run-webapp/src/main/java/org/hps/runweb/RunSummaryServlet.java)
=============================================================================
--- java/trunk/run-webapp/src/main/java/org/hps/runweb/RunSummaryServlet.java (original)
+++ java/trunk/run-webapp/src/main/java/org/hps/run/webapp/RunSummaryServlet.java Fri Aug 28 18:26:14 2015
@@ -1,4 +1,4 @@
-package org.hps.runweb;
+package org.hps.run.webapp;
import java.io.IOException;
import java.sql.Connection;
Copied: java/trunk/run-webapp/src/main/java/org/hps/run/webapp/RunsServlet.java (from r3455, java/trunk/run-webapp/src/main/java/org/hps/runweb/RunsServlet.java)
=============================================================================
--- java/trunk/run-webapp/src/main/java/org/hps/runweb/RunsServlet.java (original)
+++ java/trunk/run-webapp/src/main/java/org/hps/run/webapp/RunsServlet.java Fri Aug 28 18:26:14 2015
@@ -1,4 +1,4 @@
-package org.hps.runweb;
+package org.hps.run.webapp;
import java.io.IOException;
import java.sql.Connection;
Copied: java/trunk/run-webapp/src/main/java/org/hps/run/webapp/ScalerDataServlet.java (from r3455, java/trunk/run-webapp/src/main/java/org/hps/runweb/ScalerDataServlet.java)
=============================================================================
--- java/trunk/run-webapp/src/main/java/org/hps/runweb/ScalerDataServlet.java (original)
+++ java/trunk/run-webapp/src/main/java/org/hps/run/webapp/ScalerDataServlet.java Fri Aug 28 18:26:14 2015
@@ -1,4 +1,4 @@
-package org.hps.runweb;
+package org.hps.run.webapp;
import java.io.IOException;
import java.sql.Connection;
Modified: java/trunk/run-webapp/src/main/webapp/WEB-INF/web.xml
=============================================================================
--- java/trunk/run-webapp/src/main/webapp/WEB-INF/web.xml (original)
+++ java/trunk/run-webapp/src/main/webapp/WEB-INF/web.xml Fri Aug 28 18:26:14 2015
@@ -22,7 +22,7 @@
<servlet>
<servlet-name>RunsServlet</servlet-name>
- <servlet-class>org.hps.runweb.RunsServlet</servlet-class>
+ <servlet-class>org.hps.run.webapp.RunsServlet</servlet-class>
</servlet>
<servlet-mapping>
@@ -34,7 +34,7 @@
<servlet>
<servlet-name>RunSummaryServlet</servlet-name>
- <servlet-class>org.hps.runweb.RunSummaryServlet</servlet-class>
+ <servlet-class>org.hps.run.webapp.RunSummaryServlet</servlet-class>
</servlet>
<servlet-mapping>
@@ -46,7 +46,7 @@
<servlet>
<servlet-name>EpicsDataServlet</servlet-name>
- <servlet-class>org.hps.runweb.EpicsDataServlet</servlet-class>
+ <servlet-class>org.hps.run.webapp.EpicsDataServlet</servlet-class>
</servlet>
<servlet-mapping>
@@ -58,7 +58,7 @@
<servlet>
<servlet-name>ScalerDataServlet</servlet-name>
- <servlet-class>org.hps.runweb.ScalerDataServlet</servlet-class>
+ <servlet-class>org.hps.run.webapp.ScalerDataServlet</servlet-class>
</servlet>
<servlet-mapping>
Modified: java/trunk/run-webapp/src/main/webapp/runEpics.jsp
=============================================================================
--- java/trunk/run-webapp/src/main/webapp/runEpics.jsp (original)
+++ java/trunk/run-webapp/src/main/webapp/runEpics.jsp Fri Aug 28 18:26:14 2015
@@ -1,4 +1,4 @@
-<%@ page contentType="text/html" import="java.util.*,java.text.SimpleDateFormat,org.hps.record.epics.*,org.hps.rundb.*" %>
+<%@ 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="css/style.css" />
Modified: java/trunk/run-webapp/src/main/webapp/runSummary.jsp
=============================================================================
--- java/trunk/run-webapp/src/main/webapp/runSummary.jsp (original)
+++ java/trunk/run-webapp/src/main/webapp/runSummary.jsp Fri Aug 28 18:26:14 2015
@@ -1,4 +1,4 @@
-<%@ page contentType="text/html" import="java.util.*,org.hps.rundb.*,java.text.SimpleDateFormat"%>
+<%@ page contentType="text/html" import="java.util.*,org.hps.run.database.*,java.text.SimpleDateFormat"%>
<!DOCTYPE html>
<html>
<link rel="stylesheet" href="css/style.css" />
Modified: java/trunk/run-webapp/src/main/webapp/runTable.jsp
=============================================================================
--- java/trunk/run-webapp/src/main/webapp/runTable.jsp (original)
+++ java/trunk/run-webapp/src/main/webapp/runTable.jsp Fri Aug 28 18:26:14 2015
@@ -1,4 +1,4 @@
-<%@ page contentType="text/html" import="java.util.*,org.hps.rundb.RunSummary,java.text.SimpleDateFormat"%>
+<%@ page contentType="text/html" import="java.util.*,org.hps.run.database.RunSummary,java.text.SimpleDateFormat"%>
<!DOCTYPE html>
<html>
