From: <cs-...@li...> - 2012-01-30 17:16:13
|
details: http://cs-studio.hg.sourceforge.net/hgweb/cs-studio/cs-studio//hgrepo/c/cs/cs-studio/cs-studio/rev/5258154b4250 changeset: 13759:5258154b4250 user: Gabriele Carcassi <car...@bn...> date: Mon Jan 30 11:40:58 2012 -0500 description: updating plug-ins names/descriptions/providers details: http://cs-studio.hg.sourceforge.net/hgweb/cs-studio/cs-studio//hgrepo/c/cs/cs-studio/cs-studio/rev/7fd67fbd7025 changeset: 13760:7fd67fbd7025 user: Gabriele Carcassi <car...@bn...> date: Mon Jan 30 12:11:52 2012 -0500 description: Merge diffstat: applications/plugins/edu.msu.nscl.olog.api/META-INF/MANIFEST.MF | 3 +- applications/plugins/gov.bnl.channelfinder.api/META-INF/MANIFEST.MF | 3 +- applications/plugins/org.csstudio.alarm.jms2ora.service.oracleimpl/.project | 6 - applications/plugins/org.csstudio.alarm.jms2ora.service.oracleimpl/src/java/org/csstudio/alarm/jms2ora/service/oracleimpl/dao/MessageDao.java | 6 +- applications/plugins/org.csstudio.alarm.jms2ora.service.oracleimpl/src/java/org/csstudio/alarm/jms2ora/service/oracleimpl/dao/MetaDataDao.java | 2 +- applications/plugins/org.csstudio.alarm.jms2ora.service.oracleimpl/src/java/org/csstudio/alarm/jms2ora/service/oracleimpl/dao/OracleConnectionHandler.java | 8 +- applications/plugins/org.csstudio.alarm.jms2ora.service.persistence/.project | 6 - applications/plugins/org.csstudio.alarm.jms2ora.service.persistence/src/java/org/csstudio/alarm/jms2ora/service/persistence/MessageFileHandler.java | 64 +- applications/plugins/org.csstudio.alarm.jms2ora.service.persistence/src/java/org/csstudio/alarm/jms2ora/service/persistence/MessageFilePersistenceService.java | 7 +- applications/plugins/org.csstudio.alarm.jms2ora.service/.project | 6 - applications/plugins/org.csstudio.alarm.jms2ora.service/src/java/org/csstudio/alarm/jms2ora/service/ArchiveMessage.java | 8 +- applications/plugins/org.csstudio.alarm.jms2ora/.project | 6 - applications/plugins/org.csstudio.alarm.jms2ora/META-INF/MANIFEST.MF | 9 +- applications/plugins/org.csstudio.alarm.jms2ora/plugin.xml | 21 +- applications/plugins/org.csstudio.alarm.jms2ora/src/org/csstudio/alarm/jms2ora/IMessageConverter.java | 5 +- applications/plugins/org.csstudio.alarm.jms2ora/src/org/csstudio/alarm/jms2ora/IMessageProcessor.java | 24 +- applications/plugins/org.csstudio.alarm.jms2ora/src/org/csstudio/alarm/jms2ora/Jms2OraApplication.java | 35 +- applications/plugins/org.csstudio.alarm.jms2ora/src/org/csstudio/alarm/jms2ora/MessageProcessor.java | 51 +- applications/plugins/org.csstudio.alarm.jms2ora/src/org/csstudio/alarm/jms2ora/RemotelyAccesible.java | 2 + applications/plugins/org.csstudio.alarm.jms2ora/src/org/csstudio/alarm/jms2ora/database/DatabaseLayer.java | 1 + applications/plugins/org.csstudio.alarm.jms2ora/src/org/csstudio/alarm/jms2ora/management/DeleteAllMessageFiles.java | 47 - applications/plugins/org.csstudio.alarm.jms2ora/src/org/csstudio/alarm/jms2ora/management/GetDescription.java | 7 +- applications/plugins/org.csstudio.alarm.jms2ora/src/org/csstudio/alarm/jms2ora/management/GetMessageFileContent.java | 43 - applications/plugins/org.csstudio.alarm.jms2ora/src/org/csstudio/alarm/jms2ora/management/GetNameOfMessageFiles.java | 43 - applications/plugins/org.csstudio.alarm.jms2ora/src/org/csstudio/alarm/jms2ora/management/GetNumberOfMessageFiles.java | 21 +- applications/plugins/org.csstudio.alarm.jms2ora/src/org/csstudio/alarm/jms2ora/management/GetQueueSize.java | 55 + applications/plugins/org.csstudio.alarm.jms2ora/src/org/csstudio/alarm/jms2ora/management/GetQueuedMessages.java | 55 - applications/plugins/org.csstudio.alarm.jms2ora/src/org/csstudio/alarm/jms2ora/util/MessageConverter.java | 15 +- applications/plugins/org.csstudio.alarm.jms2ora/src/org/csstudio/alarm/jms2ora/util/MessageFilterContainer.java | 29 +- applications/plugins/org.csstudio.ams.MessageMinder/AmsMessageMinder.product | 15 + applications/plugins/org.csstudio.ams.application.deliverysystem/AmsDeliverySystem.product | 27 - applications/plugins/org.csstudio.ams.application.deliverysystem/plugin_customization.ini | 1 + applications/plugins/org.csstudio.ams.application.deliverysystem/src/org/csstudio/ams/application/deliverysystem/DeliverySystemApplication.java | 38 +- applications/plugins/org.csstudio.ams.application.deliverysystem/src/org/csstudio/ams/application/deliverysystem/DeliveryWorkerList.java | 71 + applications/plugins/org.csstudio.ams.application.deliverysystem/src/org/csstudio/ams/application/deliverysystem/internal/DeliverySystemPreference.java | 3 + applications/plugins/org.csstudio.ams.connector.jms/AmsJmsConnector.product | 15 + applications/plugins/org.csstudio.ams.connector.sms/AmsSmsConnector.product | 16 +- applications/plugins/org.csstudio.ams.connector.voicemail/AmsVoicemailConnector.product | 17 +- applications/plugins/org.csstudio.ams.distributor/AmsDistributor.product | 18 +- applications/plugins/org.csstudio.ams.distributor/src/org/csstudio/ams/distributor/DistributorWork.java | 8 +- applications/plugins/org.csstudio.ams.log4j/log4j.properties | 13 +- applications/plugins/org.csstudio.channel.opiwidgets/src/org/csstudio/channel/opiwidgets/AbstractChannelWidgetFigure.java | 7 +- applications/plugins/org.csstudio.logbook.olog/META-INF/MANIFEST.MF | 1 + applications/plugins/org.csstudio.nams.application.department.decision/AmsDepartmentDecision.product | 16 + applications/plugins/org.csstudio.opibuilder.rap/META-INF/MANIFEST.MF | 3 +- applications/plugins/org.csstudio.opibuilder.rap/WebOPI.launch | 4 +- applications/plugins/org.csstudio.opibuilder.rap/html/WebOPI.html | 29 +- applications/plugins/org.csstudio.swt.xygraph/examples/ComprehensiveExample.java | 19 +- applications/plugins/org.csstudio.utility.olog.ui/META-INF/MANIFEST.MF | 4 +- applications/plugins/org.csstudio.utility.olog/META-INF/MANIFEST.MF | 4 +- core/plugins/org.csstudio.platform.libs.epics.win32/lib/win32/x86/ca.dll | 0 core/plugins/org.csstudio.rap.ui.util/META-INF/MANIFEST.MF | 1 + core/plugins/org.csstudio.rap.ui.util/src/org/csstudio/ui/util/dialogs/ExceptionDetailsErrorDialog.java | 604 ++++++++++ products/SNS/product/org.csstudio.sns.updatesite/plugins.list | 5 + 54 files changed, 1084 insertions(+), 443 deletions(-) diffs (truncated from 2846 to 300 lines): diff -r b6606e052814 -r 7fd67fbd7025 applications/plugins/edu.msu.nscl.olog.api/META-INF/MANIFEST.MF --- a/applications/plugins/edu.msu.nscl.olog.api/META-INF/MANIFEST.MF Fri Jan 27 17:21:10 2012 -0500 +++ b/applications/plugins/edu.msu.nscl.olog.api/META-INF/MANIFEST.MF Mon Jan 30 12:11:52 2012 -0500 @@ -1,6 +1,6 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 -Bundle-Name: Olog ClientAPI +Bundle-Name: Olog Client Library Bundle-SymbolicName: edu.msu.nscl.olog.api;singleton:=true Bundle-Version: 2.0.1.qualifier Require-Bundle: org.csstudio.platform.libs.jersey, @@ -13,3 +13,4 @@ Bundle-Vendor: Kunal Shroff <ks...@bn...> - BNL Bundle-Activator: org.csstudio.utility.olog.Activator Bundle-ActivationPolicy: lazy +Bundle-Description: Olog Client Library diff -r b6606e052814 -r 7fd67fbd7025 applications/plugins/gov.bnl.channelfinder.api/META-INF/MANIFEST.MF --- a/applications/plugins/gov.bnl.channelfinder.api/META-INF/MANIFEST.MF Fri Jan 27 17:21:10 2012 -0500 +++ b/applications/plugins/gov.bnl.channelfinder.api/META-INF/MANIFEST.MF Mon Jan 30 12:11:52 2012 -0500 @@ -1,6 +1,6 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 -Bundle-Name: channelfinder client library +Bundle-Name: ChannelFinder Client Library Bundle-SymbolicName: gov.bnl.channelfinder.api;singleton:=true Bundle-Version: 2.2.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.6 @@ -11,3 +11,4 @@ Bundle-Vendor: Kunal Shroff <ks...@bn...> - BNL Bundle-ActivationPolicy: lazy Bundle-Activator: org.csstudio.utility.channelfinder.Activator +Bundle-Description: ChannelFinder Client Library diff -r b6606e052814 -r 7fd67fbd7025 applications/plugins/org.csstudio.alarm.jms2ora.service.oracleimpl/.project --- a/applications/plugins/org.csstudio.alarm.jms2ora.service.oracleimpl/.project Fri Jan 27 17:21:10 2012 -0500 +++ b/applications/plugins/org.csstudio.alarm.jms2ora.service.oracleimpl/.project Mon Jan 30 12:11:52 2012 -0500 @@ -20,15 +20,9 @@ <arguments> </arguments> </buildCommand> - <buildCommand> - <name>net.sf.eclipsecs.core.CheckstyleBuilder</name> - <arguments> - </arguments> - </buildCommand> </buildSpec> <natures> <nature>org.eclipse.pde.PluginNature</nature> <nature>org.eclipse.jdt.core.javanature</nature> - <nature>net.sf.eclipsecs.core.CheckstyleNature</nature> </natures> </projectDescription> diff -r b6606e052814 -r 7fd67fbd7025 applications/plugins/org.csstudio.alarm.jms2ora.service.oracleimpl/src/java/org/csstudio/alarm/jms2ora/service/oracleimpl/dao/MessageDao.java --- a/applications/plugins/org.csstudio.alarm.jms2ora.service.oracleimpl/src/java/org/csstudio/alarm/jms2ora/service/oracleimpl/dao/MessageDao.java Fri Jan 27 17:21:10 2012 -0500 +++ b/applications/plugins/org.csstudio.alarm.jms2ora.service.oracleimpl/src/java/org/csstudio/alarm/jms2ora/service/oracleimpl/dao/MessageDao.java Mon Jan 30 12:11:52 2012 -0500 @@ -41,8 +41,6 @@ import org.slf4j.LoggerFactory; /** - * TODO (mmoeller) : - * * @author mmoeller * @version 1.0 * @since 19.08.2011 @@ -107,6 +105,8 @@ return true; } + LOG.info("Number of messages to write: {}", messages.size()); + Connection con = null; try { con = connectionHandler.getConnection(); @@ -221,6 +221,8 @@ try{contentStatement.close();}catch(SQLException sqle){/*Ignore Me*/} contentStatement=null; } + + connectionHandler.disconnect(); } return success; diff -r b6606e052814 -r 7fd67fbd7025 applications/plugins/org.csstudio.alarm.jms2ora.service.oracleimpl/src/java/org/csstudio/alarm/jms2ora/service/oracleimpl/dao/MetaDataDao.java --- a/applications/plugins/org.csstudio.alarm.jms2ora.service.oracleimpl/src/java/org/csstudio/alarm/jms2ora/service/oracleimpl/dao/MetaDataDao.java Fri Jan 27 17:21:10 2012 -0500 +++ b/applications/plugins/org.csstudio.alarm.jms2ora.service.oracleimpl/src/java/org/csstudio/alarm/jms2ora/service/oracleimpl/dao/MetaDataDao.java Mon Jan 30 12:11:52 2012 -0500 @@ -54,7 +54,7 @@ public class MetaDataDao implements IMessageArchiveDao { /** The logger of this class */ - private Logger LOG = LoggerFactory.getLogger(MetaDataDao.class); + private static Logger LOG = LoggerFactory.getLogger(MetaDataDao.class); /** The connection handler */ private OracleConnectionHandler connectionHandler; diff -r b6606e052814 -r 7fd67fbd7025 applications/plugins/org.csstudio.alarm.jms2ora.service.oracleimpl/src/java/org/csstudio/alarm/jms2ora/service/oracleimpl/dao/OracleConnectionHandler.java --- a/applications/plugins/org.csstudio.alarm.jms2ora.service.oracleimpl/src/java/org/csstudio/alarm/jms2ora/service/oracleimpl/dao/OracleConnectionHandler.java Fri Jan 27 17:21:10 2012 -0500 +++ b/applications/plugins/org.csstudio.alarm.jms2ora.service.oracleimpl/src/java/org/csstudio/alarm/jms2ora/service/oracleimpl/dao/OracleConnectionHandler.java Mon Jan 30 12:11:52 2012 -0500 @@ -29,10 +29,8 @@ import java.sql.DriverManager; import java.sql.SQLException; import java.util.Enumeration; - import oracle.jdbc.OracleDriver; import oracle.jdbc.pool.OracleDataSource; - import org.csstudio.alarm.jms2ora.service.ConnectionInfo; import org.csstudio.alarm.jms2ora.service.MessageArchiveConnectionException; import org.csstudio.alarm.jms2ora.service.oracleimpl.Activator; @@ -43,8 +41,6 @@ import org.slf4j.LoggerFactory; /** - * TODO (mmoeller) : - * * @author mmoeller * @version 1.0 * @since 19.08.2011 @@ -87,7 +83,7 @@ } } - if (driverFound == false) { + if (!driverFound) { try { driver = new OracleDriver(); DriverManager.registerDriver(driver); @@ -169,7 +165,7 @@ * * @return ConnectionInfo */ - public ConnectionInfo getConnectionInfo() { + public final ConnectionInfo getConnectionInfo() { return this.conInfo; } } diff -r b6606e052814 -r 7fd67fbd7025 applications/plugins/org.csstudio.alarm.jms2ora.service.persistence/.project --- a/applications/plugins/org.csstudio.alarm.jms2ora.service.persistence/.project Fri Jan 27 17:21:10 2012 -0500 +++ b/applications/plugins/org.csstudio.alarm.jms2ora.service.persistence/.project Mon Jan 30 12:11:52 2012 -0500 @@ -20,15 +20,9 @@ <arguments> </arguments> </buildCommand> - <buildCommand> - <name>net.sf.eclipsecs.core.CheckstyleBuilder</name> - <arguments> - </arguments> - </buildCommand> </buildSpec> <natures> <nature>org.eclipse.pde.PluginNature</nature> <nature>org.eclipse.jdt.core.javanature</nature> - <nature>net.sf.eclipsecs.core.CheckstyleNature</nature> </natures> </projectDescription> diff -r b6606e052814 -r 7fd67fbd7025 applications/plugins/org.csstudio.alarm.jms2ora.service.persistence/src/java/org/csstudio/alarm/jms2ora/service/persistence/MessageFileHandler.java --- a/applications/plugins/org.csstudio.alarm.jms2ora.service.persistence/src/java/org/csstudio/alarm/jms2ora/service/persistence/MessageFileHandler.java Fri Jan 27 17:21:10 2012 -0500 +++ b/applications/plugins/org.csstudio.alarm.jms2ora.service.persistence/src/java/org/csstudio/alarm/jms2ora/service/persistence/MessageFileHandler.java Mon Jan 30 12:11:52 2012 -0500 @@ -32,9 +32,11 @@ import java.io.IOException; import java.io.ObjectInputStream; import java.io.ObjectOutputStream; +import java.text.DecimalFormat; import java.text.SimpleDateFormat; +import java.util.Date; import java.util.GregorianCalendar; - +import java.util.Vector; import org.csstudio.alarm.jms2ora.service.ArchiveMessage; import org.csstudio.alarm.jms2ora.service.DataDirectory; import org.csstudio.alarm.jms2ora.service.DataDirectoryException; @@ -59,7 +61,7 @@ private final DataDirectory dataDirectories; /** Prefix for the file names */ - private final String prefix = "message_"; + private final String prefix = "message-"; public MessageFileHandler() { final IPreferencesService prefs = Platform.getPreferencesService(); @@ -72,7 +74,7 @@ */ @Override public boolean accept(final File dir, final String name) { - return name.toLowerCase().matches(prefix + "\\d{8}_\\d{9}.ser"); + return name.toLowerCase().matches(prefix + "\\d{8}-\\d{9}-\\d+.ser"); } /** @@ -256,39 +258,47 @@ * * @param content - The MessageContent object that have to be stored on disk. */ - public void writeMessageContentToFile(final ArchiveMessage content) { + public void writeMessagesToFile(final Vector<ArchiveMessage> content) { - if(!content.hasContent()) { - LOG.info("Message does not contain content."); + if (content.isEmpty()) { return; } - + if(dataDirectories.existsDataDirectory() == false) { LOG.warn("Object folder does not exist. Message cannot be stored."); return; } final GregorianCalendar cal = new GregorianCalendar(); - final SimpleDateFormat dfm = new SimpleDateFormat("yyyyMMdd_HHmmssSSS"); - final String fn = prefix + dfm.format(cal.getTime()); - - FileOutputStream fos = null; - ObjectOutputStream oos = null; - - try { - fos = new FileOutputStream(dataDirectories.getDataDirectoryAsString() + fn + ".ser"); - oos = new ObjectOutputStream(fos); - - // Write the MessageContent object to disk - oos.writeObject(content); - } catch(final Exception e) { - LOG.error("[*** " + e.getClass().getSimpleName() + " ***]: " + e.getMessage()); - } finally { - if(oos != null){try{oos.close();}catch(final IOException ioe){/* Can be ignored */}} - if(fos != null){try{fos.close();}catch(final IOException ioe){/* Can be ignored */}} - - oos = null; - fos = null; + final SimpleDateFormat dfm = new SimpleDateFormat("yyyyMMdd-HHmmssSSS"); + final Date date = cal.getTime(); + final String dateString = dfm.format(date); + DecimalFormat nf = new DecimalFormat("#"); + nf.setMinimumIntegerDigits(String.valueOf(content.size()).length()); + + int count = 1; + for (ArchiveMessage o : content) { + + String fn = prefix + dateString + "-" + nf.format(count++); + + FileOutputStream fos = null; + ObjectOutputStream oos = null; + + try { + fos = new FileOutputStream(dataDirectories.getDataDirectoryAsString() + fn + ".ser"); + oos = new ObjectOutputStream(fos); + + // Write the MessageContent object to disk + oos.writeObject(o); + } catch(final Exception e) { + LOG.error("[*** " + e.getClass().getSimpleName() + " ***]: " + e.getMessage()); + } finally { + if(oos != null){try{oos.close();}catch(final IOException ioe){/* Can be ignored */}} + if(fos != null){try{fos.close();}catch(final IOException ioe){/* Can be ignored */}} + + oos = null; + fos = null; + } } } diff -r b6606e052814 -r 7fd67fbd7025 applications/plugins/org.csstudio.alarm.jms2ora.service.persistence/src/java/org/csstudio/alarm/jms2ora/service/persistence/MessageFilePersistenceService.java --- a/applications/plugins/org.csstudio.alarm.jms2ora.service.persistence/src/java/org/csstudio/alarm/jms2ora/service/persistence/MessageFilePersistenceService.java Fri Jan 27 17:21:10 2012 -0500 +++ b/applications/plugins/org.csstudio.alarm.jms2ora.service.persistence/src/java/org/csstudio/alarm/jms2ora/service/persistence/MessageFilePersistenceService.java Mon Jan 30 12:11:52 2012 -0500 @@ -69,7 +69,9 @@ */ @Override public void writeMessageContent(final ArchiveMessage content) { - fileHandler.writeMessageContentToFile(content); + Vector<ArchiveMessage> message = new Vector<ArchiveMessage>(); + message.add(content); + fileHandler.writeMessagesToFile(message); } /** @@ -77,8 +79,7 @@ */ @Override public void writeMessages(final Vector<ArchiveMessage> messages) { - // TODO Auto-generated method stub - + fileHandler.writeMessagesToFile(messages); } /** diff -r b6606e052814 -r 7fd67fbd7025 applications/plugins/org.csstudio.alarm.jms2ora.service/.project --- a/applications/plugins/org.csstudio.alarm.jms2ora.service/.project Fri Jan 27 17:21:10 2012 -0500 +++ b/applications/plugins/org.csstudio.alarm.jms2ora.service/.project Mon Jan 30 12:11:52 2012 -0500 @@ -20,15 +20,9 @@ <arguments> </arguments> </buildCommand> - <buildCommand> - <name>net.sf.eclipsecs.core.CheckstyleBuilder</name> - <arguments> - </arguments> - </buildCommand> </buildSpec> <natures> <nature>org.eclipse.pde.PluginNature</nature> <nature>org.eclipse.jdt.core.javanature</nature> - <nature>net.sf.eclipsecs.core.CheckstyleNature</nature> |