From: <cs-...@li...> - 2012-03-21 20:25:58
|
details: http://cs-studio.hg.sourceforge.net/hgweb/cs-studio/cs-studio//hgroot/cs-studio/cs-studio/rev/8576e1068a22 changeset: 14396:8576e1068a22 user: Gabriele Carcassi <car...@bn...> date: Tue Mar 20 14:31:49 2012 -0400 description: ..graphene: merge with 0.1-SNAPSHOT details: http://cs-studio.hg.sourceforge.net/hgweb/cs-studio/cs-studio//hgroot/cs-studio/cs-studio/rev/4a37e0f8807b changeset: 14397:4a37e0f8807b user: Gabriele Carcassi <car...@bn...> date: Tue Mar 20 14:34:23 2012 -0400 description: ..graphene: plugin.xml wasn't added to the binaries. details: http://cs-studio.hg.sourceforge.net/hgweb/cs-studio/cs-studio//hgroot/cs-studio/cs-studio/rev/c7b27fb57c2d changeset: 14398:c7b27fb57c2d user: xihui <ch...@or...> date: Tue Mar 20 17:35:15 2012 -0400 description: BOY: update comment details: http://cs-studio.hg.sourceforge.net/hgweb/cs-studio/cs-studio//hgroot/cs-studio/cs-studio/rev/b014d0622c90 changeset: 14399:b014d0622c90 user: xihui <ch...@or...> date: Tue Mar 20 17:36:55 2012 -0400 description: BOY: Only allow autosize to grouping container and linking container details: http://cs-studio.hg.sourceforge.net/hgweb/cs-studio/cs-studio//hgroot/cs-studio/cs-studio/rev/4edca25a2059 changeset: 14400:4edca25a2059 user: xihui <ch...@or...> date: Tue Mar 20 17:39:39 2012 -0400 description: BOY: split scaleChildren details: http://cs-studio.hg.sourceforge.net/hgweb/cs-studio/cs-studio//hgroot/cs-studio/cs-studio/rev/403a90574b91 changeset: 14401:403a90574b91 user: xihui <ch...@or...> date: Tue Mar 20 17:40:28 2012 -0400 description: BOY: Add Rounded Rectangle Backgoround Border details: http://cs-studio.hg.sourceforge.net/hgweb/cs-studio/cs-studio//hgroot/cs-studio/cs-studio/rev/23c7cea28f93 changeset: 14402:23c7cea28f93 user: xihui <ch...@or...> date: Tue Mar 20 17:40:51 2012 -0400 description: BOY: fix a layout but details: http://cs-studio.hg.sourceforge.net/hgweb/cs-studio/cs-studio//hgroot/cs-studio/cs-studio/rev/7434abf3f707 changeset: 14403:7434abf3f707 user: xihui <ch...@or...> date: Tue Mar 20 17:41:17 2012 -0400 description: BOY: add fill Parent Container Action details: http://cs-studio.hg.sourceforge.net/hgweb/cs-studio/cs-studio//hgroot/cs-studio/cs-studio/rev/dd3ec8ed58f7 changeset: 14404:dd3ec8ed58f7 user: xihui <ch...@or...> date: Tue Mar 20 17:41:40 2012 -0400 description: BOY: Add Sash Container Widget details: http://cs-studio.hg.sourceforge.net/hgweb/cs-studio/cs-studio//hgroot/cs-studio/cs-studio/rev/a5c8769bf8cd changeset: 14405:a5c8769bf8cd user: Gabriele Carcassi <car...@bn...> date: Wed Mar 21 10:10:27 2012 -0400 description: ..graphene: merge with 0.1-SNAPSHOT details: http://cs-studio.hg.sourceforge.net/hgweb/cs-studio/cs-studio//hgroot/cs-studio/cs-studio/rev/41b64cabc832 changeset: 14406:41b64cabc832 user: Gabriele Carcassi <car...@bn...> date: Wed Mar 21 10:11:58 2012 -0400 description: Merge details: http://cs-studio.hg.sourceforge.net/hgweb/cs-studio/cs-studio//hgroot/cs-studio/cs-studio/rev/ec76d29a5f6e changeset: 14407:ec76d29a5f6e user: kasemir date: Wed Mar 21 11:33:50 2012 -0400 description: SNS Scan System: beamline example details: http://cs-studio.hg.sourceforge.net/hgweb/cs-studio/cs-studio//hgroot/cs-studio/cs-studio/rev/4d67a73f21ce changeset: 14408:4d67a73f21ce user: kasemir date: Wed Mar 21 11:51:37 2012 -0400 description: o.c.utility.product: Only add alarm views to perspecitive if the alarm plugin is actually available to avoid messages "SEVERE ... unknown view " details: http://cs-studio.hg.sourceforge.net/hgweb/cs-studio/cs-studio//hgroot/cs-studio/cs-studio/rev/b72acd9e7795 changeset: 14409:b72acd9e7795 user: kasemir date: Wed Mar 21 11:53:52 2012 -0400 description: Merge details: http://cs-studio.hg.sourceforge.net/hgweb/cs-studio/cs-studio//hgroot/cs-studio/cs-studio/rev/37b9bd2e4c1a changeset: 14410:37b9bd2e4c1a user: kasemir date: Wed Mar 21 12:45:24 2012 -0400 description: o.c.trends.databrowser2: Recent changes to store more of the plot config in the *.plt file resulted in null errors for older config files. Removed some debug printouts, unused imports, ... details: http://cs-studio.hg.sourceforge.net/hgweb/cs-studio/cs-studio//hgroot/cs-studio/cs-studio/rev/e504e3be08c2 changeset: 14411:e504e3be08c2 user: Gabriele Carcassi <car...@bn...> date: Wed Mar 21 16:18:26 2012 -0400 description: ...pvmanager: merge from 1.1-SNAPSHOT, fix for multiple monitors on disconnect/reconnect. details: http://cs-studio.hg.sourceforge.net/hgweb/cs-studio/cs-studio//hgroot/cs-studio/cs-studio/rev/00555ab98bba changeset: 14412:00555ab98bba user: Gabriele Carcassi <car...@bn...> date: Wed Mar 21 16:20:07 2012 -0400 description: Merge details: http://cs-studio.hg.sourceforge.net/hgweb/cs-studio/cs-studio//hgroot/cs-studio/cs-studio/rev/265ad4ac4457 changeset: 14413:265ad4ac4457 user: Gabriele Carcassi <car...@bn...> date: Wed Mar 21 16:24:58 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.graphene/build.properties | 3 +- 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.widgets/icons/fillParent.png | 0 applications/plugins/org.csstudio.opibuilder.widgets/plugin.xml | 32 +- applications/plugins/org.csstudio.opibuilder.widgets/src/org/csstudio/opibuilder/widgets/actions/FillParentContainerAction.java | 53 + applications/plugins/org.csstudio.opibuilder.widgets/src/org/csstudio/opibuilder/widgets/editparts/GroupingContainerEditPart.java | 16 + applications/plugins/org.csstudio.opibuilder.widgets/src/org/csstudio/opibuilder/widgets/editparts/LinkingContainerEditpart.java | 16 + applications/plugins/org.csstudio.opibuilder.widgets/src/org/csstudio/opibuilder/widgets/editparts/SashContainerEditPart.java | 202 + applications/plugins/org.csstudio.opibuilder.widgets/src/org/csstudio/opibuilder/widgets/model/GroupingContainerModel.java | 12 +- applications/plugins/org.csstudio.opibuilder.widgets/src/org/csstudio/opibuilder/widgets/model/SashContainerModel.java | 170 + applications/plugins/org.csstudio.opibuilder/src/org/csstudio/opibuilder/datadefinition/DisplayScaleData.java | 100 +- applications/plugins/org.csstudio.opibuilder/src/org/csstudio/opibuilder/editparts/AbstractBaseEditPart.java | 4 +- applications/plugins/org.csstudio.opibuilder/src/org/csstudio/opibuilder/model/AbstractContainerModel.java | 11 +- applications/plugins/org.csstudio.opibuilder/src/org/csstudio/opibuilder/model/DisplayModel.java | 2 +- applications/plugins/org.csstudio.opibuilder/src/org/csstudio/opibuilder/visualparts/BorderFactory.java | 8 + applications/plugins/org.csstudio.opibuilder/src/org/csstudio/opibuilder/visualparts/BorderStyle.java | 4 +- applications/plugins/org.csstudio.opibuilder/src/org/csstudio/opibuilder/visualparts/RoundRectangleBackgroundBorder.java | 85 + applications/plugins/org.csstudio.swt.widgets.test/src/org/csstudio/swt/widgets/figures/SashContainerTest.java | 61 + applications/plugins/org.csstudio.swt.widgets/src/org/csstudio/swt/widgets/datadefinition/IManualValueChangeListener.java | 2 +- applications/plugins/org.csstudio.swt.widgets/src/org/csstudio/swt/widgets/figures/MeterFigure.java | 2 +- applications/plugins/org.csstudio.swt.widgets/src/org/csstudio/swt/widgets/figures/SashContainerFigure.java | 463 + applications/plugins/org.csstudio.trends.databrowser2/preferences.ini | 2 +- applications/plugins/org.csstudio.trends.databrowser2/src/org/csstudio/trends/databrowser2/model/AnnotationInfo.java | 49 +- applications/plugins/org.csstudio.trends.databrowser2/src/org/csstudio/trends/databrowser2/model/AxisConfig.java | 92 +- 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 | 103 +- applications/plugins/org.csstudio.trends.databrowser2/src/org/csstudio/trends/databrowser2/model/ModelItem.java | 43 +- 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 | 9 +- applications/plugins/org.csstudio.trends.databrowser2/src/org/csstudio/trends/databrowser2/model/PVItem.java | 12 +- 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 | 9 +- applications/plugins/org.csstudio.trends.databrowser2/src/org/csstudio/trends/databrowser2/ui/Controller.java | 129 +- applications/plugins/org.csstudio.trends.databrowser2/src/org/csstudio/trends/databrowser2/ui/PlotConfigListener.java | 24 +- applications/plugins/org.csstudio.trends.databrowser2/src/org/csstudio/trends/databrowser2/ui/PlotListener.java | 25 +- applications/plugins/org.csstudio.trends.databrowser2/src/org/csstudio/trends/databrowser2/ui/XYGraphSettingsUtil.java | 20 +- applications/plugins/org.csstudio.trends.databrowser2/src/org/csstudio/trends/databrowser2/waveformview/WaveformView.java | 23 +- 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 +- applications/plugins/org.csstudio.utility.product/src/org/csstudio/utility/product/CSS_Perspective.java | 19 +- applications/plugins/org.epics.graphene/src/org/epics/graphene/Histogram1DRenderer.java | 63 +- applications/plugins/org.epics.graphene/src/org/epics/graphene/RangeUtil.java | 60 - applications/plugins/org.epics.graphene/src/org/epics/graphene/ValueAxis.java | 186 + 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.util/src/org/csstudio/ui/util/NoResourceEditorInput.java | 10 +- core/plugins/org.csstudio.utility.pvmanager/src/org/epics/pvmanager/jca/JCAChannelHandler.java | 16 +- 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/examples/beamline.xml | 74 +- 162 files changed, 12360 insertions(+), 7984 deletions(-) diffs (truncated from 23632 to 300 lines): diff -r eeae27e779f6 -r 265ad4ac4457 applications/plugins/org.csstudio.ams.MessageMinder/AmsMessageMinder.product --- a/applications/plugins/org.csstudio.ams.MessageMinder/AmsMessageMinder.product Tue Mar 20 12:46:01 2012 -0400 +++ b/applications/plugins/org.csstudio.ams.MessageMinder/AmsMessageMinder.product Wed Mar 21 16:24:58 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 eeae27e779f6 -r 265ad4ac4457 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 Wed Mar 21 16:24:58 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 eeae27e779f6 -r 265ad4ac4457 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 Wed Mar 21 16:24:58 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 eeae27e779f6 -r 265ad4ac4457 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 Wed Mar 21 16:24:58 2012 -0400 @@ -0,0 +1,1 @@ +bin.includes = META-INF/ diff -r eeae27e779f6 -r 265ad4ac4457 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 Wed Mar 21 16:24:58 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 eeae27e779f6 -r 265ad4ac4457 applications/plugins/org.csstudio.ams.application.deliverysystem/AmsDeliverySystem.product --- a/applications/plugins/org.csstudio.ams.application.deliverysystem/AmsDeliverySystem.product Tue Mar 20 12:46:01 2012 -0400 +++ b/applications/plugins/org.csstudio.ams.application.deliverysystem/AmsDeliverySystem.product Wed Mar 21 16:24:58 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"/> + <plugin id="org.csstudio.ams.delivery.voicemail"/> <plugin id="org.csstudio.ams.log4j" fragment="true"/> <plugin id="org.csstudio.dal"/> <plugin id="org.csstudio.data"/> diff -r eeae27e779f6 -r 265ad4ac4457 applications/plugins/org.csstudio.ams.application.deliverysystem/AmsJmsDeliverySystem.product --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/applications/plugins/org.csstudio.ams.application.deliverysystem/AmsJmsDeliverySystem.product Wed Mar 21 16:24:58 2012 -0400 @@ -0,0 +1,199 @@ +<?xml version="1.0" encoding="UTF-8"?> +<?pde version="3.5"?> + +<product name="AmsJmsDeliverySystem" id="org.csstudio.ams.application.deliverysystem.AmsJmsDeliverySystemProduct" 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</vmArgs> + <vmArgsMac>-XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts</vmArgsMac> + </launcherArgs> + + <launcher name="AmsJmsDeliverySystem"> + <solaris/> + <win useIco="false"> + <bmp/> + </win> + </launcher> + + <vm> + </vm> + + <plugins> + <plugin id="com.google.common"/> + <plugin id="com.ibm.icu"/> + <plugin id="com.mysql.jdbc"/> + <plugin id="javax.annotation"/> + <plugin id="javax.mail"/> + <plugin id="javax.servlet"/> + <plugin id="javax.servlet.jsp"/> + <plugin id="org.apache.commons.el"/> + <plugin id="org.apache.commons.logging"/> + <plugin id="org.apache.jasper"/> + <plugin id="org.apache.log4j"/> + <plugin id="org.apache.lucene"/> + <plugin id="org.apache.lucene.analysis"/> + <plugin id="org.apache.tools.ant"/> + <plugin id="org.csstudio.ams"/> + <plugin id="org.csstudio.ams.application.deliverysystem"/> + <plugin id="org.csstudio.ams.delivery"/> + <plugin id="org.csstudio.ams.delivery.jms"/> + <plugin id="org.csstudio.ams.log4j" fragment="true"/> + <plugin id="org.csstudio.dal"/> + <plugin id="org.csstudio.data"/> + <plugin id="org.csstudio.domain.desy"/> + <plugin id="org.csstudio.platform"/> + <plugin id="org.csstudio.platform.libs.dal"/> + <plugin id="org.csstudio.platform.libs.epics"/> + <plugin id="org.csstudio.platform.libs.jdbc"/> + <plugin id="org.csstudio.platform.libs.jmock"/> + <plugin id="org.csstudio.platform.libs.jms"/> + <plugin id="org.csstudio.platform.simpledal"/> + <plugin id="org.csstudio.platform.ui"/> + <plugin id="org.csstudio.platform.utility.jms"/> + <plugin id="org.csstudio.remote"/> + <plugin id="org.csstudio.ui.preferences"/> + <plugin id="org.csstudio.utility.pvmanager"/> + <plugin id="org.csstudio.workspace"/> + <plugin id="org.eclipse.ant.core"/> + <plugin id="org.eclipse.compare"/> + <plugin id="org.eclipse.compare.core"/> + <plugin id="org.eclipse.core.commands"/> + <plugin id="org.eclipse.core.contenttype"/> + <plugin id="org.eclipse.core.databinding"/> + <plugin id="org.eclipse.core.databinding.observable"/> + <plugin id="org.eclipse.core.databinding.property"/> + <plugin id="org.eclipse.core.expressions"/> + <plugin id="org.eclipse.core.filebuffers"/> + <plugin id="org.eclipse.core.filesystem"/> + <plugin id="org.eclipse.core.filesystem.win32.x86" fragment="true"/> + <plugin id="org.eclipse.core.filesystem.win32.x86_64" fragment="true"/> + <plugin id="org.eclipse.core.jobs"/> + <plugin id="org.eclipse.core.net"/> + <plugin id="org.eclipse.core.net.win32.x86" fragment="true"/> + <plugin id="org.eclipse.core.net.win32.x86_64" fragment="true"/> + <plugin id="org.eclipse.core.resources"/> + <plugin id="org.eclipse.core.resources.win32.x86" fragment="true"/> + <plugin id="org.eclipse.core.runtime"/> + <plugin id="org.eclipse.core.runtime.compatibility.auth"/> + <plugin id="org.eclipse.core.runtime.compatibility.registry" fragment="true"/> + <plugin id="org.eclipse.core.variables"/> + <plugin id="org.eclipse.ecf"/> + <plugin id="org.eclipse.ecf.datashare"/> + <plugin id="org.eclipse.ecf.filetransfer"/> + <plugin id="org.eclipse.ecf.identity"/> + <plugin id="org.eclipse.ecf.presence"/> + <plugin id="org.eclipse.ecf.provider"/> + <plugin id="org.eclipse.ecf.provider.datashare"/> + <plugin id="org.eclipse.ecf.provider.filetransfer"/> + <plugin id="org.eclipse.ecf.provider.filetransfer.ssl" fragment="true"/> + <plugin id="org.eclipse.ecf.provider.remoteservice"/> + <plugin id="org.eclipse.ecf.provider.xmpp"/> + <plugin id="org.eclipse.ecf.provider.xmpp.datashare" fragment="true"/> + <plugin id="org.eclipse.ecf.provider.xmpp.remoteservice" fragment="true"/> + <plugin id="org.eclipse.ecf.remoteservice"/> + <plugin id="org.eclipse.ecf.sharedobject"/> + <plugin id="org.eclipse.ecf.ssl" fragment="true"/> + <plugin id="org.eclipse.equinox.app"/> + <plugin id="org.eclipse.equinox.common"/> |