Author: [log in to unmask]
Date: Fri Aug 28 17:30:34 2015
New Revision: 3454
Log:
Moving run db and crawler out of record-util. HPSJAVA-595, HPSJAVA-596
Added:
java/trunk/crawler/
java/trunk/crawler/pom.xml
java/trunk/crawler/src/
java/trunk/crawler/src/main/
java/trunk/crawler/src/main/java/
java/trunk/crawler/src/main/java/org/
java/trunk/crawler/src/main/java/org/hps/
java/trunk/crawler/src/main/java/org/hps/crawler/
java/trunk/crawler/src/main/java/org/hps/crawler/Crawler.java
- copied, changed from r3443, java/trunk/record-util/src/main/java/org/hps/record/evio/crawler/Crawler.java
java/trunk/crawler/src/main/java/org/hps/crawler/CrawlerConfig.java
- copied, changed from r3444, java/trunk/record-util/src/main/java/org/hps/record/evio/crawler/CrawlerConfig.java
java/trunk/crawler/src/main/java/org/hps/crawler/DateFileFilter.java
- copied, changed from r3424, java/trunk/record-util/src/main/java/org/hps/record/evio/crawler/DateFileFilter.java
java/trunk/crawler/src/main/java/org/hps/crawler/EvioFileVisitor.java
- copied, changed from r3424, java/trunk/record-util/src/main/java/org/hps/record/evio/crawler/EvioFileVisitor.java
java/trunk/crawler/src/main/java/org/hps/crawler/JCacheManager.java
- copied, changed from r3424, java/trunk/record-util/src/main/java/org/hps/record/evio/crawler/JCacheManager.java
java/trunk/crawler/src/main/java/org/hps/crawler/RunFilter.java
- copied, changed from r3424, java/trunk/record-util/src/main/java/org/hps/record/evio/crawler/RunFilter.java
java/trunk/crawler/src/main/java/org/hps/crawler/RunProcessor.java
- copied, changed from r3444, java/trunk/record-util/src/main/java/org/hps/record/evio/crawler/RunProcessor.java
java/trunk/crawler/src/main/java/org/hps/crawler/RunSummaryMap.java
- copied, changed from r3424, java/trunk/record-util/src/main/java/org/hps/record/evio/crawler/RunSummaryMap.java
java/trunk/crawler/src/main/java/org/hps/crawler/package-info.java
- copied, changed from r3424, java/trunk/record-util/src/main/java/org/hps/record/evio/crawler/package-info.java
java/trunk/run-database/
java/trunk/run-database/pom.xml
java/trunk/run-database/src/
java/trunk/run-database/src/main/
java/trunk/run-database/src/main/java/
java/trunk/run-database/src/main/java/org/
java/trunk/run-database/src/main/java/org/hps/
java/trunk/run-database/src/main/java/org/hps/run/
java/trunk/run-database/src/main/java/org/hps/run/database/
java/trunk/run-database/src/main/java/org/hps/run/database/EpicsDataDao.java
- copied, changed from r3428, java/trunk/record-util/src/main/java/org/hps/rundb/EpicsDataDao.java
java/trunk/run-database/src/main/java/org/hps/run/database/EpicsDataDaoImpl.java
- copied, changed from r3439, java/trunk/record-util/src/main/java/org/hps/rundb/EpicsDataDaoImpl.java
java/trunk/run-database/src/main/java/org/hps/run/database/EpicsType.java
- copied, changed from r3428, java/trunk/record-util/src/main/java/org/hps/rundb/EpicsType.java
java/trunk/run-database/src/main/java/org/hps/run/database/EpicsVariable.java
- copied, changed from r3428, java/trunk/record-util/src/main/java/org/hps/rundb/EpicsVariable.java
java/trunk/run-database/src/main/java/org/hps/run/database/EpicsVariableDao.java
- copied, changed from r3428, java/trunk/record-util/src/main/java/org/hps/rundb/EpicsVariableDao.java
java/trunk/run-database/src/main/java/org/hps/run/database/EpicsVariableDaoImpl.java
- copied, changed from r3428, java/trunk/record-util/src/main/java/org/hps/rundb/EpicsVariableDaoImpl.java
java/trunk/run-database/src/main/java/org/hps/run/database/EvioFilesDao.java
- copied, changed from r3428, java/trunk/record-util/src/main/java/org/hps/rundb/EvioFilesDao.java
java/trunk/run-database/src/main/java/org/hps/run/database/EvioFilesDaoImpl.java
- copied, changed from r3428, java/trunk/record-util/src/main/java/org/hps/rundb/EvioFilesDaoImpl.java
java/trunk/run-database/src/main/java/org/hps/run/database/RunDatabaseDaoFactory.java
- copied, changed from r3428, java/trunk/record-util/src/main/java/org/hps/rundb/RunDatabaseDaoFactory.java
java/trunk/run-database/src/main/java/org/hps/run/database/RunManager.java
- copied, changed from r3424, java/trunk/record-util/src/main/java/org/hps/rundb/RunManager.java
java/trunk/run-database/src/main/java/org/hps/run/database/RunSummary.java
- copied, changed from r3428, java/trunk/record-util/src/main/java/org/hps/rundb/RunSummary.java
java/trunk/run-database/src/main/java/org/hps/run/database/RunSummaryDao.java
- copied, changed from r3428, java/trunk/record-util/src/main/java/org/hps/rundb/RunSummaryDao.java
java/trunk/run-database/src/main/java/org/hps/run/database/RunSummaryDaoImpl.java
- copied, changed from r3428, java/trunk/record-util/src/main/java/org/hps/rundb/RunSummaryDaoImpl.java
java/trunk/run-database/src/main/java/org/hps/run/database/RunSummaryImpl.java
- copied, changed from r3428, java/trunk/record-util/src/main/java/org/hps/rundb/RunSummaryImpl.java
java/trunk/run-database/src/main/java/org/hps/run/database/ScalerDataDao.java
- copied, changed from r3424, java/trunk/record-util/src/main/java/org/hps/rundb/ScalerDataDao.java
java/trunk/run-database/src/main/java/org/hps/run/database/ScalerDataDaoImpl.java
- copied, changed from r3450, java/trunk/record-util/src/main/java/org/hps/rundb/ScalerDataDaoImpl.java
java/trunk/run-database/src/main/java/org/hps/run/database/TriggerConfigDao.java
- copied, changed from r3428, java/trunk/record-util/src/main/java/org/hps/rundb/TriggerConfigDao.java
java/trunk/run-database/src/main/java/org/hps/run/database/TriggerConfigDaoImpl.java
- copied, changed from r3435, java/trunk/record-util/src/main/java/org/hps/rundb/TriggerConfigDaoImpl.java
java/trunk/run-database/src/main/java/org/hps/run/database/package-info.java
- copied, changed from r3428, java/trunk/record-util/src/main/java/org/hps/rundb/package-info.java
Removed:
java/trunk/record-util/src/main/java/org/hps/record/evio/crawler/Crawler.java
java/trunk/record-util/src/main/java/org/hps/record/evio/crawler/CrawlerConfig.java
java/trunk/record-util/src/main/java/org/hps/record/evio/crawler/DateFileFilter.java
java/trunk/record-util/src/main/java/org/hps/record/evio/crawler/EvioFileVisitor.java
java/trunk/record-util/src/main/java/org/hps/record/evio/crawler/JCacheManager.java
java/trunk/record-util/src/main/java/org/hps/record/evio/crawler/RunFilter.java
java/trunk/record-util/src/main/java/org/hps/record/evio/crawler/RunProcessor.java
java/trunk/record-util/src/main/java/org/hps/record/evio/crawler/RunSummaryMap.java
java/trunk/record-util/src/main/java/org/hps/record/evio/crawler/package-info.java
java/trunk/record-util/src/main/java/org/hps/rundb/EpicsDataDao.java
java/trunk/record-util/src/main/java/org/hps/rundb/EpicsDataDaoImpl.java
java/trunk/record-util/src/main/java/org/hps/rundb/EpicsType.java
java/trunk/record-util/src/main/java/org/hps/rundb/EpicsVariable.java
java/trunk/record-util/src/main/java/org/hps/rundb/EpicsVariableDao.java
java/trunk/record-util/src/main/java/org/hps/rundb/EpicsVariableDaoImpl.java
java/trunk/record-util/src/main/java/org/hps/rundb/EvioFilesDao.java
java/trunk/record-util/src/main/java/org/hps/rundb/EvioFilesDaoImpl.java
java/trunk/record-util/src/main/java/org/hps/rundb/RunDatabaseDaoFactory.java
java/trunk/record-util/src/main/java/org/hps/rundb/RunManager.java
java/trunk/record-util/src/main/java/org/hps/rundb/RunSummary.java
java/trunk/record-util/src/main/java/org/hps/rundb/RunSummaryDao.java
java/trunk/record-util/src/main/java/org/hps/rundb/RunSummaryDaoImpl.java
java/trunk/record-util/src/main/java/org/hps/rundb/RunSummaryImpl.java
java/trunk/record-util/src/main/java/org/hps/rundb/ScalerDataDao.java
java/trunk/record-util/src/main/java/org/hps/rundb/ScalerDataDaoImpl.java
java/trunk/record-util/src/main/java/org/hps/rundb/TriggerConfigDao.java
java/trunk/record-util/src/main/java/org/hps/rundb/TriggerConfigDaoImpl.java
java/trunk/record-util/src/main/java/org/hps/rundb/package-info.java
Modified:
java/trunk/distribution/pom.xml
java/trunk/parent/pom.xml
java/trunk/pom.xml
java/trunk/record-util/pom.xml
java/trunk/run-webapp/pom.xml
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
Added: java/trunk/crawler/pom.xml
=============================================================================
--- java/trunk/crawler/pom.xml (added)
+++ java/trunk/crawler/pom.xml Fri Aug 28 17:30:34 2015
@@ -0,0 +1,23 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>hps-crawler</artifactId>
+ <name>crawler</name>
+ <description>file crawler</description>
+ <parent>
+ <groupId>org.hps</groupId>
+ <artifactId>hps-parent</artifactId>
+ <relativePath>../parent/pom.xml</relativePath>
+ <version>3.4.0-SNAPSHOT</version>
+ </parent>
+ <scm>
+ <url>http://java.freehep.org/svn/repos/hps/list/java/trunk/crawler/</url>
+ <connection>scm:svn:svn://svn.freehep.org/hps/java/trunk/crawler/</connection>
+ <developerConnection>scm:svn:svn://svn.freehep.org/hps/java/trunk/crawler/</developerConnection>
+ </scm>
+ <dependencies>
+ <dependency>
+ <groupId>org.hps</groupId>
+ <artifactId>hps-run-database</artifactId>
+ </dependency>
+ </dependencies>
+</project>
Copied: java/trunk/crawler/src/main/java/org/hps/crawler/Crawler.java (from r3443, java/trunk/record-util/src/main/java/org/hps/record/evio/crawler/Crawler.java)
=============================================================================
--- java/trunk/record-util/src/main/java/org/hps/record/evio/crawler/Crawler.java (original)
+++ java/trunk/crawler/src/main/java/org/hps/crawler/Crawler.java Fri Aug 28 17:30:34 2015
@@ -1,4 +1,4 @@
-package org.hps.record.evio.crawler;
+package org.hps.crawler;
import java.io.File;
import java.io.IOException;
@@ -21,9 +21,9 @@
import org.apache.commons.cli.ParseException;
import org.apache.commons.cli.PosixParser;
import org.hps.conditions.database.ConnectionParameters;
-import org.hps.rundb.RunDatabaseDaoFactory;
-import org.hps.rundb.RunSummary;
-import org.hps.rundb.RunSummaryImpl;
+import org.hps.run.database.RunDatabaseDaoFactory;
+import org.hps.run.database.RunSummary;
+import org.hps.run.database.RunSummaryImpl;
import org.lcsim.util.log.DefaultLogFormatter;
import org.lcsim.util.log.LogUtil;
Copied: java/trunk/crawler/src/main/java/org/hps/crawler/CrawlerConfig.java (from r3444, java/trunk/record-util/src/main/java/org/hps/record/evio/crawler/CrawlerConfig.java)
=============================================================================
--- java/trunk/record-util/src/main/java/org/hps/record/evio/crawler/CrawlerConfig.java (original)
+++ java/trunk/crawler/src/main/java/org/hps/crawler/CrawlerConfig.java Fri Aug 28 17:30:34 2015
@@ -1,4 +1,4 @@
-package org.hps.record.evio.crawler;
+package org.hps.crawler;
import java.io.File;
import java.text.ParseException;
Copied: java/trunk/crawler/src/main/java/org/hps/crawler/DateFileFilter.java (from r3424, java/trunk/record-util/src/main/java/org/hps/record/evio/crawler/DateFileFilter.java)
=============================================================================
--- java/trunk/record-util/src/main/java/org/hps/record/evio/crawler/DateFileFilter.java (original)
+++ java/trunk/crawler/src/main/java/org/hps/crawler/DateFileFilter.java Fri Aug 28 17:30:34 2015
@@ -1,4 +1,4 @@
-package org.hps.record.evio.crawler;
+package org.hps.crawler;
import java.io.File;
import java.io.FileFilter;
Copied: java/trunk/crawler/src/main/java/org/hps/crawler/EvioFileVisitor.java (from r3424, java/trunk/record-util/src/main/java/org/hps/record/evio/crawler/EvioFileVisitor.java)
=============================================================================
--- java/trunk/record-util/src/main/java/org/hps/record/evio/crawler/EvioFileVisitor.java (original)
+++ java/trunk/crawler/src/main/java/org/hps/crawler/EvioFileVisitor.java Fri Aug 28 17:30:34 2015
@@ -1,4 +1,4 @@
-package org.hps.record.evio.crawler;
+package org.hps.crawler;
import java.io.File;
import java.io.FileFilter;
Copied: java/trunk/crawler/src/main/java/org/hps/crawler/JCacheManager.java (from r3424, java/trunk/record-util/src/main/java/org/hps/record/evio/crawler/JCacheManager.java)
=============================================================================
--- java/trunk/record-util/src/main/java/org/hps/record/evio/crawler/JCacheManager.java (original)
+++ java/trunk/crawler/src/main/java/org/hps/crawler/JCacheManager.java Fri Aug 28 17:30:34 2015
@@ -1,4 +1,4 @@
-package org.hps.record.evio.crawler;
+package org.hps.crawler;
import java.io.ByteArrayOutputStream;
import java.io.File;
Copied: java/trunk/crawler/src/main/java/org/hps/crawler/RunFilter.java (from r3424, java/trunk/record-util/src/main/java/org/hps/record/evio/crawler/RunFilter.java)
=============================================================================
--- java/trunk/record-util/src/main/java/org/hps/record/evio/crawler/RunFilter.java (original)
+++ java/trunk/crawler/src/main/java/org/hps/crawler/RunFilter.java Fri Aug 28 17:30:34 2015
@@ -1,4 +1,4 @@
-package org.hps.record.evio.crawler;
+package org.hps.crawler;
import java.io.File;
import java.io.FileFilter;
Copied: java/trunk/crawler/src/main/java/org/hps/crawler/RunProcessor.java (from r3444, java/trunk/record-util/src/main/java/org/hps/record/evio/crawler/RunProcessor.java)
=============================================================================
--- java/trunk/record-util/src/main/java/org/hps/record/evio/crawler/RunProcessor.java (original)
+++ java/trunk/crawler/src/main/java/org/hps/crawler/RunProcessor.java Fri Aug 28 17:30:34 2015
@@ -1,4 +1,4 @@
-package org.hps.record.evio.crawler;
+package org.hps.crawler;
import java.io.File;
import java.util.Collections;
@@ -15,7 +15,7 @@
import org.hps.record.triggerbank.TiTimeOffsetEvioProcessor;
import org.hps.record.triggerbank.TriggerConfig;
import org.hps.record.triggerbank.TriggerConfigVariable;
-import org.hps.rundb.RunSummaryImpl;
+import org.hps.run.database.RunSummaryImpl;
import org.lcsim.util.log.DefaultLogFormatter;
import org.lcsim.util.log.LogUtil;
@@ -228,7 +228,6 @@
final TriggerConfig triggerConfig = new TriggerConfig();
this.triggerTimeProcessor.updateTriggerConfig(triggerConfig);
LOGGER.info("tiTimeOffset: " + triggerConfig.get(TriggerConfigVariable.TI_TIME_OFFSET));
- System.out.println("tiTimeOffset: " + triggerConfig.get(TriggerConfigVariable.TI_TIME_OFFSET));
runSummary.setTriggerConfigInt(triggerConfig);
LOGGER.getHandlers()[0].flush();
Copied: java/trunk/crawler/src/main/java/org/hps/crawler/RunSummaryMap.java (from r3424, java/trunk/record-util/src/main/java/org/hps/record/evio/crawler/RunSummaryMap.java)
=============================================================================
--- java/trunk/record-util/src/main/java/org/hps/record/evio/crawler/RunSummaryMap.java (original)
+++ java/trunk/crawler/src/main/java/org/hps/crawler/RunSummaryMap.java Fri Aug 28 17:30:34 2015
@@ -1,11 +1,11 @@
-package org.hps.record.evio.crawler;
+package org.hps.crawler;
import java.util.Collection;
import java.util.HashMap;
import java.util.logging.Logger;
-import org.hps.rundb.RunSummary;
-import org.hps.rundb.RunSummaryImpl;
+import org.hps.run.database.RunSummary;
+import org.hps.run.database.RunSummaryImpl;
import org.lcsim.util.log.LogUtil;
/**
Copied: java/trunk/crawler/src/main/java/org/hps/crawler/package-info.java (from r3424, java/trunk/record-util/src/main/java/org/hps/record/evio/crawler/package-info.java)
=============================================================================
--- java/trunk/record-util/src/main/java/org/hps/record/evio/crawler/package-info.java (original)
+++ java/trunk/crawler/src/main/java/org/hps/crawler/package-info.java Fri Aug 28 17:30:34 2015
@@ -5,4 +5,4 @@
*
* @author Jeremy McCormick, SLAC
*/
-package org.hps.record.evio.crawler;
+package org.hps.crawler;
Modified: java/trunk/distribution/pom.xml
=============================================================================
--- java/trunk/distribution/pom.xml (original)
+++ java/trunk/distribution/pom.xml Fri Aug 28 17:30:34 2015
@@ -88,5 +88,13 @@
<groupId>org.hps</groupId>
<artifactId>hps-detector-model</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.hps</groupId>
+ <artifactId>hps-run-database</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.hps</groupId>
+ <artifactId>hps-crawler</artifactId>
+ </dependency>
</dependencies>
</project>
Modified: java/trunk/parent/pom.xml
=============================================================================
--- java/trunk/parent/pom.xml (original)
+++ java/trunk/parent/pom.xml Fri Aug 28 17:30:34 2015
@@ -224,6 +224,16 @@
<artifactId>hps-monitoring-util</artifactId>
<version>3.4.0-SNAPSHOT</version>
</dependency>
+ <dependency>
+ <groupId>org.hps</groupId>
+ <artifactId>hps-run-database</artifactId>
+ <version>3.4.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.hps</groupId>
+ <artifactId>hps-crawler</artifactId>
+ <version>3.4.0-SNAPSHOT</version>
+ </dependency>
<!-- Next are external dependencies used in multiple modules. -->
<dependency>
<groupId>org.jlab.coda</groupId>
@@ -254,6 +264,7 @@
<groupId>jfreechart-aida-experimental</groupId>
<artifactId>jfreechart-aida-experimental</artifactId>
<version>1.7</version>
+<!-- <version>1.8-SNAPSHOT</version> -->
<exclusions>
<exclusion>
<groupId>jdom</groupId>
@@ -314,6 +325,10 @@
<plugin>
<artifactId>maven-resources-plugin</artifactId>
<version>2.7</version>
+ </plugin>
+ <plugin>
+ <groupId>org.kuali.maven.plugins</groupId>
+ <artifactId>graph-maven-plugin</artifactId>
</plugin>
</plugins>
</reporting>
@@ -377,6 +392,11 @@
</lifecycleMappingMetadata>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.kuali.maven.plugins</groupId>
+ <artifactId>graph-maven-plugin</artifactId>
+ <version>1.2.3</version>
+ </plugin>
</plugins>
</pluginManagement>
<plugins>
@@ -557,9 +577,7 @@
</roles>
<timezone>-5</timezone>
</developer>
- </developers>
- <contributors>
- <contributor>
+ <developer>
<name>Sebouh Paul</name>
<email>[log in to unmask]</email>
<organization>Thomas Jefferson National Accelerator Laboratory</organization>
@@ -571,8 +589,8 @@
<properties>
<aim>SebouhPaul314</aim>
</properties>
- </contributor>
- </contributors>
+ </developer>
+ </developers>
<mailingLists>
<mailingList>
<name>hps-software</name>
Modified: java/trunk/pom.xml
=============================================================================
--- java/trunk/pom.xml (original)
+++ java/trunk/pom.xml Fri Aug 28 17:30:34 2015
@@ -128,9 +128,7 @@
<modules>
<module>analysis</module>
<module>conditions</module>
-<!--
- <module>datacat</module>
--->
+ <module>crawler</module>
<module>detector-data</module>
<module>detector-model</module>
<module>distribution</module>
@@ -146,6 +144,7 @@
<module>plugin</module>
<module>recon</module>
<module>record-util</module>
+ <module>run-database</module>
<module>steering-files</module>
<module>tracking</module>
<module>users</module>
Modified: java/trunk/record-util/pom.xml
=============================================================================
--- java/trunk/record-util/pom.xml (original)
+++ java/trunk/record-util/pom.xml Fri Aug 28 17:30:34 2015
@@ -1,4 +1,5 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<artifactId>hps-record-util</artifactId>
<name>record-util</name>
@@ -13,21 +14,30 @@
<url>http://java.freehep.org/svn/repos/hps/list/java/trunk/record-util/</url>
<connection>scm:svn:svn://svn.freehep.org/hps/java/trunk/record-util/</connection>
<developerConnection>scm:svn:svn://svn.freehep.org/hps/java/trunk/record-util/</developerConnection>
- </scm>
+ </scm>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
- <excludes>
+ <excludes>
<exclude>org/hps/record/**</exclude>
- </excludes>
- </configuration>
- </plugin>
- </plugins>
+ </excludes>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <excludes>
+ <exclude>**/**</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ </plugins>
</build>
- <dependencies>
+ <dependencies>
<dependency>
<groupId>org.jlab.coda</groupId>
<artifactId>jevio</artifactId>
@@ -41,9 +51,9 @@
<artifactId>hps-conditions</artifactId>
</dependency>
<dependency>
- <groupId>org.json</groupId>
- <artifactId>json</artifactId>
- <version>20140107</version>
+ <groupId>org.json</groupId>
+ <artifactId>json</artifactId>
+ <version>20140107</version>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
@@ -51,7 +61,7 @@
<version>4.4.1</version>
</dependency>
<dependency>
- <groupId>commons-io</groupId>
+ <groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>2.4</version>
</dependency>
Added: java/trunk/run-database/pom.xml
=============================================================================
--- java/trunk/run-database/pom.xml (added)
+++ java/trunk/run-database/pom.xml Fri Aug 28 17:30:34 2015
@@ -0,0 +1,23 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>hps-run-database</artifactId>
+ <name>run-database</name>
+ <description>interface to run database</description>
+ <parent>
+ <groupId>org.hps</groupId>
+ <artifactId>hps-parent</artifactId>
+ <relativePath>../parent/pom.xml</relativePath>
+ <version>3.4.0-SNAPSHOT</version>
+ </parent>
+ <scm>
+ <url>http://java.freehep.org/svn/repos/hps/list/java/trunk/run-database/</url>
+ <connection>scm:svn:svn://svn.freehep.org/hps/java/trunk/run-database/</connection>
+ <developerConnection>scm:svn:svn://svn.freehep.org/hps/java/trunk/run-database/</developerConnection>
+ </scm>
+ <dependencies>
+ <dependency>
+ <groupId>org.hps</groupId>
+ <artifactId>hps-record-util</artifactId>
+ </dependency>
+ </dependencies>
+</project>
Copied: java/trunk/run-database/src/main/java/org/hps/run/database/EpicsDataDao.java (from r3428, java/trunk/record-util/src/main/java/org/hps/rundb/EpicsDataDao.java)
=============================================================================
--- java/trunk/record-util/src/main/java/org/hps/rundb/EpicsDataDao.java (original)
+++ java/trunk/run-database/src/main/java/org/hps/run/database/EpicsDataDao.java Fri Aug 28 17:30:34 2015
@@ -1,4 +1,4 @@
-package org.hps.rundb;
+package org.hps.run.database;
import java.util.List;
Copied: java/trunk/run-database/src/main/java/org/hps/run/database/EpicsDataDaoImpl.java (from r3439, java/trunk/record-util/src/main/java/org/hps/rundb/EpicsDataDaoImpl.java)
=============================================================================
--- java/trunk/record-util/src/main/java/org/hps/rundb/EpicsDataDaoImpl.java (original)
+++ java/trunk/run-database/src/main/java/org/hps/run/database/EpicsDataDaoImpl.java Fri Aug 28 17:30:34 2015
@@ -1,4 +1,4 @@
-package org.hps.rundb;
+package org.hps.run.database;
import java.sql.Connection;
import java.sql.PreparedStatement;
Copied: java/trunk/run-database/src/main/java/org/hps/run/database/EpicsType.java (from r3428, java/trunk/record-util/src/main/java/org/hps/rundb/EpicsType.java)
=============================================================================
--- java/trunk/record-util/src/main/java/org/hps/rundb/EpicsType.java (original)
+++ java/trunk/run-database/src/main/java/org/hps/run/database/EpicsType.java Fri Aug 28 17:30:34 2015
@@ -1,4 +1,4 @@
-package org.hps.rundb;
+package org.hps.run.database;
import org.hps.record.epics.EpicsData;
Copied: java/trunk/run-database/src/main/java/org/hps/run/database/EpicsVariable.java (from r3428, java/trunk/record-util/src/main/java/org/hps/rundb/EpicsVariable.java)
=============================================================================
--- java/trunk/record-util/src/main/java/org/hps/rundb/EpicsVariable.java (original)
+++ java/trunk/run-database/src/main/java/org/hps/run/database/EpicsVariable.java Fri Aug 28 17:30:34 2015
@@ -1,4 +1,4 @@
-package org.hps.rundb;
+package org.hps.run.database;
/**
* Information about an EPICS variable including its name in the EPICS database, column name for the run database,
@@ -7,8 +7,8 @@
* This class is used to represent data from the <i>epics_variables</i> table in the run database.
*
* @see EpicsType
- * @see org.hps.rundb.EpicsVariableDao
- * @see org.hps.rundb.EpicsVariableDaoImpl
+ * @see org.hps.run.database.EpicsVariableDao
+ * @see org.hps.run.database.EpicsVariableDaoImpl
* @author Jeremy McCormick, SLAC
*/
public final class EpicsVariable {
Copied: java/trunk/run-database/src/main/java/org/hps/run/database/EpicsVariableDao.java (from r3428, java/trunk/record-util/src/main/java/org/hps/rundb/EpicsVariableDao.java)
=============================================================================
--- java/trunk/record-util/src/main/java/org/hps/rundb/EpicsVariableDao.java (original)
+++ java/trunk/run-database/src/main/java/org/hps/run/database/EpicsVariableDao.java Fri Aug 28 17:30:34 2015
@@ -1,4 +1,4 @@
-package org.hps.rundb;
+package org.hps.run.database;
import java.util.List;
Copied: java/trunk/run-database/src/main/java/org/hps/run/database/EpicsVariableDaoImpl.java (from r3428, java/trunk/record-util/src/main/java/org/hps/rundb/EpicsVariableDaoImpl.java)
=============================================================================
--- java/trunk/record-util/src/main/java/org/hps/rundb/EpicsVariableDaoImpl.java (original)
+++ java/trunk/run-database/src/main/java/org/hps/run/database/EpicsVariableDaoImpl.java Fri Aug 28 17:30:34 2015
@@ -1,4 +1,4 @@
-package org.hps.rundb;
+package org.hps.run.database;
import java.sql.Connection;
import java.sql.PreparedStatement;
Copied: java/trunk/run-database/src/main/java/org/hps/run/database/EvioFilesDao.java (from r3428, java/trunk/record-util/src/main/java/org/hps/rundb/EvioFilesDao.java)
=============================================================================
--- java/trunk/record-util/src/main/java/org/hps/rundb/EvioFilesDao.java (original)
+++ java/trunk/run-database/src/main/java/org/hps/run/database/EvioFilesDao.java Fri Aug 28 17:30:34 2015
@@ -1,4 +1,4 @@
-package org.hps.rundb;
+package org.hps.run.database;
import java.io.File;
import java.util.List;
Copied: java/trunk/run-database/src/main/java/org/hps/run/database/EvioFilesDaoImpl.java (from r3428, java/trunk/record-util/src/main/java/org/hps/rundb/EvioFilesDaoImpl.java)
=============================================================================
--- java/trunk/record-util/src/main/java/org/hps/rundb/EvioFilesDaoImpl.java (original)
+++ java/trunk/run-database/src/main/java/org/hps/run/database/EvioFilesDaoImpl.java Fri Aug 28 17:30:34 2015
@@ -1,4 +1,4 @@
-package org.hps.rundb;
+package org.hps.run.database;
import java.io.File;
import java.sql.Connection;
Copied: java/trunk/run-database/src/main/java/org/hps/run/database/RunDatabaseDaoFactory.java (from r3428, java/trunk/record-util/src/main/java/org/hps/rundb/RunDatabaseDaoFactory.java)
=============================================================================
--- java/trunk/record-util/src/main/java/org/hps/rundb/RunDatabaseDaoFactory.java (original)
+++ java/trunk/run-database/src/main/java/org/hps/run/database/RunDatabaseDaoFactory.java Fri Aug 28 17:30:34 2015
@@ -1,4 +1,4 @@
-package org.hps.rundb;
+package org.hps.run.database;
import java.sql.Connection;
import java.sql.SQLException;
Copied: java/trunk/run-database/src/main/java/org/hps/run/database/RunManager.java (from r3424, java/trunk/record-util/src/main/java/org/hps/rundb/RunManager.java)
=============================================================================
--- java/trunk/record-util/src/main/java/org/hps/rundb/RunManager.java (original)
+++ java/trunk/run-database/src/main/java/org/hps/run/database/RunManager.java Fri Aug 28 17:30:34 2015
@@ -1,4 +1,4 @@
-package org.hps.rundb;
+package org.hps.run.database;
import java.sql.Connection;
import java.sql.SQLException;
Copied: java/trunk/run-database/src/main/java/org/hps/run/database/RunSummary.java (from r3428, java/trunk/record-util/src/main/java/org/hps/rundb/RunSummary.java)
=============================================================================
--- java/trunk/record-util/src/main/java/org/hps/rundb/RunSummary.java (original)
+++ java/trunk/run-database/src/main/java/org/hps/run/database/RunSummary.java Fri Aug 28 17:30:34 2015
@@ -1,4 +1,4 @@
-package org.hps.rundb;
+package org.hps.run.database;
import java.io.File;
import java.util.Date;
Copied: java/trunk/run-database/src/main/java/org/hps/run/database/RunSummaryDao.java (from r3428, java/trunk/record-util/src/main/java/org/hps/rundb/RunSummaryDao.java)
=============================================================================
--- java/trunk/record-util/src/main/java/org/hps/rundb/RunSummaryDao.java (original)
+++ java/trunk/run-database/src/main/java/org/hps/run/database/RunSummaryDao.java Fri Aug 28 17:30:34 2015
@@ -1,4 +1,4 @@
-package org.hps.rundb;
+package org.hps.run.database;
import java.util.List;
Copied: java/trunk/run-database/src/main/java/org/hps/run/database/RunSummaryDaoImpl.java (from r3428, java/trunk/record-util/src/main/java/org/hps/rundb/RunSummaryDaoImpl.java)
=============================================================================
--- java/trunk/record-util/src/main/java/org/hps/rundb/RunSummaryDaoImpl.java (original)
+++ java/trunk/run-database/src/main/java/org/hps/run/database/RunSummaryDaoImpl.java Fri Aug 28 17:30:34 2015
@@ -1,4 +1,4 @@
-package org.hps.rundb;
+package org.hps.run.database;
import java.sql.Connection;
import java.sql.PreparedStatement;
Copied: java/trunk/run-database/src/main/java/org/hps/run/database/RunSummaryImpl.java (from r3428, java/trunk/record-util/src/main/java/org/hps/rundb/RunSummaryImpl.java)
=============================================================================
--- java/trunk/record-util/src/main/java/org/hps/rundb/RunSummaryImpl.java (original)
+++ java/trunk/run-database/src/main/java/org/hps/run/database/RunSummaryImpl.java Fri Aug 28 17:30:34 2015
@@ -1,4 +1,4 @@
-package org.hps.rundb;
+package org.hps.run.database;
import java.io.File;
import java.text.DateFormat;
Copied: java/trunk/run-database/src/main/java/org/hps/run/database/ScalerDataDao.java (from r3424, java/trunk/record-util/src/main/java/org/hps/rundb/ScalerDataDao.java)
=============================================================================
--- java/trunk/record-util/src/main/java/org/hps/rundb/ScalerDataDao.java (original)
+++ java/trunk/run-database/src/main/java/org/hps/run/database/ScalerDataDao.java Fri Aug 28 17:30:34 2015
@@ -1,4 +1,4 @@
-package org.hps.rundb;
+package org.hps.run.database;
import java.util.List;
Copied: java/trunk/run-database/src/main/java/org/hps/run/database/ScalerDataDaoImpl.java (from r3450, java/trunk/record-util/src/main/java/org/hps/rundb/ScalerDataDaoImpl.java)
=============================================================================
--- java/trunk/record-util/src/main/java/org/hps/rundb/ScalerDataDaoImpl.java (original)
+++ java/trunk/run-database/src/main/java/org/hps/run/database/ScalerDataDaoImpl.java Fri Aug 28 17:30:34 2015
@@ -1,4 +1,4 @@
-package org.hps.rundb;
+package org.hps.run.database;
import java.sql.Connection;
import java.sql.PreparedStatement;
Copied: java/trunk/run-database/src/main/java/org/hps/run/database/TriggerConfigDao.java (from r3428, java/trunk/record-util/src/main/java/org/hps/rundb/TriggerConfigDao.java)
=============================================================================
--- java/trunk/record-util/src/main/java/org/hps/rundb/TriggerConfigDao.java (original)
+++ java/trunk/run-database/src/main/java/org/hps/run/database/TriggerConfigDao.java Fri Aug 28 17:30:34 2015
@@ -1,4 +1,4 @@
-package org.hps.rundb;
+package org.hps.run.database;
import org.hps.record.triggerbank.TriggerConfig;
Copied: java/trunk/run-database/src/main/java/org/hps/run/database/TriggerConfigDaoImpl.java (from r3435, java/trunk/record-util/src/main/java/org/hps/rundb/TriggerConfigDaoImpl.java)
=============================================================================
--- java/trunk/record-util/src/main/java/org/hps/rundb/TriggerConfigDaoImpl.java (original)
+++ java/trunk/run-database/src/main/java/org/hps/run/database/TriggerConfigDaoImpl.java Fri Aug 28 17:30:34 2015
@@ -1,4 +1,4 @@
-package org.hps.rundb;
+package org.hps.run.database;
import java.sql.Connection;
import java.sql.PreparedStatement;
Copied: java/trunk/run-database/src/main/java/org/hps/run/database/package-info.java (from r3428, java/trunk/record-util/src/main/java/org/hps/rundb/package-info.java)
=============================================================================
--- java/trunk/record-util/src/main/java/org/hps/rundb/package-info.java (original)
+++ java/trunk/run-database/src/main/java/org/hps/run/database/package-info.java Fri Aug 28 17:30:34 2015
@@ -1,4 +1,4 @@
/**
* API for accessing the HPS run database.
*/
-package org.hps.rundb;
+package org.hps.run.database;
Modified: java/trunk/run-webapp/pom.xml
=============================================================================
--- java/trunk/run-webapp/pom.xml (original)
+++ java/trunk/run-webapp/pom.xml Fri Aug 28 17:30:34 2015
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<artifactId>hps-run-webapp</artifactId>
<name>run-webapp</name>
@@ -19,9 +20,9 @@
<dependencies>
<dependency>
<groupId>org.hps</groupId>
- <artifactId>hps-record-util</artifactId>
+ <artifactId>hps-run-database</artifactId>
</dependency>
- <dependency>
+ <dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
<version>2.4</version>
@@ -32,7 +33,7 @@
<artifactId>mysql-connector-java</artifactId>
<version>5.1.28</version>
<scope>provided</scope>
- </dependency>
+ </dependency>
</dependencies>
<build>
<defaultGoal>war:war tomcat7:redeploy</defaultGoal>
@@ -46,7 +47,7 @@
<url>http://localhost:8080/manager/text</url>
<server>local-tomcat-server</server>
<path>/hps-run-webapp</path>
- </configuration>
+ </configuration>
</plugin>
</plugins>
</build>
Modified: 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/runweb/EpicsDataServlet.java Fri Aug 28 17:30:34 2015
@@ -13,11 +13,11 @@
import javax.sql.DataSource;
import org.hps.record.epics.EpicsData;
-import org.hps.rundb.EpicsDataDao;
-import org.hps.rundb.EpicsType;
-import org.hps.rundb.EpicsVariable;
-import org.hps.rundb.EpicsVariableDao;
-import org.hps.rundb.RunDatabaseDaoFactory;
+import org.hps.run.database.EpicsDataDao;
+import org.hps.run.database.EpicsType;
+import org.hps.run.database.EpicsVariable;
+import org.hps.run.database.EpicsVariableDao;
+import org.hps.run.database.RunDatabaseDaoFactory;
/**
* Setup session state for JSP that shows a run's EPICS data.
Modified: 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/runweb/RunSummaryServlet.java Fri Aug 28 17:30:34 2015
@@ -10,8 +10,8 @@
import javax.servlet.http.HttpServletResponse;
import javax.sql.DataSource;
-import org.hps.rundb.RunManager;
-import org.hps.rundb.RunSummary;
+import org.hps.run.database.RunManager;
+import org.hps.run.database.RunSummary;
/**
* Setup state for JSP that shows run summary.
Modified: 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/runweb/RunsServlet.java Fri Aug 28 17:30:34 2015
@@ -13,12 +13,12 @@
import javax.servlet.http.HttpServletResponse;
import javax.sql.DataSource;
-import org.hps.rundb.RunDatabaseDaoFactory;
-import org.hps.rundb.RunSummary;
-import org.hps.rundb.RunSummaryDao;
+import org.hps.run.database.RunDatabaseDaoFactory;
+import org.hps.run.database.RunSummary;
+import org.hps.run.database.RunSummaryDao;
/**
- * Loads the list of {@link org.hps.rundb.RunSummary} objects to setup state for the <code>runTable.jsp</code> page.
+ * Loads the list of {@link org.hps.run.database.RunSummary} objects to setup state for the <code>runTable.jsp</code> page.
*
* @author Jeremy McCormick, SLAC
*/
Modified: 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/runweb/ScalerDataServlet.java Fri Aug 28 17:30:34 2015
@@ -12,8 +12,8 @@
import javax.sql.DataSource;
import org.hps.record.scalers.ScalerData;
-import org.hps.rundb.RunDatabaseDaoFactory;
-import org.hps.rundb.ScalerDataDao;
+import org.hps.run.database.RunDatabaseDaoFactory;
+import org.hps.run.database.ScalerDataDao;
/**
* Setup session state for JSP that shows a run's scaler data.
