Menu
▾
▴
[Cs-studio-core] /hgroot/cs-studio/cs-studio: 3 new changesets
|
From: <cs-...@li...> - 2012-08-01 12:25:54
|
details: http://cs-studio.hg.sourceforge.net/hgweb/cs-studio/cs-studio//hgroot/cs-studio/cs-studio/rev/1aabc879e5be changeset: 14901:1aabc879e5be user: Markus Moeller <mar...@de...> date: Wed Aug 01 14:09:14 2012 +0200 description: o.c.alarm.jms2ora: Replaced the class LocalTime with LocalDateTime. details: http://cs-studio.hg.sourceforge.net/hgweb/cs-studio/cs-studio//hgroot/cs-studio/cs-studio/rev/0adae490a9d3 changeset: 14902:0adae490a9d3 user: Markus Moeller <mar...@de...> date: Wed Aug 01 14:12:01 2012 +0200 description: o.c.alarm.jms2ora.log4j: CHanged default log level. details: http://cs-studio.hg.sourceforge.net/hgweb/cs-studio/cs-studio//hgroot/cs-studio/cs-studio/rev/d6de5dc69c0f changeset: 14903:d6de5dc69c0f user: Markus Moeller <mar...@de...> date: Wed Aug 01 14:25:16 2012 +0200 description: Merge to main diffstat: applications/plugins/org.csstudio.alarm.jms2ora.log4j/log4j.properties | 2 +- applications/plugins/org.csstudio.alarm.jms2ora/META-INF/MANIFEST.MF | 2 +- applications/plugins/org.csstudio.alarm.jms2ora/plugin_customization.ini | 1 + applications/plugins/org.csstudio.alarm.jms2ora/src/org/csstudio/alarm/jms2ora/Jms2OraApplication.java | 7 +- applications/plugins/org.csstudio.alarm.jms2ora/src/org/csstudio/alarm/jms2ora/MessageProcessor.java | 31 +- applications/plugins/org.csstudio.alarm.jms2ora/src/org/csstudio/alarm/jms2ora/preferences/PreferenceConstants.java | 1 + applications/plugins/org.csstudio.alarm.jms2ora/src/org/csstudio/alarm/jms2ora/preferences/PreferenceInitializer.java | 23 +- applications/plugins/org.csstudio.alarm.jms2ora/src/org/csstudio/alarm/jms2ora/util/MessageContentCreator.java | 14 +- applications/plugins/org.csstudio.common.trendplotter/src/java/org/csstudio/common/trendplotter/Messages.java | 9 + applications/plugins/org.csstudio.common.trendplotter/src/java/org/csstudio/common/trendplotter/editor/DataBrowserEditor.java | 213 +++- applications/plugins/org.csstudio.common.trendplotter/src/java/org/csstudio/common/trendplotter/editor/DataBrowserModelEditorInput.java | 120 ++ applications/plugins/org.csstudio.common.trendplotter/src/java/org/csstudio/common/trendplotter/messages.properties | 16 +- applications/plugins/org.csstudio.common.trendplotter/src/java/org/csstudio/common/trendplotter/model/AnnotationInfo.java | 188 +++ applications/plugins/org.csstudio.common.trendplotter/src/java/org/csstudio/common/trendplotter/model/AxisConfig.java | 395 ++++++- applications/plugins/org.csstudio.common.trendplotter/src/java/org/csstudio/common/trendplotter/model/Model.java | 289 +++++- applications/plugins/org.csstudio.common.trendplotter/src/java/org/csstudio/common/trendplotter/model/ModelItem.java | 71 +- applications/plugins/org.csstudio.common.trendplotter/src/java/org/csstudio/common/trendplotter/model/ModelListener.java | 13 +- applications/plugins/org.csstudio.common.trendplotter/src/java/org/csstudio/common/trendplotter/model/PVItem.java | 4 +- applications/plugins/org.csstudio.common.trendplotter/src/java/org/csstudio/common/trendplotter/model/XYGraphSettings.java | 63 + applications/plugins/org.csstudio.common.trendplotter/src/java/org/csstudio/common/trendplotter/model/XYGraphSettingsXMLUtil.java | 102 ++ applications/plugins/org.csstudio.common.trendplotter/src/java/org/csstudio/common/trendplotter/preferences/Preferences.java | 262 ++-- applications/plugins/org.csstudio.common.trendplotter/src/java/org/csstudio/common/trendplotter/propsheet/AxesTableHandler.java | 7 +- applications/plugins/org.csstudio.common.trendplotter/src/java/org/csstudio/common/trendplotter/propsheet/ChangeWaveformIndexCommand.java | 58 + applications/plugins/org.csstudio.common.trendplotter/src/java/org/csstudio/common/trendplotter/propsheet/DataBrowserPropertySheetPage.java | 15 +- applications/plugins/org.csstudio.common.trendplotter/src/java/org/csstudio/common/trendplotter/propsheet/TraceTableHandler.java | 203 ++- applications/plugins/org.csstudio.common.trendplotter/src/java/org/csstudio/common/trendplotter/ui/Controller.java | 393 +++++-- applications/plugins/org.csstudio.common.trendplotter/src/java/org/csstudio/common/trendplotter/ui/Plot.java | 493 ++++++++- applications/plugins/org.csstudio.common.trendplotter/src/java/org/csstudio/common/trendplotter/ui/PlotConfigListener.java | 59 + applications/plugins/org.csstudio.common.trendplotter/src/java/org/csstudio/common/trendplotter/ui/PlotListener.java | 125 ++ applications/plugins/org.csstudio.common.trendplotter/src/java/org/csstudio/common/trendplotter/ui/XYGraphSettingsUtil.java | 185 +++ applications/plugins/org.csstudio.config.kryoNameBrowser/META-INF/MANIFEST.MF | 2 +- applications/plugins/org.csstudio.config.kryoNameBrowser/plugin.xml | 32 +- applications/plugins/org.csstudio.config.kryoNameBrowser/src/org/csstudio/config/kryonamebrowser/Activator.java | 74 +- applications/plugins/org.csstudio.config.kryoNameBrowser/src/org/csstudio/config/kryonamebrowser/ui/ShowKryoNameBrowser.java | 44 +- applications/plugins/org.csstudio.management.contactscommands.ui/META-INF/MANIFEST.MF | 2 - applications/plugins/org.csstudio.management.xmpplogindialog/META-INF/MANIFEST.MF | 4 +- applications/plugins/org.csstudio.management.xmpplogindialog/plugin.xml | 16 +- applications/plugins/org.csstudio.management.xmpplogindialog/src/org/csstudio/management/internal/xmpplogindialog/Activator.java | 18 +- applications/plugins/org.csstudio.management.xmpplogindialog/src/org/csstudio/management/internal/xmpplogindialog/PreferencePage.java | 6 +- applications/plugins/org.csstudio.management.xmpplogindialog/src/org/csstudio/management/internal/xmpplogindialog/StartupXmppLogin.java | 2 +- applications/plugins/org.csstudio.utility.ldap.nameSpaceBrowser/META-INF/MANIFEST.MF | 6 +- applications/plugins/org.csstudio.utility.ldap.nameSpaceBrowser/plugin.xml | 49 +- applications/plugins/org.csstudio.utility.ldap.nameSpaceBrowser/src/org/csstudio/utility/ldap/namespacebrowser/Activator.java | 15 +- applications/plugins/org.csstudio.utility.ldap.nameSpaceBrowser/src/org/csstudio/utility/ldap/namespacebrowser/PvPopupAction.java | 118 +- applications/plugins/org.csstudio.utility.ldap.nameSpaceBrowser/src/org/csstudio/utility/ldap/namespacebrowser/ui/ShowNamespaceBrowser.java | 28 +- applications/plugins/org.csstudio.utility.ldap.nameSpaceBrowser/src/org/csstudio/utility/ldap/namespacebrowser/utility/LdapNameSpace.java | 4 +- applications/plugins/org.csstudio.utility.nameSpaceBrowser/META-INF/MANIFEST.MF | 6 +- applications/plugins/org.csstudio.utility.nameSpaceBrowser/src/org/csstudio/utility/nameSpaceBrowser/Activator.java | 19 +- applications/plugins/org.csstudio.utility.nameSpaceBrowser/src/org/csstudio/utility/nameSpaceBrowser/ui/CSSView.java | 41 +- applications/plugins/org.csstudio.utility.nameSpaceSearch/META-INF/MANIFEST.MF | 13 +- applications/plugins/org.csstudio.utility.nameSpaceSearch/plugin.xml | 64 +- applications/plugins/org.csstudio.utility.nameSpaceSearch/src/org/csstudio/utility/nameSpaceSearch/Activator.java | 15 +- applications/plugins/org.csstudio.utility.nameSpaceSearch/src/org/csstudio/utility/nameSpaceSearch/AdapterFactory.java | 24 + applications/plugins/org.csstudio.utility.nameSpaceSearch/src/org/csstudio/utility/nameSpaceSearch/PVpopupAction.java | 25 +- applications/plugins/org.csstudio.utility.nameSpaceSearch/src/org/csstudio/utility/nameSpaceSearch/ui/MainView.java | 148 +- applications/plugins/org.csstudio.utility.nameSpaceSearch/src/org/csstudio/utility/nameSpaceSearch/ui/ProcessVariable.java | 55 - applications/plugins/org.csstudio.utility.nameSpaceSearch/src/org/csstudio/utility/nameSpaceSearch/ui/ProcessVariableItem.java | 42 + applications/plugins/org.csstudio.utility.nameSpaceSearch/src/org/csstudio/utility/nameSpaceSearch/ui/ShowNamespaceSearch.java | 17 +- applications/plugins/org.csstudio.utility.nameSpaceSearch/src/org/csstudio/utility/nameSpaceSearch/ui/TableSorter.java | 6 +- applications/plugins/org.csstudio.utility.namespace.utility/.settings/org.eclipse.jdt.core.prefs | 19 +- applications/plugins/org.csstudio.utility.namespace.utility/META-INF/MANIFEST.MF | 3 +- applications/plugins/org.csstudio.utility.namespace.utility/src/org/csstudio/utility/namespace/utility/Activator.java | 21 +- applications/plugins/org.csstudio.utility.namespace.utility/src/org/csstudio/utility/namespace/utility/AdapterFactory.java | 23 + applications/plugins/org.csstudio.utility.namespace.utility/src/org/csstudio/utility/namespace/utility/ControlSystemItem.java | 26 +- applications/plugins/org.csstudio.utility.namespace.utility/src/org/csstudio/utility/namespace/utility/ProcessVariable.java | 32 - applications/plugins/org.csstudio.utility.namespace.utility/src/org/csstudio/utility/namespace/utility/ProcessVariableItem.java | 31 + products/DESY/features/org.csstudio.desy.desytools.feature/feature.xml | 44 +- products/DESY/features/org.csstudio.desy.development.feature/feature.xml | 49 - products/DESY/features/org.csstudio.desy.library.feature/feature.xml | 33 +- products/DESY/features/org.csstudio.desy.linde.feature/.project | 17 - products/DESY/features/org.csstudio.desy.linde.feature/build.properties | 1 - products/DESY/features/org.csstudio.desy.linde.feature/feature.xml | 67 - products/DESY/features/org.csstudio.desy.platform.base.feature/feature.xml | 349 ++++++- products/DESY/features/org.csstudio.desy.platform.eclipse.feature/feature.xml | 39 +- products/DESY/features/org.csstudio.desy.pv.feature/feature.xml | 36 - products/DESY/features/org.csstudio.desy.sds.feature/feature.xml | 7 + products/DESY/plugins/org.csstudio.desy.cssci.product/.project | 11 - products/DESY/plugins/org.csstudio.desy.cssci.product/cssci.product | 388 ------- products/DESY/plugins/org.csstudio.desy.linde.product/.classpath | 6 - products/DESY/plugins/org.csstudio.desy.linde.product/.project | 28 - products/DESY/plugins/org.csstudio.desy.linde.product/.settings/org.eclipse.jdt.core.prefs | 8 - products/DESY/plugins/org.csstudio.desy.linde.product/META-INF/MANIFEST.MF | 13 - products/DESY/plugins/org.csstudio.desy.linde.product/build.properties | 21 - products/DESY/plugins/org.csstudio.desy.linde.product/build/build.properties | 138 -- products/DESY/plugins/org.csstudio.desy.linde.product/build/build.xml | 252 ----- products/DESY/plugins/org.csstudio.desy.linde.product/build/feature.cquery | 4 - products/DESY/plugins/org.csstudio.desy.linde.product/build/productBuild.xml | 73 - products/DESY/plugins/org.csstudio.desy.linde.product/build/template.rmap | 46 - products/DESY/plugins/org.csstudio.desy.linde.product/build/tools.properties | 17 - products/DESY/plugins/org.csstudio.desy.linde.product/csslinde.product | 211 ---- products/DESY/plugins/org.csstudio.desy.linde.product/icons/about.gif | 0 products/DESY/plugins/org.csstudio.desy.linde.product/icons/alt_launcher.ico | 0 products/DESY/plugins/org.csstudio.desy.linde.product/icons/css.icns | 0 products/DESY/plugins/org.csstudio.desy.linde.product/icons/css.ico | 0 products/DESY/plugins/org.csstudio.desy.linde.product/icons/css128.gif | 0 products/DESY/plugins/org.csstudio.desy.linde.product/icons/css16.gif | 0 products/DESY/plugins/org.csstudio.desy.linde.product/icons/css32.gif | 0 products/DESY/plugins/org.csstudio.desy.linde.product/icons/css48.gif | 0 products/DESY/plugins/org.csstudio.desy.linde.product/icons/css48.xpm | 79 - products/DESY/plugins/org.csstudio.desy.linde.product/icons/css64.gif | 0 products/DESY/plugins/org.csstudio.desy.linde.product/icons/perspective.gif | 0 products/DESY/plugins/org.csstudio.desy.linde.product/intro/css.html | 203 ---- products/DESY/plugins/org.csstudio.desy.linde.product/intro/images/about.gif | 0 products/DESY/plugins/org.csstudio.desy.linde.product/intro/images/cheat.png | 0 products/DESY/plugins/org.csstudio.desy.linde.product/intro/images/close.png | 0 products/DESY/plugins/org.csstudio.desy.linde.product/intro/images/restore.png | 0 products/DESY/plugins/org.csstudio.desy.linde.product/intro/images/stagger.png | 0 products/DESY/plugins/org.csstudio.desy.linde.product/intro/intro_icon.gif | 0 products/DESY/plugins/org.csstudio.desy.linde.product/intro/overview.xml | 19 - products/DESY/plugins/org.csstudio.desy.linde.product/intro/style.css | 2 - products/DESY/plugins/org.csstudio.desy.linde.product/intro_data.xml | 26 - products/DESY/plugins/org.csstudio.desy.linde.product/platform.xml | 5 - products/DESY/plugins/org.csstudio.desy.linde.product/plugin.xml | 92 - products/DESY/plugins/org.csstudio.desy.linde.product/plugin_customization.ini | 403 -------- products/DESY/plugins/org.csstudio.desy.linde.product/resources/css.ico | 0 products/DESY/plugins/org.csstudio.desy.linde.product/resources/css128x128.gif | 0 products/DESY/plugins/org.csstudio.desy.linde.product/resources/css16x16.gif | 0 products/DESY/plugins/org.csstudio.desy.linde.product/resources/css32x32.gif | 0 products/DESY/plugins/org.csstudio.desy.linde.product/resources/css48x48.gif | 0 products/DESY/plugins/org.csstudio.desy.linde.product/resources/css64x64.gif | 0 products/DESY/plugins/org.csstudio.desy.linde.product/splash.bmp | 0 products/DESY/plugins/org.csstudio.desy.linde.product/src/scmDummy.txt | 1 - products/DESY/plugins/org.csstudio.desy.product/META-INF/MANIFEST.MF | 3 +- products/DESY/plugins/org.csstudio.desy.product/css.product | 21 +- products/DESY/plugins/org.csstudio.desy.product/cssDefault.launch | 7 +- products/DESY/plugins/org.csstudio.desy.product/plugin.xml | 11 +- products/DESY/plugins/org.csstudio.desy.startuphelper/.classpath | 7 + products/DESY/plugins/org.csstudio.desy.startuphelper/.project | 28 + products/DESY/plugins/org.csstudio.desy.startuphelper/.settings/org.eclipse.jdt.core.prefs | 7 + products/DESY/plugins/org.csstudio.desy.startuphelper/META-INF/MANIFEST.MF | 16 + products/DESY/plugins/org.csstudio.desy.startuphelper/build.properties | 5 + products/DESY/plugins/org.csstudio.desy.startuphelper/plugin.xml | 5 + products/DESY/plugins/org.csstudio.desy.startuphelper/schema/startupListener.exsd | 126 ++ products/DESY/plugins/org.csstudio.desy.startuphelper/src/org/csstudio/desy/startuphelper/Activator.java | 50 + products/DESY/plugins/org.csstudio.desy.startuphelper/src/org/csstudio/desy/startuphelper/login/DesyLoginPrompt.java | 47 + products/DESY/plugins/org.csstudio.desy.startuphelper/src/org/csstudio/desy/startuphelper/startupservice/DesyServicesStartup.java | 47 + products/DESY/plugins/org.csstudio.desy.startuphelper/src/org/csstudio/desy/startuphelper/startupservice/IStartupServiceListener.java | 40 + products/DESY/plugins/org.csstudio.desy.startuphelper/src/org/csstudio/desy/startuphelper/startupservice/ServiceProxy.java | 99 ++ products/DESY/plugins/org.csstudio.desy.startuphelper/src/org/csstudio/desy/startuphelper/startupservice/StartupServiceEnumerator.java | 95 + 139 files changed, 4288 insertions(+), 3428 deletions(-) diffs (truncated from 10486 to 300 lines): diff -r bffb7a78b813 -r d6de5dc69c0f applications/plugins/org.csstudio.alarm.jms2ora.log4j/log4j.properties --- a/applications/plugins/org.csstudio.alarm.jms2ora.log4j/log4j.properties Mon Jul 30 16:10:42 2012 +0200 +++ b/applications/plugins/org.csstudio.alarm.jms2ora.log4j/log4j.properties Wed Aug 01 14:25:16 2012 +0200 @@ -7,7 +7,7 @@ #log4j.appender.CONSOLE.layout.ConversionPattern=%d{ISO8601} %-5p [%t] %c{1}\: %m%n log4j.appender.FILE=org.apache.log4j.RollingFileAppender -log4j.appender.FILE.Threshold=DEBUG +log4j.appender.FILE.Threshold=INFO log4j.appender.FILE.File=log/jms2ora.log log4j.appender.FILE.Append=true log4j.appender.FILE.MaxFileSize=2048KB diff -r bffb7a78b813 -r d6de5dc69c0f applications/plugins/org.csstudio.alarm.jms2ora/META-INF/MANIFEST.MF --- a/applications/plugins/org.csstudio.alarm.jms2ora/META-INF/MANIFEST.MF Mon Jul 30 16:10:42 2012 +0200 +++ b/applications/plugins/org.csstudio.alarm.jms2ora/META-INF/MANIFEST.MF Wed Aug 01 14:25:16 2012 +0200 @@ -2,7 +2,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: Jms2ora Bundle-SymbolicName: org.csstudio.alarm.jms2ora;singleton:=true -Bundle-Version: 3.1.3.qualifier +Bundle-Version: 3.1.4.qualifier Bundle-Activator: org.csstudio.alarm.jms2ora.Jms2OraActivator Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-1.6 diff -r bffb7a78b813 -r d6de5dc69c0f applications/plugins/org.csstudio.alarm.jms2ora/plugin_customization.ini --- a/applications/plugins/org.csstudio.alarm.jms2ora/plugin_customization.ini Mon Jul 30 16:10:42 2012 +0200 +++ b/applications/plugins/org.csstudio.alarm.jms2ora/plugin_customization.ini Wed Aug 01 14:25:16 2012 +0200 @@ -22,6 +22,7 @@ org.csstudio.alarm.jms2ora/description=The application stores the alarm messages to the database. org.csstudio.alarm.jms2ora/maxReceiveDiffTime=12 org.csstudio.alarm.jms2ora/maxStoreDiffTime=20 +org.csstudio.alarm.jms2ora/logStatistic=true # Oracle Service # ORACLE 10g URL #org.csstudio.alarm.jms2ora.service.oracleimpl/databaseUrl=jdbc:oracle:thin:@(DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)(HOST = dbsrv01.desy.de)(PORT = 1521))(ADDRESS=(PROTOCOL=TCP)(HOST=dbsrv02.desy.de)(PORT=1521))(ADDRESS=(PROTOCOL=TCP)(HOST=dbsrv03.desy.de)(PORT=1521))(LOAD_BALANCE=yes)(CONNECT_DATA=(SERVER=DEDICATED)(SERVICE_NAME=desy_db.desy.de)(FAILOVER_MODE=(TYPE=NONE)(METHOD=BASIC)(RETRIES=180)(DELAY=5)))) diff -r bffb7a78b813 -r d6de5dc69c0f applications/plugins/org.csstudio.alarm.jms2ora/src/org/csstudio/alarm/jms2ora/Jms2OraApplication.java --- a/applications/plugins/org.csstudio.alarm.jms2ora/src/org/csstudio/alarm/jms2ora/Jms2OraApplication.java Mon Jul 30 16:10:42 2012 +0200 +++ b/applications/plugins/org.csstudio.alarm.jms2ora/src/org/csstudio/alarm/jms2ora/Jms2OraApplication.java Wed Aug 01 14:25:16 2012 +0200 @@ -177,8 +177,13 @@ 60, null); + boolean logStatistic = prefs.getBoolean(Jms2OraActivator.PLUGIN_ID, + PreferenceConstants.LOG_STATISTIC, + true, + null); + // Create an object from this class - messageProcessor = new MessageProcessor(sleep, storageWait); + messageProcessor = new MessageProcessor(sleep, storageWait, logStatistic); messageProcessor.start(); Jms2OraActivator.getDefault().addSessionServiceListener(this); diff -r bffb7a78b813 -r d6de5dc69c0f applications/plugins/org.csstudio.alarm.jms2ora/src/org/csstudio/alarm/jms2ora/MessageProcessor.java --- a/applications/plugins/org.csstudio.alarm.jms2ora/src/org/csstudio/alarm/jms2ora/MessageProcessor.java Mon Jul 30 16:10:42 2012 +0200 +++ b/applications/plugins/org.csstudio.alarm.jms2ora/src/org/csstudio/alarm/jms2ora/MessageProcessor.java Wed Aug 01 14:25:16 2012 +0200 @@ -27,17 +27,15 @@ import java.util.Collection; import java.util.Vector; import java.util.concurrent.ConcurrentLinkedQueue; - import javax.annotation.CheckForNull; import javax.annotation.Nonnull; - import org.csstudio.alarm.jms2ora.service.ArchiveMessage; import org.csstudio.alarm.jms2ora.service.IMessageWriter; import org.csstudio.alarm.jms2ora.service.IPersistenceHandler; import org.csstudio.alarm.jms2ora.util.MessageConverter; import org.csstudio.alarm.jms2ora.util.StatisticCollector; import org.csstudio.domain.desy.service.osgi.OsgiServiceUnavailableException; -import org.joda.time.LocalTime; +import org.joda.time.LocalDateTime; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -96,7 +94,7 @@ private int timeBetweenStorage; /** The object holds the last processing time of the messages */ - private LocalTime nextStorageTime; + private LocalDateTime nextStorageTime; /** Indicates if the application was initialized or not */ private final boolean initialized; @@ -107,12 +105,14 @@ /** Indicates whether or not this thread stopped clean */ private boolean stoppedClean; + private boolean logStatistic; + /** * The constructor * * Oh, really */ - public MessageProcessor(long sleepingTime, int storageWaitTime) throws ServiceNotAvailableException { + public MessageProcessor(long sleepingTime, int storageWaitTime, boolean log) throws ServiceNotAvailableException { try { writerService = Jms2OraActivator.getDefault().getMessageWriterService(); @@ -134,22 +134,23 @@ throw new ServiceNotAvailableException("Persistence writer service not available: " + e.getMessage()); } + collector = new StatisticCollector(); messageConverter = new MessageConverter(this, collector); timeBetweenStorage = storageWaitTime; msgProcessorSleepingTime = sleepingTime; - nextStorageTime = new LocalTime(); + nextStorageTime = new LocalDateTime(); nextStorageTime = nextStorageTime.plusSeconds(timeBetweenStorage); archiveMessages = new ConcurrentLinkedQueue<ArchiveMessage>(); - running = true; stoppedClean = false; initialized = false; - + logStatistic = log; + this.setName("MessageProcessor-Thread"); } @@ -199,7 +200,7 @@ while(running) { - final LocalTime now = new LocalTime(); + final LocalDateTime now = new LocalDateTime(); if ((now.isAfter(nextStorageTime) || archiveMessages.size() >= 1000) && running) { @@ -223,13 +224,15 @@ storeMe.clear(); storeMe = null; - if (LOG.isDebugEnabled()) { - LOG.debug(createStatisticString()); + if (logStatistic) { + LOG.info(createStatisticString()); } + } + if (now.isAfter(nextStorageTime)) { nextStorageTime = nextStorageTime.plusSeconds(timeBetweenStorage); } - + if(running) { synchronized (this) { try { @@ -239,8 +242,8 @@ running = false; } } - LOG.debug("Waked up..."); - LOG.debug("Next processing time: {}", nextStorageTime.toString()); + LOG.info("Waked up..."); + LOG.info("Next processing time: {}", nextStorageTime.toString()); } } diff -r bffb7a78b813 -r d6de5dc69c0f applications/plugins/org.csstudio.alarm.jms2ora/src/org/csstudio/alarm/jms2ora/preferences/PreferenceConstants.java --- a/applications/plugins/org.csstudio.alarm.jms2ora/src/org/csstudio/alarm/jms2ora/preferences/PreferenceConstants.java Mon Jul 30 16:10:42 2012 +0200 +++ b/applications/plugins/org.csstudio.alarm.jms2ora/src/org/csstudio/alarm/jms2ora/preferences/PreferenceConstants.java Wed Aug 01 14:25:16 2012 +0200 @@ -53,6 +53,7 @@ public static final String WATCHDOG_PERIOD = "watchdogPeriod"; public static final String FILTER_SEND_BOUND = "filterSendBound"; public static final String FILTER_MAX_SENT_MESSAGES = "filterMaxSentMessages"; + public static final String LOG_STATISTIC = "logStatistic"; /** Waiting time (in ms) of the MessageProcessor thread */ public static final String MESSAGE_PROCESSOR_SLEEPING_TIME = "msgProcessorSleepingTime"; diff -r bffb7a78b813 -r d6de5dc69c0f applications/plugins/org.csstudio.alarm.jms2ora/src/org/csstudio/alarm/jms2ora/preferences/PreferenceInitializer.java --- a/applications/plugins/org.csstudio.alarm.jms2ora/src/org/csstudio/alarm/jms2ora/preferences/PreferenceInitializer.java Mon Jul 30 16:10:42 2012 +0200 +++ b/applications/plugins/org.csstudio.alarm.jms2ora/src/org/csstudio/alarm/jms2ora/preferences/PreferenceInitializer.java Wed Aug 01 14:25:16 2012 +0200 @@ -45,21 +45,22 @@ prefs.put(PreferenceConstants.XMPP_SERVER, "xmppserver.where.ever"); prefs.put(PreferenceConstants.XMPP_REMOTE_USER_NAME, "anonymous"); prefs.put(PreferenceConstants.XMPP_REMOTE_PASSWORD, "anonymous"); - prefs.put(PreferenceConstants.XMPP_SHUTDOWN_PASSWORD , ""); + prefs.put(PreferenceConstants.XMPP_SHUTDOWN_PASSWORD, ""); prefs.put(PreferenceConstants.JMS_PROVIDER_URLS, ""); prefs.put(PreferenceConstants.JMS_PRODUCER_URL, ""); - prefs.put(PreferenceConstants.JMS_TOPIC_NAMES , ""); - prefs.put(PreferenceConstants.JMS_CONTEXT_FACTORY_CLASS , ""); - prefs.put(PreferenceConstants.DISCARD_TYPES , ""); + prefs.put(PreferenceConstants.JMS_TOPIC_NAMES, ""); + prefs.put(PreferenceConstants.JMS_CONTEXT_FACTORY_CLASS, ""); + prefs.put(PreferenceConstants.DISCARD_TYPES, ""); prefs.put(PreferenceConstants.DISCARD_NAMES, ""); - prefs.put(PreferenceConstants.DEFAULT_VALUE_PRECISION , ""); - prefs.put(PreferenceConstants.MESSAGE_PROCESSOR_SLEEPING_TIME , "30000"); - prefs.put(PreferenceConstants.TIME_BETWEEN_STORAGE , "60"); + prefs.put(PreferenceConstants.DEFAULT_VALUE_PRECISION, ""); + prefs.put(PreferenceConstants.MESSAGE_PROCESSOR_SLEEPING_TIME, "30000"); + prefs.put(PreferenceConstants.TIME_BETWEEN_STORAGE, "60"); prefs.put(PreferenceConstants.WATCHDOG_WAIT, ""); - prefs.put(PreferenceConstants.WATCHDOG_PERIOD , ""); + prefs.put(PreferenceConstants.WATCHDOG_PERIOD, ""); prefs.put(PreferenceConstants.FILTER_SEND_BOUND, ""); - prefs.put(PreferenceConstants.FILTER_MAX_SENT_MESSAGES , ""); - prefs.put(PreferenceConstants.STORE_EMPTY_VALUES , "false"); - prefs.put(PreferenceConstants.DESCRIPTION , "I am a simple but happy application."); + prefs.put(PreferenceConstants.FILTER_MAX_SENT_MESSAGES, ""); + prefs.put(PreferenceConstants.STORE_EMPTY_VALUES, "false"); + prefs.put(PreferenceConstants.DESCRIPTION, "I am a simple but happy application."); + prefs.putBoolean(PreferenceConstants.LOG_STATISTIC, true); } } diff -r bffb7a78b813 -r d6de5dc69c0f applications/plugins/org.csstudio.alarm.jms2ora/src/org/csstudio/alarm/jms2ora/util/MessageContentCreator.java --- a/applications/plugins/org.csstudio.alarm.jms2ora/src/org/csstudio/alarm/jms2ora/util/MessageContentCreator.java Mon Jul 30 16:10:42 2012 +0200 +++ b/applications/plugins/org.csstudio.alarm.jms2ora/src/org/csstudio/alarm/jms2ora/util/MessageContentCreator.java Wed Aug 01 14:25:16 2012 +0200 @@ -174,9 +174,7 @@ for (final RawMessage m : rawMsg) { final ArchiveMessage am = this.convertRawMessage(m); if(am.discard() || !am.hasContent()) { - if (LOG.isDebugEnabled()) { - LOG.debug("Message discarded or does not have any content: {}", am.toString()); - } + LOG.info("Message discarded or does not have any content: {}", am.toString()); } else { result.add(am); } @@ -216,7 +214,7 @@ type = "unknown"; } - LOG.debug("Message type: " + type); + LOG.info("Message type: " + type); // Discard messages with the type 'simulator' if(!discardTypes.isEmpty()) { @@ -266,7 +264,7 @@ // If there is something wrong with the format... if(temp == null) { - LOG.info("Property EVENTTIME contains invalid format: " + et); + LOG.warn("Property EVENTTIME contains invalid format: " + et); wrongFormat = true; // ... create a new date string @@ -341,17 +339,17 @@ } if(wrongFormat) { - LOG.info(msgContent.toPrintableString()); + LOG.warn(msgContent.toPrintableString()); wrongFormat = false; } } if(messageFilter.shouldBeBlocked(msgContent)) { - LOG.debug("Block it!"); + LOG.info("Block it!"); msgContent.deleteContent(); collector.incrementFilteredMessages(); } else { - LOG.debug("Process it!"); + LOG.info("Process it!"); } return msgContent; diff -r bffb7a78b813 -r d6de5dc69c0f applications/plugins/org.csstudio.common.trendplotter/src/java/org/csstudio/common/trendplotter/Messages.java --- a/applications/plugins/org.csstudio.common.trendplotter/src/java/org/csstudio/common/trendplotter/Messages.java Mon Jul 30 16:10:42 2012 +0200 +++ b/applications/plugins/org.csstudio.common.trendplotter/src/java/org/csstudio/common/trendplotter/Messages.java Wed Aug 01 14:25:16 2012 +0200 @@ -107,6 +107,8 @@ public static String ExportGroupFormat; public static String ExportGroupOutput; public static String ExportGroupSource; + public static String ExportMinMaxCol; + public static String ExportMinMaxColTT; public static String ExportOptimizeCountError; public static String ExportOptimizationTT; public static String ExportPlotStartEnd; @@ -155,6 +157,7 @@ public static String Model_Disconnected; public static String Name; public static String NameLbl; + public static String NegErrColumn; public static String NotApplicable; public static String NotSaved; public static String NotSavedTT; @@ -168,6 +171,7 @@ public static String Plot_TimeAxisName; public static String Plot_ValueAxisName; public static String Plot_ValueAxisNameFMT; + public static String PosErrColumn; public static String PrefPage_ArchiveFetchDelay; public static String PrefPage_Archives; public static String PrefPage_DataServerURLs; @@ -179,6 +183,7 @@ public static String PrefPage_TraceLineWidth; public static String PrefPage_UpdatePeriod; public static String PrintSnapshot; + public static String PromptForErrors_Label; |
