Author: [log in to unmask]
Date: Mon Sep 21 15:36:34 2015
New Revision: 3658
Log:
Move java files to new package.
Added:
webapps/trunk/run-webapp/src/main/java/org/hps/webapps/
webapps/trunk/run-webapp/src/main/java/org/hps/webapps/run/
webapps/trunk/run-webapp/src/main/java/org/hps/webapps/run/DatabaseUtilities.java
- copied, changed from r3657, webapps/trunk/run-webapp/src/main/java/org/hps/run/webapp/DatabaseUtilities.java
webapps/trunk/run-webapp/src/main/java/org/hps/webapps/run/EpicsDataServlet.java
- copied, changed from r3655, webapps/trunk/run-webapp/src/main/java/org/hps/run/webapp/EpicsDataServlet.java
webapps/trunk/run-webapp/src/main/java/org/hps/webapps/run/RunSummaryServlet.java
- copied, changed from r3655, webapps/trunk/run-webapp/src/main/java/org/hps/run/webapp/RunSummaryServlet.java
webapps/trunk/run-webapp/src/main/java/org/hps/webapps/run/RunsServlet.java
- copied, changed from r3655, webapps/trunk/run-webapp/src/main/java/org/hps/run/webapp/RunsServlet.java
webapps/trunk/run-webapp/src/main/java/org/hps/webapps/run/ScalerDataServlet.java
- copied, changed from r3655, webapps/trunk/run-webapp/src/main/java/org/hps/run/webapp/ScalerDataServlet.java
Removed:
webapps/trunk/run-webapp/src/main/java/org/hps/run/webapp/DatabaseUtilities.java
webapps/trunk/run-webapp/src/main/java/org/hps/run/webapp/EpicsDataServlet.java
webapps/trunk/run-webapp/src/main/java/org/hps/run/webapp/RunSummaryServlet.java
webapps/trunk/run-webapp/src/main/java/org/hps/run/webapp/RunsServlet.java
webapps/trunk/run-webapp/src/main/java/org/hps/run/webapp/ScalerDataServlet.java
Modified:
webapps/trunk/run-webapp/src/main/webapp/WEB-INF/web.xml
Copied: webapps/trunk/run-webapp/src/main/java/org/hps/webapps/run/DatabaseUtilities.java (from r3657, webapps/trunk/run-webapp/src/main/java/org/hps/run/webapp/DatabaseUtilities.java)
=============================================================================
--- webapps/trunk/run-webapp/src/main/java/org/hps/run/webapp/DatabaseUtilities.java (original)
+++ webapps/trunk/run-webapp/src/main/java/org/hps/webapps/run/DatabaseUtilities.java Mon Sep 21 15:36:34 2015
@@ -1,4 +1,4 @@
-package org.hps.run.webapp;
+package org.hps.webapps.run;
import javax.naming.InitialContext;
import javax.naming.NamingException;
Copied: webapps/trunk/run-webapp/src/main/java/org/hps/webapps/run/EpicsDataServlet.java (from r3655, webapps/trunk/run-webapp/src/main/java/org/hps/run/webapp/EpicsDataServlet.java)
=============================================================================
--- webapps/trunk/run-webapp/src/main/java/org/hps/run/webapp/EpicsDataServlet.java (original)
+++ webapps/trunk/run-webapp/src/main/java/org/hps/webapps/run/EpicsDataServlet.java Mon Sep 21 15:36:34 2015
@@ -1,4 +1,4 @@
-package org.hps.run.webapp;
+package org.hps.webapps.run;
import java.io.IOException;
import java.sql.Connection;
Copied: webapps/trunk/run-webapp/src/main/java/org/hps/webapps/run/RunSummaryServlet.java (from r3655, webapps/trunk/run-webapp/src/main/java/org/hps/run/webapp/RunSummaryServlet.java)
=============================================================================
--- webapps/trunk/run-webapp/src/main/java/org/hps/run/webapp/RunSummaryServlet.java (original)
+++ webapps/trunk/run-webapp/src/main/java/org/hps/webapps/run/RunSummaryServlet.java Mon Sep 21 15:36:34 2015
@@ -1,4 +1,4 @@
-package org.hps.run.webapp;
+package org.hps.webapps.run;
import java.io.IOException;
import java.sql.Connection;
Copied: webapps/trunk/run-webapp/src/main/java/org/hps/webapps/run/RunsServlet.java (from r3655, webapps/trunk/run-webapp/src/main/java/org/hps/run/webapp/RunsServlet.java)
=============================================================================
--- webapps/trunk/run-webapp/src/main/java/org/hps/run/webapp/RunsServlet.java (original)
+++ webapps/trunk/run-webapp/src/main/java/org/hps/webapps/run/RunsServlet.java Mon Sep 21 15:36:34 2015
@@ -1,4 +1,4 @@
-package org.hps.run.webapp;
+package org.hps.webapps.run;
import java.io.IOException;
import java.sql.Connection;
Copied: webapps/trunk/run-webapp/src/main/java/org/hps/webapps/run/ScalerDataServlet.java (from r3655, webapps/trunk/run-webapp/src/main/java/org/hps/run/webapp/ScalerDataServlet.java)
=============================================================================
--- webapps/trunk/run-webapp/src/main/java/org/hps/run/webapp/ScalerDataServlet.java (original)
+++ webapps/trunk/run-webapp/src/main/java/org/hps/webapps/run/ScalerDataServlet.java Mon Sep 21 15:36:34 2015
@@ -1,4 +1,4 @@
-package org.hps.run.webapp;
+package org.hps.webapps.run;
import java.io.IOException;
import java.sql.Connection;
Modified: webapps/trunk/run-webapp/src/main/webapp/WEB-INF/web.xml
=============================================================================
--- webapps/trunk/run-webapp/src/main/webapp/WEB-INF/web.xml (original)
+++ webapps/trunk/run-webapp/src/main/webapp/WEB-INF/web.xml Mon Sep 21 15:36:34 2015
@@ -7,6 +7,10 @@
<display-name>HPS Run Web Application</display-name>
+ <description>
+ Application for showing information about runs of the HPS experiment.
+ </description>
+
<resource-ref>
<description>Run Database Connection</description>
<res-ref-name>jdbc/hps_run_db</res-ref-name>
@@ -14,27 +18,23 @@
<res-auth>Container</res-auth>
</resource-ref>
- <description>
- Application for showing information about runs of the HPS experiment.
- </description>
-
- <!-- Display full run table. -->
-
+ <!-- Display full run table. -->
+
<servlet>
<servlet-name>RunsServlet</servlet-name>
- <servlet-class>org.hps.run.webapp.RunsServlet</servlet-class>
+ <servlet-class>org.hps.webapps.run.RunsServlet</servlet-class>
</servlet>
<servlet-mapping>
<servlet-name>RunsServlet</servlet-name>
<url-pattern>/runs</url-pattern>
</servlet-mapping>
-
+
<!-- Display a run summary. -->
<servlet>
<servlet-name>RunSummaryServlet</servlet-name>
- <servlet-class>org.hps.run.webapp.RunSummaryServlet</servlet-class>
+ <servlet-class>org.hps.webapps.run.RunSummaryServlet</servlet-class>
</servlet>
<servlet-mapping>
@@ -46,7 +46,7 @@
<servlet>
<servlet-name>EpicsDataServlet</servlet-name>
- <servlet-class>org.hps.run.webapp.EpicsDataServlet</servlet-class>
+ <servlet-class>org.hps.webapps.run.EpicsDataServlet</servlet-class>
</servlet>
<servlet-mapping>
@@ -58,7 +58,7 @@
<servlet>
<servlet-name>ScalerDataServlet</servlet-name>
- <servlet-class>org.hps.run.webapp.ScalerDataServlet</servlet-class>
+ <servlet-class>org.hps.webapps.run.ScalerDataServlet</servlet-class>
</servlet>
<servlet-mapping>
