Menu
▾
▴
[Cs-studio-core] /hgrepo/c/cs/cs-studio/cs-studio: 4 new changesets
|
From: <cs-...@li...> - 2011-02-28 16:37:40
|
details: http://cs-studio.hg.sourceforge.net/hgweb/cs-studio/cs-studio//hgrepo/c/cs/cs-studio/cs-studio/rev/b8e085fb70ce changeset: 9343:b8e085fb70ce user: Kay Kasemir <kas...@or...> date: Mon Feb 28 11:29:32 2011 -0500 description: COMMON product: added logging plugin details: http://cs-studio.hg.sourceforge.net/hgweb/cs-studio/cs-studio//hgrepo/c/cs/cs-studio/cs-studio/rev/6c113c0aff66 changeset: 9344:6c113c0aff66 user: Kay Kasemir <kas...@or...> date: Mon Feb 28 11:33:40 2011 -0500 description: o.c.alarm.beast.configtool: Use MySQL InnoDB, configure logger details: http://cs-studio.hg.sourceforge.net/hgweb/cs-studio/cs-studio//hgrepo/c/cs/cs-studio/cs-studio/rev/a314c8044ec5 changeset: 9345:a314c8044ec5 user: Kay Kasemir <kas...@or...> date: Mon Feb 28 11:36:45 2011 -0500 description: o.c.alarm.beast.server: Remove *test plugin details: http://cs-studio.hg.sourceforge.net/hgweb/cs-studio/cs-studio//hgrepo/c/cs/cs-studio/cs-studio/rev/f5cea7e60bec changeset: 9346:f5cea7e60bec user: Kay Kasemir <kas...@or...> date: Mon Feb 28 11:37:11 2011 -0500 description: Merge diffstat: applications/plugins/org.csstudio.alarm.beast.configtool/AlarmConfigTool.product | 3 +- applications/plugins/org.csstudio.alarm.beast.configtool/META-INF/MANIFEST.MF | 4 +- applications/plugins/org.csstudio.alarm.beast.configtool/plugin_customization.ini | 4 + applications/plugins/org.csstudio.alarm.beast.configtool/src/org/csstudio/alarm/beast/configtool/Application.java | 5 + applications/plugins/org.csstudio.alarm.beast.server/AlarmServer.product | 1 - applications/plugins/org.csstudio.alarm.beast/dbd/ALARM_MYSQL.sql | 34 ++++++- applications/plugins/org.csstudio.opibuilder.adl2boy/META-INF/MANIFEST.MF | 2 +- products/COMMON/plugins/org.csstudio.common.product/common.product | 1 + 8 files changed, 43 insertions(+), 11 deletions(-) diffs (197 lines): diff -r 9ef8e3279d7a -r f5cea7e60bec applications/plugins/org.csstudio.alarm.beast.configtool/AlarmConfigTool.product --- a/applications/plugins/org.csstudio.alarm.beast.configtool/AlarmConfigTool.product Mon Feb 28 11:07:13 2011 -0500 +++ b/applications/plugins/org.csstudio.alarm.beast.configtool/AlarmConfigTool.product Mon Feb 28 11:37:11 2011 -0500 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <?pde version="3.5"?> -<product name="AlarmConfigTool" id="org.csstudio.alarm.beast.configtool.product" application="org.csstudio.alarm.beast.configtool.application" version="2.3.0" useFeatures="false" includeLaunchers="true"> +<product name="AlarmConfigTool" id="org.csstudio.alarm.beast.configtool.product" application="org.csstudio.alarm.beast.configtool.application" version="2.5.2" useFeatures="false" includeLaunchers="true"> <configIni use="default"> </configIni> @@ -24,6 +24,7 @@ <plugin id="org.csstudio.alarm.beast"/> <plugin id="org.csstudio.alarm.beast.configtool"/> <plugin id="org.csstudio.apputil"/> + <plugin id="org.csstudio.logging"/> <plugin id="org.csstudio.platform"/> <plugin id="org.csstudio.platform.libs.annotations"/> <plugin id="org.csstudio.platform.libs.dal"/> diff -r 9ef8e3279d7a -r f5cea7e60bec applications/plugins/org.csstudio.alarm.beast.configtool/META-INF/MANIFEST.MF --- a/applications/plugins/org.csstudio.alarm.beast.configtool/META-INF/MANIFEST.MF Mon Feb 28 11:07:13 2011 -0500 +++ b/applications/plugins/org.csstudio.alarm.beast.configtool/META-INF/MANIFEST.MF Mon Feb 28 11:37:11 2011 -0500 @@ -2,10 +2,12 @@ Bundle-ManifestVersion: 2 Bundle-Name: AlarmConfigTool Bundle-SymbolicName: org.csstudio.alarm.beast.configtool;singleton:=true -Bundle-Version: 2.3.0.qualifier +Bundle-Version: 2.5.2.qualifier Bundle-Vendor: Kay Kasemir <kas...@or...>, Xihui Chen <ch...@or...> - SNS +Bundle-Description: BEAST Command-line configuration tool Require-Bundle: org.junit4, org.eclipse.core.runtime, + org.csstudio.logging;bundle-version="0.0.1", org.csstudio.platform;bundle-version="1.1.0", org.csstudio.apputil;bundle-version="1.1.4", org.csstudio.alarm.beast;bundle-version="2.5.0" diff -r 9ef8e3279d7a -r f5cea7e60bec applications/plugins/org.csstudio.alarm.beast.configtool/plugin_customization.ini --- a/applications/plugins/org.csstudio.alarm.beast.configtool/plugin_customization.ini Mon Feb 28 11:07:13 2011 -0500 +++ b/applications/plugins/org.csstudio.alarm.beast.configtool/plugin_customization.ini Mon Feb 28 11:37:11 2011 -0500 @@ -6,6 +6,10 @@ org.csstudio.alarm.beast/rdb_password=sns # Logging preferences +org.csstudio.logging/console_level=CONFIG +org.csstudio.logging/jms_url= + +# Old Logging preferences org.csstudio.platform/css_console=true org.csstudio.platform/css_file=false org.csstudio.platform/log4j.appender.css_console.Threshold=INFO diff -r 9ef8e3279d7a -r f5cea7e60bec applications/plugins/org.csstudio.alarm.beast.configtool/src/org/csstudio/alarm/beast/configtool/Application.java --- a/applications/plugins/org.csstudio.alarm.beast.configtool/src/org/csstudio/alarm/beast/configtool/Application.java Mon Feb 28 11:07:13 2011 -0500 +++ b/applications/plugins/org.csstudio.alarm.beast.configtool/src/org/csstudio/alarm/beast/configtool/Application.java Mon Feb 28 11:37:11 2011 -0500 @@ -17,6 +17,7 @@ import org.csstudio.apputil.args.ArgParser; import org.csstudio.apputil.args.BooleanOption; import org.csstudio.apputil.args.StringOption; +import org.csstudio.logging.LogConfigurator; import org.csstudio.platform.data.TimestampFactory; import org.eclipse.equinox.app.IApplication; import org.eclipse.equinox.app.IApplicationContext; @@ -125,6 +126,10 @@ return EXIT_OK; } + // Configure logging + LogConfigurator.configureFromPreferences(); + + // Perform selected action switch (mode) { case LIST: diff -r 9ef8e3279d7a -r f5cea7e60bec applications/plugins/org.csstudio.alarm.beast.server/AlarmServer.product --- a/applications/plugins/org.csstudio.alarm.beast.server/AlarmServer.product Mon Feb 28 11:07:13 2011 -0500 +++ b/applications/plugins/org.csstudio.alarm.beast.server/AlarmServer.product Mon Feb 28 11:37:11 2011 -0500 @@ -30,7 +30,6 @@ <plugin id="org.csstudio.alarm.beast.server"/> <plugin id="org.csstudio.apputil"/> <plugin id="org.csstudio.logging"/> - <plugin id="org.csstudio.logging.test" fragment="true"/> <plugin id="org.csstudio.platform"/> <plugin id="org.csstudio.platform.libs.annotations"/> <plugin id="org.csstudio.platform.libs.dal"/> diff -r 9ef8e3279d7a -r f5cea7e60bec applications/plugins/org.csstudio.alarm.beast/dbd/ALARM_MYSQL.sql --- a/applications/plugins/org.csstudio.alarm.beast/dbd/ALARM_MYSQL.sql Mon Feb 28 11:07:13 2011 -0500 +++ b/applications/plugins/org.csstudio.alarm.beast/dbd/ALARM_MYSQL.sql Mon Feb 28 11:37:11 2011 -0500 @@ -21,7 +21,7 @@ NAME VARCHAR(80) NOT NULL COMMENT 'Name: Component name.', CONFIG_TIME TIMESTAMP COMMENT 'Configuration Time: Time of last configuration update.', PRIMARY KEY (COMPONENT_ID) -)ENGINE=MYISAM +)ENGINE=INNODB COMMENT='' ; @@ -35,7 +35,7 @@ COMMAND_ORDER INT NOT NULL COMMENT 'Order: The order by which the commands are arranged.', DETAIL VARCHAR(4000) NOT NULL COMMENT 'Detail: The related command which will be executed when you click on its title.', PRIMARY KEY (COMPONENT_ID, TITLE) -)ENGINE=MYISAM +)ENGINE=INNODB COMMENT='commands for the component.' ; @@ -49,7 +49,7 @@ DISPLAY_ORDER INT NOT NULL COMMENT 'Order: The order by which the displays are arranged.', DETAIL VARCHAR(4000) NOT NULL COMMENT 'Detail: The related display which will be launched when you click on its title.', PRIMARY KEY (COMPONENT_ID, TITLE) -)ENGINE=MYISAM +)ENGINE=INNODB COMMENT='Displays for the component.' ; @@ -63,7 +63,7 @@ GUIDANCE_ORDER INT NOT NULL COMMENT 'Order: The order by which the guidance are arranged.', DETAIL VARCHAR(4000) NOT NULL COMMENT 'Detail: Guidance information which is displayed in the guidance dialog.', PRIMARY KEY (COMPONENT_ID, TITLE) -)ENGINE=MYISAM +)ENGINE=INNODB COMMENT='Guidance information for the component.' ; @@ -88,7 +88,7 @@ ALARM_TIME TIMESTAMP COMMENT 'Alarm Time: The time of the most recent alarm.', ACT_GLOBAL_ALARM_IND BOOL DEFAULT FALSE NOT NULL COMMENT 'Indicates if PV has an active global alarm.', PRIMARY KEY (COMPONENT_ID) -)ENGINE=MYISAM +)ENGINE=INNODB COMMENT='Process Variable: ' ; -- Add CUR_STATUS_ID, ACT_GLOBAL_ALARM_IND to older setups: @@ -103,7 +103,7 @@ SEVERITY_ID INT NOT NULL COMMENT 'Severity Identifier: Unique identifier for the alarm severity.', NAME VARCHAR(100) NOT NULL COMMENT 'Severity Name: ', PRIMARY KEY (SEVERITY_ID) -)ENGINE=MYISAM +)ENGINE=INNODB COMMENT='Severity of an alarm like "invalid", "major alarm" etc.' ; @@ -115,7 +115,7 @@ STATUS_ID INT NOT NULL COMMENT 'Status Identifier: Unique identifier for the alarm status.', NAME VARCHAR(100) NOT NULL COMMENT 'Status Name: such as "read error", "disconnected", ...', PRIMARY KEY (STATUS_ID) -)ENGINE=MYISAM +)ENGINE=INNODB COMMENT='status of an alarm to provide more detail' ; @@ -229,3 +229,23 @@ FOREIGN KEY (STATUS_ID) REFERENCES ALARM.STATUS(STATUS_ID) ; + + +-- +-- Example data. +-- Skip if there is no need for an example +-- +INSERT INTO ALARM.ALARM_TREE VALUES (1, NULL, 'Test', now()); +INSERT INTO ALARM.ALARM_TREE VALUES (2, 1, 'Area', now()); +INSERT INTO ALARM.ALARM_TREE VALUES (3, 2, 'System', now()); +INSERT INTO ALARM.ALARM_TREE VALUES (4, 3, 'PV1', now()); +INSERT INTO ALARM.ALARM_TREE VALUES (5, 3, 'PV2', now()); + +INSERT INTO ALARM.PV(COMPONENT_ID, DESCR, ENABLED_IND, ANNUNCIATE_IND, LATCH_IND, ACT_GLOBAL_ALARM_IND) VALUES (4, 'Demo 1', true, true, true, false); +INSERT INTO ALARM.PV(COMPONENT_ID, DESCR, ENABLED_IND, ANNUNCIATE_IND, LATCH_IND, ACT_GLOBAL_ALARM_IND) VALUES (5, 'Demo 2', true, true, true, false); + +INSERT INTO ALARM.GUIDANCE(COMPONENT_ID, GUIDANCE_ORDER, TITLE, DETAIL) VALUES (4, 1, 'Info 1', 'Do something'); +INSERT INTO ALARM.GUIDANCE(COMPONENT_ID, GUIDANCE_ORDER, TITLE, DETAIL) VALUES (4, 2, 'Info 2', 'Do something else'); + +INSERT INTO ALARM.GUIDANCE(COMPONENT_ID, GUIDANCE_ORDER, TITLE, DETAIL) VALUES (5, 1, 'Info 1', 'Do something'); +INSERT INTO ALARM.GUIDANCE(COMPONENT_ID, GUIDANCE_ORDER, TITLE, DETAIL) VALUES (5, 2, 'Info 2', 'Do something else'); diff -r 9ef8e3279d7a -r f5cea7e60bec applications/plugins/org.csstudio.opibuilder.adl2boy/META-INF/MANIFEST.MF --- a/applications/plugins/org.csstudio.opibuilder.adl2boy/META-INF/MANIFEST.MF Mon Feb 28 11:07:13 2011 -0500 +++ b/applications/plugins/org.csstudio.opibuilder.adl2boy/META-INF/MANIFEST.MF Mon Feb 28 11:37:11 2011 -0500 @@ -4,7 +4,7 @@ Bundle-SymbolicName: org.csstudio.opibuilder.adl2boy; singleton:=true Bundle-Version: 1.0.4.qualifier Bundle-Activator: org.csstudio.opibuilder.adl2boy.ADL2BOYPlugin -Bundle-Vendor: John Hammonds +Bundle-Vendor: John Hammonds <JPH...@an...> - APS Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime, org.eclipse.core.resources;bundle-version="3.5.1", diff -r 9ef8e3279d7a -r f5cea7e60bec products/COMMON/plugins/org.csstudio.common.product/common.product --- a/products/COMMON/plugins/org.csstudio.common.product/common.product Mon Feb 28 11:07:13 2011 -0500 +++ b/products/COMMON/plugins/org.csstudio.common.product/common.product Mon Feb 28 11:37:11 2011 -0500 @@ -51,6 +51,7 @@ <plugin id="org.csstudio.email"/> <plugin id="org.csstudio.email.ui"/> <plugin id="org.csstudio.logbook"/> + <plugin id="org.csstudio.logging"/> <plugin id="org.csstudio.multiChannelViewer"/> <plugin id="org.csstudio.opibuilder"/> <plugin id="org.csstudio.opibuilder.adl2boy"/> |