Author: [log in to unmask]
Date: Tue Feb 24 16:38:16 2015
New Revision: 2191
Log:
Add seperate package for monitoring utilities. HPSJAVA-433
Added:
java/trunk/monitoring-util/src/main/java/org/hps/monitoring/plotting/
- copied from r2190, java/trunk/monitoring-app/src/main/java/org/hps/monitoring/plotting/
java/trunk/monitoring-util/src/main/java/org/hps/monitoring/subsys/
- copied from r2190, java/trunk/monitoring-app/src/main/java/org/hps/monitoring/subsys/
Removed:
java/trunk/monitoring-app/src/main/java/org/hps/monitoring/plotting/
java/trunk/monitoring-app/src/main/java/org/hps/monitoring/subsys/
Modified:
java/trunk/monitoring-app/pom.xml
java/trunk/monitoring-util/pom.xml
java/trunk/parent/pom.xml
java/trunk/pom.xml
Modified: java/trunk/monitoring-app/pom.xml
=============================================================================
--- java/trunk/monitoring-app/pom.xml (original)
+++ java/trunk/monitoring-app/pom.xml Tue Feb 24 16:38:16 2015
@@ -107,14 +107,6 @@
<dependencies>
<dependency>
<groupId>org.hps</groupId>
- <artifactId>hps-record-util</artifactId>
- </dependency>
- <dependency>
- <groupId>org.hps</groupId>
- <artifactId>hps-evio</artifactId>
- </dependency>
- <dependency>
- <groupId>org.hps</groupId>
<artifactId>hps-monitoring-drivers</artifactId>
</dependency>
<dependency>
@@ -122,28 +114,8 @@
<artifactId>hps-steering-files</artifactId>
</dependency>
<dependency>
- <groupId>org.hps</groupId>
- <artifactId>hps-users</artifactId>
- </dependency>
- <dependency>
- <groupId>jfreechart-aida-experimental</groupId>
- <artifactId>jfreechart-aida-experimental</artifactId>
- <version>1.5</version>
- <exclusions>
- <exclusion>
- <groupId>jdom</groupId>
- <artifactId>jdom</artifactId>
- </exclusion>
- <exclusion>
- <groupId>commons-math</groupId>
- <artifactId>commons-math</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
<groupId>org.reflections</groupId>
<artifactId>reflections</artifactId>
- <version>0.9.9-RC1</version>
</dependency>
</dependencies>
</project>
Modified: java/trunk/monitoring-util/pom.xml
=============================================================================
--- java/trunk/monitoring-util/pom.xml (original)
+++ java/trunk/monitoring-util/pom.xml Tue Feb 24 16:38:16 2015
@@ -14,7 +14,6 @@
<connection>scm:svn:svn://svn.freehep.org/hps/java/trunk/monitoring-util/</connection>
<developerConnection>scm:svn:svn://svn.freehep.org/hps/java/trunk/monitoring-util/</developerConnection>
</scm>
- <build>
<dependencies>
<dependency>
<groupId>org.hps</groupId>
@@ -27,17 +26,6 @@
<dependency>
<groupId>jfreechart-aida-experimental</groupId>
<artifactId>jfreechart-aida-experimental</artifactId>
- <version>1.5</version>
- <exclusions>
- <exclusion>
- <groupId>jdom</groupId>
- <artifactId>jdom</artifactId>
- </exclusion>
- <exclusion>
- <groupId>commons-math</groupId>
- <artifactId>commons-math</artifactId>
- </exclusion>
- </exclusions>
</dependency>
</dependencies>
</project>
Modified: java/trunk/parent/pom.xml
=============================================================================
--- java/trunk/parent/pom.xml (original)
+++ java/trunk/parent/pom.xml Tue Feb 24 16:38:16 2015
@@ -175,6 +175,11 @@
<artifactId>hps-record-util</artifactId>
<version>3.2-SNAPSHOT</version>
</dependency>
+ <dependency>
+ <groupId>org.hps</groupId>
+ <artifactId>hps-monitoring-util</artifactId>
+ <version>3.2-SNAPSHOT</version>
+ </dependency>
<!-- Next are external dependencies used in multiple modules. -->
<dependency>
<groupId>org.jlab.coda</groupId>
@@ -190,6 +195,21 @@
<groupId>org.reflections</groupId>
<artifactId>reflections</artifactId>
<version>0.9.9-RC1</version>
+ </dependency>
+ <dependency>
+ <groupId>jfreechart-aida-experimental</groupId>
+ <artifactId>jfreechart-aida-experimental</artifactId>
+ <version>1.5</version>
+ <exclusions>
+ <exclusion>
+ <groupId>jdom</groupId>
+ <artifactId>jdom</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>commons-math</groupId>
+ <artifactId>commons-math</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
</dependencies>
</dependencyManagement>
Modified: java/trunk/pom.xml
=============================================================================
--- java/trunk/pom.xml (original)
+++ java/trunk/pom.xml Tue Feb 24 16:38:16 2015
@@ -138,8 +138,9 @@
<module>ecal-recon</module>
<module>evio</module>
<module>integration-tests</module>
+ <module>monitoring-util</module>
+ <module>monitoring-drivers</module>
<module>monitoring-app</module>
- <module>monitoring-drivers</module>
<module>parent</module>
<module>plugin</module>
<module>recon</module>
