Menu
▾
▴
[Cs-studio-core] /hgroot/cs-studio/cs-studio: 53 new changesets
|
From: <cs-...@li...> - 2012-03-20 16:52:25
|
details: http://cs-studio.hg.sourceforge.net/hgweb/cs-studio/cs-studio//hgroot/cs-studio/cs-studio/rev/67cea7d5aad9 changeset: 14343:67cea7d5aad9 user: Laurent PHILIPPE date: Tue Mar 13 14:43:15 2012 +0100 description: Databrowser => Save graph settings in plt file details: http://cs-studio.hg.sourceforge.net/hgweb/cs-studio/cs-studio//hgroot/cs-studio/cs-studio/rev/0a48e47fe386 changeset: 14344:0a48e47fe386 user: laurentphilippe date: Tue Mar 13 15:01:46 2012 +0100 description: merge details: http://cs-studio.hg.sourceforge.net/hgweb/cs-studio/cs-studio//hgroot/cs-studio/cs-studio/rev/3c580adabd95 changeset: 14345:3c580adabd95 user: Laurent PHILIPPE date: Tue Mar 13 16:40:48 2012 +0100 description: Databrowser => Set databrowser editor dirty when annotation list changed details: http://cs-studio.hg.sourceforge.net/hgweb/cs-studio/cs-studio//hgroot/cs-studio/cs-studio/rev/449e38e291f9 changeset: 14346:449e38e291f9 user: Laurent PHILIPPE date: Tue Mar 13 17:23:08 2012 +0100 description: Databrowser => Set databrowser editor dirty when annotation list changed. WARNING : the editor is not set dirty when annotation X and Y value change. details: http://cs-studio.hg.sourceforge.net/hgweb/cs-studio/cs-studio//hgroot/cs-studio/cs-studio/rev/0cbaf66883ab changeset: 14347:0cbaf66883ab user: kasemir date: Tue Mar 13 14:02:43 2012 -0400 description: SNS Scan System: Matlab example details: http://cs-studio.hg.sourceforge.net/hgweb/cs-studio/cs-studio//hgroot/cs-studio/cs-studio/rev/29a9ef8bbafd changeset: 14348:29a9ef8bbafd user: kasemir date: Tue Mar 13 14:10:02 2012 -0400 description: Merge details: http://cs-studio.hg.sourceforge.net/hgweb/cs-studio/cs-studio//hgroot/cs-studio/cs-studio/rev/461ade47c411 changeset: 14349:461ade47c411 user: kasemir date: Tue Mar 13 15:23:00 2012 -0400 description: SNS Scan System: Console view shortcut details: http://cs-studio.hg.sourceforge.net/hgweb/cs-studio/cs-studio//hgroot/cs-studio/cs-studio/rev/1a660b100fe8 changeset: 14350:1a660b100fe8 user: kasemir date: Tue Mar 13 16:27:29 2012 -0400 description: SNS Scan System: Scan monitor shows server mem percentage details: http://cs-studio.hg.sourceforge.net/hgweb/cs-studio/cs-studio//hgroot/cs-studio/cs-studio/rev/7801ab8ff3ec changeset: 14351:7801ab8ff3ec user: kasemir date: Tue Mar 13 16:28:57 2012 -0400 description: SNS Scan System: Scan monitor shows server mem percentage details: http://cs-studio.hg.sourceforge.net/hgweb/cs-studio/cs-studio//hgroot/cs-studio/cs-studio/rev/128c7fb7a342 changeset: 14352:128c7fb7a342 user: kasemir date: Tue Mar 13 16:29:54 2012 -0400 description: SNS Scan System: TODOs details: http://cs-studio.hg.sourceforge.net/hgweb/cs-studio/cs-studio//hgroot/cs-studio/cs-studio/rev/153b2ccfc8ae changeset: 14353:153b2ccfc8ae user: Laurent PHILIPPE date: Wed Mar 14 16:31:18 2012 +0100 description: Databrowser => Update the databrowser properties view when the user changes graph config settings details: http://cs-studio.hg.sourceforge.net/hgweb/cs-studio/cs-studio//hgroot/cs-studio/cs-studio/rev/940df3b694f8 changeset: 14354:940df3b694f8 user: Laurent PHILIPPE date: Wed Mar 14 16:34:04 2012 +0100 description: Databrowser => Update the databrowser properties view when the user changes graph config settings 2 details: http://cs-studio.hg.sourceforge.net/hgweb/cs-studio/cs-studio//hgroot/cs-studio/cs-studio/rev/a0d1392eed67 changeset: 14355:a0d1392eed67 user: laurentphilippe date: Wed Mar 14 16:36:03 2012 +0100 description: merge details: http://cs-studio.hg.sourceforge.net/hgweb/cs-studio/cs-studio//hgroot/cs-studio/cs-studio/rev/d29b406ca506 changeset: 14356:d29b406ca506 user: Laurent PHILIPPE date: Wed Mar 14 17:12:09 2012 +0100 description: Databrowser => Correct org /csstudio/trends/databrowser2/ui/PlotDemo.java details: http://cs-studio.hg.sourceforge.net/hgweb/cs-studio/cs-studio//hgroot/cs-studio/cs-studio/rev/4f49b1e54d41 changeset: 14357:4f49b1e54d41 user: kasemir date: Wed Mar 14 13:03:09 2012 -0400 description: SNS Scan System: WaitingForDevices command shows pending devices details: http://cs-studio.hg.sourceforge.net/hgweb/cs-studio/cs-studio//hgroot/cs-studio/cs-studio/rev/876746716dbe changeset: 14358:876746716dbe user: kasemir date: Wed Mar 14 13:15:27 2012 -0400 description: SNS Scan System: Progress counter resets so that only 'main' commands are counted, not pre/post scan commands details: http://cs-studio.hg.sourceforge.net/hgweb/cs-studio/cs-studio//hgroot/cs-studio/cs-studio/rev/7f54943aa5fc changeset: 14359:7f54943aa5fc user: kasemir date: Wed Mar 14 16:18:19 2012 -0400 description: SNS Scan System: Remove old, finished scans when mem usage is high and new scans get submitted details: http://cs-studio.hg.sourceforge.net/hgweb/cs-studio/cs-studio//hgroot/cs-studio/cs-studio/rev/df67d7f4f719 changeset: 14360:df67d7f4f719 user: kasemir date: Wed Mar 14 16:27:06 2012 -0400 description: SNS Scan System: Remove old, finished scans when mem usage is high and new scans get submitted details: http://cs-studio.hg.sourceforge.net/hgweb/cs-studio/cs-studio//hgroot/cs-studio/cs-studio/rev/b07df07b9e10 changeset: 14361:b07df07b9e10 user: kasemir date: Wed Mar 14 16:29:39 2012 -0400 description: Merge details: http://cs-studio.hg.sourceforge.net/hgweb/cs-studio/cs-studio//hgroot/cs-studio/cs-studio/rev/a4bb0cc630f6 changeset: 14362:a4bb0cc630f6 user: kasemir date: Wed Mar 14 16:48:51 2012 -0400 description: SNS Scan System: Separate listener for server info and scan info details: http://cs-studio.hg.sourceforge.net/hgweb/cs-studio/cs-studio//hgroot/cs-studio/cs-studio/rev/7b0a7e87639c changeset: 14363:7b0a7e87639c user: kasemir date: Thu Mar 15 08:45:01 2012 -0400 description: o.c.utility.pv.epics: Add 'flush' to each setValue (write) instead of bulking them via JCACommandThread because that's much faster ("immediate" vs. 0.1 second delay) details: http://cs-studio.hg.sourceforge.net/hgweb/cs-studio/cs-studio//hgroot/cs-studio/cs-studio/rev/11ec051d2348 changeset: 14364:11ec051d2348 user: kasemir date: Thu Mar 15 12:01:49 2012 -0400 description: o.c.trends.databrowser: Recently added change listener crashed when old values were null, as can be the case for opiwidget details: http://cs-studio.hg.sourceforge.net/hgweb/cs-studio/cs-studio//hgroot/cs-studio/cs-studio/rev/a688ad87e355 changeset: 14365:a688ad87e355 user: kasemir date: Thu Mar 15 14:35:00 2012 -0400 description: SNS Scan System: Example extended with 'shutter', neutron count details: http://cs-studio.hg.sourceforge.net/hgweb/cs-studio/cs-studio//hgroot/cs-studio/cs-studio/rev/441e3f3f5a43 changeset: 14366:441e3f3f5a43 user: kasemir date: Thu Mar 15 14:45:08 2012 -0400 description: SNS Scan System: Example extended with 'shutter', neutron count details: http://cs-studio.hg.sourceforge.net/hgweb/cs-studio/cs-studio//hgroot/cs-studio/cs-studio/rev/eb055fa20826 changeset: 14367:eb055fa20826 user: kasemir date: Thu Mar 15 16:10:50 2012 -0400 description: o.c.platform.libs.epics.linux: Added filter on osgi.arch=x86 because this plugin will currently not support x86_64 details: http://cs-studio.hg.sourceforge.net/hgweb/cs-studio/cs-studio//hgroot/cs-studio/cs-studio/rev/fb43f9e42135 changeset: 14368:fb43f9e42135 user: kasemir date: Thu Mar 15 16:36:43 2012 -0400 description: SNS product: Filter o.c.platform.libs.epics.linux on osgi.arch=x86 to allow building for x86_64 linux details: http://cs-studio.hg.sourceforge.net/hgweb/cs-studio/cs-studio//hgroot/cs-studio/cs-studio/rev/7a25de085abe changeset: 14369:7a25de085abe user: kasemir date: Fri Mar 16 10:42:40 2012 -0400 description: SNS Scan System: Run server as linux service details: http://cs-studio.hg.sourceforge.net/hgweb/cs-studio/cs-studio//hgroot/cs-studio/cs-studio/rev/abbd95b53150 changeset: 14370:abbd95b53150 user: kasemir date: Fri Mar 16 13:59:06 2012 -0400 description: SNS Scan System: 'data' command used System.out instead of intp details: http://cs-studio.hg.sourceforge.net/hgweb/cs-studio/cs-studio//hgroot/cs-studio/cs-studio/rev/b74925fc9c2b changeset: 14371:b74925fc9c2b user: kasemir date: Fri Mar 16 13:59:37 2012 -0400 description: SNS Scan System: Tweaks for our linux setup details: http://cs-studio.hg.sourceforge.net/hgweb/cs-studio/cs-studio//hgroot/cs-studio/cs-studio/rev/ee5280f0282f changeset: 14372:ee5280f0282f user: kasemir date: Mon Mar 19 10:38:17 2012 -0400 description: SNS Scan System: Avoid GUI delays when connection to scan server times out details: http://cs-studio.hg.sourceforge.net/hgweb/cs-studio/cs-studio//hgroot/cs-studio/cs-studio/rev/3e5755ab2b79 changeset: 14373:3e5755ab2b79 user: kasemir date: Mon Mar 19 10:38:54 2012 -0400 description: SNS Scan System: Update feature dependencies details: http://cs-studio.hg.sourceforge.net/hgweb/cs-studio/cs-studio//hgroot/cs-studio/cs-studio/rev/82fdc99c1d95 changeset: 14374:82fdc99c1d95 user: kasemir date: Mon Mar 19 11:16:42 2012 -0400 description: SNS Scan System: Increment scan name in example details: http://cs-studio.hg.sourceforge.net/hgweb/cs-studio/cs-studio//hgroot/cs-studio/cs-studio/rev/234ae1275ee6 changeset: 14375:234ae1275ee6 user: kasemir date: Mon Mar 19 11:28:15 2012 -0400 description: SNS Scan System: Scan Server ports details: http://cs-studio.hg.sourceforge.net/hgweb/cs-studio/cs-studio//hgroot/cs-studio/cs-studio/rev/d4199dac0c3d changeset: 14376:d4199dac0c3d user: Laurent PHILIPPE date: Fri Mar 16 17:42:37 2012 +0100 description: Databrowser => Save graph settings in plt file, take into accout Kay kasemir comments. (TO DO : time axis and set editor dirty when user edit graph settings) details: http://cs-studio.hg.sourceforge.net/hgweb/cs-studio/cs-studio//hgroot/cs-studio/cs-studio/rev/46a9a7d95a49 changeset: 14377:46a9a7d95a49 user: Laurent PHILIPPE date: Fri Mar 16 17:44:18 2012 +0100 description: Databrowser => Save graph settings in plt file, take into accout Kay kasemir comments. (TO DO : time axis and set editor dirty when user edit graph settings) details: http://cs-studio.hg.sourceforge.net/hgweb/cs-studio/cs-studio//hgroot/cs-studio/cs-studio/rev/f1b3273766d2 changeset: 14378:f1b3273766d2 user: Laurent PHILIPPE date: Mon Mar 19 14:29:47 2012 +0100 description: Databrowser => Save graph settings in plt file, take into accout Kay kasemir comments. (TO DO : time axis and set editor dirty when user edit graph settings) details: http://cs-studio.hg.sourceforge.net/hgweb/cs-studio/cs-studio//hgroot/cs-studio/cs-studio/rev/481cdff9f450 changeset: 14379:481cdff9f450 user: Laurent PHILIPPE date: Mon Mar 19 17:48:39 2012 +0100 description: Merge with b74925fc9c2b0e3d6ebeca3f7a6f9b21eaaa3768 details: http://cs-studio.hg.sourceforge.net/hgweb/cs-studio/cs-studio//hgroot/cs-studio/cs-studio/rev/0825cc1959ae changeset: 14380:0825cc1959ae user: Laurent PHILIPPE date: Mon Mar 19 17:51:00 2012 +0100 description: Databrowser => Save graph settings in plt file, take into accout Kay kasemir comments. details: http://cs-studio.hg.sourceforge.net/hgweb/cs-studio/cs-studio//hgroot/cs-studio/cs-studio/rev/b5b35b6c7fc1 changeset: 14381:b5b35b6c7fc1 user: Laurent PHILIPPE date: Mon Mar 19 17:55:12 2012 +0100 description: Merge with 234ae1275ee6afdba4bdd1d4243a2e13b5c509a4 details: http://cs-studio.hg.sourceforge.net/hgweb/cs-studio/cs-studio//hgroot/cs-studio/cs-studio/rev/6bbffb819173 changeset: 14382:6bbffb819173 user: Gabriele Carcassi <car...@bn...> date: Tue Mar 13 14:30:16 2012 -0400 description: ..ui.util: error bar can now handle margins. details: http://cs-studio.hg.sourceforge.net/hgweb/cs-studio/cs-studio//hgroot/cs-studio/cs-studio/rev/3b06ba24cd0e changeset: 14383:3b06ba24cd0e user: Gabriele Carcassi <car...@bn...> date: Tue Mar 13 14:32:52 2012 -0400 description: ..channel.widgets: fixing the margin on the error bar so that no space is wasted. details: http://cs-studio.hg.sourceforge.net/hgweb/cs-studio/cs-studio//hgroot/cs-studio/cs-studio/rev/d5df7a697387 changeset: 14384:d5df7a697387 user: Gabriele Carcassi <car...@bn...> date: Tue Mar 13 15:34:10 2012 -0400 description: ..channel.views: introducing superclass for all channel query views. details: http://cs-studio.hg.sourceforge.net/hgweb/cs-studio/cs-studio//hgroot/cs-studio/cs-studio/rev/c79ef4136b23 changeset: 14385:c79ef4136b23 user: Gabriele Carcassi <car...@bn...> date: Tue Mar 13 15:35:05 2012 -0400 description: ..channel.views: ported pvtable to use the superclass. details: http://cs-studio.hg.sourceforge.net/hgweb/cs-studio/cs-studio//hgroot/cs-studio/cs-studio/rev/2bc7ef76a7cb changeset: 14386:2bc7ef76a7cb user: Gabriele Carcassi <car...@bn...> date: Tue Mar 13 15:41:57 2012 -0400 description: ..channel.views: ported waterfall view to use the superclass. details: http://cs-studio.hg.sourceforge.net/hgweb/cs-studio/cs-studio//hgroot/cs-studio/cs-studio/rev/a48480db2c39 changeset: 14387:a48480db2c39 user: Gabriele Carcassi <car...@bn...> date: Tue Mar 13 15:47:46 2012 -0400 description: ..channel.widgets: waterfall configuration would always show metadata radio button as selected. details: http://cs-studio.hg.sourceforge.net/hgweb/cs-studio/cs-studio//hgroot/cs-studio/cs-studio/rev/715821342565 changeset: 14388:715821342565 user: Gabriele Carcassi <car...@bn...> date: Tue Mar 13 16:15:56 2012 -0400 description: ..channel.widgets: waterfall widget handles memento. details: http://cs-studio.hg.sourceforge.net/hgweb/cs-studio/cs-studio//hgroot/cs-studio/cs-studio/rev/5ef1f33dbe0a changeset: 14389:5ef1f33dbe0a user: Gabriele Carcassi <car...@bn...> date: Tue Mar 13 16:16:36 2012 -0400 description: ..channel.views: waterfall view now saves the state. details: http://cs-studio.hg.sourceforge.net/hgweb/cs-studio/cs-studio//hgroot/cs-studio/cs-studio/rev/342c2b1ea8d0 changeset: 14390:342c2b1ea8d0 user: Gabriele Carcassi <car...@bn...> date: Tue Mar 13 16:24:13 2012 -0400 description: ..channel.views: ported channel tree view to use the superclass. details: http://cs-studio.hg.sourceforge.net/hgweb/cs-studio/cs-studio//hgroot/cs-studio/cs-studio/rev/7ae76cf87d9d changeset: 14391:7ae76cf87d9d user: Gabriele Carcassi <car...@bn...> date: Tue Mar 13 16:30:25 2012 -0400 description: ..channel.views: ported channel viewer view to use the superclass. details: http://cs-studio.hg.sourceforge.net/hgweb/cs-studio/cs-studio//hgroot/cs-studio/cs-studio/rev/e77230613d2d changeset: 14392:e77230613d2d user: Gabriele Carcassi <car...@bn...> date: Tue Mar 13 16:42:49 2012 -0400 description: Merge details: http://cs-studio.hg.sourceforge.net/hgweb/cs-studio/cs-studio//hgroot/cs-studio/cs-studio/rev/4b559f4a7d23 changeset: 14393:4b559f4a7d23 user: Gabriele Carcassi <car...@bn...> date: Fri Mar 16 15:14:50 2012 -0400 description: Merge details: http://cs-studio.hg.sourceforge.net/hgweb/cs-studio/cs-studio//hgroot/cs-studio/cs-studio/rev/eeae27e779f6 changeset: 14394:eeae27e779f6 user: Gabriele Carcassi <car...@bn...> date: Tue Mar 20 12:46:01 2012 -0400 description: Merge details: http://cs-studio.hg.sourceforge.net/hgweb/cs-studio/cs-studio//hgroot/cs-studio/cs-studio/rev/ae8136a6a4c3 changeset: 14395:ae8136a6a4c3 user: Gabriele Carcassi <car...@bn...> date: Tue Mar 20 12:49:53 2012 -0400 description: Merge from 3.1 diffstat: applications/plugins/org.csstudio.ams.MessageMinder/AmsMessageMinder.product | 3 +- applications/plugins/org.csstudio.ams.application.deliverysystem.log4j/.project | 22 + applications/plugins/org.csstudio.ams.application.deliverysystem.log4j/META-INF/MANIFEST.MF | 8 + applications/plugins/org.csstudio.ams.application.deliverysystem.log4j/build.properties | 1 + applications/plugins/org.csstudio.ams.application.deliverysystem.log4j/log4j.properties | 98 + applications/plugins/org.csstudio.ams.application.deliverysystem/AmsDeliverySystem.product | 6 +- applications/plugins/org.csstudio.ams.application.deliverysystem/AmsJmsDeliverySystem.product | 199 + applications/plugins/org.csstudio.ams.application.deliverysystem/plugin.xml | 14 +- applications/plugins/org.csstudio.ams.connector.email/DEPRECATED | 4 + applications/plugins/org.csstudio.ams.connector.jms/AmsJmsConnector.product | 35 +- applications/plugins/org.csstudio.ams.connector.jms/DEPRECATED | 4 + applications/plugins/org.csstudio.ams.connector.sms/AmsSmsConnector.product | 2 +- applications/plugins/org.csstudio.ams.connector.sms/DEPRECATED | 4 + applications/plugins/org.csstudio.ams.connector.sms/src/org/csstudio/ams/connector/sms/Sms.java | 8 +- applications/plugins/org.csstudio.ams.connector.sms/src/org/csstudio/ams/connector/sms/SmsConnectorPlugin.java | 2 +- applications/plugins/org.csstudio.ams.connector.sms/src/org/csstudio/ams/connector/sms/SmsConnectorWork.java | 2 +- applications/plugins/org.csstudio.ams.connector.voicemail/DEPRECATED | 4 + applications/plugins/org.csstudio.ams.delivery.email/META-INF/MANIFEST.MF | 4 +- applications/plugins/org.csstudio.ams.delivery.email/src/org/csstudio/ams/delivery/email/EMailDeliveryWorker.java | 49 +- applications/plugins/org.csstudio.ams.delivery.email/src/org/csstudio/ams/delivery/email/OutgoingEMailQueue.java | 4 +- applications/plugins/org.csstudio.ams.delivery.jms/.classpath | 7 + applications/plugins/org.csstudio.ams.delivery.jms/.project | 28 + applications/plugins/org.csstudio.ams.delivery.jms/.settings/org.eclipse.jdt.core.prefs | 8 + applications/plugins/org.csstudio.ams.delivery.jms/META-INF/MANIFEST.MF | 20 + applications/plugins/org.csstudio.ams.delivery.jms/build.properties | 5 + applications/plugins/org.csstudio.ams.delivery.jms/plugin.xml | 11 + applications/plugins/org.csstudio.ams.delivery.jms/src/org/csstudio/ams/delivery/jms/JmsAlarmMessage.java | 60 + applications/plugins/org.csstudio.ams.delivery.jms/src/org/csstudio/ams/delivery/jms/JmsDeliveryActivator.java | 54 + applications/plugins/org.csstudio.ams.delivery.jms/src/org/csstudio/ams/delivery/jms/JmsDeliveryWorker.java | 201 + applications/plugins/org.csstudio.ams.delivery.jms/src/org/csstudio/ams/delivery/jms/JmsDevice.java | 135 + applications/plugins/org.csstudio.ams.delivery.jms/src/org/csstudio/ams/delivery/jms/internal/JmsDeliveryPreferenceKey.java | 34 + applications/plugins/org.csstudio.ams.delivery.jms/src/org/csstudio/ams/delivery/jms/internal/PreferenceInitializer.java | 39 + applications/plugins/org.csstudio.ams.delivery.sms/META-INF/MANIFEST.MF | 4 +- applications/plugins/org.csstudio.ams.delivery.sms/src/org/csstudio/ams/delivery/sms/DeviceTestMessageContent.java | 3 +- applications/plugins/org.csstudio.ams.delivery.sms/src/org/csstudio/ams/delivery/sms/GatewayStatusNotification.java | 24 +- applications/plugins/org.csstudio.ams.delivery.sms/src/org/csstudio/ams/delivery/sms/IncomingSmsMessage.java | 59 + applications/plugins/org.csstudio.ams.delivery.sms/src/org/csstudio/ams/delivery/sms/ModemTestStatus.java | 354 +- applications/plugins/org.csstudio.ams.delivery.sms/src/org/csstudio/ams/delivery/sms/OutgoingSmsQueue.java | 6 +- applications/plugins/org.csstudio.ams.delivery.sms/src/org/csstudio/ams/delivery/sms/SmsDeliveryDevice.java | 526 +- applications/plugins/org.csstudio.ams.delivery.sms/src/org/csstudio/ams/delivery/sms/SmsDeliveryWorker.java | 358 +- applications/plugins/org.csstudio.ams.delivery.sms/src/org/csstudio/ams/delivery/sms/internal/PreferencesInitializer.java | 2 +- applications/plugins/org.csstudio.ams.delivery.sms/src/org/csstudio/ams/delivery/sms/util/DeviceUncaughtExceptionHandler.java | 48 + applications/plugins/org.csstudio.ams.delivery.voicemail/.classpath | 3 +- applications/plugins/org.csstudio.ams.delivery.voicemail/META-INF/MANIFEST.MF | 5 +- applications/plugins/org.csstudio.ams.delivery.voicemail/build.properties | 5 +- applications/plugins/org.csstudio.ams.delivery.voicemail/lib/log4j-1.2.16.jar | 0 applications/plugins/org.csstudio.ams.delivery.voicemail/lib/maryclient.jar | 0 applications/plugins/org.csstudio.ams.delivery.voicemail/src/org/csstudio/ams/delivery/voicemail/OutgoingVoicemailQueue.java | 4 +- applications/plugins/org.csstudio.ams.delivery.voicemail/src/org/csstudio/ams/delivery/voicemail/VoicemailDeliveryWorker.java | 118 +- applications/plugins/org.csstudio.ams.delivery.voicemail/src/org/csstudio/ams/delivery/voicemail/isdn/CapiCaller.java | 14 +- applications/plugins/org.csstudio.ams.delivery.voicemail/src/org/csstudio/ams/delivery/voicemail/isdn/VoicemailDevice.java | 17 +- applications/plugins/org.csstudio.ams.delivery.voicemail/src/org/csstudio/ams/delivery/voicemail/speech/SpeechProducer.java | 26 +- applications/plugins/org.csstudio.ams.delivery/META-INF/MANIFEST.MF | 4 +- applications/plugins/org.csstudio.ams.delivery/src/org/csstudio/ams/delivery/device/DeviceListener.java | 37 + applications/plugins/org.csstudio.ams.delivery/src/org/csstudio/ams/delivery/device/DeviceObject.java | 50 + applications/plugins/org.csstudio.ams.delivery/src/org/csstudio/ams/delivery/device/DummyDevice.java | 73 + applications/plugins/org.csstudio.ams.delivery/src/org/csstudio/ams/delivery/jms/AbstractMessageContent.java | 87 - applications/plugins/org.csstudio.ams.delivery/src/org/csstudio/ams/delivery/jms/JmsAsyncConsumer.java | 270 - applications/plugins/org.csstudio.ams.delivery/src/org/csstudio/ams/delivery/jms/JmsProperties.java | 60 - applications/plugins/org.csstudio.ams.delivery/src/org/csstudio/ams/delivery/jms/JmsSender.java | 323 - applications/plugins/org.csstudio.ams.delivery/src/org/csstudio/ams/delivery/message/BaseAlarmMessage.java | 2 +- applications/plugins/org.csstudio.ams.delivery/src/org/csstudio/ams/delivery/message/BaseIncomingMessage.java | 6 +- applications/plugins/org.csstudio.ams.delivery/src/org/csstudio/ams/delivery/queue/AbstractMessageQueue.java | 63 +- applications/plugins/org.csstudio.ams.delivery/src/org/csstudio/ams/delivery/queue/IncomingQueue.java | 30 +- applications/plugins/org.csstudio.ams.delivery/src/org/csstudio/ams/delivery/util/jms/AbstractMessageContent.java | 87 + applications/plugins/org.csstudio.ams.delivery/src/org/csstudio/ams/delivery/util/jms/JmsAsyncConsumer.java | 270 + applications/plugins/org.csstudio.ams.delivery/src/org/csstudio/ams/delivery/util/jms/JmsProperties.java | 60 + applications/plugins/org.csstudio.ams.delivery/src/org/csstudio/ams/delivery/util/jms/JmsSender.java | 323 + applications/plugins/org.csstudio.ams.distributor/AmsDistributor.product | 5 +- applications/plugins/org.csstudio.ams.log4j/log4j.properties | 66 +- applications/plugins/org.csstudio.ams.systemmonitor/AmsSystemMonitor.product | 32 +- applications/plugins/org.csstudio.ams/plugin_customization.ini | 98 +- applications/plugins/org.csstudio.channel.views/src/org/csstudio/channel/views/AbstractChannelQueryView.java | 172 + applications/plugins/org.csstudio.channel.views/src/org/csstudio/channel/views/ChannelTreeByPropertyView.java | 142 +- applications/plugins/org.csstudio.channel.views/src/org/csstudio/channel/views/ChannelViewer.java | 81 +- applications/plugins/org.csstudio.channel.views/src/org/csstudio/channel/views/PVTableByPropertyView.java | 139 +- applications/plugins/org.csstudio.channel.views/src/org/csstudio/channel/views/WaterfallView.java | 104 +- applications/plugins/org.csstudio.channel.widgets/src/org/csstudio/channel/widgets/ChannelQueryInputBar.java | 39 +- applications/plugins/org.csstudio.channel.widgets/src/org/csstudio/channel/widgets/ChannelTreeByPropertyWidget.java | 3 +- applications/plugins/org.csstudio.channel.widgets/src/org/csstudio/channel/widgets/ChannelViewerWidget.java | 25 +- applications/plugins/org.csstudio.channel.widgets/src/org/csstudio/channel/widgets/PVTableByPropertyWidget.java | 3 +- applications/plugins/org.csstudio.channel.widgets/src/org/csstudio/channel/widgets/WaterfallConfigurationPanel.java | 1 - applications/plugins/org.csstudio.channel.widgets/src/org/csstudio/channel/widgets/WaterfallWidget.java | 52 +- applications/plugins/org.csstudio.channel.widgets/src/org/csstudio/channel/widgets/util/ToolTipHelp.java | 37 + applications/plugins/org.csstudio.nams.application.department.decision/AmsDepartmentDecision.product | 2 +- applications/plugins/org.csstudio.opibuilder.examples/examples/BOY Examples/5_5_FileIOWithScript.opi | 1850 +++--- applications/plugins/org.csstudio.opibuilder.examples/examples/BOY Examples/widgets/2_5_2_XY_Graph.opi | 2110 +++--- applications/plugins/org.csstudio.opibuilder.examples/examples/BOY Examples/widgets/3_3_Menu_Button.opi | 2188 +++--- applications/plugins/org.csstudio.opibuilder.examples/examples/BOY Examples/widgets/3_4_Text_Input.opi | 2616 ++++---- applications/plugins/org.csstudio.opibuilder.examples/examples/BOY Examples/widgets/4_1_GroupingContainer.opi | 2964 +++++----- applications/plugins/org.csstudio.opibuilder/src/org/csstudio/opibuilder/datadefinition/DisplayScaleData.java | 100 +- applications/plugins/org.csstudio.swt.xygraph/src/org/csstudio/swt/xygraph/figures/Annotation.java | 52 +- applications/plugins/org.csstudio.swt.xygraph/src/org/csstudio/swt/xygraph/figures/Axis.java | 95 +- applications/plugins/org.csstudio.swt.xygraph/src/org/csstudio/swt/xygraph/figures/Grid.java | 29 + applications/plugins/org.csstudio.swt.xygraph/src/org/csstudio/swt/xygraph/figures/IAxisListener.java | 14 +- applications/plugins/org.csstudio.swt.xygraph/src/org/csstudio/swt/xygraph/figures/ITraceListener.java | 15 + applications/plugins/org.csstudio.swt.xygraph/src/org/csstudio/swt/xygraph/figures/PlotArea.java | 543 +- applications/plugins/org.csstudio.swt.xygraph/src/org/csstudio/swt/xygraph/figures/Trace.java | 1241 ++- applications/plugins/org.csstudio.swt.xygraph/src/org/csstudio/swt/xygraph/figures/XYGraph.java | 82 + applications/plugins/org.csstudio.swt.xygraph/src/org/csstudio/swt/xygraph/linearscale/AbstractScale.java | 1 + applications/plugins/org.csstudio.swt.xygraph/src/org/csstudio/swt/xygraph/toolbar/AxisConfigPage.java | 2 + applications/plugins/org.csstudio.swt.xygraph/src/org/csstudio/swt/xygraph/toolbar/XYGraphConfigDialog.java | 6 +- applications/plugins/org.csstudio.swt.xygraph/src/org/csstudio/swt/xygraph/undo/XYGraphConfigCommand.java | 163 +- applications/plugins/org.csstudio.swt.xygraph/src/org/csstudio/swt/xygraph/undo/XYGraphMemento.java | 13 + applications/plugins/org.csstudio.swt.xygraph/src/org/csstudio/swt/xygraph/undo/XYGraphMementoUtil.java | 228 + applications/plugins/org.csstudio.trends.databrowser2/preferences.ini | 2 +- applications/plugins/org.csstudio.trends.databrowser2/src/org/csstudio/trends/databrowser2/editor/DataBrowserEditor.java | 71 +- applications/plugins/org.csstudio.trends.databrowser2/src/org/csstudio/trends/databrowser2/model/AnnotationInfo.java | 89 +- applications/plugins/org.csstudio.trends.databrowser2/src/org/csstudio/trends/databrowser2/model/AxisConfig.java | 613 +- applications/plugins/org.csstudio.trends.databrowser2/src/org/csstudio/trends/databrowser2/model/HistoricSamples.java | 12 +- applications/plugins/org.csstudio.trends.databrowser2/src/org/csstudio/trends/databrowser2/model/LiveSamples.java | 12 +- applications/plugins/org.csstudio.trends.databrowser2/src/org/csstudio/trends/databrowser2/model/Model.java | 154 +- applications/plugins/org.csstudio.trends.databrowser2/src/org/csstudio/trends/databrowser2/model/ModelItem.java | 9 +- applications/plugins/org.csstudio.trends.databrowser2/src/org/csstudio/trends/databrowser2/model/ModelListener.java | 8 + applications/plugins/org.csstudio.trends.databrowser2/src/org/csstudio/trends/databrowser2/model/ModelListenerHeadlessTest.java | 15 + applications/plugins/org.csstudio.trends.databrowser2/src/org/csstudio/trends/databrowser2/model/PVItem.java | 16 +- applications/plugins/org.csstudio.trends.databrowser2/src/org/csstudio/trends/databrowser2/model/PVSamples.java | 4 +- applications/plugins/org.csstudio.trends.databrowser2/src/org/csstudio/trends/databrowser2/model/PlotSample.java | 16 +- applications/plugins/org.csstudio.trends.databrowser2/src/org/csstudio/trends/databrowser2/model/XYGraphSettings.java | 65 + applications/plugins/org.csstudio.trends.databrowser2/src/org/csstudio/trends/databrowser2/model/XYGraphSettingsXMLUtil.java | 110 + applications/plugins/org.csstudio.trends.databrowser2/src/org/csstudio/trends/databrowser2/propsheet/AxesTableHandler.java | 12 + applications/plugins/org.csstudio.trends.databrowser2/src/org/csstudio/trends/databrowser2/propsheet/DataBrowserPropertySheetPage.java | 13 + applications/plugins/org.csstudio.trends.databrowser2/src/org/csstudio/trends/databrowser2/propsheet/TraceTableHandler.java | 12 + applications/plugins/org.csstudio.trends.databrowser2/src/org/csstudio/trends/databrowser2/sampleview/SampleView.java | 13 + applications/plugins/org.csstudio.trends.databrowser2/src/org/csstudio/trends/databrowser2/ui/Controller.java | 176 +- applications/plugins/org.csstudio.trends.databrowser2/src/org/csstudio/trends/databrowser2/ui/Plot.java | 1201 ++- applications/plugins/org.csstudio.trends.databrowser2/src/org/csstudio/trends/databrowser2/ui/PlotConfigListener.java | 61 + applications/plugins/org.csstudio.trends.databrowser2/src/org/csstudio/trends/databrowser2/ui/PlotDemo.java | 90 + applications/plugins/org.csstudio.trends.databrowser2/src/org/csstudio/trends/databrowser2/ui/PlotListener.java | 126 + applications/plugins/org.csstudio.trends.databrowser2/src/org/csstudio/trends/databrowser2/ui/XYGraphSettingsUtil.java | 192 + applications/plugins/org.csstudio.trends.databrowser2/src/org/csstudio/trends/databrowser2/waveformview/WaveformView.java | 15 +- applications/plugins/org.csstudio.utility.product/META-INF/MANIFEST.MF | 2 +- applications/plugins/org.csstudio.utility.product/src/org/csstudio/utility/product/Activator.java | 2 +- applications/plugins/org.csstudio.utility.product/src/org/csstudio/utility/product/ApplicationWorkbenchAdvisor.java | 25 +- core/plugins/org.csstudio.platform.libs.epics.linux/META-INF/MANIFEST.MF | 4 +- core/plugins/org.csstudio.startup/src/org/csstudio/startup/module/ProjectExtPoint.java | 52 +- core/plugins/org.csstudio.startup/src/org/csstudio/startup/module/defaults/DefaultProject.java | 21 +- core/plugins/org.csstudio.ui.help/html/changelog/core.html | 4 + core/plugins/org.csstudio.ui.util/src/org/csstudio/ui/util/NoResourceEditorInput.java | 10 +- core/plugins/org.csstudio.ui.util/src/org/csstudio/ui/util/widgets/ErrorBar.java | 103 +- core/plugins/org.csstudio.utility.pv.epics/META-INF/MANIFEST.MF | 2 +- core/plugins/org.csstudio.utility.pv.epics/src/org/csstudio/utility/pv/epics/EPICS_V3_PV.java | 6 + products/PANDA/category.xml | 11 + products/PANDA/features/org.csstudio.panda.applications.feature/.project | 17 + products/PANDA/features/org.csstudio.panda.applications.feature/build.properties | 1 + products/PANDA/features/org.csstudio.panda.applications.feature/feature.xml | 78 + products/PANDA/features/org.csstudio.panda.core.feature/.project | 17 + products/PANDA/features/org.csstudio.panda.core.feature/build.properties | 1 + products/PANDA/features/org.csstudio.panda.core.feature/feature.xml | 348 + products/PANDA/features/org.csstudio.panda.eclipse.feature/.project | 17 + products/PANDA/features/org.csstudio.panda.eclipse.feature/build.properties | 1 + products/PANDA/features/org.csstudio.panda.eclipse.feature/feature.xml | 640 ++ products/PANDA/plugins/org.csstudio.panda.product/.classpath | 7 + products/PANDA/plugins/org.csstudio.panda.product/.project | 28 + products/PANDA/plugins/org.csstudio.panda.product/.settings/org.eclipse.jdt.core.prefs | 8 + products/PANDA/plugins/org.csstudio.panda.product/META-INF/MANIFEST.MF | 19 + products/PANDA/plugins/org.csstudio.panda.product/build.properties | 7 + products/PANDA/plugins/org.csstudio.panda.product/css-panda.product | 48 + products/PANDA/plugins/org.csstudio.panda.product/icons/about.png | 0 products/PANDA/plugins/org.csstudio.panda.product/icons/alt_about.gif | 0 products/PANDA/plugins/org.csstudio.panda.product/icons/css.icns | 0 products/PANDA/plugins/org.csstudio.panda.product/icons/css.ico | 0 products/PANDA/plugins/org.csstudio.panda.product/icons/css128.png | 0 products/PANDA/plugins/org.csstudio.panda.product/icons/css16.png | 0 products/PANDA/plugins/org.csstudio.panda.product/icons/css32.png | 0 products/PANDA/plugins/org.csstudio.panda.product/icons/css48.png | 0 products/PANDA/plugins/org.csstudio.panda.product/icons/css48.xpm | 79 + products/PANDA/plugins/org.csstudio.panda.product/icons/css64.png | 0 products/PANDA/plugins/org.csstudio.panda.product/icons/project_close.png | 0 products/PANDA/plugins/org.csstudio.panda.product/icons/project_open.png | 0 products/PANDA/plugins/org.csstudio.panda.product/icons/welcome.png | 0 products/PANDA/plugins/org.csstudio.panda.product/intro_data.xml | 23 + products/PANDA/plugins/org.csstudio.panda.product/plugin.xml | 110 + products/PANDA/plugins/org.csstudio.panda.product/plugin_customization.ini | 139 + products/PANDA/plugins/org.csstudio.panda.product/splash.bmp | 0 products/PANDA/plugins/org.csstudio.panda.product/src/org/csstudio/panda/product/Activator.java | 50 + products/SNS/plugins/org.csstudio.scan.client/src/org/csstudio/scan/client/ScanInfoModel.java | 27 +- products/SNS/plugins/org.csstudio.scan.client/src/org/csstudio/scan/client/ScanInfoModelListener.java | 10 +- products/SNS/plugins/org.csstudio.scan.client/test/org/csstudio/scan/client/ScanInfoModelUnitTest.java | 7 + products/SNS/plugins/org.csstudio.scan.server/ScanServer.product | 1 - products/SNS/plugins/org.csstudio.scan.server/scan_server | 52 + products/SNS/plugins/org.csstudio.scan.server/src/org/csstudio/scan/commandimpl/WaitForDevicesCommandImpl.java | 17 +- products/SNS/plugins/org.csstudio.scan.server/src/org/csstudio/scan/condition/Condition.java | 9 +- products/SNS/plugins/org.csstudio.scan.server/src/org/csstudio/scan/condition/WaitForDevicesCondition.java | 24 +- products/SNS/plugins/org.csstudio.scan.server/src/org/csstudio/scan/server/app/ConsoleCommands.java | 6 +- products/SNS/plugins/org.csstudio.scan.server/src/org/csstudio/scan/server/internal/Scan.java | 34 +- products/SNS/plugins/org.csstudio.scan.server/src/org/csstudio/scan/server/internal/ScanEngine.java | 18 +- products/SNS/plugins/org.csstudio.scan.server/src/org/csstudio/scan/server/internal/ScanServerImpl.java | 15 +- products/SNS/plugins/org.csstudio.scan.server/test/org/csstudio/scan/WaitForDevicesConditionHeadlessTest.java | 9 + products/SNS/plugins/org.csstudio.scan.ui.scanmonitor/META-INF/MANIFEST.MF | 1 + products/SNS/plugins/org.csstudio.scan.ui.scanmonitor/src/org/csstudio/scan/ui/scanmonitor/Bar.java | 88 + products/SNS/plugins/org.csstudio.scan.ui.scanmonitor/src/org/csstudio/scan/ui/scanmonitor/GUI.java | 49 +- products/SNS/plugins/org.csstudio.scan.ui.scanmonitor/src/org/csstudio/scan/ui/scanmonitor/Messages.java | 2 + products/SNS/plugins/org.csstudio.scan.ui.scanmonitor/src/org/csstudio/scan/ui/scanmonitor/ScanMonitorView.java | 10 +- products/SNS/plugins/org.csstudio.scan.ui.scanmonitor/src/org/csstudio/scan/ui/scanmonitor/actions/AbortAction.java | 6 +- products/SNS/plugins/org.csstudio.scan.ui.scanmonitor/src/org/csstudio/scan/ui/scanmonitor/actions/AbstractGUIAction.java | 20 +- products/SNS/plugins/org.csstudio.scan.ui.scanmonitor/src/org/csstudio/scan/ui/scanmonitor/actions/InfoAction.java | 5 +- products/SNS/plugins/org.csstudio.scan.ui.scanmonitor/src/org/csstudio/scan/ui/scanmonitor/actions/PauseAction.java | 6 +- products/SNS/plugins/org.csstudio.scan.ui.scanmonitor/src/org/csstudio/scan/ui/scanmonitor/actions/RemoveAction.java | 6 +- products/SNS/plugins/org.csstudio.scan.ui.scanmonitor/src/org/csstudio/scan/ui/scanmonitor/actions/RemoveCompletedAction.java | 6 +- products/SNS/plugins/org.csstudio.scan.ui.scanmonitor/src/org/csstudio/scan/ui/scanmonitor/actions/ResumeAction.java | 6 +- products/SNS/plugins/org.csstudio.scan.ui.scanmonitor/src/org/csstudio/scan/ui/scanmonitor/actions/ShowDevicesAction.java | 6 +- products/SNS/plugins/org.csstudio.scan.ui.scanmonitor/src/org/csstudio/scan/ui/scanmonitor/messages.properties | 2 + products/SNS/plugins/org.csstudio.scan.ui.scantree/src/org/csstudio/scan/ui/scantree/ScanEditor.java | 10 +- products/SNS/plugins/org.csstudio.scan.ui.scantree/src/org/csstudio/scan/ui/scantree/gui/Perspective.java | 10 +- products/SNS/plugins/org.csstudio.scan.ui/src/org/csstudio/scan/ui/messages.properties | 2 +- products/SNS/plugins/org.csstudio.scan/examples/BeamLine1.opi | 449 +- products/SNS/plugins/org.csstudio.scan/examples/BeamLine2.opi | 565 +- products/SNS/plugins/org.csstudio.scan/examples/beamline.xml | 2 + products/SNS/plugins/org.csstudio.scan/examples/custom_scan.py | 11 +- products/SNS/plugins/org.csstudio.scan/examples/images/run.gif | 0 products/SNS/plugins/org.csstudio.scan/examples/images/sample.png | 0 products/SNS/plugins/org.csstudio.scan/examples/images/shutter_closed.png | 0 products/SNS/plugins/org.csstudio.scan/examples/images/shutter_open.png | 0 products/SNS/plugins/org.csstudio.scan/examples/jython.sh | 4 +- products/SNS/plugins/org.csstudio.scan/examples/matlab/example1.m | 4 +- products/SNS/plugins/org.csstudio.scan/examples/matlab/example2.m | 51 +- products/SNS/plugins/org.csstudio.scan/examples/matlab/scan_decode_samples.m | 3 + products/SNS/plugins/org.csstudio.scan/examples/matlab/scan_decode_spreadsheet.m | 27 + products/SNS/plugins/org.csstudio.scan/examples/post_scan.scn | 6 + products/SNS/plugins/org.csstudio.scan/examples/run.gif | 0 products/SNS/plugins/org.csstudio.scan/examples/run_scan.py | 12 +- products/SNS/plugins/org.csstudio.scan/examples/sample.png | 0 products/SNS/plugins/org.csstudio.scan/examples/scan_client.py | 87 +- products/SNS/plugins/org.csstudio.scan/examples/scan_ui.py | 24 + products/SNS/plugins/org.csstudio.scan/examples/simulation.db | 37 + products/SNS/plugins/org.csstudio.scan/examples/simulation.plt | 15 +- products/SNS/plugins/org.csstudio.scan/preferences.ini | 7 +- products/SNS/plugins/org.csstudio.scan/src/org/csstudio/scan/Preferences.java | 8 + products/SNS/plugins/org.csstudio.scan/src/org/csstudio/scan/TODO.java | 10 +- products/SNS/plugins/org.csstudio.scan/src/org/csstudio/scan/device/DeviceInfo.java | 4 +- products/SNS/plugins/org.csstudio.scan/src/org/csstudio/scan/server/ScanServer.java | 8 +- products/SNS/product/org.csstudio.scan.ui.feature/feature.xml | 9 +- products/SNS/product/org.csstudio.sns.feature.core/feature.xml | 4 +- 234 files changed, 16585 insertions(+), 9922 deletions(-) diffs (truncated from 31801 to 300 lines): diff -r 65476b6938ea -r ae8136a6a4c3 applications/plugins/org.csstudio.ams.MessageMinder/AmsMessageMinder.product --- a/applications/plugins/org.csstudio.ams.MessageMinder/AmsMessageMinder.product Fri Mar 09 17:10:32 2012 -0500 +++ b/applications/plugins/org.csstudio.ams.MessageMinder/AmsMessageMinder.product Tue Mar 20 12:49:53 2012 -0400 @@ -37,15 +37,14 @@ <plugin id="org.apache.lucene.analysis"/> <plugin id="org.csstudio.ams"/> <plugin id="org.csstudio.ams.MessageMinder"/> + <plugin id="org.csstudio.ams.log4j" fragment="true"/> <plugin id="org.csstudio.dal"/> <plugin id="org.csstudio.data"/> - <plugin id="org.csstudio.desy.common.product.log4j" fragment="true"/> <plugin id="org.csstudio.domain.desy"/> <plugin id="org.csstudio.platform"/> <plugin id="org.csstudio.platform.libs.dal"/> <plugin id="org.csstudio.platform.libs.dal.epics"/> <plugin id="org.csstudio.platform.libs.epics"/> - <plugin id="org.csstudio.platform.libs.epics.ui"/> <plugin id="org.csstudio.platform.libs.jdbc"/> <plugin id="org.csstudio.platform.libs.jmock"/> <plugin id="org.csstudio.platform.libs.jms"/> diff -r 65476b6938ea -r ae8136a6a4c3 applications/plugins/org.csstudio.ams.application.deliverysystem.log4j/.project --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/applications/plugins/org.csstudio.ams.application.deliverysystem.log4j/.project Tue Mar 20 12:49:53 2012 -0400 @@ -0,0 +1,22 @@ +<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.csstudio.ams.application.deliverysystem.log4j</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.pde.ManifestBuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.pde.SchemaBuilder</name> + <arguments> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.PluginNature</nature> + </natures> +</projectDescription> diff -r 65476b6938ea -r ae8136a6a4c3 applications/plugins/org.csstudio.ams.application.deliverysystem.log4j/META-INF/MANIFEST.MF --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/applications/plugins/org.csstudio.ams.application.deliverysystem.log4j/META-INF/MANIFEST.MF Tue Mar 20 12:49:53 2012 -0400 @@ -0,0 +1,8 @@ +Manifest-Version: 1.0 +Bundle-ManifestVersion: 2 +Bundle-Name: Delivery System Log4j +Bundle-SymbolicName: org.csstudio.ams.application.deliverysystem.log4j +Bundle-Version: 1.0.0.qualifier +Bundle-Vendor: Markus Moeller <mar...@de...> +Fragment-Host: org.apache.log4j;bundle-version="1.2.16" +Bundle-RequiredExecutionEnvironment: JavaSE-1.6 diff -r 65476b6938ea -r ae8136a6a4c3 applications/plugins/org.csstudio.ams.application.deliverysystem.log4j/build.properties --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/applications/plugins/org.csstudio.ams.application.deliverysystem.log4j/build.properties Tue Mar 20 12:49:53 2012 -0400 @@ -0,0 +1,1 @@ +bin.includes = META-INF/ diff -r 65476b6938ea -r ae8136a6a4c3 applications/plugins/org.csstudio.ams.application.deliverysystem.log4j/log4j.properties --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/applications/plugins/org.csstudio.ams.application.deliverysystem.log4j/log4j.properties Tue Mar 20 12:49:53 2012 -0400 @@ -0,0 +1,98 @@ +#log4j.logger.org.csstudio.ams=, CONSOLEOUT, FILE_AMS +#log4j.logger.org.csstudio.ams.application.deliverysystem=, CONSOLEOUT, FILE_DELIVERY_SYSTEM +#log4j.logger.org.csstudio.ams.delivery.device=, CONSOLEOUT, FILE_DELIVERY_SYSTEM +#log4j.logger.org.csstudio.ams.delivery.email=, CONSOLEOUT, FILE_MAIL_WORKER +#log4j.logger.org.csstudio.ams.delivery.sms=, CONSOLEOUT, FILE_SMS_WORKER +#log4j.logger.org.csstudio.ams.delivery.voicemail=, CONSOLEOUT, FILE_VOICE_WORKER +#log4j.logger.org.csstudio.ams.delivery.jms=, CONSOLEOUT, FILE_DELIVERY_SYSTEM +#log4j.logger.smslib=, FILE_SMSLIB +#log4j.logger.org.csstudio=, CONSOLEOUT, FILE_AMS + +log4j.logger.org.csstudio=, FILE_AMS +log4j.logger.org.csstudio.ams=, FILE_AMS +log4j.logger.org.csstudio.ams.application.deliverysystem=, FILE_DELIVERY_SYSTEM +log4j.logger.org.csstudio.ams.delivery.device=, FILE_DELIVERY_SYSTEM +log4j.logger.org.csstudio.ams.delivery.jms=, FILE_JMS_WORKER +log4j.logger.org.csstudio.ams.delivery.email=, FILE_MAIL_WORKER +log4j.logger.org.csstudio.ams.delivery.sms=, FILE_SMS_WORKER +log4j.logger.org.csstudio.ams.delivery.voicemail=, FILE_VOICE_WORKER +log4j.logger.smslib=, FILE_SMSLIB + +#log4j.appender.CONSOLEOUT=org.apache.log4j.ConsoleAppender +#log4j.appender.CONSOLEOUT.Threshold=DEBUG +#log4j.appender.CONSOLEOUT.layout=org.apache.log4j.PatternLayout +#log4j.appender.CONSOLEOUT.layout.ConversionPattern=%d{ISO8601} %-5p [%t] %c{1}\: %m%n + +log4j.appender.FILE_AMS=org.apache.log4j.RollingFileAppender +log4j.appender.FILE_AMS.Threshold=DEBUG +log4j.appender.FILE_AMS.File=log/ams.log +log4j.appender.FILE_AMS.Append=true +log4j.appender.FILE_AMS.MaxBackupIndex=50 +log4j.appender.FILE_AMS.MaxFileSize=4096KB +log4j.appender.FILE_AMS.layout.ConversionPattern=%d{ISO8601} %-5p [%t] %c{1}\: %m%n +log4j.appender.FILE_AMS.layout=org.apache.log4j.PatternLayout + +log4j.appender.FILE_DELIVERY_SYSTEM=org.apache.log4j.RollingFileAppender +log4j.appender.FILE_DELIVERY_SYSTEM.Threshold=DEBUG +log4j.appender.FILE_DELIVERY_SYSTEM.File=log/deliverySystem.log +log4j.appender.FILE_DELIVERY_SYSTEM.Append=true +log4j.appender.FILE_DELIVERY_SYSTEM.MaxBackupIndex=50 +log4j.appender.FILE_DELIVERY_SYSTEM.MaxFileSize=4096KB +log4j.appender.FILE_DELIVERY_SYSTEM.layout.ConversionPattern=%d{ISO8601} %-5p [%t] %c{1}\: %m%n +log4j.appender.FILE_DELIVERY_SYSTEM.layout=org.apache.log4j.PatternLayout + +log4j.appender.FILE_JMS_WORKER=org.apache.log4j.RollingFileAppender +log4j.appender.FILE_JMS_WORKER.Threshold=DEBUG +log4j.appender.FILE_JMS_WORKER.File=log/jmsWorker.log +log4j.appender.FILE_JMS_WORKER.Append=true +log4j.appender.FILE_JMS_WORKER.MaxBackupIndex=20 +log4j.appender.FILE_JMS_WORKER.MaxFileSize=4096KB +log4j.appender.FILE_JMS_WORKER.layout.ConversionPattern=%d{ISO8601} %-5p [%t] %c{1}\: %m%n +log4j.appender.FILE_JMS_WORKER.layout=org.apache.log4j.PatternLayout + +log4j.appender.FILE_MAIL_WORKER=org.apache.log4j.RollingFileAppender +log4j.appender.FILE_MAIL_WORKER.Threshold=DEBUG +log4j.appender.FILE_MAIL_WORKER.File=log/emailWorker.log +log4j.appender.FILE_MAIL_WORKER.Append=true +log4j.appender.FILE_MAIL_WORKER.MaxBackupIndex=20 +log4j.appender.FILE_MAIL_WORKER.MaxFileSize=4096KB +log4j.appender.FILE_MAIL_WORKER.layout.ConversionPattern=%d{ISO8601} %-5p [%t] %c{1}\: %m%n +log4j.appender.FILE_MAIL_WORKER.layout=org.apache.log4j.PatternLayout + +log4j.appender.FILE_SMS_WORKER=org.apache.log4j.RollingFileAppender +log4j.appender.FILE_SMS_WORKER.Threshold=DEBUG +log4j.appender.FILE_SMS_WORKER.File=log/smsWorker.log +log4j.appender.FILE_SMS_WORKER.Append=true +log4j.appender.FILE_SMS_WORKER.MaxBackupIndex=20 +log4j.appender.FILE_SMS_WORKER.MaxFileSize=4096KB +log4j.appender.FILE_SMS_WORKER.layout.ConversionPattern=%d{ISO8601} %-5p [%t] %c{1}\: %m%n +log4j.appender.FILE_SMS_WORKER.layout=org.apache.log4j.PatternLayout + +log4j.appender.FILE_VOICE_WORKER=org.apache.log4j.RollingFileAppender +log4j.appender.FILE_VOICE_WORKER.Threshold=DEBUG +log4j.appender.FILE_VOICE_WORKER.File=log/voicemailWorker.log +log4j.appender.FILE_VOICE_WORKER.Append=true +log4j.appender.FILE_VOICE_WORKER.MaxBackupIndex=20 +log4j.appender.FILE_VOICE_WORKER.MaxFileSize=4096KB +log4j.appender.FILE_VOICE_WORKER.layout.ConversionPattern=%d{ISO8601} %-5p [%t] %c{1}\: %m%n +log4j.appender.FILE_VOICE_WORKER.layout=org.apache.log4j.PatternLayout + +log4j.appender.FILE_SMSLIB=org.apache.log4j.RollingFileAppender +log4j.appender.FILE_SMSLIB.Threshold=INFO +log4j.appender.FILE_SMSLIB.File=log/smslib.log +log4j.appender.FILE_SMSLIB.Append=true +log4j.appender.FILE_SMSLIB.MaxBackupIndex=20 +log4j.appender.FILE_SMSLIB.MaxFileSize=4096KB +log4j.appender.FILE_SMSLIB.layout.ConversionPattern=%d{ISO8601} %-5p [%t] %c{1}\: %m%n +log4j.appender.FILE_SMSLIB.layout=org.apache.log4j.PatternLayout + +log4j.appender.JMS=org.csstudio.platform.logging.CSSJmsAppender +log4j.appender.JMS.Threshold=ERROR +log4j.appender.JMS.topicConnectionFactoryBindingName=ConnectionFactory +log4j.appender.JMS.initialContextFactoryName=org.apache.activemq.jndi.ActiveMQInitialContextFactory +log4j.appender.JMS.providerURL=failover\:(krykjmsb.desy.de\:64616,tcp\://krykjmsa.desy.de\:62616)?maxReconnectDelay\=5000 +log4j.appender.JMS.topicBindingName=LOG +log4j.appender.JMS.userName= +log4j.appender.JMS.password= +log4j.appender.JMS.layout=org.apache.log4j.PatternLayout +log4j.appender.JMS.layout.ConversionPattern=%c{1}\: %m diff -r 65476b6938ea -r ae8136a6a4c3 applications/plugins/org.csstudio.ams.application.deliverysystem/AmsDeliverySystem.product --- a/applications/plugins/org.csstudio.ams.application.deliverysystem/AmsDeliverySystem.product Fri Mar 09 17:10:32 2012 -0500 +++ b/applications/plugins/org.csstudio.ams.application.deliverysystem/AmsDeliverySystem.product Tue Mar 20 12:49:53 2012 -0400 @@ -1,14 +1,14 @@ <?xml version="1.0" encoding="UTF-8"?> <?pde version="3.5"?> -<product name="AmsDeliverySystem" id="org.csstudio.ams.application.deliverysystem.AmsDeliverySystemProduct" application="org.csstudio.ams.application.deliverysystem.DeliverySystemApplication" useFeatures="false" includeLaunchers="true"> +<product name="AmsDeliverySystem" id="org.csstudio.ams.application.deliverysystem.AmsDeliveryProduct" application="org.csstudio.ams.application.deliverysystem.DeliverySystemApplication" useFeatures="false" includeLaunchers="true"> <configIni use="default"> </configIni> <launcherArgs> <programArgs>-plugincustomization plugin_customization.ini</programArgs> - <vmArgs>-Xms256m -Xmx512m -Dsmslib.at.simpinwait=10000</vmArgs> + <vmArgs>-Xms512m -Xmx768m -Dsmslib.at.simpinwait=10000</vmArgs> <vmArgsMac>-XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts</vmArgsMac> </launcherArgs> @@ -41,7 +41,9 @@ <plugin id="org.csstudio.ams.application.deliverysystem"/> <plugin id="org.csstudio.ams.delivery"/> <plugin id="org.csstudio.ams.delivery.email"/> + <plugin id="org.csstudio.ams.delivery.jms"/> <plugin id="org.csstudio.ams.delivery.sms"/> + ... [truncated message content] |