Author: [log in to unmask]
Date: Fri Mar 6 16:59:47 2015
New Revision: 2307
Log:
Merge monitoring-app-HPSJAVA-442 into trunk.
Added:
java/trunk/monitoring-app/src/main/java/org/hps/monitoring/application/
- copied from r2306, java/branches/monitoring-app-HPSJAVA-442/src/main/java/org/hps/monitoring/application/
java/trunk/monitoring-app/src/main/resources/monitoringButtonGraphics/
- copied from r2306, java/branches/monitoring-app-HPSJAVA-442/src/main/resources/monitoringButtonGraphics/
Removed:
java/trunk/monitoring-app/src/main/java/org/hps/monitoring/enums/
java/trunk/monitoring-app/src/main/java/org/hps/monitoring/gui/
java/trunk/monitoring-app/src/main/java/org/hps/monitoring/package-info.java
Modified:
java/trunk/monitoring-app/ (props changed)
java/trunk/monitoring-app/pom.xml
java/trunk/monitoring-app/src/main/resources/org/hps/monitoring/config/default_config.prop
Modified: java/trunk/monitoring-app/pom.xml
=============================================================================
--- java/trunk/monitoring-app/pom.xml (original)
+++ java/trunk/monitoring-app/pom.xml Fri Mar 6 16:59:47 2015
@@ -31,7 +31,7 @@
<transformers>
<transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" />
<transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
- <mainClass>org.hps.monitoring.gui.Main</mainClass>
+ <mainClass>org.hps.monitoring.application.Main</mainClass>
</transformer>
</transformers>
<artifactSet>
@@ -121,5 +121,10 @@
<groupId>org.reflections</groupId>
<artifactId>reflections</artifactId>
</dependency>
+ <dependency>
+ <groupId>javax.jlfgr</groupId>
+ <artifactId>jlfgr</artifactId>
+ <version>1.0</version>
+ </dependency>
</dependencies>
</project>
Modified: java/trunk/monitoring-app/src/main/resources/org/hps/monitoring/config/default_config.prop
=============================================================================
--- java/trunk/monitoring-app/src/main/resources/org/hps/monitoring/config/default_config.prop (original)
+++ java/trunk/monitoring-app/src/main/resources/org/hps/monitoring/config/default_config.prop Fri Mar 6 16:59:47 2015
@@ -2,14 +2,13 @@
# Monitoring Application configuration
# job settings
-AutoSaveAida=true
-AidaFileName=monitoringPlots.aida
DetectorName=HPS-Proposal2014-v8-6pt6
DisconnectOnError=false
DisconnectOnEndRun=true
EventBuilderClassName=org.hps.evio.LCSimEngRunEventBuilder
#LogFileName=
LogLevel=ALL
+LogLevelFilter=ALL
LogToFile=false
MaxEvents=-1
#SteeringFile=
@@ -18,7 +17,7 @@
# event source
DataSourceType=ET_SERVER
-DataSourcePath=
+#DataSourcePath=
ProcessingStage=LCIO
# ET connection settings
