Attachment #209317 for bug #368356

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

View | Details | Raw Unified | Return to bug 368356
Collapse All | Expand All

Lines 17-19 Link Here

(-)a/.gitignore (+1 lines)
17	bitset_test	17	bitset_test
18	rangeset_test	18	rangeset_test
19	testaif	19	testaif
		20	/.project

Lines 2-7 Link Here

(-)a/core/org.eclipse.ptp.proxy/META-INF/MANIFEST.MF (-1 / +1 lines)
2	Bundle-ManifestVersion: 2	2	Bundle-ManifestVersion: 2
3	Bundle-Name: %pluginName	3	Bundle-Name: %pluginName
4	Bundle-SymbolicName: org.eclipse.ptp.proxy	4	Bundle-SymbolicName: org.eclipse.ptp.proxy
5	Bundle-Version: 5.0.4.qualifier	5	Bundle-Version: 5.0.5.qualifier
6	Bundle-Vendor: %pluginProvider	6	Bundle-Vendor: %pluginProvider
7	Bundle-Localization: plugin	7	Bundle-Localization: plugin




				connection, shell, RemoteResourceBrowser.SINGLE);
		browser.setType(RemoteResourceBrowser.DIRECTORY_BROWSER);
		browser.setInitialPath(filterPath);
		browser.setTitle(message);
		browser.showConnections(showConnections);
		if (browser.open() == Window.CANCEL) {
			return null;

				connection, shell, RemoteResourceBrowser.SINGLE);
		browser.setType(RemoteResourceBrowser.FILE_BROWSER);
		browser.setInitialPath(filterPath);
		browser.setTitle(message);
		browser.showConnections(showConnections);
		if (browser.open() == Window.CANCEL) {
			return null;

				connection, shell, RemoteResourceBrowser.MULTI);
		browser.setType(RemoteResourceBrowser.FILE_BROWSER);
		browser.setInitialPath(filterPath);
		browser.setTitle(message);
		browser.showConnections(showConnections);
		if (browser.open() == Window.CANCEL) {
			return null;

Lines 2-7 Link Here

(-)a/core/org.eclipse.ptp.utils/META-INF/MANIFEST.MF (-1 / +1 lines)
2	Bundle-ManifestVersion: 2	2	Bundle-ManifestVersion: 2
3	Bundle-Name: %pluginName	3	Bundle-Name: %pluginName
4	Bundle-SymbolicName: org.eclipse.ptp.utils	4	Bundle-SymbolicName: org.eclipse.ptp.utils
5	Bundle-Version: 5.0.4.qualifier	5	Bundle-Version: 5.0.5.qualifier
6	Bundle-Vendor: %pluginProvider	6	Bundle-Vendor: %pluginProvider
7	Bundle-Localization: plugin	7	Bundle-Localization: plugin

Lines 2-8 Link Here

(-)a/debug/org.eclipse.ptp.debug.sdm/META-INF/MANIFEST.MF (-1 / +1 lines)
2	Bundle-ManifestVersion: 2	2	Bundle-ManifestVersion: 2
3	Bundle-Name: %pluginName	3	Bundle-Name: %pluginName
4	Bundle-SymbolicName: org.eclipse.ptp.debug.sdm	4	Bundle-SymbolicName: org.eclipse.ptp.debug.sdm
5	Bundle-Version: 5.0.4.qualifier	5	Bundle-Version: 5.0.5.qualifier
6	Bundle-Vendor: %pluginProvider	6	Bundle-Vendor: %pluginProvider
7	Require-Bundle: org.eclipse.ptp.proxy,	7	Require-Bundle: org.eclipse.ptp.proxy,
8	org.eclipse.ptp.utils	8	org.eclipse.ptp.utils

Lines 16-21 Link Here

(-)a/pom.xml (+6 lines)
16	<tycho-version>0.13.0</tycho-version>	16	<tycho-version>0.13.0</tycho-version>
17	<eclipse-release>indigo</eclipse-release>	17	<eclipse-release>indigo</eclipse-release>
18	<eclipse-site>http://download.eclipse.org/releases/${eclipse-release}</eclipse-site>	18	<eclipse-site>http://download.eclipse.org/releases/${eclipse-release}</eclipse-site>
		19	<photran-site>file://home/data/httpd/download.eclipse.org/tools/ptp/builds/hudson/ptp-photran-release</photran-site>
19	</properties>	20	</properties>
20		21
21	<licenses>	22	<licenses>
Lines 196-201 Link Here
196	<url>${eclipse-site}</url>	197	<url>${eclipse-site}</url>
197	<layout>p2</layout>	198	<layout>p2</layout>
198	</repository>	199	</repository>
		200	<repository>
		201	<id>photran</id>
		202	<url>${photran-site}</url>
		203	<layout>p2</layout>
		204	</repository>
199	</repositories>	205	</repositories>
200		206
201	<pluginRepositories>	207	<pluginRepositories>

Lines 2-8 Link Here

(-)a/rdt/org.eclipse.ptp.rdt.core.remotejars/META-INF/MANIFEST.MF (-1 / +1 lines)
2	Bundle-ManifestVersion: 2	2	Bundle-ManifestVersion: 2
3	Bundle-Name: Remotejars	3	Bundle-Name: Remotejars
4	Bundle-SymbolicName: org.eclipse.ptp.rdt.core.remotejars	4	Bundle-SymbolicName: org.eclipse.ptp.rdt.core.remotejars
5	Bundle-Version: 5.0.4.qualifier	5	Bundle-Version: 5.0.5.qualifier
6	Require-Bundle: org.eclipse.ptp.rdt.core;bundle-version="1.1.0",	6	Require-Bundle: org.eclipse.ptp.rdt.core;bundle-version="1.1.0",
7	org.eclipse.ptp.rdt.make.ui;bundle-version="1.1.0",	7	org.eclipse.ptp.rdt.make.ui;bundle-version="1.1.0",
8	org.eclipse.ptp.rdt.managedbuilder.xlc.ui;bundle-version="3.0.0",	8	org.eclipse.ptp.rdt.managedbuilder.xlc.ui;bundle-version="3.0.0",

Lines 10-16 Link Here

(-)a/rdt/org.eclipse.ptp.rdt.core.remotejars/pom.xml (-1 / +1 lines)
10	</parent>	10	</parent>
11		11
12	<artifactId>org.eclipse.ptp.rdt.core.remotejars</artifactId>	12	<artifactId>org.eclipse.ptp.rdt.core.remotejars</artifactId>
13	<version>5.0.4-SNAPSHOT</version>	13	<version>5.0.5-SNAPSHOT</version>
14	<packaging>eclipse-plugin</packaging>	14	<packaging>eclipse-plugin</packaging>
15		15
16	<profiles>	16	<profiles>

Lines 9-16 Link Here

(-)a/releng/org.eclipse.ptp-feature/pom.xml (-1 / +1 lines)
9	<relativePath>../../pom.xml</relativePath>	9	<relativePath>../../pom.xml</relativePath>
10	</parent>	10	</parent>
11		11
		12	<groupId>org.eclipse.ptp.features</groupId>
12	<artifactId>org.eclipse.ptp</artifactId>	13	<artifactId>org.eclipse.ptp</artifactId>
13	<version>5.0.5-SNAPSHOT</version>	14	<version>5.0.5-SNAPSHOT</version>
14	<packaging>eclipse-feature</packaging>	15	<packaging>eclipse-feature</packaging>
15	<groupId>org.eclipse.ptp.features</groupId>
16	</project>	16	</project>

Lines 2-8 Link Here

(-)a/releng/org.eclipse.ptp.aix.ppc/META-INF/MANIFEST.MF (-1 / +1 lines)
2	Bundle-ManifestVersion: 2	2	Bundle-ManifestVersion: 2
3	Bundle-Name: %fragmentName.aix.ppc	3	Bundle-Name: %fragmentName.aix.ppc
4	Bundle-SymbolicName: org.eclipse.ptp.aix.ppc;singleton:=true	4	Bundle-SymbolicName: org.eclipse.ptp.aix.ppc;singleton:=true
5	Bundle-Version: 5.0.4.qualifier	5	Bundle-Version: 5.0.5.qualifier
6	Fragment-Host: org.eclipse.ptp.core;bundle-version="2.0.0"	6	Fragment-Host: org.eclipse.ptp.core;bundle-version="2.0.0"
7	Bundle-Localization: plugin	7	Bundle-Localization: plugin
8	Bundle-Vendor: %pluginProvider	8	Bundle-Vendor: %pluginProvider

Lines 9-16 Link Here

(-)a/releng/org.eclipse.ptp.core-feature/pom.xml (-3 / +3 lines)
9	<relativePath>../../pom.xml</relativePath>	9	<relativePath>../../pom.xml</relativePath>
10	</parent>	10	</parent>
11		11
12	<artifactId>org.eclipse.ptp.core</artifactId>
13	<version>5.0.4-SNAPSHOT</version>
14	<packaging>eclipse-feature</packaging>
15	<groupId>org.eclipse.ptp.features</groupId>	12	<groupId>org.eclipse.ptp.features</groupId>
		13	<artifactId>org.eclipse.ptp.core</artifactId>
		14	<version>5.0.5-SNAPSHOT</version>
		15	<packaging>eclipse-feature</packaging>
16	</project>	16	</project>

Lines 9-16 Link Here

(-)a/releng/org.eclipse.ptp.etfw-feature/pom.xml (-3 / +3 lines)
9	<relativePath>../../pom.xml</relativePath>	9	<relativePath>../../pom.xml</relativePath>
10	</parent>	10	</parent>
11		11
12	<artifactId>org.eclipse.ptp.etfw</artifactId>
13	<version>5.0.4-SNAPSHOT</version>
14	<packaging>eclipse-feature</packaging>
15	<groupId>org.eclipse.ptp.features</groupId>	12	<groupId>org.eclipse.ptp.features</groupId>
		13	<artifactId>org.eclipse.ptp.etfw</artifactId>
		14	<version>5.0.5-SNAPSHOT</version>
		15	<packaging>eclipse-feature</packaging>
16	</project>	16	</project>

Lines 9-16 Link Here

(-)a/releng/org.eclipse.ptp.etfw.ppw-feature/pom.xml (-3 / +3 lines)
9	<relativePath>../../pom.xml</relativePath>	9	<relativePath>../../pom.xml</relativePath>
10	</parent>	10	</parent>
11		11
12	<artifactId>org.eclipse.ptp.etfw.ppw</artifactId>
13	<version>5.0.4-SNAPSHOT</version>
14	<packaging>eclipse-feature</packaging>
15	<groupId>org.eclipse.ptp.features</groupId>	12	<groupId>org.eclipse.ptp.features</groupId>
		13	<artifactId>org.eclipse.ptp.etfw.ppw</artifactId>
		14	<version>5.0.5-SNAPSHOT</version>
		15	<packaging>eclipse-feature</packaging>
16	</project>	16	</project>

Lines 9-16 Link Here

(-)a/releng/org.eclipse.ptp.etfw.tau-feature/pom.xml (-3 / +3 lines)
9	<relativePath>../../pom.xml</relativePath>	9	<relativePath>../../pom.xml</relativePath>
10	</parent>	10	</parent>
11		11
12	<artifactId>org.eclipse.ptp.etfw.tau</artifactId>
13	<version>5.0.4-SNAPSHOT</version>
14	<packaging>eclipse-feature</packaging>
15	<groupId>org.eclipse.ptp.features</groupId>	12	<groupId>org.eclipse.ptp.features</groupId>
		13	<artifactId>org.eclipse.ptp.etfw.tau</artifactId>
		14	<version>5.0.5-SNAPSHOT</version>
		15	<packaging>eclipse-feature</packaging>
16	</project>	16	</project>

Lines 9-16 Link Here

(-)a/releng/org.eclipse.ptp.etfw.tau.fortran-feature/pom.xml (-3 / +3 lines)
9	<relativePath>../../pom.xml</relativePath>	9	<relativePath>../../pom.xml</relativePath>
10	</parent>	10	</parent>
11		11
12	<artifactId>org.eclipse.ptp.etfw.tau.fortran</artifactId>
13	<version>5.0.4-SNAPSHOT</version>
14	<packaging>eclipse-feature</packaging>
15	<groupId>org.eclipse.ptp.features</groupId>	12	<groupId>org.eclipse.ptp.features</groupId>
		13	<artifactId>org.eclipse.ptp.etfw.tau.fortran</artifactId>
		14	<version>5.0.5-SNAPSHOT</version>
		15	<packaging>eclipse-feature</packaging>
16	</project>	16	</project>

Lines 9-16 Link Here

(-)a/releng/org.eclipse.ptp.external-feature/pom.xml (-3 / +3 lines)
9	<relativePath>../../pom.xml</relativePath>	9	<relativePath>../../pom.xml</relativePath>
10	</parent>	10	</parent>
11		11
12	<artifactId>org.eclipse.ptp.external</artifactId>
13	<version>5.0.4-SNAPSHOT</version>
14	<packaging>eclipse-feature</packaging>
15	<groupId>org.eclipse.ptp.features</groupId>	12	<groupId>org.eclipse.ptp.features</groupId>
		13	<artifactId>org.eclipse.ptp.external</artifactId>
		14	<version>5.0.5-SNAPSHOT</version>
		15	<packaging>eclipse-feature</packaging>
16	</project>	16	</project>

Lines 9-16 Link Here

(-)a/releng/org.eclipse.ptp.gem-feature/pom.xml (-3 / +3 lines)
9	<relativePath>../../pom.xml</relativePath>	9	<relativePath>../../pom.xml</relativePath>
10	</parent>	10	</parent>
11		11
12	<artifactId>org.eclipse.ptp.gem</artifactId>
13	<version>5.0.4-SNAPSHOT</version>
14	<packaging>eclipse-feature</packaging>
15	<groupId>org.eclipse.ptp.features</groupId>	12	<groupId>org.eclipse.ptp.features</groupId>
		13	<artifactId>org.eclipse.ptp.gem</artifactId>
		14	<version>5.0.5-SNAPSHOT</version>
		15	<packaging>eclipse-feature</packaging>
16	</project>	16	</project>

Lines 2-8 Link Here

(-)a/releng/org.eclipse.ptp.linux.ppc/META-INF/MANIFEST.MF (-1 / +1 lines)
2	Bundle-ManifestVersion: 2	2	Bundle-ManifestVersion: 2
3	Bundle-Name: %fragmentName.linux.ppc	3	Bundle-Name: %fragmentName.linux.ppc
4	Bundle-SymbolicName: org.eclipse.ptp.linux.ppc;singleton:=true	4	Bundle-SymbolicName: org.eclipse.ptp.linux.ppc;singleton:=true
5	Bundle-Version: 5.0.4.qualifier	5	Bundle-Version: 5.0.5.qualifier
6	Fragment-Host: org.eclipse.ptp.core;bundle-version="2.0.0"	6	Fragment-Host: org.eclipse.ptp.core;bundle-version="2.0.0"
7	Bundle-Localization: plugin	7	Bundle-Localization: plugin
8	Bundle-Vendor: %pluginProvider	8	Bundle-Vendor: %pluginProvider

Lines 2-8 Link Here

(-)a/releng/org.eclipse.ptp.linux.x86/META-INF/MANIFEST.MF (-1 / +1 lines)
2	Bundle-ManifestVersion: 2	2	Bundle-ManifestVersion: 2
3	Bundle-Name: %fragmentName.linux.x86	3	Bundle-Name: %fragmentName.linux.x86
4	Bundle-SymbolicName: org.eclipse.ptp.linux.x86;singleton:=true	4	Bundle-SymbolicName: org.eclipse.ptp.linux.x86;singleton:=true
5	Bundle-Version: 5.0.4.qualifier	5	Bundle-Version: 5.0.5.qualifier
6	Fragment-Host: org.eclipse.ptp.core;bundle-version="2.0.0"	6	Fragment-Host: org.eclipse.ptp.core;bundle-version="2.0.0"
7	Bundle-Localization: plugin	7	Bundle-Localization: plugin
8	Bundle-Vendor: %pluginProvider	8	Bundle-Vendor: %pluginProvider

Lines 2-8 Link Here

(-)a/releng/org.eclipse.ptp.linux.x86_64/META-INF/MANIFEST.MF (-1 / +1 lines)
2	Bundle-ManifestVersion: 2	2	Bundle-ManifestVersion: 2
3	Bundle-Name: %fragmentName.linux.x86_64	3	Bundle-Name: %fragmentName.linux.x86_64
4	Bundle-SymbolicName: org.eclipse.ptp.linux.x86_64;singleton:=true	4	Bundle-SymbolicName: org.eclipse.ptp.linux.x86_64;singleton:=true
5	Bundle-Version: 5.0.4.qualifier	5	Bundle-Version: 5.0.5.qualifier
6	Fragment-Host: org.eclipse.ptp.core;bundle-version="2.0.0"	6	Fragment-Host: org.eclipse.ptp.core;bundle-version="2.0.0"
7	Bundle-Localization: plugin	7	Bundle-Localization: plugin
8	Bundle-Vendor: %pluginProvider	8	Bundle-Vendor: %pluginProvider

Lines 2-8 Link Here

(-)a/releng/org.eclipse.ptp.macosx.ppc/META-INF/MANIFEST.MF (-1 / +1 lines)
2	Bundle-ManifestVersion: 2	2	Bundle-ManifestVersion: 2
3	Bundle-Name: %fragmentName.macosx.ppc	3	Bundle-Name: %fragmentName.macosx.ppc
4	Bundle-SymbolicName: org.eclipse.ptp.macosx.ppc;singleton:=true	4	Bundle-SymbolicName: org.eclipse.ptp.macosx.ppc;singleton:=true
5	Bundle-Version: 5.0.4.qualifier	5	Bundle-Version: 5.0.5.qualifier
6	Fragment-Host: org.eclipse.ptp.core;bundle-version="2.0.0"	6	Fragment-Host: org.eclipse.ptp.core;bundle-version="2.0.0"
7	Bundle-Localization: plugin	7	Bundle-Localization: plugin
8	Bundle-Vendor: %pluginProvider	8	Bundle-Vendor: %pluginProvider

Lines 2-8 Link Here

(-)a/releng/org.eclipse.ptp.macosx.x86/META-INF/MANIFEST.MF (-1 / +1 lines)
2	Bundle-ManifestVersion: 2	2	Bundle-ManifestVersion: 2
3	Bundle-Name: %fragmentName.macosx.x86	3	Bundle-Name: %fragmentName.macosx.x86
4	Bundle-SymbolicName: org.eclipse.ptp.macosx.x86;singleton:=true	4	Bundle-SymbolicName: org.eclipse.ptp.macosx.x86;singleton:=true
5	Bundle-Version: 5.0.4.qualifier	5	Bundle-Version: 5.0.5.qualifier
6	Fragment-Host: org.eclipse.ptp.core;bundle-version="2.0.0"	6	Fragment-Host: org.eclipse.ptp.core;bundle-version="2.0.0"
7	Bundle-Localization: plugin	7	Bundle-Localization: plugin
8	Bundle-Vendor: %pluginProvider	8	Bundle-Vendor: %pluginProvider

Lines 9-16 Link Here

(-)a/releng/org.eclipse.ptp.pldt-feature/pom.xml (-3 / +3 lines)
9	<relativePath>../../pom.xml</relativePath>	9	<relativePath>../../pom.xml</relativePath>
10	</parent>	10	</parent>
11		11
12	<artifactId>org.eclipse.ptp.pldt</artifactId>
13	<version>5.0.4-SNAPSHOT</version>
14	<packaging>eclipse-feature</packaging>
15	<groupId>org.eclipse.ptp.features</groupId>	12	<groupId>org.eclipse.ptp.features</groupId>
		13	<artifactId>org.eclipse.ptp.pldt</artifactId>
		14	<version>5.0.5-SNAPSHOT</version>
		15	<packaging>eclipse-feature</packaging>
16	</project>	16	</project>

Lines 10-17 Link Here

(-)a/releng/org.eclipse.ptp.pldt.fortran-feature/pom.xml (-3 / +3 lines)
10	<relativePath>../../pom.xml</relativePath>	10	<relativePath>../../pom.xml</relativePath>
11	</parent>	11	</parent>
12		12
13	<artifactId>org.eclipse.ptp.pldt.fortran</artifactId>
14	<version>5.0.4-SNAPSHOT</version>
15	<packaging>eclipse-feature</packaging>
16	<groupId>org.eclipse.ptp.features</groupId>	13	<groupId>org.eclipse.ptp.features</groupId>
		14	<artifactId>org.eclipse.ptp.pldt.fortran</artifactId>
		15	<version>5.0.5-SNAPSHOT</version>
		16	<packaging>eclipse-feature</packaging>
17	</project>	17	</project>

Lines 9-16 Link Here

(-)a/releng/org.eclipse.ptp.pldt.lapi-feature/pom.xml (-3 / +3 lines)
9	<relativePath>../../pom.xml</relativePath>	9	<relativePath>../../pom.xml</relativePath>
10	</parent>	10	</parent>
11		11
12	<artifactId>org.eclipse.ptp.pldt.lapi</artifactId>
13	<version>5.0.4-SNAPSHOT</version>
14	<packaging>eclipse-feature</packaging>
15	<groupId>org.eclipse.ptp.features</groupId>	12	<groupId>org.eclipse.ptp.features</groupId>
		13	<artifactId>org.eclipse.ptp.pldt.lapi</artifactId>
		14	<version>5.0.5-SNAPSHOT</version>
		15	<packaging>eclipse-feature</packaging>
16	</project>	16	</project>

Lines 9-16 Link Here

(-)a/releng/org.eclipse.ptp.pldt.upc-feature/pom.xml (-3 / +3 lines)
9	<relativePath>../../pom.xml</relativePath>	9	<relativePath>../../pom.xml</relativePath>
10	</parent>	10	</parent>
11		11
12	<artifactId>org.eclipse.ptp.pldt.upc</artifactId>
13	<version>5.0.4-SNAPSHOT</version>
14	<packaging>eclipse-feature</packaging>
15	<groupId>org.eclipse.ptp.features</groupId>	12	<groupId>org.eclipse.ptp.features</groupId>
		13	<artifactId>org.eclipse.ptp.pldt.upc</artifactId>
		14	<version>5.0.5-SNAPSHOT</version>
		15	<packaging>eclipse-feature</packaging>
16	</project>	16	</project>

Lines 9-16 Link Here

(-)a/releng/org.eclipse.ptp.rdt-feature/pom.xml (-3 / +3 lines)
9	<relativePath>../../pom.xml</relativePath>	9	<relativePath>../../pom.xml</relativePath>
10	</parent>	10	</parent>
11		11
12	<artifactId>org.eclipse.ptp.rdt</artifactId>
13	<version>5.0.4-SNAPSHOT</version>
14	<packaging>eclipse-feature</packaging>
15	<groupId>org.eclipse.ptp.features</groupId>	12	<groupId>org.eclipse.ptp.features</groupId>
		13	<artifactId>org.eclipse.ptp.rdt</artifactId>
		14	<version>5.0.5-SNAPSHOT</version>
		15	<packaging>eclipse-feature</packaging>
16	</project>	16	</project>

Lines 9-16 Link Here

(-)a/releng/org.eclipse.ptp.rdt.remotejars-feature/pom.xml (-3 / +3 lines)
9	<relativePath>../../pom.xml</relativePath>	9	<relativePath>../../pom.xml</relativePath>
10	</parent>	10	</parent>
11		11
12	<artifactId>org.eclipse.ptp.rdt.remotejars</artifactId>
13	<version>5.0.4-SNAPSHOT</version>
14	<packaging>eclipse-feature</packaging>
15	<groupId>org.eclipse.ptp.features</groupId>	12	<groupId>org.eclipse.ptp.features</groupId>
		13	<artifactId>org.eclipse.ptp.rdt.remotejars</artifactId>
		14	<version>5.0.5-SNAPSHOT</version>
		15	<packaging>eclipse-feature</packaging>
16	</project>	16	</project>

Lines 9-16 Link Here

(-)a/releng/org.eclipse.ptp.rdt.remotetools-feature/pom.xml (-3 / +3 lines)
9	<relativePath>../../pom.xml</relativePath>	9	<relativePath>../../pom.xml</relativePath>
10	</parent>	10	</parent>
11		11
12	<artifactId>org.eclipse.ptp.rdt.remotetools</artifactId>
13	<version>5.0.4-SNAPSHOT</version>
14	<packaging>eclipse-feature</packaging>
15	<groupId>org.eclipse.ptp.features</groupId>	12	<groupId>org.eclipse.ptp.features</groupId>
		13	<artifactId>org.eclipse.ptp.rdt.remotetools</artifactId>
		14	<version>5.0.5-SNAPSHOT</version>
		15	<packaging>eclipse-feature</packaging>
16	</project>	16	</project>

Lines 9-16 Link Here

(-)a/releng/org.eclipse.ptp.rdt.sync-feature/pom.xml (-3 / +3 lines)
9	<relativePath>../../pom.xml</relativePath>	9	<relativePath>../../pom.xml</relativePath>
10	</parent>	10	</parent>
11		11
12	<artifactId>org.eclipse.ptp.rdt.sync</artifactId>
13	<version>5.0.4-SNAPSHOT</version>
14	<packaging>eclipse-feature</packaging>
15	<groupId>org.eclipse.ptp.features</groupId>	12	<groupId>org.eclipse.ptp.features</groupId>
		13	<artifactId>org.eclipse.ptp.rdt.sync</artifactId>
		14	<version>5.0.5-SNAPSHOT</version>
		15	<packaging>eclipse-feature</packaging>
16	</project>	16	</project>

Lines 9-16 Link Here

(-)a/releng/org.eclipse.ptp.rdt.sync.fortran-feature/pom.xml (-3 / +3 lines)
9	<relativePath>../../pom.xml</relativePath>	9	<relativePath>../../pom.xml</relativePath>
10	</parent>	10	</parent>
11		11
12	<artifactId>org.eclipse.ptp.rdt.sync.fortran</artifactId>
13	<version>5.0.4-SNAPSHOT</version>
14	<packaging>eclipse-feature</packaging>
15	<groupId>org.eclipse.ptp.features</groupId>	12	<groupId>org.eclipse.ptp.features</groupId>
		13	<artifactId>org.eclipse.ptp.rdt.sync.fortran</artifactId>
		14	<version>5.0.5-SNAPSHOT</version>
		15	<packaging>eclipse-feature</packaging>
16	</project>	16	</project>

Lines 9-16 Link Here

(-)a/releng/org.eclipse.ptp.rdt.xlc-feature/pom.xml (-3 / +3 lines)
9	<relativePath>../../pom.xml</relativePath>	9	<relativePath>../../pom.xml</relativePath>
10	</parent>	10	</parent>
11		11
12	<artifactId>org.eclipse.ptp.rdt.xlc</artifactId>
13	<version>5.0.4-SNAPSHOT</version>
14	<packaging>eclipse-feature</packaging>
15	<groupId>org.eclipse.ptp.features</groupId>	12	<groupId>org.eclipse.ptp.features</groupId>
		13	<artifactId>org.eclipse.ptp.rdt.xlc</artifactId>
		14	<version>5.0.5-SNAPSHOT</version>
		15	<packaging>eclipse-feature</packaging>
16	</project>	16	</project>

Lines 9-16 Link Here

(-)a/releng/org.eclipse.ptp.remote-feature/pom.xml (-3 / +3 lines)
9	<relativePath>../../pom.xml</relativePath>	9	<relativePath>../../pom.xml</relativePath>
10	</parent>	10	</parent>
11		11
12	<artifactId>org.eclipse.ptp.remote</artifactId>
13	<version>5.0.4-SNAPSHOT</version>
14	<packaging>eclipse-feature</packaging>
15	<groupId>org.eclipse.ptp.features</groupId>	12	<groupId>org.eclipse.ptp.features</groupId>
		13	<artifactId>org.eclipse.ptp.remote</artifactId>
		14	<version>5.0.5-SNAPSHOT</version>
		15	<packaging>eclipse-feature</packaging>
16	</project>	16	</project>

Lines 9-16 Link Here

(-)a/releng/org.eclipse.ptp.remote.remotetools-feature/pom.xml (-3 / +3 lines)
9	<relativePath>../../pom.xml</relativePath>	9	<relativePath>../../pom.xml</relativePath>
10	</parent>	10	</parent>
11		11
12	<artifactId>org.eclipse.ptp.remote.remotetools</artifactId>
13	<version>5.0.4-SNAPSHOT</version>
14	<packaging>eclipse-feature</packaging>
15	<groupId>org.eclipse.ptp.features</groupId>	12	<groupId>org.eclipse.ptp.features</groupId>
		13	<artifactId>org.eclipse.ptp.remote.remotetools</artifactId>
		14	<version>5.0.5-SNAPSHOT</version>
		15	<packaging>eclipse-feature</packaging>
16	</project>	16	</project>

Lines 9-16 Link Here

(-)a/releng/org.eclipse.ptp.remote.rse-feature/pom.xml (-3 / +3 lines)
9	<relativePath>../../pom.xml</relativePath>	9	<relativePath>../../pom.xml</relativePath>
10	</parent>	10	</parent>
11		11
12	<artifactId>org.eclipse.ptp.remote.rse</artifactId>
13	<version>5.0.4-SNAPSHOT</version>
14	<packaging>eclipse-feature</packaging>
15	<groupId>org.eclipse.ptp.features</groupId>	12	<groupId>org.eclipse.ptp.features</groupId>
		13	<artifactId>org.eclipse.ptp.remote.rse</artifactId>
		14	<version>5.0.5-SNAPSHOT</version>
		15	<packaging>eclipse-feature</packaging>
16	</project>	16	</project>

Lines 9-16 Link Here

(-)a/releng/org.eclipse.ptp.remotetools-feature/pom.xml (-3 / +3 lines)
9	<relativePath>../../pom.xml</relativePath>	9	<relativePath>../../pom.xml</relativePath>
10	</parent>	10	</parent>
11		11
12	<artifactId>org.eclipse.ptp.remotetools</artifactId>
13	<version>5.0.4-SNAPSHOT</version>
14	<packaging>eclipse-feature</packaging>
15	<groupId>org.eclipse.ptp.features</groupId>	12	<groupId>org.eclipse.ptp.features</groupId>
		13	<artifactId>org.eclipse.ptp.remotetools</artifactId>
		14	<version>5.0.5-SNAPSHOT</version>
		15	<packaging>eclipse-feature</packaging>
16	</project>	16	</project>

Lines 67-72 Link Here

(-)a/releng/org.eclipse.ptp.repo/fixPom.xsl (+3 lines)
67	<xsl:template match="p:version[preceding-sibling::p:artifactId='org.eclipse.ptp']">	67	<xsl:template match="p:version[preceding-sibling::p:artifactId='org.eclipse.ptp']">
68	<version><xsl:value-of select="$newVersion"/>-SNAPSHOT</version>	68	<version><xsl:value-of select="$newVersion"/>-SNAPSHOT</version>
69	</xsl:template>	69	</xsl:template>
		70	<xsl:template match="p:version[preceding-sibling::p:artifactId='org.eclipse.ptp.rdt.remotejars']">
		71	<version><xsl:value-of select="$newVersion"/>-SNAPSHOT</version>
		72	</xsl:template>
70		73
71	<xsl:template match="@*\|node()">	74	<xsl:template match="@*\|node()">
72	<xsl:copy>	75	<xsl:copy>




	org.eclipse.ptp.services-feature \
	org.eclipse.ptp.utils-feature"

PTP_PLUGINS="\
	releng/org.eclipse.ptp.aix.ppc \
	releng/org.eclipse.ptp.linux.ppc \
	releng/org.eclipse.ptp.linux.x86 \
	releng/org.eclipse.ptp.linux.x86_64 \
	releng/org.eclipse.ptp.macosx.ppc \
	releng/org.eclipse.ptp.macosx.x86 \
	releng/org.eclipse.ptp \
	debug/org.eclipse.ptp.debug.sdm \
	core/org.eclipse.ptp.utils \
	core/org.eclipse.ptp.proxy \
	rms/org.eclipse.ptp.rm.ibm.pe.proxy \
	rms/org.eclipse.ptp.rm.ibm.ll.proxy \
	rms/org.eclipse.ptp.rm.slurm.proxy \
	tools/sci/org.eclipse.ptp.sci \
	rdt/org.eclipse.ptp.rdt.core.remotejars"
	
update_feature() {
	sed -e "s/^\([ \t]*\)version=\"[0-9]\.[0-9]\.[0-9]\.qualifier\"/\1version=\"$2\.qualifier\"/" < releng/$1/feature.xml > $TMP_DIR/${1}_feature.xml
	mv $TMP_DIR/${1}_feature.xml releng/$1/feature.xml
}

update_manifest() {
	sed -e "s/^Bundle-Version: *[0-9]\.[0-9]\.[0-9]\.qualifier/Bundle-Version: $2.qualifier/" < $1/META-INF/MANIFEST.MF > $TMP_DIR/${1}_MANIFEST.MF
	mv $TMP_DIR/${1}_MANIFEST.MF $1/META-INF/MANIFEST.MF
}

for feature in $PTP_FEATURES; do
	echo "Updating $feature..."
	update_feature $feature $ptp_version
done

for plugin in $PTP_PLUGINS; do
	echo "Updating $plugin..."
	update_manifest $plugin $ptp_version
done

(cd releng/org.eclipse.ptp.repo && ant -DnewVersion="$ptp_version" -f fixModules.xml)

exit 0

Lines 9-16 Link Here

(-)a/releng/org.eclipse.ptp.rm.ibm.ll-feature/pom.xml (-3 / +3 lines)
9	<relativePath>../../pom.xml</relativePath>	9	<relativePath>../../pom.xml</relativePath>
10	</parent>	10	</parent>
11		11
12	<artifactId>org.eclipse.ptp.rm.ibm.ll</artifactId>
13	<version>5.0.4-SNAPSHOT</version>
14	<packaging>eclipse-feature</packaging>
15	<groupId>org.eclipse.ptp.features</groupId>	12	<groupId>org.eclipse.ptp.features</groupId>
		13	<artifactId>org.eclipse.ptp.rm.ibm.ll</artifactId>
		14	<version>5.0.5-SNAPSHOT</version>
		15	<packaging>eclipse-feature</packaging>
16	</project>	16	</project>

Lines 9-16 Link Here

(-)a/releng/org.eclipse.ptp.rm.ibm.pe-feature/pom.xml (-3 / +3 lines)
9	<relativePath>../../pom.xml</relativePath>	9	<relativePath>../../pom.xml</relativePath>
10	</parent>	10	</parent>
11		11
12	<artifactId>org.eclipse.ptp.rm.ibm.pe</artifactId>
13	<version>5.0.4-SNAPSHOT</version>
14	<packaging>eclipse-feature</packaging>
15	<groupId>org.eclipse.ptp.features</groupId>	12	<groupId>org.eclipse.ptp.features</groupId>
		13	<artifactId>org.eclipse.ptp.rm.ibm.pe</artifactId>
		14	<version>5.0.5-SNAPSHOT</version>
		15	<packaging>eclipse-feature</packaging>
16	</project>	16	</project>

Lines 9-16 Link Here

(-)a/releng/org.eclipse.ptp.rm.jaxb-feature/pom.xml (-3 / +3 lines)
9	<relativePath>../../pom.xml</relativePath>	9	<relativePath>../../pom.xml</relativePath>
10	</parent>	10	</parent>
11		11
12	<artifactId>org.eclipse.ptp.rm.jaxb</artifactId>
13	<version>5.0.4-SNAPSHOT</version>
14	<packaging>eclipse-feature</packaging>
15	<groupId>org.eclipse.ptp.features</groupId>	12	<groupId>org.eclipse.ptp.features</groupId>
		13	<artifactId>org.eclipse.ptp.rm.jaxb</artifactId>
		14	<version>5.0.5-SNAPSHOT</version>
		15	<packaging>eclipse-feature</packaging>
16	</project>	16	</project>

Lines 9-16 Link Here

(-)a/releng/org.eclipse.ptp.rm.jaxb.contrib-feature/pom.xml (-3 / +3 lines)
9	<relativePath>../../pom.xml</relativePath>	9	<relativePath>../../pom.xml</relativePath>
10	</parent>	10	</parent>
11		11
12	<artifactId>org.eclipse.ptp.rm.jaxb.contrib</artifactId>
13	<version>5.0.4-SNAPSHOT</version>
14	<packaging>eclipse-feature</packaging>
15	<groupId>org.eclipse.ptp.features</groupId>	12	<groupId>org.eclipse.ptp.features</groupId>
		13	<artifactId>org.eclipse.ptp.rm.jaxb.contrib</artifactId>
		14	<version>5.0.5-SNAPSHOT</version>
		15	<packaging>eclipse-feature</packaging>
16	</project>	16	</project>

Lines 9-16 Link Here

(-)a/releng/org.eclipse.ptp.rm.jaxb.pbs-feature/pom.xml (-3 / +3 lines)
9	<relativePath>../../pom.xml</relativePath>	9	<relativePath>../../pom.xml</relativePath>
10	</parent>	10	</parent>
11		11
12	<artifactId>org.eclipse.ptp.rm.jaxb.pbs</artifactId>
13	<version>5.0.4-SNAPSHOT</version>
14	<packaging>eclipse-feature</packaging>
15	<groupId>org.eclipse.ptp.features</groupId>	12	<groupId>org.eclipse.ptp.features</groupId>
		13	<artifactId>org.eclipse.ptp.rm.jaxb.pbs</artifactId>
		14	<version>5.0.5-SNAPSHOT</version>
		15	<packaging>eclipse-feature</packaging>
16	</project>	16	</project>

Lines 9-16 Link Here

(-)a/releng/org.eclipse.ptp.rm.lml-feature/pom.xml (-3 / +3 lines)
9	<relativePath>../../pom.xml</relativePath>	9	<relativePath>../../pom.xml</relativePath>
10	</parent>	10	</parent>
11		11
12	<artifactId>org.eclipse.ptp.rm.lml</artifactId>
13	<version>5.0.4-SNAPSHOT</version>
14	<packaging>eclipse-feature</packaging>
15	<groupId>org.eclipse.ptp.features</groupId>	12	<groupId>org.eclipse.ptp.features</groupId>
		13	<artifactId>org.eclipse.ptp.rm.lml</artifactId>
		14	<version>5.0.5-SNAPSHOT</version>
		15	<packaging>eclipse-feature</packaging>
16	</project>	16	</project>

Lines 9-16 Link Here

(-)a/releng/org.eclipse.ptp.rm.lml_jaxb-feature/pom.xml (-3 / +3 lines)
9	<relativePath>../../pom.xml</relativePath>	9	<relativePath>../../pom.xml</relativePath>
10	</parent>	10	</parent>
11		11
12	<artifactId>org.eclipse.ptp.rm.lml_jaxb</artifactId>
13	<version>5.0.4-SNAPSHOT</version>
14	<packaging>eclipse-feature</packaging>
15	<groupId>org.eclipse.ptp.features</groupId>	12	<groupId>org.eclipse.ptp.features</groupId>
		13	<artifactId>org.eclipse.ptp.rm.lml_jaxb</artifactId>
		14	<version>5.0.5-SNAPSHOT</version>
		15	<packaging>eclipse-feature</packaging>
16	</project>	16	</project>

Lines 9-16 Link Here

(-)a/releng/org.eclipse.ptp.rm.mpich2-feature/pom.xml (-3 / +3 lines)
9	<relativePath>../../pom.xml</relativePath>	9	<relativePath>../../pom.xml</relativePath>
10	</parent>	10	</parent>
11		11
12	<artifactId>org.eclipse.ptp.rm.mpich2</artifactId>
13	<version>5.0.4-SNAPSHOT</version>
14	<packaging>eclipse-feature</packaging>
15	<groupId>org.eclipse.ptp.features</groupId>	12	<groupId>org.eclipse.ptp.features</groupId>
		13	<artifactId>org.eclipse.ptp.rm.mpich2</artifactId>
		14	<version>5.0.5-SNAPSHOT</version>
		15	<packaging>eclipse-feature</packaging>
16	</project>	16	</project>

Lines 9-16 Link Here

(-)a/releng/org.eclipse.ptp.rm.openmpi-feature/pom.xml (-3 / +3 lines)
9	<relativePath>../../pom.xml</relativePath>	9	<relativePath>../../pom.xml</relativePath>
10	</parent>	10	</parent>
11		11
12	<artifactId>org.eclipse.ptp.rm.openmpi</artifactId>
13	<version>5.0.4-SNAPSHOT</version>
14	<packaging>eclipse-feature</packaging>
15	<groupId>org.eclipse.ptp.features</groupId>	12	<groupId>org.eclipse.ptp.features</groupId>
		13	<artifactId>org.eclipse.ptp.rm.openmpi</artifactId>
		14	<version>5.0.5-SNAPSHOT</version>
		15	<packaging>eclipse-feature</packaging>
16	</project>	16	</project>

Lines 9-16 Link Here

(-)a/releng/org.eclipse.ptp.rm.slurm-feature/pom.xml (-3 / +3 lines)
9	<relativePath>../../pom.xml</relativePath>	9	<relativePath>../../pom.xml</relativePath>
10	</parent>	10	</parent>
11		11
12	<artifactId>org.eclipse.ptp.rm.slurm</artifactId>
13	<version>5.0.4-SNAPSHOT</version>
14	<packaging>eclipse-feature</packaging>
15	<groupId>org.eclipse.ptp.features</groupId>	12	<groupId>org.eclipse.ptp.features</groupId>
		13	<artifactId>org.eclipse.ptp.rm.slurm</artifactId>
		14	<version>5.0.5-SNAPSHOT</version>
		15	<packaging>eclipse-feature</packaging>
16	</project>	16	</project>

Lines 9-16 Link Here

(-)a/releng/org.eclipse.ptp.sci-feature/pom.xml (-1 / +1 lines)
9	<relativePath>../../pom.xml</relativePath>	9	<relativePath>../../pom.xml</relativePath>
10	</parent>	10	</parent>
11		11
		12	<groupId>org.eclipse.ptp.features</groupId>
12	<artifactId>org.eclipse.ptp.sci</artifactId>	13	<artifactId>org.eclipse.ptp.sci</artifactId>
13	<version>5.0.5-SNAPSHOT</version>	14	<version>5.0.5-SNAPSHOT</version>
14	<packaging>eclipse-feature</packaging>	15	<packaging>eclipse-feature</packaging>
15	<groupId>org.eclipse.ptp.features</groupId>
16	</project>	16	</project>

Lines 9-16 Link Here

(-)a/releng/org.eclipse.ptp.sdk-feature/pom.xml (-3 / +3 lines)
9	<relativePath>../../pom.xml</relativePath>	9	<relativePath>../../pom.xml</relativePath>
10	</parent>	10	</parent>
11		11
12	<artifactId>org.eclipse.ptp.sdk</artifactId>
13	<version>5.0.4-SNAPSHOT</version>
14	<packaging>eclipse-feature</packaging>
15	<groupId>org.eclipse.ptp.features</groupId>	12	<groupId>org.eclipse.ptp.features</groupId>
		13	<artifactId>org.eclipse.ptp.sdk</artifactId>
		14	<version>5.0.5-SNAPSHOT</version>
		15	<packaging>eclipse-feature</packaging>
16	</project>	16	</project>

Lines 9-16 Link Here

(-)a/releng/org.eclipse.ptp.sdm-feature/pom.xml (-1 / +1 lines)
9	<relativePath>../../pom.xml</relativePath>	9	<relativePath>../../pom.xml</relativePath>
10	</parent>	10	</parent>
11		11
		12	<groupId>org.eclipse.ptp.features</groupId>
12	<artifactId>org.eclipse.ptp.debug.sdm</artifactId>	13	<artifactId>org.eclipse.ptp.debug.sdm</artifactId>
13	<version>5.0.5-SNAPSHOT</version>	14	<version>5.0.5-SNAPSHOT</version>
14	<packaging>eclipse-feature</packaging>	15	<packaging>eclipse-feature</packaging>
15	<groupId>org.eclipse.ptp.features</groupId>
16	</project>	16	</project>

Lines 9-16 Link Here

(-)a/releng/org.eclipse.ptp.services-feature/pom.xml (-3 / +3 lines)
9	<relativePath>../../pom.xml</relativePath>	9	<relativePath>../../pom.xml</relativePath>
10	</parent>	10	</parent>
11		11
12	<artifactId>org.eclipse.ptp.services</artifactId>
13	<version>5.0.4-SNAPSHOT</version>
14	<packaging>eclipse-feature</packaging>
15	<groupId>org.eclipse.ptp.features</groupId>	12	<groupId>org.eclipse.ptp.features</groupId>
		13	<artifactId>org.eclipse.ptp.services</artifactId>
		14	<version>5.0.5-SNAPSHOT</version>
		15	<packaging>eclipse-feature</packaging>
16	</project>	16	</project>

Lines 9-16 Link Here

(-)a/releng/org.eclipse.ptp.utils-feature/pom.xml (-1 / +1 lines)
9	<relativePath>../../pom.xml</relativePath>	9	<relativePath>../../pom.xml</relativePath>
10	</parent>	10	</parent>
11		11
		12	<groupId>org.eclipse.ptp.features</groupId>
12	<artifactId>org.eclipse.ptp.utils</artifactId>	13	<artifactId>org.eclipse.ptp.utils</artifactId>
13	<version>5.0.5-SNAPSHOT</version>	14	<version>5.0.5-SNAPSHOT</version>
14	<packaging>eclipse-feature</packaging>	15	<packaging>eclipse-feature</packaging>
15	<groupId>org.eclipse.ptp.features</groupId>
16	</project>	16	</project>

Lines 2-7 Link Here

(-)a/releng/org.eclipse.ptp/META-INF/MANIFEST.MF (-1 / +1 lines)
2	Bundle-ManifestVersion: 2	2	Bundle-ManifestVersion: 2
3	Bundle-Name: %pluginName	3	Bundle-Name: %pluginName
4	Bundle-SymbolicName: org.eclipse.ptp	4	Bundle-SymbolicName: org.eclipse.ptp
5	Bundle-Version: 5.0.4.qualifier	5	Bundle-Version: 5.0.5.qualifier
6	Bundle-Vendor: %providerName	6	Bundle-Vendor: %providerName
7	Bundle-Localization: plugin	7	Bundle-Localization: plugin

Lines 2-8 Link Here

(-)a/rms/org.eclipse.ptp.rm.ibm.ll.proxy/META-INF/MANIFEST.MF (-1 / +1 lines)
2	Bundle-ManifestVersion: 2	2	Bundle-ManifestVersion: 2
3	Bundle-Name: %pluginName	3	Bundle-Name: %pluginName
4	Bundle-SymbolicName: org.eclipse.ptp.rm.ibm.ll.proxy	4	Bundle-SymbolicName: org.eclipse.ptp.rm.ibm.ll.proxy
5	Bundle-Version: 5.0.4.qualifier	5	Bundle-Version: 5.0.5.qualifier
6	Bundle-Localization: plugin	6	Bundle-Localization: plugin
7	Bundle-Vendor: %pluginProvider	7	Bundle-Vendor: %pluginProvider
8	Require-Bundle: org.eclipse.ptp.proxy,	8	Require-Bundle: org.eclipse.ptp.proxy,

Lines 2-8 Link Here

(-)a/rms/org.eclipse.ptp.rm.ibm.pe.proxy/META-INF/MANIFEST.MF (-1 / +1 lines)
2	Bundle-ManifestVersion: 2	2	Bundle-ManifestVersion: 2
3	Bundle-Name: %pluginName	3	Bundle-Name: %pluginName
4	Bundle-SymbolicName: org.eclipse.ptp.rm.ibm.pe.proxy	4	Bundle-SymbolicName: org.eclipse.ptp.rm.ibm.pe.proxy
5	Bundle-Version: 5.0.4.qualifier	5	Bundle-Version: 5.0.5.qualifier
6	Bundle-Vendor: %pluginProvider	6	Bundle-Vendor: %pluginProvider
7	Bundle-Localization: plugin	7	Bundle-Localization: plugin
8	Require-Bundle: org.eclipse.ptp.proxy,	8	Require-Bundle: org.eclipse.ptp.proxy,





	public static final int UNDEFINED = -1;

	public static final int COPY_BUFFER_SIZE = 64 * 1024;
	public static final int STREAM_BUFFER_SIZE = 8 * 1024;
	public static final int EOF = -1;
	public static final long MINUTE_IN_MS = 60 * 60 * 1000;
	public static final long VALIDATE_TIMER = 500;
	public static final long STANDARD_WAIT = 1000;
	public static final int READY_FILE_BLOCK = 60;

	/* CHARACTERS */
	public static final String LEN = "N";//$NON-NLS-1$
	public static final String ZEROSTR = "";//$NON-NLS-1$
	public static final String TAB = "\t"; //$NON-NLS-1$
	public static final String SP = " ";//$NON-NLS-1$
	public static final String EQ = "=";//$NON-NLS-1$
	public static final String QT = "\"";//$NON-NLS-1$
	public static final String QM = "?";//$NON-NLS-1$
	public static final String PD = "#";//$NON-NLS-1$
	public static final String PDRX = "[#]";//$NON-NLS-1$
	public static final String CM = ",";//$NON-NLS-1$
	public static final String CO = ":";//$NON-NLS-1$
	public static final String SC = ";";//$NON-NLS-1$
	public static final String LT = "<"; //$NON-NLS-1$
	public static final String LTS = "</";//$NON-NLS-1$
	public static final String GT = ">";//$NON-NLS-1$
	public static final String GTLT = "><";//$NON-NLS-1$
	public static final String HYPH = "-";//$NON-NLS-1$
	public static final String AT = "@";//$NON-NLS-1$
	public static final String DOL = "$";//$NON-NLS-1$
	public static final String PIP = "|";//$NON-NLS-1$
	public static final String REGPIP = "[|]";//$NON-NLS-1$
	public static final String DOT = ".";//$NON-NLS-1$
	public static final String Z3 = "000";//$NON-NLS-1$
	public static final String OPENP = "(";//$NON-NLS-1$
	public static final String OPENSQ = "[";//$NON-NLS-1$
	public static final String OPENV = "${";//$NON-NLS-1$
	public static final String OPENVRM = "${rm:";//$NON-NLS-1$
	public static final String OPENVLT = "${lt:";//$NON-NLS-1$
	public static final String VRM = "rm:";//$NON-NLS-1$
	public static final String VLC = "lc:";//$NON-NLS-1$
	public static final String CLOSP = ")";//$NON-NLS-1$
	public static final String CLOSSQ = "]";//$NON-NLS-1$
	public static final String CLOSV = "}";//$NON-NLS-1$
	public static final String CLOSVAL = "#value}";//$NON-NLS-1$
	public static final String BKESC = "\\\\";//$NON-NLS-1$
	public static final String BKBKESC = "\\\\\\\\";//$NON-NLS-1$
	public static final String DLESC = "\\$";//$NON-NLS-1$
	public static final String DLESCESC = "\\\\\\$";//$NON-NLS-1$
	public static final String SPESC = "\\\\s";//$NON-NLS-1$
	public static final String LNSEPESC = "\\\\n";//$NON-NLS-1$
	public static final String TBESC = "\\t";//$NON-NLS-1$
	public static final String TBESCESC = "\\\\t";//$NON-NLS-1$
	public static final String LNESC = "\\n";//$NON-NLS-1$
	public static final String RTESC = "\\r";//$NON-NLS-1$
	public static final String LINE_SEP = System.getProperty("line.separator"); //$NON-NLS-1$
	public static final String REMOTE_LINE_SEP = "\n"; //$NON-NLS-1$
	public static final String REMOTE_PATH_SEP = "/"; //$NON-NLS-1$
	public static final String PATH_SEP = System.getProperty("file.separator"); //$NON-NLS-1$

	/* KEY WORDS */
	public static final String TRUE = "true";//$NON-NLS-1$
	public static final String FALSE = "false";//$NON-NLS-1$
	public static final String YES = "yes";//$NON-NLS-1$
	public static final String NO = "no";//$NON-NLS-1$
	public static final String NOT = "not";//$NON-NLS-1$
	public static final String OR = "or";//$NON-NLS-1$
	public static final String AND = "and";//$NON-NLS-1$
	public static final String xEQ = "EQ";//$NON-NLS-1$
	public static final String xLT = "LT";//$NON-NLS-1$
	public static final String xGT = "GT";//$NON-NLS-1$
	public static final String xLE = "LE";//$NON-NLS-1$
	public static final String xGE = "GE";//$NON-NLS-1$
	public static final String GET = "get";//$NON-NLS-1$
	public static final String SET = "set";//$NON-NLS-1$
	public static final String IS = "is";//$NON-NLS-1$
	public static final String CLASS = "class";//$NON-NLS-1$
	public static final String STRING = "string";//$NON-NLS-1$
	public static final String NAME = "name";//$NON-NLS-1$
	public static final String VALUE = "value";//$NON-NLS-1$
	public static final String BASIC = "basic";//$NON-NLS-1$
	public static final String CHOICE = "choice";//$NON-NLS-1$
	public static final String sDEFAULT = "default";//$NON-NLS-1$
	public static final String DESC = "description";//$NON-NLS-1$
	public static final String MAX = "max";//$NON-NLS-1$
	public static final String MIN = "min";//$NON-NLS-1$
	public static final String READONLY = "readOnly";//$NON-NLS-1$
	public static final String STATUS = "status";//$NON-NLS-1$
	public static final String TOOLTIP = "tooltip";//$NON-NLS-1$
	public static final String TYPE = "type";//$NON-NLS-1$
	public static final String VALIDATOR = "validator";//$NON-NLS-1$
	public static final String SELECTED = "visible";//$NON-NLS-1$
	public static final String LOCAL = "local";//$NON-NLS-1$
	public static final String JOB_ID_TAG = "@jobId";//$NON-NLS-1$
	public static final String NAME_TAG = AT + NAME;
	public static final String VALUE_TAG = AT + VALUE;

	/* TYPE MATCHING */
	public static final String NT = "nt";//$NON-NLS-1$
	public static final String BOOL = "bool";//$NON-NLS-1$
	public static final String ET = "et";//$NON-NLS-1$
	public static final String IST = "ist";//$NON-NLS-1$
	public static final String ECTOR = "ector";//$NON-NLS-1$

	/* STANDARD PROPERTIES */
	public static final String ID = "id";//$NON-NLS-1$
	public static final String JAVA_USER_HOME = "user.home";//$NON-NLS-1$
	public static final String JAVA_TMP_DIR = "java.io.tmpdir";//$NON-NLS-1$
	public static final String FILE_SCHEME = "file";//$NON-NLS-1$
	public static final String XMLSchema = "http://www.w3.org/2001/XMLSchema"; //$NON-NLS-1$
	public static final String SCHEMA = "schema/"; //$NON-NLS-1$
	public static final String RM_XSD = SCHEMA + "lgui.xsd";//$NON-NLS-1$
	public static final String JAXB = "JAXB";//$NON-NLS-1$
	public static final String JAXB_CONTEXT = "org.eclipse.ptp.rm.jaxb.core.data";//$NON-NLS-1$
	public static final String RM_CONFIG_PROPS = "rm_configurations.properties";//$NON-NLS-1$
	public static final String RM_XSD_PATH = "rm_schema_path";//$NON-NLS-1$
	public static final String RM_XSD_URL = "rm_schema_url";//$NON-NLS-1$
	public static final String PREV_RM_XSD_PATH = "prev_rm_schema_path";//$NON-NLS-1$
	public static final String EXTERNAL_RM_XSD_PATHS = "external_rm_schema_paths";//$NON-NLS-1$
	public static final String CHECKED_ATTRIBUTES = "checked_attributes";//$NON-NLS-1$
	public static final String SHOW_ONLY_CHECKED = "show_only_checked";//$NON-NLS-1$
	public static final String IS_PRESET = "is_preset";//$NON-NLS-1$
	public static final String SCRIPT_PATH = "script_path";//$NON-NLS-1$
	public static final String SCRIPT = "script";//$NON-NLS-1$
	public static final String SCRIPT_FILE = "managed_file_for_script";//$NON-NLS-1$
	public static final String CSH = "csh";//$NON-NLS-1$
	public static final String SH = ".sh";//$NON-NLS-1$
	public static final String SETENV = "setenv";//$NON-NLS-1$
	public static final String EXPORT = "export";//$NON-NLS-1$
	public static final String DATE_FORMAT = "yyyy/MM/dd HH:mm:ss";//$NON-NLS-1$

	public static final String RESOURCE_MANAGERS = "resourceManagers";//$NON-NLS-1$
	public static final String CUSTOM = "custom";//$NON-NLS-1$
	public static final String CONTROL_USER_NAME = "controlUserName";//$NON-NLS-1$
	public static final String MONITOR_USER_NAME = "monitorUserName";//$NON-NLS-1$
	public static final String CONTROL_CONNECTION_NAME = "controlConnectionName";//$NON-NLS-1$
	public static final String MONITOR_CONNECTION_NAME = "monitorConnectionName";//$NON-NLS-1$
	public static final String LOCALHOST = "localhost";//$NON-NLS-1$
	public static final String CONTROL_PATH = "controlPath"; //$NON-NLS-1$
	public static final String MONITOR_PATH = "monitorPath"; //$NON-NLS-1$
	public static final String CONTROL_OPTIONS = "controlOptions"; //$NON-NLS-1$
	public static final String MONITOR_OPTIONS = "monitorOptions"; //$NON-NLS-1$
	public static final String CONTROL_INVOCATION_OPTIONS = "controlInvocationOptions"; //$NON-NLS-1$
	public static final String MONITOR_INVOCATION_OPTIONS = "monitorInvocationOptions"; //$NON-NLS-1$
	public static final String CONTROL_ADDRESS = "controlAddress"; //$NON-NLS-1$
	public static final String LOCAL_ADDRESS = "localAddress"; //$NON-NLS-1$
	public static final String MONITOR_ADDRESS = "monitorAddress"; //$NON-NLS-1$
	public static final String CONTROL_USER_VAR = "control.user.name";//$NON-NLS-1$
	public static final String CONTROL_ADDRESS_VAR = "control.address";//$NON-NLS-1$
	public static final String MONITOR_USER_VAR = "monitor.user.name";//$NON-NLS-1$
	public static final String MONITOR_ADDRESS_VAR = "monitor.address";//$NON-NLS-1$
	public static final String ARPA = ".in-addr.arpa";//$NON-NLS-1$
	public static final String ECLIPSESETTINGS = ".eclipsesettings";//$NON-NLS-1$
	public static final String DEBUG_PACKAGE = "org.eclipse.debug";//$NON-NLS-1$
	public static final String PTP_PACKAGE = "org.eclipse.ptp";//$NON-NLS-1$

	//	public static final String STARTUP = "OnStartUp";//$NON-NLS-1$
	//	public static final String SHUTDOWN = "OnShutDown";//$NON-NLS-1$
	//	public static final String DISCATTR = "DiscoverAttributes";//$NON-NLS-1$
	//	public static final String JOBSTATUS = "GetJobStatus";//$NON-NLS-1$
	//	public static final String VALIDATE = "ValidateJob";//$NON-NLS-1$

	public static final String JOB_ATTRIBUTE = "jobAttribute";//$NON-NLS-1$
	public static final String ATTRIBUTE = "attribute";//$NON-NLS-1$
	public static final String PROPERTY = "property";//$NON-NLS-1$
	public static final String QUEUES = "available_queues";//$NON-NLS-1$
	public static final String JOB_ID = "job_id";//$NON-NLS-1$
	public static final String RM_ID = "rm_id";//$NON-NLS-1$
	public static final String STDOUT_REMOTE_FILE = "stdout_remote_path";//$NON-NLS-1$
	public static final String STDERR_REMOTE_FILE = "stderr_remote_path";//$NON-NLS-1$
	public static final String EXEC_PATH = "executablePath";//$NON-NLS-1$
	public static final String PROG_ARGS = "progArgs";//$NON-NLS-1$
	public static final String DIRECTORY = "directory";//$NON-NLS-1$
	public static final String MPI_CMD = "mpiCommand";//$NON-NLS-1$
	public static final String MPI_ARGS = "mpiArgs";//$NON-NLS-1$

	public static final String CASE_INSENSITIVE = "CASE_INSENSITIVE";//$NON-NLS-1$
	public static final String MULTILINE = "MULTILINE";//$NON-NLS-1$
	public static final String DOTALL = "DOTALL";//$NON-NLS-1$
	public static final String UNICODE_CASE = "UNICODE_CASE";//$NON-NLS-1$
	public static final String CANON_EQ = "CANON_EQ";//$NON-NLS-1$
	public static final String LITERAL = "LITERAL";//$NON-NLS-1$
	public static final String COMMENTS = "COMMENTS";//$NON-NLS-1$

	public static final String DOT_XML = ".xml";//$NON-NLS-1$
	public static final String TOKENIZER_EXT_PT = "streamParserTokenizer";//$NON-NLS-1$
	public static final String TAIL = "tail";//$NON-NLS-1$
	public static final String MINUS_F = "-F";//$NON-NLS-1$
	public static final String CONFIGURATION_FILE_ATTRIBUTE = "configurationFile"; //$NON-NLS-1$
	public static final String RM_CONFIG_EXTENSION_POINT = "org.eclipse.ptp.rm.jaxb.core.JAXBResourceManagerConfigurations"; //$NON-NLS-1$
	public static final String IMPORTED_JAXB_CONFIG = "org.eclipse.ptp.rm.jaxb.ImportedConfigurations"; //$NON-NLS-1$
	/*
	 * EFS Attributes
	 */
	public static final String ATTRIBUTE_READ_ONLY = "ATTRIBUTE_READ_ONLY";//$NON-NLS-1$
	public static final String ATTRIBUTE_IMMUTABLE = "ATTRIBUTE_IMMUTABLE";//$NON-NLS-1$
	public static final String ATTRIBUTE_OWNER_READ = "ATTRIBUTE_OWNER_READ";//$NON-NLS-1$
	public static final String ATTRIBUTE_OWNER_WRITE = "ATTRIBUTE_OWNER_WRITE";//$NON-NLS-1$
	public static final String ATTRIBUTE_OWNER_EXECUTE = "ATTRIBUTE_OWNER_EXECUTE";//$NON-NLS-1$
	public static final String ATTRIBUTE_GROUP_READ = "ATTRIBUTE_GROUP_READ";//$NON-NLS-1$
	public static final String ATTRIBUTE_GROUP_WRITE = "ATTRIBUTE_GROUP_WRITE";//$NON-NLS-1$
	public static final String ATTRIBUTE_GROUP_EXECUTE = "ATTRIBUTE_GROUP_EXECUTE";//$NON-NLS-1$
	public static final String ATTRIBUTE_OTHER_READ = "ATTRIBUTE_OTHER_READ";//$NON-NLS-1$
	public static final String ATTRIBUTE_OTHER_WRITE = "ATTRIBUTE_OTHER_WRITE";//$NON-NLS-1$
	public static final String ATTRIBUTE_OTHER_EXECUTE = "ATTRIBUTE_OTHER_EXECUTE";//$NON-NLS-1$
	public static final String ATTRIBUTE_EXECUTABLE = "ATTRIBUTE_EXECUTABLE";//$NON-NLS-1$
	public static final String ATTRIBUTE_ARCHIVE = "ATTRIBUTE_ARCHIVE";//$NON-NLS-1$
	public static final String ATTRIBUTE_HIDDEN = "ATTRIBUTE_HIDDEN";//$NON-NLS-1$
	public static final String ATTRIBUTE_SYMLINK = "ATTRIBUTE_SYMLINK";//$NON-NLS-1$
	public static final String ATTRIBUTE_LINK_TARGET = "ATTRIBUTE_LINK_TARGET";//$NON-NLS-1$

	/*
	 * IRemoteProcessBuilder
	 */
	public static final String TAG_NONE = "NONE";//$NON-NLS-1$
	public static final String TAG_ALLOCATE_PTY = "ALLOCATE_PTY";//$NON-NLS-1$
	public static final String TAG_FORWARD_X11 = "FORWARD_X11";//$NON-NLS-1$

	/*
	 * Element keywords
	 */
	public static String INCLUDE_ELEMENT = "include"; //$NON-NLS-1$
	public static String TABLE_ELEMENT = "table"; //$NON-NLS-1$
	public static String USAGEBAR_ELEMENT = "usagebar"; //$NON-NLS-1$
	public static String TEXT_ELEMENT = "text"; //$NON-NLS-1$
	public static String INFOBOX_ELEMENT = "infobox"; //$NON-NLS-1$
	public static String CHART_ELEMENT = "chart"; //$NON-NLS-1$
	public static String CHARTGROUP_ELEMENT = "chartgroup"; //$NON-NLS-1$
	public static String NODEDISPLAY_ELEMENT = "nodedisplay"; //$NON-NLS-1$
	public static String ABSLAYOUT_ELEMENT = "abslayout"; //$NON-NLS-1$
	public static String SPLITLAYOUT_ELEMENT = "splitlayout"; //$NON-NLS-1$
	public static String TABLELAYOUT_ELEMENT = "tablelayout"; //$NON-NLS-1$
	public static String COMPONENTLAYOUT_ELEMENT = "componentlayout"; //$NON-NLS-1$
	public static String NODEDISPLAYLAYOUT_ELEMENT = "nodedisplaylayout"; //$NON-NLS-1$
	public static String TITLE_PREFIX = "title_"; //$NON-NLS-1$
}




 *******************************************************************************/
package org.eclipse.ptp.rm.lml.core;

import java.io.File;
import java.io.IOException;
import java.net.URL;
import java.util.MissingResourceException;
import java.util.ResourceBundle;

import org.eclipse.core.runtime.FileLocator;
import javax.xml.bind.JAXBContext;
import javax.xml.bind.JAXBException;
import javax.xml.bind.Marshaller;
import javax.xml.bind.Unmarshaller;
import javax.xml.validation.Schema;
import javax.xml.validation.SchemaFactory;

import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Path;
import org.eclipse.core.runtime.Plugin;
import org.eclipse.core.runtime.Status;
import org.eclipse.ptp.rm.lml.core.messages.Messages;
import org.eclipse.ptp.rm.lml.core.util.DebugUtil;
import org.osgi.framework.Bundle;
import org.osgi.framework.BundleContext;
import org.xml.sax.SAXException;

public class LMLCorePlugin extends Plugin {
	public static final String PLUGIN_ID = "org.eclipse.ptp.rm.lml.core"; //$NON-NLS-1$

	// The shared instance.
	private static LMLCorePlugin fPlugin;

	/*
	 * Unmarshaller for JAXB-generator
	 */
	private static Unmarshaller unmarshaller;

	/*
	 * Marshaller for JAXB-model
	 */
	private static Marshaller marshaller;

	/**
	 * Returns the shared instance.
	 */
	public static LMLCorePlugin getDefault() {
		return fPlugin;
	}

	public static URL getResource(String resource) throws IOException {
		URL url = null;
		if (getDefault() != null) {
			final Bundle bundle = getDefault().getBundle();
			url = FileLocator.find(bundle, new Path(ILMLCoreConstants.PATH_SEP + resource), null);
		} else {
			url = new File(resource).toURI().toURL();
		}
		return url;
	}

	/**

	}

	/**
	 * Get the JAXB marshaller
	 * 
	 * @return the JAXB marshaller
	 */
	public Marshaller getMarshaller() {
		if (marshaller == null) {
			try {
				createMarshaller();
			} catch (final JAXBException e) {
				log(e);
			}
		}
		return marshaller;
	}

	/**
	 * Returns the plugin's resource bundle,
	 */
	public ResourceBundle getResourceBundle() {
		return resourceBundle;
	}

	/**
	 * Get the JAXB unmarshaller.
	 * 
	 * @return the JAXB unmarshaller
	 */
	public Unmarshaller getUnmarshaller() {
		if (unmarshaller == null) {
			try {
				createUnmarshaller();
			} catch (final JAXBException e) {
				log(e);
			} catch (final MalformedURLException e) {
				log(e);
			}
		}
		return unmarshaller;
	}

	/**

	@Override
	public void start(BundleContext context) throws Exception {
		super.start(context);
		createUnmarshaller();
		DebugUtil.configurePluginDebugOptions();
	}


		} finally {
			super.stop(context);
			fPlugin = null;
		}
	}

	private void createMarshaller() throws JAXBException {
		final JAXBContext jc = JAXBContext.newInstance("org.eclipse.ptp.rm.lml.internal.core.elements", //$NON-NLS-1$
				LMLCorePlugin.class.getClassLoader());
		marshaller = jc.createMarshaller();
	}

	/**
	 * For the generation of instances from classes by JAXB a unmarshaller is
	 * needed. In the method the needed unmarshaller is created. It is said
	 * where the classes for the instantiation are.
	 * 
	 * @throws MalformedURLException
	 * @throws JAXBException
	 */
	private void createUnmarshaller() throws MalformedURLException, JAXBException {
		final URL xsd = getBundle().getEntry("/schema/lgui.xsd"); //$NON-NLS-1$

		final JAXBContext jc = JAXBContext.newInstance("org.eclipse.ptp.rm.lml.internal.core.elements", //$NON-NLS-1$
				LMLCorePlugin.class.getClassLoader());

		unmarshaller = jc.createUnmarshaller();

		// if xsd is null => do not check for validity
		if (xsd != null) {

			Schema mySchema;
			final SchemaFactory sf = SchemaFactory.newInstance(XMLConstants.W3C_XML_SCHEMA_NS_URI);

			try {

				mySchema = sf.newSchema(xsd);
			} catch (final SAXException saxe) {
				// ...(error handling)
				mySchema = null;

			}

			// Connect schema to unmarshaller
			unmarshaller.setSchema(mySchema);

		}
	}





import java.io.InputStream;
import java.io.OutputStream;
import java.util.HashMap;
import java.util.List;
import java.util.Map;

import javax.xml.bind.JAXBException;

import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.ListenerList;
import org.eclipse.core.runtime.Status;
import org.eclipse.ptp.rm.lml.core.events.ILguiAddedEvent;
import org.eclipse.ptp.rm.lml.core.events.ILguiRemovedEvent;
import org.eclipse.ptp.rm.lml.core.events.IMarkObjectEvent;
import org.eclipse.ptp.rm.lml.core.events.ISelectObjectEvent;
import org.eclipse.ptp.rm.lml.core.events.ITableFilterEvent;
import org.eclipse.ptp.rm.lml.core.events.ITableSortedEvent;
import org.eclipse.ptp.rm.lml.core.events.IUnmarkObjectEvent;
import org.eclipse.ptp.rm.lml.core.events.IUnselectedObjectEvent;
import org.eclipse.ptp.rm.lml.core.events.IViewUpdateEvent;
import org.eclipse.ptp.rm.lml.core.listeners.ILMLListener;
import org.eclipse.ptp.rm.lml.core.model.ILguiItem;
import org.eclipse.ptp.rm.lml.core.model.IPattern;
import org.eclipse.ptp.rm.lml.internal.core.elements.RequestType;
import org.eclipse.ptp.rm.lml.internal.core.events.LguiAddedEvent;
import org.eclipse.ptp.rm.lml.internal.core.events.LguiRemovedEvent;
import org.eclipse.ptp.rm.lml.internal.core.events.MarkObjectEvent;
import org.eclipse.ptp.rm.lml.internal.core.events.SelectObjectEvent;
import org.eclipse.ptp.rm.lml.internal.core.events.TableFilterEvent;
import org.eclipse.ptp.rm.lml.internal.core.events.TableSortedEvent;
import org.eclipse.ptp.rm.lml.internal.core.events.UnmarkObjectEvent;
import org.eclipse.ptp.rm.lml.internal.core.events.UnselectObjectEvent;

	/*
	 * A list of all listeners on the ILguiItem
	 */
	private final ListenerList viewListeners = new ListenerList();

	/*
	 * An instance of this class.

	}

	public void addListener(ILMLListener listener, String view) {
		viewListeners.add(listener);
	}

	public void addUserJob(String name, String jobId, JobStatusData status) {


	}

	public void filterLgui(String gid, List<IPattern> filterValues) {
		fireFilterLgui(gid, filterValues);
	}

	public String getCurrentLayout(String name) {
		ILguiItem item = null;
		synchronized (LGUIS) {

			return string;
		}
		return null;
	}

	public Map<String, List<IPattern>> getCurrentPattern(String name) {
		ILguiItem item = null;
		synchronized (LGUIS) {
			item = LGUIS.get(name);
		}
		if (item != null) {
			final Map<String, List<IPattern>> map = item.getPattern();
			return map;
		}
		return new HashMap<String, List<IPattern>>();
	}

	public ILguiItem getSelectedLguiItem() {

	 *            Layout from an earlier Eclipse session
	 * @param jobs
	 *            Array of earlier started jobs
	 * @param pattern
	 */
	public void openLgui(String name, String username, RequestType request, StringBuilder layout, JobStatusData[] jobs,
			Map<String, List<IPattern>> pattern) {
		synchronized (LGUIS) {
			ILguiItem item = LGUIS.get(name);
			if (item == null) {
				item = new LguiItem(name, username);
				LGUIS.put(name, item);
			}
			fLguiItem = item;


		fLguiItem.reloadLastLayout(layout);
		fLguiItem.setRequest(request);
		fLguiItem.setPattern(pattern);
		restoreJobStatusData(fLguiItem, jobs);

		if (!fLguiItem.isEmpty()) {

	}

	public void removeListener(ILMLListener listener) {
		viewListeners.remove(listener);
	}

	public void removeUserJob(String name, String jobId) {

			lguiItem = LGUIS.get(name);
		}
		if (lguiItem != null) {
			lguiItem.getCurrentLayout(output);
			lguiItem.update(input);
			} catch (final JAXBException e) {
				throw new CoreException(new Status(IStatus.ERROR, LMLCorePlugin.getUniqueIdentifier(), e.getCause()
						.getLocalizedMessage()));
			}
			try {
				lguiItem.update(input);
			} catch (final JAXBException e) {
				throw new CoreException(new Status(IStatus.ERROR, LMLCorePlugin.getUniqueIdentifier(), e.getCause()
						.getLocalizedMessage()));
			}

			if (fLguiItem == lguiItem) {
				if (!isDisplayed) {


	private void fireChangeSelectedObject(String oid) {
		final ISelectObjectEvent event = new SelectObjectEvent(oid);
		for (final Object listener : viewListeners.getListeners()) {
			((ILMLListener) listener).handleEvent(event);
		}
	}

	private void fireFilterLgui(String gid, List<IPattern> filterValues) {
		final ITableFilterEvent event = new TableFilterEvent(gid, filterValues);
		for (final Object listener : viewListeners.getListeners()) {
			((ILMLListener) listener).handleEvent(event);
		}
	}

	private void fireMarkObject(String oid) {
		final IMarkObjectEvent event = new MarkObjectEvent(oid);
		for (final Object listener : viewListeners.getListeners()) {
			((ILMLListener) listener).handleEvent(event);
		}
	}

	 */
	private void fireNewLgui() {
		final ILguiAddedEvent event = new LguiAddedEvent();
		for (final Object listener : viewListeners.getListeners()) {
			((ILMLListener) listener).handleEvent(event);
		}
		isDisplayed = true;


	private void fireRemovedLgui(ILguiItem title) {
		final ILguiRemovedEvent event = new LguiRemovedEvent();
		for (final Object listener : viewListeners.getListeners()) {
			((ILMLListener) listener).handleEvent(event);
		}
		isDisplayed = false;

	 */
	private void fireSortedLgui() {
		final ITableSortedEvent event = new TableSortedEvent(this, fLguiItem);
		for (final Object listener : viewListeners.getListeners()) {
			((ILMLListener) listener).handleEvent(event);
		}
	}

	private void fireUnmarkObject(String oid) {
		final IUnmarkObjectEvent event = new UnmarkObjectEvent(oid);
		for (final Object listener : viewListeners.getListeners()) {
			((ILMLListener) listener).handleEvent(event);
		}
	}

	private void fireUnselectObject(String oid) {
		final IUnselectedObjectEvent event = new UnselectObjectEvent(oid);
		for (final Object listener : viewListeners.getListeners()) {
			((ILMLListener) listener).handleEvent(event);
		}
	}

	private void fireUpdatedLgui() {
		final IViewUpdateEvent event = new ViewUpdateEvent();
		for (final Object listener : viewListeners.getListeners()) {
			((ILMLListener) listener).handleEvent(event);
		}
	}

			}
		}
	}

	// /**
	// * @param map
	// * @param memento
	// * guaranteed by caller to be non-<code>null</code>
	// */
	// private void saveJobStatusData(ILguiItem item, IMemento memento) {
	// for (final JobStatusData status : item.getUserJobs()) {
	// if (!status.isRemoved()) {
	// status.save(memento);
	// }
	// }
	// }
}




/*******************************************************************************
 * Copyright (c) 2007 IBM Corporation and others.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
 * http://www.eclipse.org/legal/epl-v10.html
 *
 * Contributors:
 * IBM Corporation - Initial API and implementation
 * 
 * Modified by:
 * 		Claudia Knobloch, Forschungszentrum Juelich GmbH
 *******************************************************************************/

package org.eclipse.ptp.rm.lml.core.events;

import java.util.List;

import org.eclipse.ptp.rm.lml.core.model.IPattern;

public interface ITableFilterEvent {

	public String getGid();

	public List<IPattern> getPattern();

}




import org.eclipse.ptp.rm.lml.core.events.ILguiRemovedEvent;
import org.eclipse.ptp.rm.lml.core.events.IMarkObjectEvent;
import org.eclipse.ptp.rm.lml.core.events.ISelectObjectEvent;
import org.eclipse.ptp.rm.lml.core.events.ITableFilterEvent;
import org.eclipse.ptp.rm.lml.core.events.ITableSortedEvent;
import org.eclipse.ptp.rm.lml.core.events.IUnmarkObjectEvent;
import org.eclipse.ptp.rm.lml.core.events.IUnselectedObjectEvent;


	public void handleEvent(ISelectObjectEvent event);

	public void handleEvent(ITableFilterEvent event);

	/**
	 * Handles an IJobListSortedEevnt.
	 * 
	 * @param event
	 *            an IJobListSortedEvent
	 */
	public void handleEvent(ITableSortedEvent event);

	public void handleEvent(IUnmarkObjectEvent event);


Lines 12-15 Link Here

(-)a/rms/org.eclipse.ptp.rm.lml.core/src/org/eclipse/ptp/rm/lml/core/model/ILguiHandler.java (+10 lines)
12	package org.eclipse.ptp.rm.lml.core.model;	12	package org.eclipse.ptp.rm.lml.core.model;
13		13
14	public interface ILguiHandler {	14	public interface ILguiHandler {
		15	/*
		16	* Mandatory table fields
		17	*/
		18	public static String JOB_ID = "step"; //$NON-NLS-1$
		19	public static String JOB_OWNER = "owner"; //$NON-NLS-1$
		20	public static String JOB_STATUS = "status"; //$NON-NLS-1$
		21	public static String JOB_QUEUE_NAME = "queue"; //$NON-NLS-1$
		22
		23	public static String ACTIVE_JOB_TABLE = "joblistrun"; //$NON-NLS-1$
		24	public static String INACTIVE_JOB_TABLE = "joblistwait"; //$NON-NLS-1$
15	}	25	}

Lines 12-17 Link Here

(-)a/rms/org.eclipse.ptp.rm.lml.core/src/org/eclipse/ptp/rm/lml/core/model/ILguiItem.java (-18 / +16 lines)
12		12
13	import java.io.InputStream;	13	import java.io.InputStream;
14	import java.io.OutputStream;	14	import java.io.OutputStream;
		15	import java.util.List;
		16	import java.util.Map;
15		17
16	import javax.xml.bind.JAXBException;	18	import javax.xml.bind.JAXBException;
17		19
Lines 77-88 Link Here
77	*/	79	*/
78	public void addUserJob(String jobId, JobStatusData status, boolean force);	80	public void addUserJob(String jobId, JobStatusData status, boolean force);
79		81
		82	public String[] getColumnTitlePattern(String gid);
		83
80	/**	84	/**
81	* The meth	85	* The meth
82	*	86	*
83	* @param output	87	* @param output
84	*/	88	*/
85	public void getCurrentLayout(OutputStream output) throws JAXBException;	89	public void getCurrentLayout(OutputStream output);
86		90
87	/**	91	/**
88	* @return	92	* @return
Lines 114-119 Link Here
114	*/	118	*/
115	public OverviewAccess getOverviewAccess();	119	public OverviewAccess getOverviewAccess();
116		120
		121	public Map<String, List<IPattern>> getPattern();
		122
		123	public List<IPattern> getPattern(String gid);
		124
117	/**	125	/**
118	* @return	126	* @return
119	*/	127	*/
Lines 129-134 Link Here
129	* @return	137	* @return
130	*/	138	*/
131	public JobStatusData[] getUserJobs();	139	public JobStatusData[] getUserJobs();
		140
		141	public String getUsername();
132		142
133	/**	143	/**
134	* Getting the version of the LguiType:	144	* Getting the version of the LguiType:
Lines 157-171 Link Here
157		167
158	/**	168	/**
159	*	169	*
160	* @param memento	170	* @param layout
161	*/	171	*/
162	public void reloadLastLayout(StringBuilder layout);	172	public void reloadLastLayout(StringBuilder layout);
163
164	// /**
165	// *
166	// * @param memento
167	// */
168	// public void reloadLastLayout(IMemento memento);
169		173
170	/**	174	/**
171	* @param name	175	* @param name
Lines 179-193 Link Here
179	*/	183	*/
180	public String saveCurrentLayout();	184	public String saveCurrentLayout();
181		185
182	// /**	186	public void setPattern(Map<String, List<IPattern>> pattern);
183	// * The Resource Manager is being closed. The current layout of the	187
184	// different	188	public void setPattern(String gid, List<IPattern> filterValues);
185	// * monitoring parts should be saved during the closing.
186	// *
187	// * @param memento
188	// * Memento in which the current layout should be saved
189	// */
190	// public void saveCurrentLayout(IMemento memento);
191		189
192	public void setRequest(RequestType request);	190	public void setRequest(RequestType request);
193		191
Lines 203-209 Link Here
203	* @param stream	201	* @param stream
204	* @throws JAXBException	202	* @throws JAXBException
205	*/	203	*/
206	public void update(InputStream stream) throws JAXBException;	204	public void update(InputStream stream);
207		205
208	/**	206	/**
209	* @param name	207	* @param name




/**
 * Copyright (c) 2011 Forschungszentrum Juelich GmbH
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution and is available at
 * http://www.eclipse.org/legal/epl-v10.html
 * 
 * Contributors:
 * 		Claudia Knobloch, FZ Juelich
 */
package org.eclipse.ptp.rm.lml.core.model;

public interface IPattern {

	public String getColumnTitle();

	public String getMaxValueRange();

	public String getMinValueRange();

	public String getRelationOperator();

	public String getType();

	public String getRelationValue();

	public boolean isRange();

	public boolean isRelation();

	public IPattern setRange(String minValueRange, String maxValueRange);

	public IPattern setRelation(String relationOperator, String valueRelation);
}

Lines 25-30 Link Here

(-)a/rms/org.eclipse.ptp.rm.lml.core/src/org/eclipse/ptp/rm/lml/core/model/ITableColumnLayout.java (+2 lines)
25	public static String COLUMN_TYPE_MANDATORY = "mandatory"; //$NON-NLS-1$	25	public static String COLUMN_TYPE_MANDATORY = "mandatory"; //$NON-NLS-1$
26	public static String COLUMN_TYPE_OPTIONAL = "optional"; //$NON-NLS-1$	26	public static String COLUMN_TYPE_OPTIONAL = "optional"; //$NON-NLS-1$
27		27
		28	public String getOrder();
		29
28	/**	30	/**
29	* Getting the style (LEFT or RIGHT) of the column.	31	* Getting the style (LEFT or RIGHT) of the column.
30	*	32	*




package org.eclipse.ptp.rm.lml.core.util;

import java.io.IOException;
import java.io.OutputStream;
import java.io.StringReader;
import java.io.StringWriter;
import java.math.BigInteger;
import java.net.URISyntaxException;
import java.net.URL;
import java.util.ArrayList;
import java.util.HashSet;
import java.util.List;

import javax.xml.bind.JAXBContext;
import javax.xml.bind.JAXBElement;
import javax.xml.bind.JAXBException;
import javax.xml.bind.Marshaller;
import javax.xml.bind.PropertyException;
import javax.xml.bind.Unmarshaller;
import javax.xml.namespace.QName;
import javax.xml.transform.Source;
import javax.xml.transform.stream.StreamSource;
import javax.xml.validation.Schema;
import javax.xml.validation.SchemaFactory;
import javax.xml.validation.Validator;

import org.eclipse.ptp.rm.lml.core.ILMLCoreConstants;
import org.eclipse.ptp.rm.lml.core.LMLCorePlugin;
import org.eclipse.ptp.rm.lml.core.model.ILguiItem;
import org.eclipse.ptp.rm.lml.internal.core.elements.AbslayoutType;
import org.eclipse.ptp.rm.lml.internal.core.elements.ChartType;
import org.eclipse.ptp.rm.lml.internal.core.elements.ChartgroupType;
import org.eclipse.ptp.rm.lml.internal.core.elements.ColumnType;
import org.eclipse.ptp.rm.lml.internal.core.elements.ComponentType;
import org.eclipse.ptp.rm.lml.internal.core.elements.ComponentlayoutType;
import org.eclipse.ptp.rm.lml.internal.core.elements.DataType;
import org.eclipse.ptp.rm.lml.internal.core.elements.GobjectType;
import org.eclipse.ptp.rm.lml.internal.core.elements.InfoboxType;
import org.eclipse.ptp.rm.lml.internal.core.elements.LayoutType;
import org.eclipse.ptp.rm.lml.internal.core.elements.LguiType;
import org.eclipse.ptp.rm.lml.internal.core.elements.Nodedisplay;
import org.eclipse.ptp.rm.lml.internal.core.elements.NodedisplaylayoutType;
import org.eclipse.ptp.rm.lml.internal.core.elements.ObjectFactory;
import org.eclipse.ptp.rm.lml.internal.core.elements.PaneType;
import org.eclipse.ptp.rm.lml.internal.core.elements.PatternMatchType;
import org.eclipse.ptp.rm.lml.internal.core.elements.PatternType;
import org.eclipse.ptp.rm.lml.internal.core.elements.SchemeType;
import org.eclipse.ptp.rm.lml.internal.core.elements.SplitlayoutType;
import org.eclipse.ptp.rm.lml.internal.core.elements.TableType;
import org.eclipse.ptp.rm.lml.internal.core.elements.TablelayoutType;
import org.eclipse.ptp.rm.lml.internal.core.elements.TextboxType;
import org.eclipse.ptp.rm.lml.internal.core.elements.UsagebarType;
import org.eclipse.ptp.rm.lml.internal.core.model.LguiItem;
import org.xml.sax.SAXException;
import org.xml.sax.SAXParseException;

public class JAXBUtil {

	private static JAXBUtil jaxbUtil;

	private static Unmarshaller unmarshaller;

	private static Marshaller marshaller;

	private static String JAXB_CLASSES = "org.eclipse.ptp.rm.lml.internal.core.elements";//$NON-NLS-1$

	private static String SCHEMA_LOCATION = "jaxb.schemaLocation";//$NON-NLS-1$
	private static String SCHEMA_FILE = "lgui.xsd";//$NON-NLS-1$
	private static String SCHEMA_LGUI = "lgui";//$NON-NLS-1$
	private static String SCHEMA_LML = "lml";//$NON-NLS-1$
	private static String SCHEMA_DIRECTORY = "http://www.llview.de";//$NON-NLS-1$

	private static Validator validator;

	public static JAXBUtil getInstance() {
		if (jaxbUtil == null) {
			jaxbUtil = new JAXBUtil();
		}
		return jaxbUtil;
	}

	/**
	 * Take a graphical object and minimize the data so that this instance is
	 * valid against the LML-Schema but at the same time as small as possible.
	 * 
	 * @param gobject
	 * @return a copy of gobj with minimal size, only attributes in GobjectType
	 *         are copied and lower special elements which are needed to make
	 *         lml-model valid
	 */
	@SuppressWarnings("unchecked")
	public static JAXBElement<GobjectType> minimizeGobjectType(
			GobjectType gobject, ObjectFactory objectFactory) {

		String qName = null;
		GobjectType value = null;

		if (gobject instanceof TableType) {
			value = objectFactory.createTableType();
			final TableType origin = (TableType) gobject;
			((TableType) value).setContenttype(origin.getContenttype());
			// copy all columns with pattern to table
			for (final ColumnType column : origin.getColumn()) {
				if (column.getPattern() != null) {
					((TableType) value).getColumn().add(column);
				}
			}

			qName = ILMLCoreConstants.TABLE_ELEMENT;
		} else if (gobject instanceof UsagebarType) {
			value = objectFactory.createUsagebarType();

			((UsagebarType) value).setCpucount(BigInteger.valueOf(0));

			qName = ILMLCoreConstants.USAGEBAR_ELEMENT;
		} else if (gobject instanceof TextboxType) {
			value = objectFactory.createTextboxType();
			((TextboxType) value).setText(ILMLCoreConstants.ZEROSTR);

			qName = ILMLCoreConstants.TEXT_ELEMENT;
		} else if (gobject instanceof InfoboxType) {
			value = objectFactory.createInfoboxType();

			qName = ILMLCoreConstants.INFOBOX_ELEMENT;
		} else if (gobject instanceof Nodedisplay) {
			value = objectFactory.createNodedisplay();
			final SchemeType scheme = objectFactory.createSchemeType();
			scheme.getEl1().add(objectFactory.createSchemeElement1());
			((Nodedisplay) value).setScheme(scheme);

			final DataType dat = objectFactory.createDataType();
			dat.getEl1().add(objectFactory.createDataElement1());
			((Nodedisplay) value).setData(dat);

			qName = ILMLCoreConstants.NODEDISPLAY_ELEMENT;
		} else if (gobject instanceof ChartType) {
			value = objectFactory.createChartType();

			qName = ILMLCoreConstants.CHART_ELEMENT;
		} else if (gobject instanceof ChartgroupType) {
			final ChartgroupType chartgroupType = objectFactory
					.createChartgroupType();
			// Add lower chart-elements to the minimized chart-group
			// Go through all charts minimize them and add them to ut
			for (final ChartType chart : ((ChartgroupType) gobject).getChart()) {
				final ChartType minimal = (ChartType) (minimizeGobjectType(
						chart, objectFactory).getValue());
				chartgroupType.getChart().add(minimal);
			}

			value = chartgroupType;

			qName = ILMLCoreConstants.CHARTGROUP_ELEMENT;
		}

		value.setDescription(gobject.getDescription());
		value.setId(gobject.getId());
		value.setTitle(gobject.getTitle());

		return new JAXBElement<GobjectType>(new QName(qName),
				(Class<GobjectType>) gobject.getClass(), value);
	}

	/**
	 * Replace a global layout within the lml-model by a new one
	 * 
	 * @param newLayout
	 *            new layout, which replaces the old in model with the same id
	 * @param lgui
	 *            lgui-instance, which is changed
	 */
	@SuppressWarnings("unchecked")
	public static void replaceGlobalLayout(LguiType newLayout, LguiType lgui) {

		for (final JAXBElement<?> layout : newLayout
				.getObjectsAndRelationsAndInformation()) {
			if (layout.getValue() instanceof LayoutType) {
				boolean replaced = false;
				for (final JAXBElement<?> object : lgui
						.getObjectsAndRelationsAndInformation()) {
					if (object.getValue() instanceof LayoutType) {
						if (((LayoutType) object.getValue()).getId().equals(
								((LayoutType) layout.getValue()).getId())) {
							((JAXBElement<LayoutType>) object)
									.setValue((LayoutType) layout.getValue());
							replaced = true;
							break;
						}
					}
				}
				if (!replaced) {
					lgui.getObjectsAndRelationsAndInformation().add(layout);
				}
			}
		}
	}

	/**
	 * Search for gid-attributes of a pane and put it into neededComponents
	 * Recursively search all graphical objects referenced by this pane
	 * 
	 * @param pane
	 *            part of SplitLayout, which is scanned for gid-attributes
	 * @param components
	 *            resulting Hashset
	 */
	private static void collectComponents(PaneType pane, HashSet<String> components) {

		if (pane.getGid() != null) {
			components.add(pane.getGid());
		} else {
			// top and bottom components?
			if (pane.getBottom() != null) {
				collectComponents(pane.getBottom(), components);
				collectComponents(pane.getTop(), components);
			} else {// Left and right
				collectComponents(pane.getLeft(), components);
				collectComponents(pane.getRight(), components);
			}
		}

	}

	/**
	 * * Uses the ResourceManagerData schema.
	 * 
	 * @return static singleton
	 * @throws IOException
	 * @throws SAXException
	 */
	@SuppressWarnings("unused")
	private synchronized static Validator getValidator() throws IOException, SAXException {
		if (validator == null) {

			final URL xsd = LMLCorePlugin.getResource(ILMLCoreConstants.RM_XSD);
			final SchemaFactory factory = SchemaFactory.newInstance(ILMLCoreConstants.XMLSchema);
			final Schema schema = factory.newSchema(xsd);
			validator = schema.newValidator();
		}
		return validator;
	}

	private static void validate(Source source) throws SAXException, IOException, URISyntaxException {
		try {
			getValidator().validate(source);
		} catch (final SAXParseException sax) {
			throw sax;
		}
	}

	private JAXBUtil() {
		jaxbUtil = this;
		try {
			final JAXBContext jaxbContext = JAXBContext.newInstance(JAXB_CLASSES);
			marshaller = jaxbContext.createMarshaller();
			unmarshaller = jaxbContext.createUnmarshaller();

		} catch (final JAXBException e) {
			marshaller = null;
			unmarshaller = null;
			// TODO Error Message?
		}
	}

	public void addComponentLayoutElement(LguiType lgui,
			ComponentlayoutType component) {
		if (component instanceof TablelayoutType) {
			lgui.getObjectsAndRelationsAndInformation()
					.add(new JAXBElement<TablelayoutType>(new QName(
							ILMLCoreConstants.TABLELAYOUT_ELEMENT),
							TablelayoutType.class, (TablelayoutType) component));
		} else if (component instanceof NodedisplaylayoutType) {
			lgui.getObjectsAndRelationsAndInformation().add(
					new JAXBElement<NodedisplaylayoutType>(new QName(
							ILMLCoreConstants.NODEDISPLAYLAYOUT_ELEMENT),
							NodedisplaylayoutType.class,
							(NodedisplaylayoutType) component));
		} else {
			lgui.getObjectsAndRelationsAndInformation().add(
					new JAXBElement<ComponentlayoutType>(new QName(
							ILMLCoreConstants.COMPONENTLAYOUT_ELEMENT),
							ComponentlayoutType.class, component));
		}
	}

	public void addLayoutElement(LguiType lgui, Object object) {
		if (object instanceof SplitlayoutType) {
			lgui.getObjectsAndRelationsAndInformation().add(
					new JAXBElement<SplitlayoutType>(new QName(
							ILMLCoreConstants.SPLITLAYOUT_ELEMENT),
							SplitlayoutType.class, (SplitlayoutType) object));
		} else if (object instanceof AbslayoutType) {
			lgui.getObjectsAndRelationsAndInformation().add(
					new JAXBElement<AbslayoutType>(new QName(
							ILMLCoreConstants.ABSLAYOUT_ELEMENT),
							AbslayoutType.class, (AbslayoutType) object));
		}

	}

	/**
	 * Add a new created layout to the model
	 * 
	 * @param layout
	 *            absolute or splitlayout
	 */
	public void addLayoutTag(LguiType lgui, ILguiItem lguiItem,
			LayoutType layout) {

		if (layout.getId() == null) {
			layout.setId(ILMLCoreConstants.ZEROSTR);
		}

		JAXBElement<? extends LayoutType> jaxbElement = null;
		// Create jaxbelement corresponding to the class-type
		if (layout instanceof AbslayoutType) {

			final AbslayoutType absLayout = (AbslayoutType) layout;

			jaxbElement = new JAXBElement<AbslayoutType>(new QName(
					ILMLCoreConstants.ABSLAYOUT_ELEMENT), AbslayoutType.class,
					absLayout);

		} else if (layout instanceof SplitlayoutType) {

			final SplitlayoutType splitLayout = (SplitlayoutType) layout;

			jaxbElement = new JAXBElement<SplitlayoutType>(new QName(
					ILMLCoreConstants.SPLITLAYOUT_ELEMENT),
					SplitlayoutType.class, splitLayout);

		} else {
			return;
		}

		lgui.getObjectsAndRelationsAndInformation().add(jaxbElement);

		lguiItem.notifyListeners();

	}

	public void addPatternInclude(PatternType pattern,
			PatternMatchType patternMatch) {
		pattern.getIncludeAndExclude().add(
				new JAXBElement<PatternMatchType>(new QName(
						ILMLCoreConstants.INCLUDE_ELEMENT),
						PatternMatchType.class, patternMatch));
	}

	public void addTable(LguiType lgui, TableType table) {
		lgui.getObjectsAndRelationsAndInformation().add(
				new JAXBElement<TableType>(new QName(
						ILMLCoreConstants.TABLE_ELEMENT), TableType.class,
						table));
	}

	public void getLayoutComponents(LguiType result, LguiType lgui, HashSet<String> components) {

		for (final JAXBElement<?> element : lgui.getObjectsAndRelationsAndInformation()) {

			final Object object = element.getValue();

			if (object instanceof LayoutType) {
				if (object instanceof SplitlayoutType) {
					lgui.getObjectsAndRelationsAndInformation().add(element);
				} else if (object instanceof AbslayoutType) {
					lgui.getObjectsAndRelationsAndInformation().add(element);
				}

				if (object instanceof SplitlayoutType) {
					if (((SplitlayoutType) object).getLeft() != null) {
						collectComponents(((SplitlayoutType) object).getLeft(), components);
						collectComponents(((SplitlayoutType) object).getRight(), components);
					}
				} else if (object instanceof AbslayoutType) {
					for (final ComponentType component : ((AbslayoutType) object).getComp()) {
						components.add(component.getGid());
					}
				}
			} else if (object instanceof ComponentlayoutType) {
				if (((ComponentlayoutType) object).isActive()) {
					addComponentLayoutElement(result, (ComponentlayoutType) object);
					components.add(((ComponentlayoutType) object).getGid());
				}
			}
		}
	}

	public ArrayList<Object> getObjects(LguiType lgui) {
		final ArrayList<Object> list = new ArrayList<Object>();
		for (final JAXBElement<?> element : lgui
				.getObjectsAndRelationsAndInformation()) {
			list.add(element.getValue());
		}
		return list;
	}

	public void marshal(LguiType lgui, OutputStream output) {
		try {
			marshaller.setProperty(SCHEMA_LOCATION, SCHEMA_DIRECTORY + SCHEMA_FILE);
			marshaller.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, Boolean.TRUE);
			final QName tagname = new QName(SCHEMA_DIRECTORY, SCHEMA_LGUI, SCHEMA_LML);

			final JAXBElement<LguiType> rootElement = new JAXBElement<LguiType>(
					tagname, LguiType.class, lgui);
			/*
			 * Synchronize to avoid the dreaded
			 * "FWK005 parse may not be called while parsing" message
			 */
			synchronized (LguiItem.class) {
				marshaller.marshal(rootElement, output);
			}
			output.close(); // Must close to flush stream
		} catch (final PropertyException e) {
			// TODO ErrorMessage
		} catch (final IOException e) {
			// TODO ErrorMessage
		} catch (final JAXBException e) {
			// TODO ErrorMessage
		}
	}

	public void marshal(LguiType lgui, StringWriter writer) {
		try {
			marshaller.setProperty(SCHEMA_LOCATION, SCHEMA_DIRECTORY + SCHEMA_FILE);
			marshaller.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, Boolean.TRUE);
			final QName tagname = new QName(SCHEMA_DIRECTORY, SCHEMA_LGUI, SCHEMA_LML);

			final JAXBElement<LguiType> rootElement = new JAXBElement<LguiType>(
					tagname, LguiType.class, lgui);
			/*
			 * Synchronize to avoid the dreaded
			 * "FWK005 parse may not be called while parsing" message
			 */
			synchronized (LguiItem.class) {
				marshaller.marshal(rootElement, writer);
			}

		} catch (final PropertyException e) {
			// TODO ErrorMessage
		} catch (final JAXBException e) {
			// TODO ErrorMessage
		}
	}

	/**
	 * Replace all componentlayouts for a graphical object with given gid
	 * through newlayout.getGid() with newlayout
	 * 
	 * @param newLayout
	 *            new layout, which is placed into the positions of old layouts
	 */
	@SuppressWarnings("unchecked")
	public void replaceComponentLayout(LguiType lgui, ILguiItem lguiItem, ComponentlayoutType newLayout) {
		if (newLayout == null) {
			return;
		}
		final List<JAXBElement<?>> objects = lgui.getObjectsAndRelationsAndInformation();

		boolean replaced = false;

		// Over all objects in lml-file
		for (int i = 0; i < objects.size(); i++) {
			final JAXBElement<?> object = objects.get(i);

			// Over all Componentlayouts
			if (object.getValue() instanceof ComponentlayoutType) {

				if (((ComponentlayoutType) object.getValue()).getGid() != null
						&& ((ComponentlayoutType) object.getValue()).getGid()
								.equals(newLayout.getGid())) {

					if (!replaced) {

						((JAXBElement<ComponentlayoutType>) object)
								.setValue(newLayout);
						lguiItem.notifyListeners();
						replaced = true;
					} else {// Delete this object
						objects.remove(object);
						// One step back
						i--;
					}
				}

			}
		}

		if (!replaced) {
			// Insert new layout, if there was nothing to replace
			// Takes any componentlayout
			JAXBElement<?> newElement = null;

			// Differ between several layouts, create different JAXBElements
			if (newLayout instanceof TablelayoutType) {
				newElement = new JAXBElement<TablelayoutType>(new QName(
						ILMLCoreConstants.TABLELAYOUT_ELEMENT),
						TablelayoutType.class, (TablelayoutType) newLayout);
			} else if (newLayout instanceof NodedisplaylayoutType) {
				newElement = new JAXBElement<NodedisplaylayoutType>(new QName(
						ILMLCoreConstants.NODEDISPLAYLAYOUT_ELEMENT),
						NodedisplaylayoutType.class,
						(NodedisplaylayoutType) newLayout);
			}

			if (newElement != null) {
				lgui.getObjectsAndRelationsAndInformation().add(newElement);
				lguiItem.notifyListeners();
			}
		}

	}

	/**
	 * Parsing an XML file. The method generates from an XML file an instance of
	 * LguiType.
	 * 
	 * @param string
	 *            String containing the information from the server side
	 * @return the generated LguiType
	 */
	@SuppressWarnings("unchecked")
	public LguiType unmarshal(String string) {
		/*
		 * Synchronize to avoid the dreaded
		 * "FWK005 parse may not be called while parsing" message
		 */
		Source source = new StreamSource(new StringReader(string));
		try {
			validate(source);
		} catch (final SAXException e1) {
			// TODO Auto-generated catch block
			e1.printStackTrace();
		} catch (final IOException e1) {
			// TODO Auto-generated catch block
			e1.printStackTrace();
		} catch (final URISyntaxException e1) {
			// TODO Auto-generated catch block
			e1.printStackTrace();
		}
		source = new StreamSource(new StringReader(string));
		JAXBElement<LguiType> jaxb = null;
		try {
			synchronized (LguiItem.class) {
				jaxb = (JAXBElement<LguiType>) unmarshaller.unmarshal(source);
			}
		} catch (final JAXBException e) {
			// TODO ErrorMessage
		}
		return jaxb.getValue();
	}
}




/*******************************************************************************
 * Copyright (c) 2005, 2006, 2007 Los Alamos National Security, LLC.
 * This material was produced under U.S. Government contract DE-AC52-06NA25396
 * for Los Alamos National Laboratory (LANL), which is operated by the Los Alamos
 * National Security, LLC (LANS) for the U.S. Department of Energy.  The U.S. Government has
 * rights to use, reproduce, and distribute this software. NEITHER THE
 * GOVERNMENT NOR LANS MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR
 * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified
 * to produce derivative works, such modified software should be clearly marked,
 * so as not to confuse it with the version available from LANL.
 *
 * Additionally, this program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
 * http://www.eclipse.org/legal/epl-v10.html
 * 
 * Modified by:
 * 		Claudia Knobloch, Forschungszentrum Juelich GmbH
 *******************************************************************************/

package org.eclipse.ptp.rm.lml.internal.core.events;

import java.util.LinkedList;
import java.util.List;

import org.eclipse.ptp.rm.lml.core.events.ITableFilterEvent;
import org.eclipse.ptp.rm.lml.core.model.IPattern;

public class TableFilterEvent implements ITableFilterEvent {

	private List<IPattern> pattern;

	private final String gid;

	public TableFilterEvent(String gid, List<IPattern> pattern) {
		this.gid = gid;
		if (pattern == null) {
			pattern = new LinkedList<IPattern>();
		} else {
			this.pattern = pattern;
		}
	}

	public String getGid() {
		return gid;
	}

	public List<IPattern> getPattern() {
		return pattern;
	}

}





package org.eclipse.ptp.rm.lml.internal.core.model;

import java.io.OutputStream;
import java.math.BigInteger;
import java.util.ArrayList;
import java.util.HashMap;

import java.util.List;
import java.util.Map;

import org.eclipse.ptp.rm.lml.core.ILMLCoreConstants;
import javax.xml.bind.JAXBElement;
import javax.xml.bind.JAXBException;
import javax.xml.bind.Marshaller;
import javax.xml.namespace.QName;

import org.eclipse.ptp.rm.lml.core.events.ILguiUpdatedEvent;
import org.eclipse.ptp.rm.lml.core.listeners.ILguiListener;
import org.eclipse.ptp.rm.lml.core.model.ILguiItem;
import org.eclipse.ptp.rm.lml.core.util.JAXBUtil;
import org.eclipse.ptp.rm.lml.internal.core.elements.AbslayoutType;
import org.eclipse.ptp.rm.lml.internal.core.elements.ChartType;
import org.eclipse.ptp.rm.lml.internal.core.elements.ChartgroupType;
import org.eclipse.ptp.rm.lml.internal.core.elements.ChartlayoutType;
import org.eclipse.ptp.rm.lml.internal.core.elements.ColumnType;
import org.eclipse.ptp.rm.lml.internal.core.elements.ColumnlayoutType;
import org.eclipse.ptp.rm.lml.internal.core.elements.ComponentType;
import org.eclipse.ptp.rm.lml.internal.core.elements.ComponentlayoutType;
import org.eclipse.ptp.rm.lml.internal.core.elements.DataType;
import org.eclipse.ptp.rm.lml.internal.core.elements.GobjectType;
import org.eclipse.ptp.rm.lml.internal.core.elements.InfoboxType;
import org.eclipse.ptp.rm.lml.internal.core.elements.InfoboxlayoutType;
import org.eclipse.ptp.rm.lml.internal.core.elements.LayoutType;
import org.eclipse.ptp.rm.lml.internal.core.elements.LguiType;
import org.eclipse.ptp.rm.lml.internal.core.elements.Nodedisplay;
import org.eclipse.ptp.rm.lml.internal.core.elements.NodedisplaylayoutType;
import org.eclipse.ptp.rm.lml.internal.core.elements.ObjectFactory;
import org.eclipse.ptp.rm.lml.internal.core.elements.PaneType;
import org.eclipse.ptp.rm.lml.internal.core.elements.SchemeType;
import org.eclipse.ptp.rm.lml.internal.core.elements.SplitlayoutType;
import org.eclipse.ptp.rm.lml.internal.core.elements.TableType;
import org.eclipse.ptp.rm.lml.internal.core.elements.TablelayoutType;
import org.eclipse.ptp.rm.lml.internal.core.elements.TextboxType;
import org.eclipse.ptp.rm.lml.internal.core.elements.UsagebarType;
import org.eclipse.ptp.rm.lml.internal.core.elements.UsagebarlayoutType;

/**

 * functions, which allow to merge layouts to one lml-model
 */
public class LayoutAccess extends LguiHandler {
	/*
	 * create an objectfactory for all functions in this class
	 */
	private static ObjectFactory objectFactory = new ObjectFactory();

	private static final String LAYOUT_ENDING = "_layout";//$NON-NLS-1$

	private static String DEAFULT_ABS = "abs_default";//$NON-NLS-1$

	private static JAXBUtil jaxbUtil = JAXBUtil.getInstance();

	/**
	 * This method merges the layout information given by the "layout"-instance
	 * with the layout, which is included in "data". Component-layouts in "data"

		if (data == null || layout == null) {
			return data;
		}
		final LguiItem lguiData = new LguiItem(data);
		final LayoutAccess la = new LayoutAccess(lgui, lgui.getLguiType());
		// Replace component-layouts
		for (final Object object : jaxbUtil.getObjects(layout)) {
			if (object instanceof ComponentlayoutType) {
				jaxbUtil.replaceComponentLayout(data, lguiData, (ComponentlayoutType) object);
			}
		}


		 * } }
		 **/

		JAXBUtil.replaceGlobalLayout(layout, data);
		for (final JAXBElement<?> el : layout.getObjectsAndRelationsAndInformation()) {
			if (el.getValue() instanceof LayoutType) {
				if (!replaceGlobalLayout((LayoutType) el.getValue(), data)) {
					// If not replaced, insert it
					data.getObjectsAndRelationsAndInformation().add(el);
				}
			}
		}

		return data;
	}

	/**
	 * Replace a global layout within the lml-model by a new one
	 * 
	 * @param newlayout
	 *            new layout, which replaces the old in model with the same id
	 * @param model
	 *            lgui-instance, which is changed
	 */
	@SuppressWarnings("unchecked")
	public static boolean replaceGlobalLayout(LayoutType newlayout, LguiType model) {

		final List<JAXBElement<?>> all = model.getObjectsAndRelationsAndInformation();

		// Go through all objects, search for layouttypes with newlayout.getId
		// as id and replace them with this layout
		for (int i = 0; i < all.size(); i++) {
			final JAXBElement<?> aobj = all.get(i);
			if (aobj.getValue() instanceof LayoutType) {
				final LayoutType old = (LayoutType) aobj.getValue();
				if (old.getId().equals(newlayout.getId())) {
					((JAXBElement<LayoutType>) aobj).setValue(newlayout);
					return true;
				}
			}
		}

		return false;
	}

	/**
	 * Search for gid-attributes of a pane and put it into neededComponents
	 * Recursively search all graphical objects referenced by this pane
	 * 
	 * @param p
	 *            part of SplitLayout, which is scanned for gid-attributes
	 * @param neededComponents
	 *            resulting Hashset
	 */
	private static void collectComponents(PaneType p, HashSet<String> neededComponents) {

		if (p.getGid() != null) {
			neededComponents.add(p.getGid());
		} else {
			// top and bottom components?
			if (p.getBottom() != null) {
				collectComponents(p.getBottom(), neededComponents);
				collectComponents(p.getTop(), neededComponents);
			} else {// Left and right
				collectComponents(p.getLeft(), neededComponents);
				collectComponents(p.getRight(), neededComponents);
			}
		}

	}

	/**
	 * Take a graphical object and minimize the data so that this instance is
	 * valid against the LML-Schema but at the same time as small as possible.
	 * 
	 * @param gobj
	 * @return a copy of gobj with minimal size, only attributes in GobjectType
	 *         are copied and lower special elements which are needed to make
	 *         lml-model valid
	 */
	@SuppressWarnings("unchecked")
	private static JAXBElement<GobjectType> minimizeGobjectType(GobjectType gobj) {

		String qname = "table"; //$NON-NLS-1$
		final Class<GobjectType> c = (Class<GobjectType>) gobj.getClass();

		GobjectType value = objectFactory.createGobjectType();

		if (gobj instanceof TableType) {
			final TableType tt = objectFactory.createTableType();
			final TableType orig = (TableType) gobj;
			tt.setContenttype(orig.getContenttype());
			// copy all columns with pattern to table
			for (final ColumnType col : orig.getColumn()) {
				if (col.getPattern() != null) {
					tt.getColumn().add(col);
				}
			}

			value = tt;

			qname = "table"; //$NON-NLS-1$
		} else if (gobj instanceof UsagebarType) {
			final UsagebarType ut = objectFactory.createUsagebarType();

			ut.setCpucount(BigInteger.valueOf(0));

			value = ut;

			qname = "usagebar"; //$NON-NLS-1$
		} else if (gobj instanceof TextboxType) {
			final TextboxType ut = objectFactory.createTextboxType();

			ut.setText(""); //$NON-NLS-1$

			value = ut;

			qname = "text"; //$NON-NLS-1$
		} else if (gobj instanceof InfoboxType) {
			final InfoboxType ut = objectFactory.createInfoboxType();

			value = ut;

			qname = "infobox"; //$NON-NLS-1$
		} else if (gobj instanceof Nodedisplay) {// Create minimal nodedisplay
			final Nodedisplay ut = objectFactory.createNodedisplay();

			value = ut;
			final SchemeType scheme = objectFactory.createSchemeType();
			scheme.getEl1().add(objectFactory.createSchemeElement1());
			ut.setScheme(scheme);

			final DataType dat = objectFactory.createDataType();
			dat.getEl1().add(objectFactory.createDataElement1());
			ut.setData(dat);

			qname = "nodedisplay"; //$NON-NLS-1$
		} else if (gobj instanceof ChartType) {
			final ChartType ut = objectFactory.createChartType();

			value = ut;

			qname = "chart"; //$NON-NLS-1$
		} else if (gobj instanceof ChartgroupType) {
			final ChartgroupType ut = objectFactory.createChartgroupType();
			// Add lower chart-elements to the minimized chart-group
			final ChartgroupType orig = (ChartgroupType) gobj;
			// Go through all charts minimize them and add them to ut
			for (final ChartType chart : orig.getChart()) {
				final ChartType min = (ChartType) (minimizeGobjectType(chart).getValue());
				ut.getChart().add(min);
			}

			value = ut;

			qname = "chartgroup"; //$NON-NLS-1$
		}

		value.setDescription(gobj.getDescription());
		value.setId(gobj.getId());
		value.setTitle(gobj.getTitle());

		final JAXBElement<GobjectType> res = new JAXBElement<GobjectType>(new QName(qname), c, value);

		return res;
	}

	/**
	 * @param obj
	 *            LguiType-instance
	 * @param output
	 *            OutputStream to save xml-representation of obj in
	 * @throws JAXBException
	 */
	@SuppressWarnings("unused")
	private static void objToLML(LguiType obj, OutputStream output) throws JAXBException {

		final JAXBContext jc = JAXBContext.newInstance("lml"); //$NON-NLS-1$

		final Marshaller mar = jc.createMarshaller();

		mar.setProperty("jaxb.schemaLocation", "http://www.llview.de lgui.xsd"); //$NON-NLS-1$ //$NON-NLS-2$

		final QName tagname = new QName("http://www.llview.de", "lgui", "lml"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

		final JAXBElement<LguiType> rootel = new JAXBElement<LguiType>(tagname, LguiType.class, obj);

		mar.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, true);

		mar.marshal(rootel, output);
	}

	// DefaultLayouts
	private final UsagebarlayoutType defaultUsagebar;

	private final ChartlayoutType defaultChart;

	private final TablelayoutType defaultTable;

	private final InfoboxlayoutType defaultInfobox;

	/*
	 * create an objectfactory for all functions in this class
	 */
	private static ObjectFactory objectFactory = new ObjectFactory();

	/**
	 * @param lguiItem

	 */
	public LayoutAccess(ILguiItem lguiItem, LguiType lgui) {
		super(lguiItem, lgui);
		defaultUsagebar = objectFactory.createUsagebarlayoutType();
		defaultChart = objectFactory.createChartlayoutType();
		defaultTable = objectFactory.createTablelayoutType();
		defaultInfobox = objectFactory.createInfoboxlayoutType();

		this.lguiItem.addListener(new ILguiListener() {
			public void handleEvent(ILguiUpdatedEvent e) {

	}

	/**
	 * Generates an absolute layout without needing a layout tag. Active components are placed in a grid on the screen. Use this
	 * function, if no layout was specified by the lml-file.
	 * @param layout
	 *            absolute or splitlayout
	 */
	public void addLayoutTag(LayoutType layout) {

		if (layout.getId() == null) {
			layout.setId(""); //$NON-NLS-1$
		}

		JAXBElement<? extends LayoutType> jaxbel = null;
		// Create jaxbelement corresponding to the class-type
		if (layout instanceof AbslayoutType) {

			final AbslayoutType abslayout = (AbslayoutType) layout;

			jaxbel = new JAXBElement<AbslayoutType>(new QName("abslayout"), AbslayoutType.class, abslayout); //$NON-NLS-1$

		} else if (layout instanceof SplitlayoutType) {

			final SplitlayoutType splitlayout = (SplitlayoutType) layout;

			jaxbel = new JAXBElement<SplitlayoutType>(new QName("splitlayout"), SplitlayoutType.class, splitlayout); //$NON-NLS-1$

		} else {
			return;
		}

		lgui.getObjectsAndRelationsAndInformation().add(jaxbel);

		lguiItem.notifyListeners();

	}

	/**
	 * Generates an absolute layout without needing a layout tag. Active
	 * components are placed in a grid on the screen. Use this function, if no
	 * layout was specified by the lml-file.
	 * 
	 * @param width
	 *            width in pixels of the area, on which this layout is shown

	 */
	public AbslayoutType generateDefaultAbsoluteLayout(int width, int height) {

		final ArrayList<GobjectType> activeObjects = new ArrayList<GobjectType>();
		final List<GobjectType> gobjects = lguiItem.getOverviewAccess().getGraphicalObjects();

		final ArrayList<GobjectType> activeobjects = new ArrayList<GobjectType>();
		// Go through all graphical objects
		for (final GobjectType gobject : lguiItem.getOverviewAccess().getGraphicalObjects()) {
			// Get layouts for this object, normally there is only one
			final List<ComponentlayoutType> layouts = getComponentLayoutByGid(gobject
					.getId());

			if (layouts.size() == 0) {// assume gobject to be active if there is
										// no componentlayout
				activeObjects.add(gobject);
			}

			// Search for a componentlayout which declares gobject to be active
			for (final ComponentlayoutType componentLayout : layouts) {
				if (componentLayout.isActive()) {
					activeObjects.add(gobject);
					break;
				}
			}
		}

		// Now activeObjects contains all active graphical objects, which have
		// to be arranged on the screen

		final AbslayoutType result = objectFactory.createAbslayoutType();

		result.setId(DEAFULT_ABS);

		// Try to create as many columns as rows
		int columns = (int) Math.round(Math.sqrt(activeObjects.size()));

		if (columns == 0) {
			columns = 1;
		}

		int rows = (int) Math.ceil((double) activeObjects.size() / columns);

		if (rows == 0) {
			rows = 1;
		}
		// Calculate width and height of graphical objects
		int index = 0;
		final int rectWidth = width / columns;
		final int rectHeight = height / rows;

		for (final GobjectType gobject : activeObjects) {

			final ComponentType component = objectFactory.createComponentType();
			component.setGid(gobject.getId());
			// Positioning the component
			component.setW(BigInteger.valueOf(rectWidth));
			component.setH(BigInteger.valueOf(rectHeight));

			component.setX(BigInteger.valueOf((index % columns) * rectWidth));
			component.setY(BigInteger.valueOf((index / columns) * rectHeight));

			// Add this component position to the layout
			result.getComp().add(component);

			index++;
		}

		return result;
	}

	public String[] getActiveNodedisplayLayoutGid() {
		final ArrayList<String> nodedisplayID = new ArrayList<String>();
		final List<NodedisplaylayoutType> nodedisplayLayouts = getNodedisplayLayouts();
		for (final NodedisplaylayoutType nodedisplayLayout : nodedisplayLayouts) {
			if (nodedisplayLayout.isActive()) {
				nodedisplayID.add(nodedisplayLayout.getGid());
			}
		}
		return nodedisplayID.toArray(new String[nodedisplayID.size()]);
	}

	public String[] getActiveTableLayoutsGid() {
		final ArrayList<String> tableLayoutsId = new ArrayList<String>();
		final List<TablelayoutType> tableLayouts = getTableLayouts();
		for (final TablelayoutType tableLayout : tableLayouts) {
			if (tableLayout.isActive()) {
				tableLayoutsId.add(tableLayout.getGid());
			}
		}
		return tableLayoutsId.toArray(new String[tableLayoutsId.size()]);
	}

	/**
	 * Simply returns the first layout found for a chart with the given id or a default-layout
	 * default-layout
	 * 
	 * @param chartId
	 * @return defaultlayout for a chart or first layout for chart with id
	 *         chartid given by lml-file
	 */
	public ChartlayoutType getChartLayout(String chartId) {
		for (final ChartlayoutType chartLayout : getChartLayouts()) {
			if (chartLayout.getGid().equals(chartId)) {
			if (chartLayout.getGid().equals(chartID)) {
				return chartLayout;
			}
		}
		return objectFactory.createChartlayoutType();
	}

	public List<ChartlayoutType> getChartLayouts() {
		final List<ChartlayoutType> chartLayouts = new LinkedList<ChartlayoutType>();
		for (final ComponentlayoutType layout : getComponentLayouts()) {
			if (layout instanceof ChartlayoutType) {
				chartLayouts.add((ChartlayoutType) layout);
			}
		}
		return chartLayouts;
	}

	/**
	 * Search in component-layouts for layout for the graphical object with gid.
	 * gid.
	 * 
	 * @param gid
	 *            id of corresponding graphical object, for which layouts are

	 * @return list of componentlayouts corresponding to the graphical object id
	 *         gid
	 */
	public List<ComponentlayoutType> getComponentLayoutByGid(String gid) {
		final ArrayList<ComponentlayoutType> result = new ArrayList<ComponentlayoutType>();
		for (final ComponentlayoutType layout : getComponentLayouts()) {
			if (layout.getGid() != null && layout.getGid().equals(gid)) {
				result.add(layout);

		for (final ComponentlayoutType alayout : complayouts) {

			if (alayout.getGid() != null && alayout.getGid().equals(gid)) {

				res.add(alayout);
			}
		}
		return result;
		return res;
	}

	/**

	 */
	public List<ComponentlayoutType> getComponentLayouts() {
		final List<ComponentlayoutType> layouts = new LinkedList<ComponentlayoutType>();
		for (final Object object : jaxbUtil.getObjects(lgui)) {
			if (object instanceof ComponentlayoutType) {
				layouts.add((ComponentlayoutType) object);
			}
		}
		return layouts;
	}

	public TablelayoutType getDefaultTableLayoutFromTable(String gid) {
		TablelayoutType tableLayout = getTableLayout(gid);
		if (tableLayout == null) {
			tableLayout = new TablelayoutType();

			getTableLayouts().add(tableLayout);
		}
		if (tableLayout.getColumn().size() <= 0) {
			tableLayout.setId(gid + LAYOUT_ENDING);
			tableLayout.setGid(gid);
			final TableType table = lguiItem.getTableHandler().getTable(gid);
			if (table != null) {
				for (int i = 0; i < table.getColumn().size(); i++) {

	}

	public Map<String, String> getInactiveComponents() {
		final List<ComponentlayoutType> objects = getComponentLayouts();
		final ArrayList<String> inactive = new ArrayList<String>();
		final Map<String, String> inactiveMap = new HashMap<String, String>();
		for (final ComponentlayoutType object : getComponentLayouts()) {
			if (!object.isActive()) {
				if (object instanceof TablelayoutType) {
					final TableType table = lguiItem.getTableHandler().getTable(object.getGid());
					if (table != null) {
						inactiveMap.put(table.getTitle(), object.getGid());
					}
				} else if (object instanceof NodedisplaylayoutType) {
					inactiveMap
							.put(lguiItem.getNodedisplayAccess().getNodedisplayById(object.getGid()).getTitle(), object.getGid());
				}
				inactive.add(object.getGid());
			}
		}
		return inactiveMap;
	}

	/**
	 * Simply returns the first layout found for a infobox with the given id or a default-layout
	 * a default-layout
	 * 
	 * @param infoID
	 * @return defaultlayout for a table or first layout for table with id
	 *         tableid given by lml-file
	 */
	public InfoboxlayoutType getInfoboxLayout(String infoId) {
		for (final InfoboxlayoutType infoboxLayout : getInfoboxLayout()) {
			if (infoboxLayout.getGid().equals(infoId)) {
			if (infoboxLayout.getGid().equals(infoID)) {
				return infoboxLayout;
			}
		}
		return objectFactory.createInfoboxlayoutType();
	}

	public ColumnlayoutType[] getLayoutColumsToCids(BigInteger[] cids, String gid) {

	}

	/**
	 * Remove all real data from model return only layout-information and data, which is needed to make lml-model valid
	 * which is needed to make lml-model valid
	 * 
	 * @param model
	 *            lml-model with data and layout-information
	 * @return
	 */
	public LguiType getLayoutFromModel() {
		final LguiType result = objectFactory.createLguiType();

		final HashSet<String> components = new HashSet<String>();
		// nodedisplays
		final String dummystring = "__dummy_nd__";//$NON-NLS-1$

		jaxbUtil.getLayoutComponents(result, lgui, components);

		final List<GobjectType> gobjectList = new LinkedList<GobjectType>();
		for (final Object object : jaxbUtil.getObjects(lgui)) {
		for (final JAXBElement<?> tag : lgui.getObjectsAndRelationsAndInformation()) {

			final Object value = tag.getValue();

			// add normal global layouts
			if (value instanceof LayoutType) {
				res.getObjectsAndRelationsAndInformation().add(tag);

				if (value instanceof SplitlayoutType) {
					final SplitlayoutType splitlayout = (SplitlayoutType) value;
					// Collect needed components from layout recursively
					if (splitlayout.getLeft() != null) {
						collectComponents(splitlayout.getLeft(), neededComponents);
						collectComponents(splitlayout.getRight(), neededComponents);
					}
				} else if (value instanceof AbslayoutType) {

					final AbslayoutType abslayout = (AbslayoutType) value;
					// Just traverse comp-list for gid-attributes
					for (final ComponentType comp : abslayout.getComp()) {
						neededComponents.add(comp.getGid());
					}

				}

			} else if (value instanceof ComponentlayoutType) {
				if (((ComponentlayoutType) value).isActive()) {
					res.getObjectsAndRelationsAndInformation().add(tag);

					final ComponentlayoutType complayout = (ComponentlayoutType) value;
					neededComponents.add(complayout.getGid());

					// Workaround for nodedisplay
					if (value instanceof NodedisplaylayoutType) {
						final NodedisplaylayoutType nlayout = (NodedisplaylayoutType) value;
						nlayout.setGid(dummystring);
					}

				}
			}

		}

		final HashMap<String, GobjectType> idtoGobject = new HashMap<String, GobjectType>();
		// Search needed components in data-tag to discover, which type the
		// needed components have
		for (final JAXBElement<?> tag : lgui.getObjectsAndRelationsAndInformation()) {

			final Object value = tag.getValue();
			// is it a graphical object?
			if (object instanceof GobjectType) {
				if (components.contains(((GobjectType) object).getId())) {
					gobjectList.add((GobjectType) object);
					idtoGobject.put(gobj.getId(), gobj);
				}
			}
		}

		// Add all gobjects in idtoGobject to the result, so that lml-model is
		// valid
		for (final GobjectType gobject : gobjectList) {
			result.getObjectsAndRelationsAndInformation().add(JAXBUtil.minimizeGobjectType(gobject, objectFactory));

			// Workaround for nodedisplay
			final GobjectType newgobj = min.getValue();
			if (newgobj instanceof Nodedisplay) {
				((Nodedisplay) newgobj).setId(dummystring);
			}

			res.getObjectsAndRelationsAndInformation().add(min);
		}

		// Set layout-attribute
		result.setLayout(true);

		return result;
	}

	/**

	 */
	public List<NodedisplaylayoutType> getNodedisplayLayouts() {
		final List<NodedisplaylayoutType> nodedisplayLayouts = new LinkedList<NodedisplaylayoutType>();
		for (final ComponentlayoutType layout : getComponentLayouts()) {
			if (layout instanceof NodedisplaylayoutType) {
				nodedisplayLayouts.add((NodedisplaylayoutType) layout);
			}
		}
		return nodedisplayLayouts;

	}

	/**
	 * Getting the layout of a given table, the identifier of the layout is the shared ID of table and layout.
	 * shared ID of table and layout.
	 * 
	 * @param tablelayoutID
	 *            ID of the desired tablelayout
	 * @return Corresponding layout of a table
	 */
	public TablelayoutType getTableLayout(String tablelayoutId) {
		for (final TablelayoutType layout : getTableLayouts()) {
			if (layout.getGid().equals(tablelayoutId)) {
				return layout;
			}
		}
		return objectFactory.createTablelayoutType();
	}

	/**

	 */
	public List<TablelayoutType> getTableLayouts() {
		final List<TablelayoutType> tableLayouts = new LinkedList<TablelayoutType>();
		for (final ComponentlayoutType layout : getComponentLayouts()) {
			if (layout instanceof TablelayoutType) {
				tableLayouts.add((TablelayoutType) layout);
			}
		}
		return tableLayouts;
	}

	/**
	 * This function is only for easier understanding this class Textboxlayouts are identical to infoboxlayouts, so you could call
	 * are identical to infoboxlayouts, so you could call
	 * getInfoboxLayout(textid) and would get the same result.
	 * 
	 * @param textID
	 *            id of a textbox
	 * @return layout for a textbox with an info-tag in it
	 */
	public InfoboxlayoutType getTextboxLayout(String textId) {
		return getInfoboxLayout(textId);
	}

	/**
	 * Simply returns the first layout found for a usagebar with the given id or a default-layout
	 * a default-layout
	 * 
	 * @param usagebarId
	 * @return defaultlayout for a usagebar or first layout for usagebar with id
	 *         usagebarid given by lml-file
	 */
	public UsagebarlayoutType getUsagebarLayout(String usagebarId) {
		final List<UsagebarlayoutType> usagebarLayouts = getUsagebarLayouts();
		// Over all objects in lml-file
		for (final UsagebarlayoutType usagebarLayout : getUsagebarLayouts()) {
			if (usagebarLayout.getGid().equals(usagebarId)) {
				return usagebarLayout;
			}
		}
		return objectFactory.createUsagebarlayoutType();
	}

	public List<UsagebarlayoutType> getUsagebarLayouts() {
		final List<UsagebarlayoutType> usagebarLayouts = new LinkedList<UsagebarlayoutType>();
		for (final ComponentlayoutType layout : getComponentLayouts()) {
			if (layout instanceof UsagebarlayoutType) {
				usagebarLayouts.add((UsagebarlayoutType) layout);
			}
		}
		return usagebarLayouts;
	}

	/**
	 * Replace all componentlayouts for a graphical object with given gid
	 * through newlayout.getGid() with newlayout
	 * 
	 * @param newLayout
	 *            new layout, which is placed into the positions of old layouts
	 */
	@SuppressWarnings("unchecked")
	public void replaceComponentLayout(ComponentlayoutType newlayout) {
		if (newlayout == null) {
			return;
		}
		final String gid = newlayout.getGid();

		final List<JAXBElement<?>> allobjects = lgui.getObjectsAndRelationsAndInformation();

		boolean replaced = false;

		// Over all objects in lml-file
		for (int i = 0; i < allobjects.size(); i++) {
			final JAXBElement<?> aobj = allobjects.get(i);

			// Over all Componentlayouts
			if (aobj.getValue() instanceof ComponentlayoutType) {

				final ComponentlayoutType alayout = (ComponentlayoutType) aobj.getValue();

				if (alayout.getGid() != null && alayout.getGid().equals(gid)) {

					if (!replaced) {

						((JAXBElement<ComponentlayoutType>) aobj).setValue(newlayout);
						lguiItem.notifyListeners();
						replaced = true;
					} else {// Delete this object
						allobjects.remove(aobj);
						// One step back
						i--;
					}
				}

			}
		}

		if (!replaced) {// Insert new layout, if there was nothing to replace
			// Takes any componentlayout
			JAXBElement<?> newel = null;

			// Differ between several layouts, create different JAXBElements
			if (newlayout instanceof TablelayoutType) {
				newel = new JAXBElement<TablelayoutType>(new QName("tablelayout"), TablelayoutType.class, //$NON-NLS-1$
						(TablelayoutType) newlayout);
			} else if (newlayout instanceof NodedisplaylayoutType) {
				newel = new JAXBElement<NodedisplaylayoutType>(new QName("nodedisplaylayout"), NodedisplaylayoutType.class, //$NON-NLS-1$
						(NodedisplaylayoutType) newlayout);
			}

			if (newel != null) {
				lgui.getObjectsAndRelationsAndInformation().add(newel);
				lguiItem.notifyListeners();
			}
		}

	}

	/**
	 * Setting Changes in the Layout.
	 */
	public void setChangesLayoutColumn() {

	}

	public String setComponentActive(String gid, boolean active) {

		final ComponentlayoutType component = getComponent(gid);
		if (component != null) {
			if (component instanceof TablelayoutType) {
				type = ILMLCoreConstants.TABLE_ELEMENT;
			} else if (component instanceof NodedisplaylayoutType) {
				type = ILMLCoreConstants.NODEDISPLAY_ELEMENT;
			}
			component.setActive(active);
		}

	}

	private ComponentlayoutType getComponent(String gid) {
		for (final ComponentlayoutType object : getComponentLayouts()) {
		for (final ComponentlayoutType object : objects) {
			if (object.getGid().equals(gid)) {
				return object;
			}


	private List<InfoboxlayoutType> getInfoboxLayout() {
		final List<InfoboxlayoutType> infoboxLayouts = new LinkedList<InfoboxlayoutType>();
		for (final ComponentlayoutType layout : getComponentLayouts()) {
			if (layout instanceof InfoboxlayoutType) {
				infoboxLayouts.add((InfoboxlayoutType) layout);
			}
		}
		return infoboxLayouts;

Lines 13-18 Link Here

(-)a/rms/org.eclipse.ptp.rm.lml.core/src/org/eclipse/ptp/rm/lml/internal/core/model/LguiHandler.java (+3 lines)
13		13
14	import org.eclipse.ptp.rm.lml.core.model.ILguiHandler;	14	import org.eclipse.ptp.rm.lml.core.model.ILguiHandler;
15	import org.eclipse.ptp.rm.lml.core.model.ILguiItem;	15	import org.eclipse.ptp.rm.lml.core.model.ILguiItem;
		16	import org.eclipse.ptp.rm.lml.core.util.JAXBUtil;
16	import org.eclipse.ptp.rm.lml.internal.core.elements.LguiType;	17	import org.eclipse.ptp.rm.lml.internal.core.elements.LguiType;
17		18
18	/**	19	/**
Lines 40-45 Link Here
40	*/	41	*/
41	protected LguiType lgui;	42	protected LguiType lgui;
42		43
		44	protected static final JAXBUtil jaxbUtil = JAXBUtil.getInstance();
		45
43	/**	46	/**
44	* @param lguiItem	47	* @param lguiItem
45	* surrounding lml-manager needed to fire events, if this handler changed data	48	* surrounding lml-manager needed to fire events, if this handler changed data




import java.io.InputStream;
import java.io.InputStreamReader;
import java.io.OutputStream;
import java.io.StringReader;
import java.io.StringWriter;
import java.math.BigInteger;
import java.util.ArrayList;

import java.util.TreeMap;
import java.util.UUID;

import javax.xml.bind.JAXBElement;
import javax.xml.bind.JAXBException;
import javax.xml.bind.Marshaller;
import javax.xml.bind.PropertyException;
import javax.xml.bind.Unmarshaller;
import javax.xml.namespace.QName;

import org.eclipse.ptp.rm.lml.core.JobStatusData;
import org.eclipse.ptp.rm.lml.core.LMLCorePlugin;
import org.eclipse.ptp.rm.lml.core.events.ILguiUpdatedEvent;
import org.eclipse.ptp.rm.lml.core.listeners.ILguiListener;
import org.eclipse.ptp.rm.lml.core.model.ILguiHandler;
import org.eclipse.ptp.rm.lml.core.model.ILguiItem;
import org.eclipse.ptp.rm.lml.core.model.IPattern;
import org.eclipse.ptp.rm.lml.core.util.JAXBUtil;
import org.eclipse.ptp.rm.lml.internal.core.elements.CellType;
import org.eclipse.ptp.rm.lml.internal.core.elements.ColumnType;
import org.eclipse.ptp.rm.lml.internal.core.elements.ComponentlayoutType;

	 */
	private final List<ILguiListener> listeners = new LinkedList<ILguiListener>();

	private Map<String, List<IPattern>> filters = new HashMap<String, List<IPattern>>();

	/**
	 * List of encapsulated classes, which handle parts of the lml-hierarchy
	 */

	 */
	private final Map<String, JobStatusData> fJobMap = Collections.synchronizedMap(new TreeMap<String, JobStatusData>());

	private final JAXBUtil jaxbUtil = JAXBUtil.getInstance();

	//	private static final String LAYOUT = "layout";//$NON-NLS-1$

	// TODO Rewrite - Java Applet
	private final Marshaller marshaller = LMLCorePlugin.getDefault().getMarshaller();

	private final Unmarshaller unmarshaller = LMLCorePlugin.getDefault().getUnmarshaller();

	private RequestType request;

	private String username = null;

	private boolean lockUpdate = true;

	private boolean lockPattern = false;

	/**
	 * Constructor with LML-model as argument

	 */
	public LguiItem(LguiType lgui) {
		this.lgui = lgui;
		// TODO Give the LguiItem a name
		createLguiHandlers();
	}

	/**
	 * 
	 */
	public LguiItem(String name, String username) {
		this.name = name;
		this.username = username;
	}

	/**

				if (overview != null) {
					String oid = overview.getOIDByJobId(jobId);
					if (oid == null) {
						final TableHandler handler = getTableHandler();
						if (handler != null) {
							final TableType table = handler.getTable(getGidFromJobStatus(status.getState()));
							if (table != null) {

		}
	}

	public String[] getColumnTitlePattern(String gid) {
		final List<String> titles = new ArrayList<String>();
		final List<IPattern> patternList = filters.get(gid);
		if (patternList != null) {
			for (final IPattern pattern : patternList) {
				titles.add(pattern.getColumnTitle());
			}
		}
		return titles.toArray(new String[titles.size()]);
	}

	/*
	 * (non-Javadoc)
	 * 
	 * @see org.eclipse.ptp.rm.lml.core.model.ILguiItem#getCurrentLayout(java.io. OutputStream)
	 */
	public void getCurrentLayout(OutputStream output) {
		while (lockPattern) {
			// wait until the pattern have been set

		}
		lockUpdate = true;
		LguiType layoutLgui = null;
		if (lgui == null) {
			layoutLgui = firstRequest();

			layoutLgui = getLayoutAccess().getLayoutFromModel();
			layoutLgui.setRequest(request);
		}
		jaxbUtil.marshal(layoutLgui, output);
			marshaller.setProperty("jaxb.schemaLocation", lmlNamespace + " lgui.xsd"); //$NON-NLS-1$ //$NON-NLS-2$
			marshaller.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, Boolean.TRUE);
			final QName tagname = new QName(lmlNamespace, "lgui", "lml"); //$NON-NLS-1$ //$NON-NLS-2$

			final JAXBElement<LguiType> rootElement = new JAXBElement<LguiType>(tagname, LguiType.class, layoutLgui);
			/*
			 * Synchronize to avoid the dreaded "FWK005 parse may not be called while parsing" message
			 */
			synchronized (LguiItem.class) {
				marshaller.marshal(rootElement, output);
			}
			output.close(); // Must close to flush stream
		} catch (final PropertyException e) {
			LMLCorePlugin.log(e);
		} catch (final IOException e) {
			LMLCorePlugin.log(e);
		}
	}

	/**

		return (OverviewAccess) lguiHandlers.get(OverviewAccess.class);
	}

	public Map<String, List<IPattern>> getPattern() {
		return filters;
	}

	public List<IPattern> getPattern(String gid) {
		if (filters.containsKey(gid)) {
			return filters.get(gid);
		}
		return new LinkedList<IPattern>();
	}

	public TableHandler getTableHandler() {
		if (lguiHandlers.get(TableHandler.class) == null) {
			return null;

		synchronized (fJobMap) {
			return fJobMap.values().toArray(new JobStatusData[0]);
		}
	}

	public String getUsername() {
		if (username == null) {
			return new String();
		}
		return username;
	}

	/*

	 */
	public void notifyListeners() {
		final LguiUpdatedEvent event = new LguiUpdatedEvent(this, lgui);
		for (final ILguiListener listener : listeners) {
			listener.handleEvent(event);
		}
	}

	// public void reloadLastLayout(IMemento memento) {
	// final StringBuilder layout = new StringBuilder();
	//
	// if (memento != null) {
	// final IMemento child = memento.getChild(LAYOUT);
	// layout.append(child.getID());
	// }
	// LguiType lguiType = null;
	// if (layout.length() > 0) {
	// try {
	// lguiType = parseLML(layout.toString());
	// } catch (final JAXBException e) {
	// LMLCorePlugin.log(e);
	// }
	// }
	// if (lguiType != null) {
	// for (final JAXBElement<?> tag : lguiType
	// .getObjectsAndRelationsAndInformation()) {
	// if (tag.getValue() instanceof ComponentlayoutType) {
	// lgui = lguiType;
	// if (listeners.isEmpty()) {
	// createLguiHandlers();
	// }
	// }
	// }
	// }
	// }

	public void reloadLastLayout(StringBuilder layout) {
		LguiType lguiType = null;
		if (layout.length() > 0) {
			lguiType = jaxbUtil.unmarshal(layout.toString());
				lguiType = parseLML(layout.toString());
			} catch (final JAXBException e) {
				LMLCorePlugin.log(e);
			}
		}
		if (lguiType != null) {
			for (final Object object : jaxbUtil.getObjects(lguiType)) {
				if (object instanceof ComponentlayoutType) {
					lgui = lguiType;
					if (listeners.isEmpty()) {
						createLguiHandlers();
					}
					break;
				}
			}
		}

		} else {
			layoutLgui = getLayoutAccess().getLayoutFromModel();
		}
		jaxbUtil.marshal(layoutLgui, writer);
			marshaller.setProperty("jaxb.schemaLocation", lmlNamespace + " lgui.xsd"); //$NON-NLS-1$ //$NON-NLS-2$
			marshaller.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, Boolean.TRUE);
			final QName tagname = new QName(lmlNamespace, "lgui", "lml"); //$NON-NLS-1$ //$NON-NLS-2$

			final JAXBElement<LguiType> rootElement = new JAXBElement<LguiType>(tagname, LguiType.class, layoutLgui);
			/*
			 * Synchronize to avoid the dreaded "FWK005 parse may not be called while parsing" message
			 */
			synchronized (LguiItem.class) {
				marshaller.marshal(rootElement, writer);
			}
		} catch (final PropertyException e) {
			LMLCorePlugin.log(e);
		} catch (final JAXBException e) {
			LMLCorePlugin.log(e);
		}
		return writer.getBuffer().toString();
	}

	public void setPattern(Map<String, List<IPattern>> pattern) {
		if (pattern != null) {
			filters = pattern;
		}
	}

	public void setPattern(String gid, List<IPattern> filterValues) {
		while (lockUpdate) {
			// wait until the update with the server is finished
		}
		lockPattern = true;
		if (filters.containsKey(gid)) {
			filters.remove(gid);
		}
		filters.put(gid, filterValues);
		lockPattern = false;
	}
	//
	// final JAXBElement<LguiType> rootElement = new JAXBElement<LguiType>(
	// tagname, LguiType.class, layoutLgui);
	// /*
	// * Synchronize to avoid the dreaded
	// * "FWK005 parse may not be called while parsing" message
	// */
	// synchronized (LguiItem.class) {
	// marshaller.marshal(rootElement, writer);
	//
	// }
	// } catch (final PropertyException e) {
	// LMLCorePlugin.log(e);
	// } catch (final JAXBException e) {
	// LMLCorePlugin.log(e);
	// }
	// final IMemento layoutMemento = memento.createChild(LAYOUT, writer
	// .getBuffer().toString());
	// }

	public void setRequest(RequestType request) {
		this.request = request;

	 * 
	 * @see org.eclipse.ptp.rm.lml.core.model.ILguiItem#update(java.io.InputStream)
	 */
	public void update(InputStream stream) {

		final BufferedReader reader = new BufferedReader(new InputStreamReader(stream));
		StringBuilder xmlStream = new StringBuilder();

			}
		}
		if (xmlStream.length() > 0) {
			lgui = jaxbUtil.unmarshal(xmlStream.toString());
			if (listeners.isEmpty()) {
				createLguiHandlers();
			}

			}
			updateJobData();
		}
		lockUpdate = false;
	}

	/*

		layoutLgui.setVersion("1"); //$NON-NLS-1$
		layoutLgui.setLayout(true);

		// final RequestType request = objectFactory.createRequestType();
		final LayoutRequestType layoutReq = objectFactory.createLayoutRequestType();
		layoutReq.setGetDefaultData(true);


			return ACTIVE_JOB_TABLE;
		}
		return INACTIVE_JOB_TABLE;
	}

	/**
	 * Parsing an XML file. The method generates from an XML file an instance of LguiType.
	 * 
	 * @param stream
	 *            the input stream of the XML file
	 * @return the generated LguiType
	 * @throws JAXBException
	 */
	@SuppressWarnings("unchecked")
	private LguiType parseLML(String string) throws JAXBException {
		/*
		 * Synchronize to avoid the dreaded "FWK005 parse may not be called while parsing" message
		 */
		final JAXBElement<LguiType> doc;
		synchronized (LguiItem.class) {
			doc = (JAXBElement<LguiType>) unmarshaller.unmarshal(new StringReader(string));
		}
		return doc.getValue();
	}

	private void setCid() {




import java.util.HashMap;
import java.util.List;

import javax.xml.bind.JAXBElement;

import org.eclipse.ptp.rm.lml.core.events.ILguiUpdatedEvent;
import org.eclipse.ptp.rm.lml.core.listeners.ILguiListener;
import org.eclipse.ptp.rm.lml.core.model.ILguiItem;

 * This class provides access to information-objects within a lml-model. It can
 * be used for fast and simple access to information filtered by the
 * information-type or the object-id.
 * 
 * @author karbach
 * 
 */
public class OIDToInformation extends LguiHandler {



		oidtoinfo = new HashMap<String, List<InfoType>>();

		for (final Object object : jaxbUtil.getObjects(lgui)) {

			if (!(object instanceof InformationType)) {
														// information-tags

			final Object tag = jaxbtag.getValue();

			if (!(tag instanceof InformationType)) {
				continue;
			}

			final InformationType ainfos = (InformationType) object;

			final List<InfoType> realinfos = ainfos.getInfo();





import java.util.LinkedList;
import java.util.List;

import javax.xml.bind.JAXBElement;

import org.eclipse.ptp.rm.lml.core.events.ILguiUpdatedEvent;
import org.eclipse.ptp.rm.lml.core.listeners.ILguiListener;
import org.eclipse.ptp.rm.lml.core.model.ILguiItem;

	 */
	public List<GobjectType> getGraphicalObjects() {
		final List<GobjectType> objects = new LinkedList<GobjectType>();
		for (final Object object : jaxbUtil.getObjects(lgui)) {
			if (object instanceof GobjectType) {
				objects.add((GobjectType) object);
			}
		}
		return objects;

	 */
	public List<InformationType> getInformations() {
		final List<InformationType> informations = new LinkedList<InformationType>();
		for (final Object object : jaxbUtil.getObjects(lgui)) {
			if (object instanceof InformationType) {
				informations.add((InformationType) object);
			}
		}
		return informations;

	 */
	public List<LayoutType> getLayouts() {
		final List<LayoutType> layouts = new LinkedList<LayoutType>();
		for (final Object object : jaxbUtil.getObjects(lgui)) {
			if (object instanceof LayoutType) {
				layouts.add((LayoutType) object);
			}
		}
		return layouts;

	 */
	public List<ObjectsType> getObjects() {
		final List<ObjectsType> objects = new LinkedList<ObjectsType>();
		for (final Object object : jaxbUtil.getObjects(lgui)) {
			if (object instanceof ObjectsType) {
				objects.add((ObjectsType) object);
			}
		}
		return objects;




/* Copyright (c) 2011 Forschungszentrum Juelich GmbH
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution and is available at
 * http://www.eclipse.org/legal/epl-v10.html
 * 
 * Contributors:
 * 		Claudia Knobloch, Carsten Karbach, FZ Juelich
 */
package org.eclipse.ptp.rm.lml.internal.core.model;

import org.eclipse.ptp.rm.lml.core.model.IPattern;

public class Pattern implements IPattern {

	private String columntitle;

	private String type;

	private boolean relation;

	private boolean range;

	// Relation
	private String valueRelation;

	private String relationOperator;

	// Range
	private String minValueRange;

	private String maxValueRange;

	public Pattern(String title, String type) {
		columntitle = title;
		this.type = type;
		if (columntitle == null) {
			columntitle = new String();
		}
		if (this.type == null) {
			this.type = new String("alpha");
		}
	}

	public String getColumnTitle() {
		return columntitle;
	}

	public String getMaxValueRange() {
		return maxValueRange;
	}

	public String getMinValueRange() {
		return minValueRange;
	}

	public String getRelationOperator() {
		return relationOperator;
	}

	public String getType() {
		return type;
	}

	public String getRelationValue() {
		return valueRelation;
	}

	public boolean isRange() {
		return (range && !relation);
	}

	public boolean isRelation() {
		return (relation && !range);
	}

	public IPattern setRange(String minValueRange, String maxValueRange) {
		this.range = true;
		this.relation = false;
		this.minValueRange = minValueRange;
		this.maxValueRange = maxValueRange;
		if (minValueRange == null) {
			this.minValueRange = new String();
		}
		if (maxValueRange == null) {
			this.maxValueRange = new String();
		}
		return this;
	}

	public IPattern setRelation(String relationOperator, String valueRelation) {
		this.relation = true;
		this.range = false;
		this.relationOperator = relationOperator;
		this.valueRelation = valueRelation;
		if (relationOperator == null) {
			this.relationOperator = new String("=");
		}
		if (valueRelation == null) {
			this.valueRelation = new String();
		}
		return this;
	}

}

Lines 38-43 Link Here

(-)a/rms/org.eclipse.ptp.rm.lml.core/src/org/eclipse/ptp/rm/lml/internal/core/model/TableColumnLayout.java (-2 / +14 lines)
38	*/	38	*/
39	private final boolean active;	39	private final boolean active;
40		40
		41	/*
		42	* Order of the data.
		43	*/
		44	private String order;
		45
41	/**	46	/**
42	* Constructor	47	* Constructor
43	*	48	*
Lines 50-61 Link Here
50	* @param activity	55	* @param activity
51	* of the column	56	* of the column
52	*/	57	*/
53	public TableColumnLayout(String title, Double width, String style,	58	public TableColumnLayout(String title, Double width, String style, boolean active, String order) {
54	boolean active) {
55	this.title = title;	59	this.title = title;
56	this.width = width;	60	this.width = width;
57	this.style = style;	61	this.style = style;
58	this.active = active;	62	this.active = active;
		63	this.order = order;
59	if (title == null) {	64	if (title == null) {
60	this.title = new String();	65	this.title = new String();
61	}	66	}
Lines 65-70 Link Here
65	if (style == null) {	70	if (style == null) {
66	this.style = ITableColumnLayout.COLUMN_STYLE_LEFT;	71	this.style = ITableColumnLayout.COLUMN_STYLE_LEFT;
67	}	72	}
		73	if (order == null) {
		74	this.order = new String("alpha");
		75	}
		76	}
		77
		78	public String getOrder() {
		79	return order;
68	}	80	}
69		81
70	/*	82	/*




import java.math.BigInteger;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import javax.xml.bind.JAXBElement;
import javax.xml.namespace.QName;

import org.eclipse.ptp.rm.lml.core.ILMLCoreConstants;
import org.eclipse.ptp.rm.lml.core.JobStatusData;

import org.eclipse.ptp.rm.lml.core.events.ILguiUpdatedEvent;
import org.eclipse.ptp.rm.lml.core.listeners.ILguiListener;
import org.eclipse.ptp.rm.lml.core.model.ILguiItem;
import org.eclipse.ptp.rm.lml.core.model.IPattern;
import org.eclipse.ptp.rm.lml.core.model.ITableColumnLayout;
import org.eclipse.ptp.rm.lml.internal.core.elements.CellType;
import org.eclipse.ptp.rm.lml.internal.core.elements.ColumnType;

				table.getColumn().add(column);
			}
		}
		jaxbUtil.addTable(lgui, table);
				new JAXBElement<TableType>(new QName(
						ILMLCoreConstants.TABLE_ELEMENT), TableType.class,
						table));
		return table;
	}

	public ITableColumnLayout[] getActiveTableColumnLayout(String gid) {
		final ITableColumnLayout[] allColumns = getTableColumnLayout(gid);
		final List<ITableColumnLayout> activeColumns = new ArrayList<ITableColumnLayout>();
		for (final ITableColumnLayout allColumn : allColumns) {
			if (allColumn.isActive()) {
				activeColumns.add(allColumn);
			}
		}
		return activeColumns.toArray(new ITableColumnLayout[activeColumns.size()]);
	}

	public String getCellValue(TableType table, RowType row, String colName) {

	 *            ID of the table layout
	 * @return column layout
	 */
	/**
	 * Get the column layout for the table
	 * 
	 * @param gid
	 *            ID of the table layout
	 * @return column layout
	 */
	public ITableColumnLayout[] getTableColumnLayout(String gid) {
		if (lguiItem == null && lguiItem.getLayoutAccess() == null) {
			return new ITableColumnLayout[0];
		}

		final BigInteger[] cids = getCids(gid);

			final ColumnlayoutType column = layoutColumns[i];
			if (column != null) {
				String style;
				final String sort = getColumnSortProperty(getTable(gid), cids,
						i);
				// when there is a change
				if (column.getSorted() != null
						&& column.getSorted().value() != null && sort != null
						&& sort.equals("numeric")) {
					style = ITableColumnLayout.COLUMN_STYLE_RIGHT;
				} else {
					style = ITableColumnLayout.COLUMN_STYLE_LEFT;
				}
				tableColumnLayouts[i] = new TableColumnLayout(column.getKey(),
						column.getWidth(), style, column.isActive(), sort);
			}
		}
		return tableColumnLayouts;

		}
		return tableColumnNonActive.toArray(new String[tableColumnNonActive
				.size()]);
	}

	public String[] getTableColumnTitles(String gid) {
		if (lguiItem == null && lguiItem.getLayoutAccess() == null) {
			return null;
		}
		final ColumnlayoutType[] layoutColumns = lguiItem.getLayoutAccess()
				.getLayoutColumsToCids(getCidsActiveColumns(gid), gid);
		final List<String> titles = new ArrayList<String>();
		for (final ColumnlayoutType layoutColumn : layoutColumns) {
			if (layoutColumn.getKey() != null) {
				titles.add(layoutColumn.getKey());
			}
		}

		return titles.toArray(new String[titles.size()]);
	}

	/**

			tableData[i].setCells(tableDataRow);
		}
		return tableData;
	}

	public Row[] getTableDataWithColor(String gid, boolean addColor, List<IPattern> filterTitlesValues) {
		final Row[] rows = getTableDataWithColor(gid, addColor);
		if (rows.length == 0) {
			return rows;
		}
		final BigInteger[] cids = getCids(gid);
		final TableType table = getTable(gid);

		// Convert Map filterTitlesValues into Map filterPosValues
		final Map<Integer, IPattern> filterPosValues = new HashMap<Integer, IPattern>();
		for (final IPattern pattern : filterTitlesValues) {
			BigInteger cid = BigInteger.valueOf(-1);
			for (final ColumnType column : table.getColumn()) {
				if (column.getName().equals(pattern.getColumnTitle())) {
					cid = column.getId();
					break;
				}
			}
			if (cid.equals(BigInteger.valueOf(-1))) {
				continue;
			}
			int position = -1;
			for (int i = 0; i < cids.length; i++) {
				if (cids[i].equals(cid)) {
					position = i;
					break;
				}
			}
			if (position == -1) {
				continue;
			}

			filterPosValues.put(position, pattern);
		}

		// Filter the rows
		final List<Row> filterRows = new ArrayList<Row>();
		for (final Row row : rows) {
			boolean allIncluded = true;
			for (final int position : filterPosValues.keySet()) {

				if (row.cells[position] == null) {
					continue;
				}
				final IPattern pattern = filterPosValues.get(position);
				final String rowValue = row.cells[position].value;

				final String type = pattern.getType();

				if (pattern.isRange()) {
					// Range
					final String minValue = pattern.getMinValueRange();
					final String maxValue = pattern.getMaxValueRange();
					if (type.equals("numeric")) {
						if ((Integer.valueOf(rowValue) < Integer.valueOf(minValue))
								|| (Integer.valueOf(maxValue) < Integer.valueOf(rowValue))) {
							allIncluded = false;
							break;
						}
					} else {
						if (rowValue.compareTo(minValue) < 0 || maxValue.compareTo(rowValue) < 0) {
							allIncluded = false;
							break;
						}
					}
				} else if (pattern.isRelation()) {
					// Relation
					final String compareValue = pattern.getRelationValue();
					final String compareOperator = pattern.getRelationOperator();
					if (type.equals("numeric")) {
						final int rowValueInt = Integer.valueOf(rowValue);
						final int compareValueInt = Integer.valueOf(compareValue);
						if (compareOperator.equals("=") && rowValueInt != compareValueInt) {
							allIncluded = false;
							break;
						} else if (compareOperator.equals("!=") && rowValueInt == compareValueInt) {
							allIncluded = false;
							break;
						} else if (compareOperator.equals("<") && rowValueInt >= compareValueInt) {
							allIncluded = false;
							break;
						} else if (compareOperator.equals("<=") && rowValueInt > compareValueInt) {
							allIncluded = false;
							break;
						} else if (compareOperator.equals(">") && rowValueInt <= compareValueInt) {
							allIncluded = false;
							break;
						} else if (compareOperator.equals(">=") && rowValueInt < compareValueInt) {
							allIncluded = false;
							break;
						}
					} else {
						if ((compareOperator.equals("=") && !compareValue.equals(rowValue))
								|| (compareOperator.equals("!=") && compareValue.equals(rowValue))) {
							allIncluded = false;
							break;
						} else if (type.equals("alpha")) {
							if ((compareOperator.equals("=~") && !rowValue.contains(compareValue))
									|| (compareOperator.equals("!~") && rowValue.contains(compareValue))) {
								allIncluded = false;
								break;
							}
						} else if (type.equals("date")) {
							if (compareOperator.equals("<") && rowValue.compareTo(compareValue) >= 0) {
								allIncluded = false;
								break;
							} else if (compareOperator.equals("<=") && rowValue.compareTo(compareValue) > 0) {
								allIncluded = false;
								break;
							} else if (compareOperator.equals(">") && rowValue.compareTo(compareValue) <= 0) {
								allIncluded = false;
								break;
							} else if (compareOperator.equals(">=") && rowValue.compareTo(compareValue) < 0) {
								allIncluded = false;
								break;
							}
						}
					}
				}
			}
			if (allIncluded) {
				filterRows.add(row);
			}
		}

		return filterRows.toArray(new Row[filterRows.size()]);
	}

	/**

		final PatternType pattern = new PatternType();
		final PatternMatchType patternMatch = new PatternMatchType();
		patternMatch.setRegexp(regexp);
		jaxbUtil.addPatternInclude(pattern, patternMatch);
				new JAXBElement<PatternMatchType>(new QName(
						ILMLCoreConstants.INCLUDE_ELEMENT),
						PatternMatchType.class, patternMatch));
		column.setPattern(pattern);
	}


		return cids;
	}

	/**
	 * Get column indexes of active columns for the table layout
	 * 
	 * @param gid
	 *            ID of the table layout
	 * @return array of column indexes
	 */
	private BigInteger[] getCidsActiveColumns(String gid) {
		final TablelayoutType layout = lguiItem.getLayoutAccess()
				.getTableLayout(gid);
		final List<BigInteger> cids = new ArrayList<BigInteger>();
		for (int i = 0; i < layout.getColumn().size(); i++) {
			for (final ColumnlayoutType column : layout.getColumn()) {
				if (column.getPos() != null
						&& column.getPos().equals(BigInteger.valueOf(i))
						&& column.isActive()) {
					cids.add(column.getCid());
				}
			}
		}
		return cids.toArray(new BigInteger[cids.size()]);
	}

	private BigInteger getColumnIndex(TableType table, String colName) {
		if (table != null) {
			for (final ColumnType column : table.getColumn()) {

				}
			}
		}
		return "alpha";
	}

	/**

Added Link Here

(-)a/rms/org.eclipse.ptp.rm.lml.da.server/.gitignore (+1 lines)
1	/lml-driver.tar




	$self->_adjust_layout_bg();


    } elsif($self->{SYSTEMTYPE} eq "CRAYXT") {
	my($maxpcol,$maxprow,$maxpcage,$maxpslot,$maxpnode)=$self->_get_system_size_crayxt();
	if(!$self->_init_trees_crayxt($maxpcol,$maxprow,$maxpcage,$maxpslot,$maxpnode)) {
	    print "ERROR: could not init internal data structures, system type: $self->{SYSTEMTYPE}, aborting ...\n";
	    return(-1);
	}
	# init data tree with empty root nodes
	$self->_add_empty_root_elements();
	
	$self->_adjust_layout_crayxt();



    } elsif($self->{SYSTEMTYPE} eq "Cluster") {

	# user define scheme given

	$inforef=$self->{LMLFH}->{DATA}->{INFODATA}->{$key};
	next if($inforef->{status} ne 'RUNNING');
	if(exists($inforef->{vnodelist})) {
	    $nodelist=$self->_remap_nodes_vnode($inforef->{vnodelist});
	} else {
	    $nodelist=$self->_remap_nodes($inforef->{nodelist});
	}
#	print "_insert_run_jobs job $key nodelist $nodelist\n";
	$self->insert_job_into_nodedisplay($self->{SCHEMEROOT},$self->{DATAROOT},$nodelist,$key);
	push(@idlist,$key);
	$jcount++;

	}
	$newnodelist.="," if($newnodelist);
	$newnodelist.=sprintf("%s-c%02d",$newnode,$num);
    }
    return($newnodelist);
}

sub _remap_nodes_vnode {
    my($self) = shift;
    my($nodelist)=shift;
    my($newnodelist,$spec,$node,$num,$number,$newnode,$start);
    if($self->{SYSTEMTYPE} eq "BG/P") {
	return($nodelist);
    }
    foreach $spec (split(/\),?\(/,$nodelist)) {
	# change form '(node,number tasks)' to (node-c<num>, ...)
	if($spec=~/\(?([^,]+),(\d+)\)?/) {
	    $node=$1;$number=$2;
	} elsif($spec=~/^([^,]+)$/) {
	    $node=$1;$number=0;	
	} else {
	    print "ERROR: _remap_nodes: unknown node in spec '$spec', skipping\n";
	}
	
	if(exists($self->{NODEMAPPING}->{$node})) {
	    $newnode=$self->{NODEMAPPING}->{$node}; 
	} else {
	    $newnode=$node;
	}
	
	if(!exists($self->{NODELASTTASKNUMBER}->{$node})) {
	    $self->{NODELASTTASKNUMBER}->{$node}=-1;
	}
	$start=$self->{NODELASTTASKNUMBER}->{$node}+1;
	for($num=$start;$num<$start+$number;$num++) {
	    $newnodelist.="," if($newnodelist);
	    $newnodelist.=sprintf("%s-c%02d",$newnode,$num);
	}
    }
    return($newnodelist);
}

}


###############################################
# Cray XT related
############################################### 
sub _adjust_layout_crayxt  {
    my($self) = shift;
    my($root_layout,$root_scheme,$treenode,$ltreenode,$streenode,$num,$min,$max,$lmin,$lmax);
    my $rc=1;
    my $maxlevel=6;
  
    $root_layout=$self->{LAYOUT}->{tree};
    $root_scheme=$self->{SCHEMEROOT};

    # COLS
    ######
    $streenode=$root_scheme->get_child({_name => "el1" });
    $ltreenode=$root_layout->get_child({_name => "el0" });

    # get number of rows (in el1 of scheme)
    if($streenode) {
	$min=$streenode->{ATTR}->{min};
	$max=$streenode->{ATTR}->{max};
	$num=$max-$min+1;
	
    } else {
	print STDERR "$0: ERROR: inconsistent scheme tree for Cray XT system (cols) ...\n";return(0);
    }
    
    if(!$ltreenode) {
	$ltreenode=$root_layout->new_child();
    }
    # set size attributes
    $ltreenode->{ATTR}->{rows}=1;
    $ltreenode->{ATTR}->{cols}=$num;

    # set some default layout attributes
#    $ltreenode->{ATTR}->{maxlevel} = 6              if(!exists($ltreenode->{ATTR}->{maxlevel}));
    $ltreenode->{ATTR}->{maxlevel} = 4              ;
    $ltreenode->{ATTR}->{vgap} = 5                  if(!exists($ltreenode->{ATTR}->{vgap}));
    $ltreenode->{ATTR}->{hgap} = 0                  if(!exists($ltreenode->{ATTR}->{hgap}));       
    $ltreenode->{ATTR}->{fontsize} = 10             if(!exists($ltreenode->{ATTR}->{fontsize}));   
    $ltreenode->{ATTR}->{border}   = 0              if(!exists($ltreenode->{ATTR}->{border}));     
    $ltreenode->{ATTR}->{fontfamily} = "Monospaced" if(!exists($ltreenode->{ATTR}->{fontfamily})); 
    $ltreenode->{ATTR}->{showtitle}  = "false"      if(!exists($ltreenode->{ATTR}->{showtitle}));  
    $ltreenode->{ATTR}->{background} = "#777"       if(!exists($ltreenode->{ATTR}->{background})); 
    $ltreenode->{ATTR}->{mouseborder}= 0            if(!exists($ltreenode->{ATTR}->{mouseborder})); 
    $ltreenode->{ATTR}->{transparent}= "false"      if(!exists($ltreenode->{ATTR}->{transparent}));
    $lmin=$min;$lmax=$max;

    # Rack
    ######
    $streenode=$streenode->get_child({_name => "el2" });

    # get number of rows (in el1 of scheme)
    if($streenode) {
	$min=$streenode->{ATTR}->{min};
	$max=$streenode->{ATTR}->{max};
	$num=$max-$min+1;
    } else {
	print STDERR "$0: ERROR: inconsistent scheme tree for Cray XT system (rows) ...\n";return(0);
    }
    
    $treenode=$ltreenode->get_child({_name => "el1" });
    if(!$treenode) {
	$treenode=$ltreenode->new_child();
    } 
    $ltreenode=$treenode;

    # set size attributes
    $ltreenode->{ATTR}->{rows}=$num;
    $ltreenode->{ATTR}->{cols}=1;

    # set some default layout attributes
#    $ltreenode->{ATTR}->{maxlevel} = 5              if(!exists($ltreenode->{ATTR}->{maxlevel}));
    $ltreenode->{ATTR}->{maxlevel} = 5;
    $ltreenode->{ATTR}->{vgap} = 5                  if(!exists($ltreenode->{ATTR}->{vgap}));
    $ltreenode->{ATTR}->{hgap} = 0                  if(!exists($ltreenode->{ATTR}->{hgap}));       
#    $ltreenode->{ATTR}->{fontsize} = 10             if(!exists($ltreenode->{ATTR}->{fontsize}));   
#    $ltreenode->{ATTR}->{border}   = 0              if(!exists($ltreenode->{ATTR}->{border}));     
#    $ltreenode->{ATTR}->{fontfamily} = "Monospaced" if(!exists($ltreenode->{ATTR}->{fontfamily})); 
    $ltreenode->{ATTR}->{showtitle}  = "true"       if(!exists($ltreenode->{ATTR}->{showtitle}));  
#    $ltreenode->{ATTR}->{background} = "#777"       if(!exists($ltreenode->{ATTR}->{background})); 
#    $ltreenode->{ATTR}->{mouseborder}= 0            if(!exists($ltreenode->{ATTR}->{mouseborder})); 
#    $ltreenode->{ATTR}->{transparent}= "false"      if(!exists($ltreenode->{ATTR}->{transparent}));
    $lmin=$min;$lmax=$max;

    # Cage
    #######
    $streenode=$streenode->get_child({_name => "el3" });

    # get number of cages (in el2 of scheme)
    if($streenode) {
	$min=$streenode->{ATTR}->{min};
	$max=$streenode->{ATTR}->{max};
	$num=$max-$min+1;
    } else {
	print STDERR "$0: ERROR: inconsistent scheme tree for BG system (racks) ...\n";return(0);
    }
    
    $treenode=$ltreenode->get_child({_name => "el2" });
    if(!$treenode) {
	$treenode=$ltreenode->new_child();
    } 
    $ltreenode=$treenode;

    # set size attributes
    $ltreenode->{ATTR}->{rows}=$num;    $ltreenode->{ATTR}->{cols}=1;
    $ltreenode->{ATTR}->{min}=$lmin;    $ltreenode->{ATTR}->{max}=$lmax;

    # set some default layout attributes
    $ltreenode->{ATTR}->{maxlevel} = 6             if(!exists($ltreenode->{ATTR}->{maxlevel}));
    $ltreenode->{ATTR}->{showtitle}  = "true"      if(!exists($ltreenode->{ATTR}->{showtitle}));  
    $lmin=$min;$lmax=$max;

    # blade
    #######
    $streenode=$streenode->get_child({_name => "el4" });

    # get number of slots (in el3 of scheme)
    if($streenode) {
	$min=$streenode->{ATTR}->{min};
	$max=$streenode->{ATTR}->{max};
	$num=$max-$min+1;
    } else {
	print STDERR "$0: ERROR: inconsistent scheme tree for BG system (midplanes) ...\n";return(0);
    }
    
    $treenode=$ltreenode->get_child({_name => "el3" });
    if(!$treenode) {
	$treenode=$ltreenode->new_child();
    } 
    $ltreenode=$treenode;

    # set size attributes
    $ltreenode->{ATTR}->{rows}=1;       $ltreenode->{ATTR}->{cols}=$num;
    $ltreenode->{ATTR}->{min}=$lmin;    $ltreenode->{ATTR}->{max}=$lmax;

    # set some default layout attributes
    $ltreenode->{ATTR}->{maxlevel}         = 6             if(!exists($ltreenode->{ATTR}->{maxlevel}));
    $ltreenode->{ATTR}->{showtitle}        = "false"        if(!exists($ltreenode->{ATTR}->{showtitle}));  
    $ltreenode->{ATTR}->{highestrowfirst}  = "true"        if(!exists($ltreenode->{ATTR}->{highestrowfirst}));  
    $ltreenode->{ATTR}->{showfulltitle}    = "false"        if(!exists($ltreenode->{ATTR}->{showfulltitle}));  
    $lmin=$min;$lmax=$max;


    # Node
    ######
    $streenode=$streenode->get_child({_name => "el5" });

    # get number of midplanes (in el4 of scheme)
    if($streenode) {
	$min=$streenode->{ATTR}->{min};
	$max=$streenode->{ATTR}->{max};
	$num=$max-$min+1;
    } else {
	print STDERR "$0: ERROR: inconsistent scheme tree for BG system (nodeboards) ...\n";return(0);
    }
    
    $treenode=$ltreenode->get_child({_name => "el4" });
    if(!$treenode) {
	$treenode=$ltreenode->new_child();
    } 
    $ltreenode=$treenode;

    # set size attributes
    $ltreenode->{ATTR}->{rows}=$num;    $ltreenode->{ATTR}->{cols}=1;
    $ltreenode->{ATTR}->{min}=$lmin;    $ltreenode->{ATTR}->{max}=$lmax;

    # set some default layout attributes
    $ltreenode->{ATTR}->{maxlevel}         = $maxlevel     if(!exists($ltreenode->{ATTR}->{maxlevel}));
    $ltreenode->{ATTR}->{showtitle}        = "false"        if(!exists($ltreenode->{ATTR}->{showtitle}));  
    $ltreenode->{ATTR}->{fontsize}         = 8             if(!exists($ltreenode->{ATTR}->{fontsize}));   
    $ltreenode->{ATTR}->{vgap}             = 0             if(!exists($ltreenode->{ATTR}->{vgap}));
    $ltreenode->{ATTR}->{hgap}             = 0             if(!exists($ltreenode->{ATTR}->{hgap}));       
    $ltreenode->{ATTR}->{highestrowfirst}  = "true"        if(!exists($ltreenode->{ATTR}->{highestrowfirst}));  
    $ltreenode->{ATTR}->{showfulltitle}    = "false"       if(!exists($ltreenode->{ATTR}->{showfulltitle}));  
    $lmin=$min;$lmax=$max;

    # cores
    #######
    $streenode=$streenode->get_child({_name => "el6" });

    # get number of midplanes (in el6 of scheme)
    if($streenode) {
	$min=$streenode->{ATTR}->{min};
	$max=$streenode->{ATTR}->{max};
	$num=$max-$min+1;
    } else {
	print STDERR "$0: ERROR: inconsistent scheme tree for BG system (cores) ...\n";return(0);
    }
    
    $treenode=$ltreenode->get_child({_name => "el5" });
    if(!$treenode) {
	$treenode=$ltreenode->new_child();
    } 
    $ltreenode=$treenode;

    # set size attributes
    $ltreenode->{ATTR}->{rows}=1;       $ltreenode->{ATTR}->{cols}=12;
    $ltreenode->{ATTR}->{min}=$lmin;    $ltreenode->{ATTR}->{max}=$lmax;

    # set some default layout attributes
    $ltreenode->{ATTR}->{maxlevel}         = $maxlevel     if(!exists($ltreenode->{ATTR}->{maxlevel}));
    $lmin=$min;$lmax=$max;


#    print "$0: LAYOUT: ",Dumper($root_layout);
#    print "$0: SCHEME: ",Dumper($root_scheme);

    return($rc);
}


###############################################
# Cray XT related
############################################### 
sub _get_system_size_crayxt {
    my($self) = shift;
    my($indataref) = $self->{INDATA};
    my($nodename,$pcol,$prow,$pcage,$pslot,$pnode);
    my($maxpcol,$maxprow,$maxpcage,$maxpslot,$maxpnode);

    my ($key,$ref);
    
    $maxpcol=    $maxprow=    $maxpcage=    $maxpslot=    $maxpnode= 0;
    keys(%{$self->{LMLFH}->{DATA}->{OBJECT}}); # reset iterator
    while(($key,$ref)=each(%{$self->{LMLFH}->{DATA}->{OBJECT}})) {
	next if($ref->{type} ne 'node');
	$nodename=$self->{LMLFH}->{DATA}->{OBJECT}->{$key}->{name};
	if($nodename=~/^c(\d+)-(\d+)c(\d+)s(\d+)n(\d+)$/) {
	    ($pcol,$prow,$pcage,$pslot,$pnode)=($1,$2,$3,$4,$5);
	} else {
	    print "_get_system_size_crayxt: node name could not be parsed: $nodename\n";
	}
	$maxpcol=$pcol if($pcol>$maxpcol);
	$maxprow=$prow if($prow>$maxprow);
	$maxpcage=$pcage if($pcage>$maxpcage);
	$maxpslot=$pslot if($pslot>$maxpslot);
	$maxpnode=$pnode if($pnode>$maxpnode);
    }

    printf("_get_system_size_crayxt: Cray XT system found of size: %dx%dx%d\n",
	   $maxpcol+1,$maxprow+1,$maxpcage+1,$maxpslot+1,$maxpnode+1 ) if($self->{VERBOSE});
    
    return($maxpcol,$maxprow,$maxpcage,$maxpslot,$maxpnode);
}


sub _init_trees_crayxt  {
    my($self) = shift;
    my($maxpcol,$maxprow,$maxpcage,$maxpslot,$maxpnode)=@_;
    my($id,$subid,$treenode,$schemeroot,$bgsystem);

    $schemeroot=$self->{SCHEMEROOT};
    $treenode=$schemeroot;
    $bgsystem=$treenode=$treenode->new_child();
    $treenode->add_attr({ tagname => 'col',
			  min     => 0,
			  max     => $maxpcol,
			  mask    => 'c%d-' });

    $treenode=$treenode->new_child();
    $treenode->add_attr({ tagname => 'rack',
			  min     => 0,
			  max     => $maxprow,
			  mask    => '%01d' });

    $treenode=$treenode->new_child();
    $treenode->add_attr({ tagname => 'cage',
			  min     => 0,
			  max     => $maxpcage,
			  mask    => 'c%01d' });

    $treenode=$treenode->new_child();
    $treenode->add_attr({ tagname => 'blade',
			  min     => 0,
			  max     => $maxpslot,
			  mask    => 's%01d' });

    $treenode=$treenode->new_child();
    $treenode->add_attr({ tagname => 'node',
			  min     => 0,
			  max     => $maxpnode,
			  mask    => 'n%01d' });

    $treenode=$treenode->new_child();
    $treenode->add_attr({ tagname => 'core',
			  min     => 0,
			  max     => 11,
			  mask    => '-c%02d' });

    return(1);
}


1;

Lines 476-482 Link Here

(-)a/rms/org.eclipse.ptp.rm.lml.da/LML2LML/LML_gen_nodedisplay_insert_job.pm (-1 / +1 lines)
476	$rg=$schemeref->{ATTR}->{_maskregall};	476	$rg=$schemeref->{ATTR}->{_maskregall};
477		477
478	# ready if nodename matches to this level	478	# ready if nodename matches to this level
479	# print "get_numbers_from_name: check on level ",$schemeref->{_level}+1," $name -> $rg\n" if($debug>=2);	479	# print "get_numbers_from_name: check on level ",$schemeref->{_level}+1," $name -> $rg subcheck ",$name=~/^$rg/,"\n" if($debug>=2);
480	if($name=~/^$rg$/) {	480	if($name=~/^$rg$/) {
481	@list=$name=~/^$rg$/;	481	@list=$name=~/^$rg$/;
482	print "get_numbers_from_name: found on level ",$schemeref->{_level}+1," $name -> ",join(',',@list),"\n" if($debug>=2);	482	print "get_numbers_from_name: found on level ",$schemeref->{_level}+1," $name -> ",join(',',@list),"\n" if($debug>=2);

Lines 515-521 Link Here

(-)a/rms/org.eclipse.ptp.rm.lml.da/LML_color/LML_color_manager.pm (-1 / +1 lines)
515	$color="red";	515	$color="red";
516	}	516	}
517	if($self->{USEDCOLORS}[$cat]->{$color}) {	517	if($self->{USEDCOLORS}[$cat]->{$color}) {
518	printf( "llview_manage_color: warning color in use .. by: %10s %-15s -> %-20s #buffer=%3d\n",	518	printf( "llview_manage_color: warning color $color in use by: %10s %-15s -> %-20s #buffer=%3d\n",
519	$self->{USEDCOLORS}[$cat]->{$color},$id,$color,$#{$self->{BUFFER}[$cat]});	519	$self->{USEDCOLORS}[$cat]->{$color},$id,$color,$#{$self->{BUFFER}[$cat]});
520	}	520	}
521	$self->{KNOWNIDS}[$cat]->{$id}=$color;	521	$self->{KNOWNIDS}[$cat]->{$id}=$color;

Lines 84-89 Link Here

(-)a/rms/org.eclipse.ptp.rm.lml.da/LML_color/LML_color_obj.pl (+1 lines)
84	{	84	{
85	my ($key,$type,$color);	85	my ($key,$type,$color);
86	foreach $key (keys(%{$filehandler->{DATA}->{OBJECT}})) {	86	foreach $key (keys(%{$filehandler->{DATA}->{OBJECT}})) {
		87	next if(!exists($filehandler->{DATA}->{OBJECT}->{$key}->{type}));
87	$type=$filehandler->{DATA}->{OBJECT}->{$key}->{type};	88	$type=$filehandler->{DATA}->{OBJECT}->{$key}->{type};
88	$color=$colormanager->get_color($type,$key);	89	$color=$colormanager->get_color($type,$key);
89	if($color) {	90	if($color) {

Lines 10-16 Link Here

(-)a/rms/org.eclipse.ptp.rm.lml.da/LML_color/default.conf (-1 / +1 lines)
10	#*******************************************************************************/	10	#*******************************************************************************/
11	# color space definitions for different types of LML objects	11	# color space definitions for different types of LML objects
12	class: type=class, colortype=gray,gray=1..200,buffer=2000	12	class: type=class, colortype=gray,gray=1..200,buffer=2000
13	job: type=job, colortype=hsv,H=001..297, S=76, V=75,buffer=2000	13	job: type=job, colortype=hsv,H=001..297, S=76, V=75,buffer=3000
14	node: type=node, colortype=hsv,H=297..076, S=80, V=75,buffer=5000	14	node: type=node, colortype=hsv,H=297..076, S=80, V=75,buffer=5000
15	partition: type=partition, colortype=hsv,H=010..100, S=90, V=75,buffer=200	15	partition: type=partition, colortype=hsv,H=010..100, S=90, V=75,buffer=200
16	partmap: type=partmap, colortype=hsv,H=001..299, S=40, V=75,buffer=100	16	partmap: type=partmap, colortype=hsv,H=001..299, S=40, V=75,buffer=100




use LML_combine_file_obj;
use LML_combine_obj_check;
use LML_combine_obj_bgp;
use LML_combine_obj_xt;


my $patint="([\\+\\-\\d]+)";   # Pattern for Integer number

    }
}

print "system_type=$system_type\n";

if($system_type eq "BG/P") {
    &LML_combine_obj_bgp::update($filehandler->get_data_ref(),$opt_dbdir);
}

if($system_type eq "CRAYXT") {
    &LML_combine_obj_crayxt::update($filehandler->get_data_ref(),$opt_dbdir);
}

# check if Cluster is a PBS controlled Altix SMP Cluster
if($system_type eq "Cluster") {
    keys(%{$filehandler->{DATA}->{OBJECT}}); # reset iterator




#*******************************************************************************
#* Copyright (c) 2011 Forschungszentrum Juelich GmbH.
#* All rights reserved. This program and the accompanying materials
#* are made available under the terms of the Eclipse Public License v1.0
#* which accompanies this distribution, and is available at
#* http://www.eclipse.org/legal/epl-v10.html
#*
#* Contributors:
#*    Wolfgang Frings (Forschungszentrum Juelich GmbH) 
#*******************************************************************************/ 
package LML_combine_obj_crayxt;
use strict;
use Data::Dumper;

my($debug)=0;

my $patint="([\\+\\-\\d]+)";   # Pattern for Integer number
my $patfp ="([\\+\\-\\d.E]+)"; # Pattern for Floating Point number
my $patwrd="([\^\\s]+)";       # Pattern for Work (all noblank characters)
my $patbl ="\\s+";             # Pattern for blank space (variable length)

sub update {
    my($dataptr) = shift;
    my($dbdir) = shift;

    my $nodemapref=&get_mapping_info($dataptr);

    &update_node_info($dataptr,$nodemapref);

    my $appmapref=&get_app_mapping_info($dataptr,$nodemapref);

    &update_job_info($dataptr,$appmapref);
    return(1);
} 

# returns hash:  NID -> nodename
sub get_mapping_info {
    my($dataptr) = shift;
    my($id,$nid,$nodename,%nodemap);

    # scan for partition names
    foreach $id (keys(%{$dataptr->{OBJECT}})) {
	if($dataptr->{OBJECT}->{$id}->{type} eq "nodemap") {
	    $nid=$dataptr->{OBJECT}->{$id}->{name};
	    $nodename=$dataptr->{INFODATA}->{$id}->{name};
	    $nodemap{$nid}=$nodename;
	    delete($dataptr->{OBJECT}->{$id});
	    delete($dataptr->{INFO}->{$id});
	    delete($dataptr->{INFODATA}->{$id});
	}
    }
    return(\%nodemap);
}

# returns hash:  apid-> vnodelist
sub get_app_mapping_info {
    my($dataptr) = shift;
    my($nodemapref) = shift;
    my($id,$apid,$nodename,%appmap,$numtasks);

    # scan for partition names
    foreach $id (keys(%{$dataptr->{OBJECT}})) {
	if($dataptr->{OBJECT}->{$id}->{type} eq "node") {
	    next if(!(exists($dataptr->{INFODATA}->{$id}->{Apids})));
	    next if($dataptr->{INFODATA}->{$id}->{Apids} eq "-");
	    $apid=$dataptr->{INFODATA}->{$id}->{Apids};  # todo: more apid's possible?
	    $numtasks=1;
	    if(exists($dataptr->{INFODATA}->{$id}->{Pl})) {
		$numtasks=$dataptr->{INFODATA}->{$id}->{Pl};
	    }
	    $appmap{$apid}.="(".$dataptr->{OBJECT}->{$id}->{name}.",$numtasks)";
	}
    }
    return(\%appmap);
}


sub update_node_info {
    my($dataptr) = shift;
    my($nodemapref) = shift;
    my($id,$nid,$noderef);
    
    # update node info
    foreach $id (keys(%{$dataptr->{OBJECT}})) {
	if($dataptr->{OBJECT}->{$id}->{type} eq "node") {
	    $noderef=$dataptr->{INFODATA}->{$id};
	    $nid=$dataptr->{OBJECT}->{$id}->{name};
	    if(exists($nodemapref->{$nid})) {
		$dataptr->{OBJECT}->{$id}->{name}=$nodemapref->{$nid};
	    } else {
		print "update_node_info(Cray XT): warning unknown nid: '$nid'\n";
	    }
	    
	    # update attribute: memory
	    my $memfactor=1;
	    if(exists($noderef->{PgSz})) {
		if($noderef->{PgSz}=~/$patint[K]/) {
		    $memfactor=$1 / 1024.0; # --> MB
		}
		delete($noderef->{PgSz});
	    }
	    if(exists($noderef->{Conf})) {
		$noderef->{physmem}=int($memfactor*$noderef->{Conf});
		delete($noderef->{Conf});
	    }else {
		$noderef->{physmem}="0";
	    }

	    if(exists($noderef->{Placed})) {
		$noderef->{availmem}=$noderef->{physmem}-int($memfactor*$noderef->{Placed});
		$noderef->{availmem}=int($memfactor*$noderef->{Placed});
		delete($noderef->{Placed});
	    } else {
		$noderef->{availmem}="0";
	    }

	    if(exists($noderef->{State})) {
		$noderef->{state}="Running" if ($noderef->{State} eq "UP");
		$noderef->{state}="Down"    if ($noderef->{State} eq "DN");
		delete($noderef->{State});
	    } else {
		$noderef->{state}="Unknown";
	    }
	}
    }

    return(1);
}


sub update_job_info {
    my($dataptr) = shift;
    my($appmapnodemapref) = shift;
    my($id,$jobref,$apid,$batchid,%batchtoappid);
    
    # scan for app
    foreach $id (keys(%{$dataptr->{OBJECT}})) {
	if($dataptr->{OBJECT}->{$id}->{type} eq "app") {
	    $apid=$dataptr->{INFODATA}->{$id}->{apid};
	    $batchid=$dataptr->{INFODATA}->{$id}->{batchid};
	    $batchtoappid{$batchid}=$apid;
	    delete($dataptr->{OBJECT}->{$id});
	    delete($dataptr->{INFO}->{$id});
	    delete($dataptr->{INFODATA}->{$id});
	}
    }
    # update job info
    foreach $id (keys(%{$dataptr->{OBJECT}})) {
	if($dataptr->{OBJECT}->{$id}->{type} eq "job") {
	    $jobref=$dataptr->{INFODATA}->{$id};
	    
	    # update nodelist 
	    if($jobref->{state} ne "Running") {
		if(!exists($jobref->{nodelist})) {
		    $jobref->{nodelist}="-";
		    $jobref->{totaltasks}=0;
		}
		if(!exists($jobref->{vnodelist})) {
		    $jobref->{vnodelist}="-";
		}
	    }
	    # update totalcores
	    if(!exists($jobref->{totalcores})) {
		print "update_job_info: could not find attributes for job $id to compute totalcores\n";
	    }

	    if($jobref->{state} eq "Running") {
		$batchid=$dataptr->{OBJECT}->{$id}->{name};
		$batchid=~s/\..*$//gs;
		if(exists($batchtoappid{$batchid})) {
		    $apid=$batchtoappid{$batchid};
		} else {
		    print "update_job_info: could not find apid for batch job '$batchid'\n";
		}
		if(exists($appmapnodemapref->{$apid})) {
		    $jobref->{vnodelist}=$appmapnodemapref->{$apid};
		} else {
		    print "update_job_info: could not find nodelist for app '$apid' of batch job '$batchid'\n";
		}
	    }
	}
    }
    return(1);
}

sub update_class_info {
    my($dataptr) = shift;
    my($id,$class);
    my(%classes);

    # get class info
    foreach $id (keys(%{$dataptr->{OBJECT}})) {
	if($dataptr->{OBJECT}->{$id}->{type} eq "class") {
	    $class=$dataptr->{INFODATA}->{$id}->{name};
	    $classes{$class}{include}=$dataptr->{INFODATA}->{$id}->{crayxt_incl_bg};
	    $classes{$class}{exclude}=$dataptr->{INFODATA}->{$id}->{crayxt_excl_bg};
	}
    }

    return(1);
} 

1;




my $patwrd="([\^\\s]+)";       # Pattern for Work (all noblank characters)
my $patbl ="\\s+";             # Pattern for blank space (variable length)

my $version="1.14";
 
my ($tstart,$tdiff,$rc);


#    - return output file

# option handling
my $opt_rawfile=""; # unset
my $opt_verbose=0;
my $opt_quiet=0;
my $hostname = `hostname`;chomp($hostname);
my $ppid = $$;
my %options = (
    "rawfile"             => "",
    "tmpdir"              => "./tmp_".$hostname."_".$ppid,
    "permdir"             => "./perm_".$hostname,
    "keeptmp"             => 0,
    "keepperm"            => 1,
    "verbose"             => 0,
    "quiet"               => 0,
    "nocheckrequest"      => 0,
    "rms"                 => "undef",
    "dump"                => 0,
    "demo"                => 0,
    "test"                => 0
);
my @save_ARGV=(@ARGV);
my @options_from_file_found;

usage($0) if( ! GetOptions( 
                            'verbose'          => \$options{verbose},
                            'quiet'            => \$options{quiet},
                            'rawfile=s'        => \$options{rawfile},
                            'tmpdir=s'         => \$options{tmpdir},
                            'permdir=s'        => \$options{permdir},
                            'keeptmp'          => \$options{keeptmp},
                            'rms=s'            => \$options{rms},
                            'nocheckrequest'   => \$options{nocheckrequest},
                            'demo'             => \$options{demo},
                            'test'             => \$options{test},
     		            'dump'             => \$options{dump}
                            ) );
my $date=`date`;
chomp($date);

my $REPORT;

&open_report();

my $options_file=".LML_da_options";
if (-f $options_file) {
    my ($line);
    open(IN,$options_file);
    while($line=<IN>) {
        if($line=~/$patwrd=\s*$patwrd\s*$/) {
	    my($opt_name,$opt_value)=($1,$2) ;
	    if(exists($options{$opt_name})) {
		$options{$opt_name}=$opt_value;
		push(@options_from_file_found,$opt_name);
	    } else {
		&report_if_verbose("WARNING found unknown option (%s) in option file file %s\n",$opt_name,$options_file);
	    }
        }
    }
    close(IN);
}

# print header
&report_if_verbose("%s%s","-"x90,"\n");
&report("%s","  LLVIEW Data Access Workflow Manager Driver $version, starting at ($date)\n");
&report_if_verbose("  %s%s%s"," command line args: ",join(" ",@save_ARGV),"\n"); 
&report_if_verbose("  %s%s%s%s"," option file  args: ",join(" ",@options_from_file_found),"     (from file $options_file)","\n") if($#options_from_file_found>=0); 
&report_if_verbose("%s%s", "-"x90,"\n");


# check positional parameters 

    $outputfile  = "-";
}

my $tmpdir       = $options{tmpdir};
my $permdir       = $options{permdir};
my $rawfile      = undef;
my $removetmpdir = 0; # remove only if directory was create 

my $workflowxml = "";
my $laststep    = "";

# init global vars
my $pwd=`pwd`;
chomp($pwd);

if(! $options{test}) {

# check and/or create temporary directory
if(! -d $tmpdir) {
    &report_if_verbose("%s","$0: temporary directory not found, create new directory $tmpdir ...\n");
    if(!mkdir($tmpdir,0755)) {
        &exit_witherror($outputfile,"$0: could not create $tmpdir ...$!\n");
    } else {
        &report_if_verbose("%s", "$0: tmpdir created ($tmpdir)\n");
    }
    $removetmpdir=1;
}

# check permanent directory
if(! -d $permdir) {
    &report_if_verbose("$0: permanent directory not found, create new directory $permdir ...\n");
    if(!mkdir($permdir,0755)) {
        &exit_witherror($outputfile,"$0: could not create $permdir ...$!\n");
    } else {
        &report_if_verbose("%s", "$0: permdir created ($permdir)\n");
    }
}

# check request input file
if ($requestfile ne "-") {
    if(! -f $requestfile) {
        &exit_witherror($outputfile,"$0: requestfile $requestfile not found, exiting ...\n");
    }
}

# check rawfile
if($options{rawfile}) {
    if(! -f $options{rawfile}) {
        &exit_witherror($outputfile,"$0: rawfile $rawfile specified but not found, exiting ...\n");
    }
    $rawfile=$options{rawfile};
}


# read config file
&report_if_verbose("%s", "$0: requestfile=$requestfile\n");
$tstart=time;

# debug request file
open(OUT,"> $options{tmpdir}/request.xml");
if ($requestfile eq "-") {
    while(<>) {
        print OUT $_;
    }
    $requestfile="$options{tmpdir}/request.xml";
} else {
    open(IN,$requestfile);
    while(<IN>) {
        print OUT $_;
    }
    close(IN);
}
close(OUT);

my $filehandler_request = LML_file_obj->new($options{verbose},1);
$filehandler_request->read_lml_fast($requestfile);
$tdiff=time-$tstart;
&report_if_verbose("$0: parsing XML requestfile in %6.4f sec\n",$tdiff);
if(!$filehandler_request) {
    &exit_witherror($outputfile,"$0: could not parse requestfile $requestfile, exiting ...\n");
}

# init global vars
my $pwd=`pwd`;
chomp($pwd);


#########################
# create workflow
#########################
$workflowxml=&create_workflow($tmpdir,$permdir);
my $laststep = "";
my $step     = "";

# hashes containing function references to rms specific functions
my $check_functions;
my $generate_functions;


#########################

if($rawfile) {
    $step="rawfilecp";
    if($rawfile=~/\.gz$/) {
        &add_exec_step_to_workflow($workflowxml,$step, $laststep, 
                                   "gunzip -c $rawfile > \$stepoutfile");
    } else {
        &add_exec_step_to_workflow($workflowxml,$step, $laststep, 
                                   "cp $rawfile \$stepoutfile");
    }
    $laststep=$step;
} else {
    # get data from resource management system (RMS)


    # check for hints about queueing system
    my $rms="undef";
    my $r;
    my %cmds=();

    if($options{rms} ne "undef") { 
	&report_if_verbose("$0: rms given by command line option: $options{rms} ...\n");
	$rms=$options{rms};
		    if(exists($driver_ref->{attr})) {
				if(exists($driver_ref->{attr}->{name})) {
				    $rms=uc($driver_ref->{attr}->{name});
				    print STDERR "$0: check_for rms, got hint from request ... ($rms)\n" if($opt_verbose);
				}
		    }
		    
		    if(exists($driver_ref->{command})) {
				my($key);
				foreach $key ( keys(%{$driver_ref->{command}}) ) {
				    if(exists($driver_ref->{command}->{$key}->{exec})) {
						my $cmd_key="cmd_".$key;
						$cmds{$cmd_key}=$driver_ref->{command}->{$key}->{exec};
						print STDERR "$0: check_for rms, got hint from for cmd $cmd_key ... ($cmds{$cmd_key})\n"  if($opt_verbose);
				    }
				}
		    }
		}
    } 
    if ($rms ne "undef") {
    	do "rms/$rms/da_check_info_LML.pl" || &exit_witherror($outputfile,"$0: unable to locate rms\n");
    	&check_rms(\$rms,\%cmds,$opt_verbose) || &exit_witherror($outputfile,"$0: unable to locate rms\n");
    } else {
	&report_if_verbose("$0: check request for rms hint ...\n");
	if(exists($filehandler_request->{DATA}->{REQUEST})) {
	    if(exists($filehandler_request->{DATA}->{REQUEST}->{driver})) {
		my $driver_ref=$filehandler_request->{DATA}->{REQUEST}->{driver};
		if(!$options{nocheckrequest}) {
		    # check rms name
		    if(exists($driver_ref->{attr})) {
			if(exists($driver_ref->{attr}->{name})) {
			    $rms=uc($driver_ref->{attr}->{name}); # upper case, except:  
			    $rms="GridEngine" if ($rms=~/GRIDENGINE/);
			    &report_if_verbose("$0: check_for rms, got hint from request ... ($rms)\n");
                        }
		    }
		}
		
		if(!$options{nocheckrequest}) {
		    # check rms commands
		    if(exists($driver_ref->{command})) {
			my($key);
			foreach $key ( keys(%{$driver_ref->{command}}) ) {
			    if(exists($driver_ref->{command}->{$key}->{exec})) {
				my $cmd_key="cmd_".$key;
				$cmds{$cmd_key}=$driver_ref->{command}->{$key}->{exec};
				&report_if_verbose("$0: check_for rms, got hint from for cmd $cmd_key ... ($cmds{$cmd_key})\n");
			    }
			}
		    }
		}
	    }
	} 
    }

    if ($rms ne "undef") {
	if (do "rms/$rms/da_check_info_LML.pl") {
	    if (exists($main::check_functions->{$rms})) {
		if ( &{$main::check_functions->{$rms}}(\$rms,\%cmds,$options{verbose})) {
		    &report_if_verbose("$0: rms/$rms/da_check_info_LML.pl --> rms=$rms\n");
		} else {
		    &report_if_verbose("$0: rms/$rms/da_check_info_LML.pl unable to locate rms $rms\n");
		    $rms="undef";
		} 
	    } else { 
		&report_if_verbose("$0:  WARNING rms/$rms/da_check_info_LML.pl defines no check function\n");
		$rms="undef";
	    }
	} else {
	    &report_if_verbose("$0:  ERROR could not run rms/$rms/da_check_info_LML.pl (perhaps missing return code of script)\n");
	    $rms="undef";
	}
    } else {
        my ($r,$check_f,$generate_f,$test_rms);
        foreach $r (<rms/*>) {
	    $test_rms=$r;$test_rms=~s/(.*\/)//s;
	    &report_if_verbose("$0: found rms/$r/da_check_info_LML.pl running test ...\n");
	    if (do "$r/da_check_info_LML.pl") {
		if (exists($main::check_functions->{$test_rms})) {
		    if ( &{$main::check_functions->{$test_rms}}(\$rms,\%cmds,$options{verbose})) {
			$rms=$test_rms;
			&report_if_verbose("$0: rms/$r/da_check_info_LML.pl --> rms=$rms\n");
			last;
		    } 
		} else {
		    &report_if_verbose("$0:  WARNING rms/$r/da_check_info_LML.pl defines no check function\n");
		}
	    } else {
		&report_if_verbose("$0:  ERROR could not run rms/$r/da_check_info_LML.pl (perhaps missing return code of script)\n");
	    }
	}
    }

    if($rms eq "undef") {
	&exit_witherror($outputfile,"$0: could not determine rms, exiting ...\n");
    }
    
    if (exists($main::generate_functions->{$rms})) {
	$laststep=&{$main::generate_functions->{$rms}}($workflowxml, $laststep, \%cmds);
    }

    $step="addcolor";
    &add_exec_step_to_workflow($workflowxml,$step, $laststep, 
                               "$^X \$instdir/LML_color/LML_color_obj.pl -colordefs \$instdir/LML_color/default.conf " .
                               "-dbdir \$permdir " .
                               "-o     \$stepoutfile \$stepinfile");
    $laststep=$step;

}

my $usedefaultlayout=0;
if(exists($filehandler_request->{DATA}->{request})) {
    if(exists($filehandler_request->{DATA}->{request}->[0]->{getDefaultData})) {
        if($filehandler_request->{DATA}->{request}->[0]->{getDefaultData}=~/^true$/i) {
            $usedefaultlayout=1;
        }
    }
}
#check if layout is given in request

if(!$usedefaultlayout) {
    my $key;
    foreach $key (keys(%{$filehandler_request->{DATA}})) {
        $layoutfound=1 if ($key=~/LAYOUT$/);
    }
    $usedefaultlayout=1 if(!$layoutfound);
}
&report_if_verbose("$0: layoutfound=$layoutfound usedefaultlayout=$usedefaultlayout\n");

my $filehandler_layout;
if($usedefaultlayout) {

#########################
$step="LML2LML";
my $demo="";
$demo="-demo" if $options{demo};
&add_exec_step_to_workflow($workflowxml,$step, $laststep, 
                           "$^X LML2LML/LML2LML.pl -v $demo -layout \$tmpdir/layout.xml".
                           " -output \$stepoutfile \$stepinfile");
$laststep=$step;


#########################
# Dump?
#########################
if($options{dump}) {
    print STDERR Dumper($filehandler_request->{DATA});
    print STDERR Dumper($workflowxml);
    print STDERR Dumper($filehandler_layout->{DATA});
    exit(1);
}

} #  ! $options{test}

#########################
# execute Workflow
#########################
if(! $options{test}) {
    my $workflow_obj = LML_da_workflow_obj->new($options{verbose},0);
    $workflow_obj->{DATA}=$workflowxml;
    $workflow_obj->write_xml("$tmpdir/workflow.xml");
    my $cmd="$^X ./LML_da.pl";
    $cmd .= " -v"  if($options{verbose});
    $cmd .= " -c $tmpdir/workflow.xml";
    $cmd .= " > $tmpdir/LML_da.log";
    $cmd .= " 2> $tmpdir/LML_da.errlog";
    &report_if_verbose("$0: executing: %s ...\n",$cmd);
    $tstart=time;
    system($cmd);$rc=$?;
    $tdiff=time-$tstart;
    &report_if_verbose("$0: %60s -> ready, time used %10.4ss\n","",$tdiff);
    if($rc) {     
        &exit_witherror($outputfile,"$0 failed executing: $cmd rc=$rc\n");
    }
} else {
    $laststep="LML2LML";
    my $cmd="( cd $tmpdir/..; $^X $pwd/LML_da.pl";
    $cmd .= " -v"  if($options{verbose});
    $cmd .= " -c $tmpdir/workflow.xml";
    $cmd .= " > $tmpdir/LML_da.log";
    $cmd .= " 2> $tmpdir/LML_da.errlog )";
    &report_if_verbose("$0: executing: %s ...\n",$cmd);
    $tstart=time;
    system($cmd);$rc=$?;
    $tdiff=time-$tstart;
    &report_if_verbose("$0: %60s -> ready, time used %10.4ss\n","",$tdiff);
    if($rc) {     
        &exit_witherror($outputfile,"$0 failed executing: $cmd rc=$rc\n");
    }
}

#########################

if($outputfile eq "-") {
    open(IN,$stepoutfile);
    while(<IN>) {
        print $_;
    }
    close(IN);
} else {
    open(IN,$stepoutfile);
    open(OUT," > $outputfile") || die "could not open for write '$outputfile'";
    while(<IN>) {
        print OUT $_;
    }
    close(OUT);
    close(IN);
}

# clean up
if(($removetmpdir) && (!$options{keeptmp})) {
    my $file;
    foreach $file (`ls $tmpdir`) {
        chomp($file);
#       print STDERR "unlink $tmpdir/$file\n";
        unlink("$tmpdir/$file");
    }
    if(!rmdir($tmpdir)) {
        &report("$0: could not rmdir $tmpdir ...$!, exiting ...\n");
    } else {
        &report_if_verbose("$0: tmpdir removed ($tmpdir)\n");
    }
}


&report_if_verbose("%s%s","-"x90,"\n");
&report("  LLVIEW Data Access Workflow Manager Driver $version, ending at   ($date)\n");
&report_if_verbose("%s%s","-"x90,"\n");

if(! (($removetmpdir) && (!$options{keeptmp}))) {
    close_report("$tmpdir/report.log");
}

sub usage {
    die " 

                -permdir  <dir>          : use this directory for permanent data 
                                           (e.g., databases, default: ./tmp) 
                -keeptmp                 : keep temporary directory
                -test                    : use input files from temporary directory
                -demo                    : generate anonymous data
                -rms <rms>               : check only for this rms
                -nocheckrequest          : don't check request for hints 
                -verbose                 : verbose mode
                -quiet                   : prints no messages on stderr


    my($outputfile,$errormsg)=@_;
    my $xmlout="";

    
    $xmlout.="<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>\n";
    $xmlout.="<lml:lgui xmlns:lml=\"http://www.llview.de\"\n";
    $xmlout.="          xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n";

    $xmlout.="</information>\n";

    $xmlout.="</lml:lgui>\n";
    
    printf(STDERR "$errormsg\n");

    &report("$0: ERROR $errormsg\n");
    
    if($outputfile eq "-") {
        print $xmlout;
    } else {
        open(OUT," > $outputfile") || die "could not open for write '$outputfile'";
        print OUT $xmlout;
        close(OUT);
    }

    close_report("$tmpdir/report.log");
    
    exit(1);

}

    $stepref->{type}        = "execute";
    
    foreach $cmd (@cmds) {
        $cmdref={};
        $cmdref->{exec}         = $cmd;
        push(@{$stepref->{cmd}},$cmdref);
    }
    
    $datastructref->{step}->{$id}=$stepref;

sub create_default_layout {
    my($filehandler_request)=@_;

    my $filehandler_layout = LML_file_obj->new($options{verbose},1);
    $filehandler_layout->read_lml_fast("$FindBin::RealBin/samples/layout_default.xml");
    $filehandler_layout->check_lml();
    return($filehandler_layout);

    my($filehandler_request)=@_;
    my($key);

    my $filehandler_layout = LML_file_obj->new($options{verbose},1);
    $filehandler_layout -> init_file_obj();
    foreach $key ("TABLELAYOUT","TABLE","NODEDISPLAYLAYOUT","NODEDISPLAY","OBJECT") {
        if (exists($filehandler_request->{DATA}->{$key})) {
            $filehandler_layout->{DATA}->{$key}=dclone($filehandler_request->{DATA}->{$key});
        }
    }
    $filehandler_layout->check_lml();
    return($filehandler_layout);
}

sub open_report {
    $REPORT="";
}


sub report {
    my $format = shift;
    # print to protocol file
    $REPORT.=sprintf( $format, @_ );

    if(!$options{quiet}) {
        # print to stderr
        printf(STDERR $format, @_);
    }
}

sub report_if_verbose {
    my $format = shift;
    # print to protocol file
    $REPORT.=sprintf( $format, @_ );
    
    if($options{verbose}) {
        # print to stderr
        printf(STDERR $format, @_);
    }
}

sub close_report {
    my($reportfile)=@_;
    if(open(REPORT,"> $reportfile")) {
        print REPORT $REPORT;
        close(REPORT);
    }
}

Lines 71-77 Link Here

(-)a/rms/org.eclipse.ptp.rm.lml.da/LML_specs/LML_specs.pm (-1 / +2 lines)
71	"comment" => ["s","O",undef, "comment" ],	71	"comment" => ["s","O",undef, "comment" ],
72	"totalcores" => ["d","M",undef, "total number of machine cores requested"],	72	"totalcores" => ["d","M",undef, "total number of machine cores requested"],
73	"totaltasks" => ["d","M",undef, "total number of (MPI) tasks"],	73	"totaltasks" => ["d","M",undef, "total number of (MPI) tasks"],
74	"nodelist" => ["s","M",undef, "node on ehich a job is running" ],	74	"nodelist" => ["s","M",undef, "node on which a job is running" ],
		75	"vnodelist" => ["s","M",undef, "virtual node list (PBS), used first" ],
75	"queue" => ["s","M",undef, "queue"],	76	"queue" => ["s","M",undef, "queue"],
76	"dependency" => ["s","O",undef, "dependency string"],	77	"dependency" => ["s","O",undef, "dependency string"],
77	"executable" => ["s","O",undef, "path and name of executable"],	78	"executable" => ["s","O",undef, "path and name of executable"],




   - persistent color management
     - color db will be stored in a file in the perm-directory
   - first driver for PBSpro controlled systems

1.10:
   - bug fixes

1.11:
   - bug fixes

1.12:
   - bug fixes

1.13:
   - improved reporting: option -verbose control debug output on stderr
     	      		 full debugging report will written $tmpdir/report.log
   - improved support for PBS (vnodes)
   - bug fixes

1.14:
   - Improvements for testing and demonstration purpose 
     - option -test: use existing workflow input in tmpdir
     - options specification file .LML_da_options 
       - will be read if exists in current directory
       - will overwrite command line option
    - incoporated support for new RMS (GridEngine, PE)
      (contributed by others)   




sub write_lml {
    my($self) = shift;
    my $outfile  = shift;
    my($k,$rc,$id,$c,$key,$ref,$t);
    my $tstart=time;
    $rc=1;


    printf(OUT "<objects>\n");
    foreach $id (sort keys %{$self->{DATA}->{OBJECT}}) {
	printf(OUT "<object");
	$t=0;
	foreach $k (sort keys %{$self->{DATA}->{OBJECT}->{$id}}) {
	    printf(OUT " %s=\"%s\"",$k,$self->{DATA}->{OBJECT}->{$id}->{$k});$t=1;
	}
	printf(OUT "/>\n");
	print "write_lml: WARNING object with id '$id' has no attributes\n" if($t==0);
    }
    printf(OUT "</objects>\n");





#!/usr/bin/perl -w
#*******************************************************************************
#* Copyright (c) 2011 University of Illinois and others.  All rights reserved.
#* This program and the accompanying materials are made available under the
#* terms of the Eclipse Public License v1.0 which accompanies this distribution,
#* and is available at http://www.eclipse.org/legal/epl-v10.html 
#* 
#* Contributors: 
#*     Jeff Overbey (Illinois/NCSA) - Design and implementation
#*******************************************************************************

package GEHelper;

use strict;
use warnings;

use POSIX qw(ceil floor);

use Exporter;
our @ISA= qw( Exporter );
our @EXPORT_OK = qw( parsexml trimtext get_jobs get_job_nodes get_nodes should_group_nodes group_nodes MAX_CORES );
our @EXPORT = qw( get_jobs get_job_nodes get_nodes should_group_nodes group_nodes MAX_CORES );

use constant {
    MAX_NODES => 64,    # If the system has more nodes than this, nodes will be
                        # grouped so that LML displays one node per box rather
                        # than one core per box
    MAX_CORES => 64,    # If nodes are not grouped, this is the maximum number
                        # of cores that will be displayed for a single node
};

# The return value of get_nodes() is cached here to avoid re-executing qhost
my %cached_nodes = ();

my $cmd_jobinfo="/usr/bin/qstat";
$cmd_jobinfo=$ENV{"CMD_JOBINFO"} if($ENV{"CMD_JOBINFO"});

my $cmd_nodeinfo="/usr/bin/qhost";
$cmd_nodeinfo=$ENV{"CMD_NODEINFO"} if($ENV{"CMD_NODEINFO"}); 



###############################################################################
# get_jobs - Returns a hash containing information about jobs (from qstat)
###############################################################################
#
# The returned hash has job numbers as its keys and dictionaries of LML
# attributes as its values.
#
sub get_jobs {
    my %qstat_xml = parsexml("$cmd_jobinfo -u '*' -s prsz -r -xml |");
    trimtext(\%qstat_xml);

    my %jobs = ();

    my @jobs_in_queue = @{$qstat_xml{queue_info}[0]{job_list}};
    my @jobs_not_in_queue = @{$qstat_xml{job_info}[0]{job_list}};
    for my $job (@jobs_in_queue, @jobs_not_in_queue) {
        # The hash referenced by $job corresponds to an XML element like this:
        # <job_list state="running">
        #     <JB_job_number>344911</JB_job_number>
        #     <JAT_prio>0.12923</JAT_prio>
        #     <JB_name>RF-38</JB_name>
        #     <JB_owner>tg458455</JB_owner>
        #     <state>r</state>
        #     <JAT_start_time>2011-11-29T03:21:14</JAT_start_time>
        #     <queue_name>normal@c327-104.ls4.tacc.utexas.edu</queue_name>
        #     <slots>24</slots>
        #     <full_job_name>RF-38</full_job_name>
        #     <requested_pe name="12way">24</requested_pe>
        #     <granted_pe name="12way">24</granted_pe>
        #     <hard_request name="h_rt" resource_contribution="0.000000">86400</hard_request>
        #     <hard_request name="mem_total" resource_contribution="0.000000">23.4G</hard_request>
        #     <hard_req_queue>normal</hard_req_queue>
        # </job_list>
        my $jobid                 = $job->{JB_job_number}[0]{_text};
        $jobs{$jobid}{step}       = $jobid;
        $jobs{$jobid}{name}       = $jobid; #$job->{JB_name}[0]{_text};
        $jobs{$jobid}{owner}      = $job->{JB_owner}[0]{_text};
        $jobs{$jobid}{state}      = $job->{_attrs}{state};
        $jobs{$jobid}{totalcores} = $job->{slots}[0]{_text};
        $jobs{$jobid}{queue}      = $job->{queue_name}[0]{_text};
        if ($job->{_attrs}{state} ne "running") {
            $jobs{$jobid}{queuedate} = $job->{JB_submission_time}[0]{_text};
        } else {
            $jobs{$jobid}{dispatchdate} = $job->{JAT_start_time}[0]{_text};
        }
        $jobs{$jobid}{wall}       = '-';
        if (defined ($job->{hard_request})) {
            for my $request (@{$job->{hard_request}}) {
                if ($request->{_attrs}{name} eq 'h_rt') {
                    $jobs{$jobid}{wall} = $request->{_text};
                }
            }
        }
    }

    return %jobs;
}



###############################################################################
# get_job_nodes - Returns a hash containing information about what nodes each
#                 job is running on (from qhost)
###############################################################################
#
# The returned hash has job numbers as its keys and a comma-separated list of
# node names as its values.  Unfortunately, there is no information about what
# cores a job is assigned to on nodes with multiple cores.
#
sub get_job_nodes {
    my %qhost_xml = parsexml("$cmd_nodeinfo -j -xml |");
    trimtext(\%qhost_xml);

    my %job_hosts = ();
    for my $host (@{$qhost_xml{host}}) {
        # The hash referenced by $host corresponds to an XML element like
        # <host name='c300-001.ls4.tacc.utexas.edu'>
        #   <hostvalue name='arch_string'>lx24-amd64</hostvalue>
        #   <hostvalue name='num_proc'>12</hostvalue>
        #   <hostvalue name='load_avg'>0.02</hostvalue>
        #   <hostvalue name='mem_total'>47.2G</hostvalue>
        #   <hostvalue name='mem_used'>892.5M</hostvalue>
        #   <hostvalue name='swap_total'>0.0</hostvalue>
        #   <hostvalue name='swap_used'>0.0</hostvalue>
        # </host>
        my $hostname = $host->{_attrs}{name};
        $hostname =~ s/\..*//;
        if (defined($host->{job})) {
            for my $jobelt (@{$host->{job}}) {
                # The hash referenced by $jobelt corresponds to an XML element like
                #  <job name='353538'>
                #   <jobvalue jobid='353538' name='priority'>'0.005689'</jobvalue>
                #   <jobvalue jobid='353538' name='qinstance_name'>grace@c300-003.ls4.tacc.utexas.edu</jobvalue>
                #   <jobvalue jobid='353538' name='job_name'>acc+att.2008-01</jobvalue>
                #   <jobvalue jobid='353538' name='job_owner'>byaa705</jobvalue>
                #   <jobvalue jobid='353538' name='job_state'>r</jobvalue>
                #   <jobvalue jobid='353538' name='start_time'>1322585173</jobvalue>
                #   <jobvalue jobid='353538' name='queue_name'>grace@c300-003.ls4.tacc.utexas.edu</jobvalue>
                #   <jobvalue jobid='353538' name='pe_master'>SLAVE</jobvalue>
                # </job>
                my $jobid = $jobelt->{_attrs}{name};
                if (!defined($job_hosts{$jobid})) {
                    $job_hosts{$jobid} = {};
                }
                $job_hosts{$jobid}->{$hostname} = 1;
            }
        }
    }

    for my $jobid (keys %job_hosts) {
        my $nodelist = '';
        for my $node (keys %{$job_hosts{$jobid}}) {
            $nodelist .= "$node,";
        }
        chop($nodelist);
        $job_hosts{$jobid} = $nodelist;
    }

    return %job_hosts;
}



###############################################################################
# get_nodes - Returns a hash containing information about nodes (from qhost)
###############################################################################
#
# The returned hash has node names as its keys and dictionaries of LML
# attributes as its values.
#
sub get_nodes {
    if (scalar keys %cached_nodes > 0) {
        return %cached_nodes;
    }

    my %qhost_xml = parsexml("$cmd_nodeinfo -xml |");
    trimtext(\%qhost_xml);

    my %nodes = ();
    for my $host (@{$qhost_xml{host}}) {
        # The hash referenced by $host corresponds to an XML element like
        # <host name='c300-001.ls4.tacc.utexas.edu'>
        #   <hostvalue name='arch_string'>lx24-amd64</hostvalue>
        #   <hostvalue name='num_proc'>12</hostvalue>
        #   <hostvalue name='load_avg'>0.02</hostvalue>
        #   <hostvalue name='mem_total'>47.2G</hostvalue>
        #   <hostvalue name='mem_used'>892.5M</hostvalue>
        #   <hostvalue name='swap_total'>0.0</hostvalue>
        #   <hostvalue name='swap_used'>0.0</hostvalue>
        # </host>

        my $nodeid = $host->{_attrs}{name};
        $nodeid =~ s/\..*//;

        my %hostvalues = ();
        for my $hostvalue (@{$host->{hostvalue}}) {
            my $key = $hostvalue->{_attrs}{name};
            my $value = $hostvalue->{_text};
            $hostvalues{$key} = $value;
        }

        $nodes{$nodeid}{id} = $nodeid;

        $nodes{$nodeid}{ntype} = $hostvalues{arch_string};

        if (defined($hostvalues{num_proc})) {
            my $ncores = $hostvalues{num_proc};
            if ($ncores =~ /^[0-9]+$/) {
                if ($ncores > MAX_CORES) {
                    $ncores = MAX_CORES;
                } else {
                    $nodes{$nodeid}{ncores} = $ncores;
                }
            } else {
                $nodes{$nodeid}{ncores} = 1;
            }
        }

        $nodes{$nodeid}{physmem} = $hostvalues{mem_total};
    }

    %cached_nodes = %nodes;
    return %nodes;
}



###############################################################################
# should_group_nodes - Returns true if nodes should be grouped in the LML
#                      display (for performance reasons)
###############################################################################
sub should_group_nodes {
    my %nodes = get_nodes();
    my $num_nodes = scalar keys %nodes;
    return $num_nodes > MAX_NODES;
}



###############################################################################
# group_nodes - Places the system's nodes into groups such that there are no
#               more than MAX_NODES groups.
###############################################################################
#
# Three values are returned:
# - A reference to a hash mapping node names to group names
# - A reference to a hash mapping node names to their 0-based indices in the group
# - The (maximum) number of nodes in each group
#
sub group_nodes {
    my %nodes = get_nodes();
    my @nodeids = sort(keys(%nodes));
    my $num_nodes = $#nodeids + 1;

    my %node_group = ();
    my %node_index = ();
    my $nodes_per_group = ceil($num_nodes / MAX_NODES);
    if ($num_nodes <= MAX_NODES) {
        %node_group = map { $_ => $_ } @nodeids;
        %node_index = map { $_ => 0 } @nodeids;
    } else {
        my $nodenum = 0;
        for my $nodeid (@nodeids) {
            $node_group{$nodeid} = "Group" . floor($nodenum / $nodes_per_group);
            $node_index{$nodeid} = $nodenum % $nodes_per_group;
            $nodenum++;
        }
    }
    return (\%node_group, \%node_index, $nodes_per_group);
}



###### (PRIVATE) ##############################################################
# parsexml - Parses the given XML file into a hash.
###############################################################################
#
# The hash is keyed by the names of child elements.  It also contains
# the keys '_attrs' and '_text'.
#
# As an example, the XML file
#     <?xml version='1.0'?>
#     <aaa xxx="1">
#       <bbb xxx="" yyy="  2">This is child 1</bbb>
#       <bbb>This is child 2
#         <ccc/>
#       </bbb>
#     </aaa>
# is parsed into the hash
#     { '_text' => '\n\n\n',
#       '_attrs' => { 'xxx' => '1' },
#       'bbb' => [ { '_text' => 'This is child 1',
#                    '_attrs' => { 'xxx' => '',
#                                  'yyy' => '  2' }
#                  },
#                  { '_text' => 'This is child 2\n    \n  ',
#                    '_attrs' => {},
#                    'ccc' => [ { '_text' => '',
#                               '_attrs' => {} }
#                             ]
#                  }
#                ]
#     };
#
# This isn't fully general (e.g., it doesn't handle CDATA,
# and it assumes there won't be any child elements with the
# names '_attrs' or '_text') but it works for our purposes.
#
# Ideally, we could use XML::Simple and avoid this, except the
# TACC machines only have the XML::Parser module available.
sub parsexml {
    my ($file) = @_;

    use XML::Parser;

    # When we encounter a start tag, we will push the hash
    # for that XML element onto the stack.
    my @stack = ();

    my $parser = new XML::Parser(ErrorContext => 2);
    $parser->setHandlers(
        Start => sub {
                my ($parser, $elt, %attrs) = @_;
                # When we encounter an XML start tag, create a hash
                # for that XML element and push it onto the stack.
                my %element = ( _attrs => \%attrs, _text => '' );
                push(@stack, \%element);
            },
        Char => sub {
                my ($parser, $text) = @_;
                # When we encounter text, append it to the _text
                # for the current XML element.
                my $topref = $stack[-1];
                ${$topref}{_text} .= $text;
            },
        End => sub {
                my ($parser, $elt) = @_;
                # When we encounter an XML end tag, pop that
                # element's hash from the stack and mark it
                # as a child of the parent element.
                if ($#stack > 0) {
                    my $childref = pop(@stack);
                    my $parentref = $stack[-1];
                    if (not exists ${$parentref}{$elt}) {
                        ${$parentref}{$elt} = [];
                    }
                    my $arrayref = @{$parentref}{$elt};
                    push(@{$arrayref}, $childref);
                }
            });
    $parser->parsefile($file);
    if ($#stack == -1) {
        return undef;
    } else {
        return %{$stack[-1]};
    }
}



###### (PRIVATE) ##############################################################
# trimtext - Traverses the a tree returned by parsexml, removing leading and
#            trailing whitespace from all '_text' values.
###############################################################################
#
# As an example, when trimtext is applied to the example for parsexml above,
# the hash becomes the following:
#     { '_text' => '',
#       '_attrs' => { 'xxx' => '1' },
#       'bbb' => [ { '_text' => 'This is child 1',
#                    '_attrs' => { 'xxx' => '',
#                                  'yyy' => '  2' }
#                  },
#                  { '_text' => 'This is child 2',
#                    '_attrs' => {},
#                    'ccc' => [ { '_text' => '',
#                               '_attrs' => {} }
#                             ]
#                  }
#                ]
#     };
#
# Note that only the '_text' values are trimmed.  The attribute values (e.g.,
# for 'yyy') are not trimmed.
#
sub trimtext {
    my ($xml) = @_;
    for my $key (keys %{$xml}) {
        my $val = $xml->{$key};
        if ($key eq '_text') {
            $xml->{_text} =~ s/^\s+//;
            $xml->{_text} =~ s/\s+$//;
        } elsif (ref($val) eq "ARRAY") {
            for my $elt (@{$val}) {
                trimtext($elt);
            }
        } elsif (ref($val) eq "HASH") {
            trimtext($val);
        }
    }
    return $xml;
}





#!/usr/bin/perl -w
#*******************************************************************************
#* Copyright (c) 2011 Forschungszentrum Juelich GmbH.
#* All rights reserved. This program and the accompanying materials
#* are made available under the terms of the Eclipse Public License v1.0
#* which accompanies this distribution, and is available at
#* http://www.eclipse.org/legal/epl-v10.html
#*
#* Contributors:
#*    Jeff Overbey (Illinois/NCSA) - Sun Grid Engine support
#*    Wolfgang Frings (Forschungszentrum Juelich GmbH) 
#*******************************************************************************/ 
use strict;

#############################
# rms: Sun/Oracle Grid Engine
#############################
sub check_rms_GridEngine {
    my($rmsref,$cmdsref)=@_;
    my($key,$cmd);
    my $rc=1;

    my %cmdname=(
        "job"  => "qstat",
        "node" => "qhost",
        );
    my %cmdpath=(
        "job" => "/usr/bin/qstat",
        "node" => "/usr/bin/qhost",
        );
   
    foreach $key (keys(%cmdname)) {
        # check for job query cmd
        if(exists($cmdsref->{"cmd_${key}info"})) {
            $cmd=$cmdsref->{"cmd_${key}info"};
        } else {
            $cmd=$cmdpath{$key};
        }
        if(! -f $cmd) {
            my $cmdpath=`which $cmdname{$key} 2>/dev/null`;         # last try: which 
            if(!$?) {
                chomp($cmdpath);
                $cmd=$cmdpath;
		&report_if_verbose("%s","$0: check_rms_GridEngine: found $cmdname{$key} by which ($cmd)\n");
            } 
        }
        if(-f $cmd) {
            $cmdsref->{"cmd_${key}info"}=$cmd;
        } else {
	    &report_if_verbose("%s","$0: check_rms_GridEngine: no cmd found for $cmdname{$key}\n");
	    $rc=0;
	}
    }
    
    if($rc==1)  { 
	$$rmsref="GridEngine";
	&report_if_verbose("%s%s%s", "$0: check_rms_GridEngine: found Grid Engine commands (",
			   join(",",(values(%{$cmdsref}))),
			   ")\n");
    } else {
	&report_if_verbose("%s","$0: check_rms_GridEngine: seems not to be a Grid Engine system\n");
    }
    
    return($rc);
}


sub generate_step_rms_GridEngine {
    my($workflowxml, $laststep, $cmdsref)=@_;
    my($step,$envs,$key,$ukey);

    $envs="";
    foreach $key (keys(%{$cmdsref})) {
        $ukey=uc($key);
        $envs.="$ukey=$cmdsref->{$key} ";
    }
    $step="getdata";
    &add_exec_step_to_workflow($workflowxml,$step, $laststep, 
                               "$envs $^X rms/GridEngine/da_system_info_LML.pl               \$tmpdir/sysinfo_LML.xml",
                               "$envs $^X rms/GridEngine/da_nodes_info_LML.pl                \$tmpdir/nodes_LML.xml",
                               "$envs $^X rms/GridEngine/da_jobs_info_LML.pl                 \$tmpdir/jobs_LML.xml");
    $laststep=$step;

    $step="combineLML";
    &add_exec_step_to_workflow($workflowxml,$step, $laststep, 
                               "$^X \$instdir/LML_combiner/LML_combine_obj.pl  -v -o \$stepoutfile ".
                               "\$tmpdir/sysinfo_LML.xml \$tmpdir/jobs_LML.xml \$tmpdir/nodes_LML.xml");
    $laststep=$step;

    return($laststep);
}

$main::check_functions->{GridEngine}   =\&check_rms_GridEngine;
$main::generate_functions->{GridEngine}=\&generate_step_rms_GridEngine;

1;




#!/usr/bin/perl -w
#*******************************************************************************
#* Copyright (c) 2011 Forschungszentrum Juelich GmbH and others.
#* All rights reserved. This program and the accompanying materials
#* are made available under the terms of the Eclipse Public License v1.0
#* which accompanies this distribution, and is available at
#* http://www.eclipse.org/legal/epl-v10.html
#*
#* Contributors:
#*    Wolfgang Frings (Forschungszentrum Juelich GmbH)
#*    Jeff Overbey (Illinois/NCSA) - Grid Engine support
#*******************************************************************************/ 
use strict;

use FindBin;                # Find the directory containing this script
use lib "$FindBin::Bin";    # Search for modules in this script's directory
use GEHelper;               # Now look for our GEHelper module

my $patint="([\\+\\-\\d]+)";   # Pattern for Integer number
my ($line,%jobs,%jobnr,$key,$value,$count,%notmappedkeys,%notfoundkeys);

if ($#ARGV != 0) {
  die " Usage: $0 <filename> $#ARGV\n";
}
my $filename = $ARGV[0];

my $system_sysprio=-1;
my $maxtopdogs=-1;

my %mapping = map { $_ => $_ } (
    "name",
    "owner",
    "restart",
    "dependency",
    "totalcores",
    "wall",
    "nodelist",
    "vnodelist",
    "state",
    "queuedate",
    "queue",
    "dispatchdate",
    "step",
    "totaltasks",
    "spec",
    "status",
    "detailedstatus",
    "group"
    );

%jobs = get_jobs();

my %nodes = get_nodes();
my ($node_groups, $node_index, $nodes_per_group) = group_nodes();
my %job_nodes = get_job_nodes();
for my $jobid (keys %job_nodes) {
    my $nodelist = $job_nodes{$jobid};
    if (should_group_nodes()) {
        # Determine what groups this 
        my %groups = ();
        for my $nodeid (split(/,/, $nodelist)) {
            my $groupid = $node_groups->{$nodeid};
            my $groupidx = $node_index->{$nodeid};
            $groups{"($groupid,$groupidx)"} = 1;
        }
        $nodelist = join("", sort(keys(%groups)));
    } else {
        my @nodes_in_list = split(/,/, $nodelist);
        $nodelist = '';
        for my $nd (@nodes_in_list) {
            if (defined($nodes{$nd}{ncores}) && $nodes{$nd}{ncores} =~ /[0-9]+/) {
                my $ncores = $nodes{$nd}{ncores};
                for (my $i = 0; $i < $ncores; $i++) {
                    $nodelist .= "($nd,$i)";
                }
            } else {
                $nodelist .= "($nd,0)";
            }
        }
    }

    $jobs{$jobid}{nodelist} = $nodelist;
}

# add unknown but manatory attributes to jobs
for my $jobid (sort(keys(%jobs))) {
    $jobs{$jobid}{group}      = "unknown" if(!exists($jobs{$jobid}{group}));
    $jobs{$jobid}{nodelist}  = "-" if(!exists($jobs{$jobid}{nodelist}));
    $jobs{$jobid}{totaltasks} = $jobs{$jobid}{totalcores} if(!exists($jobs{$jobid}{totaltasks}));
    $jobs{$jobid}{spec}       = $jobs{$jobid}{totalcores} if(!exists($jobs{$jobid}{spec}));
    # check state
    ($jobs{$jobid}{status},$jobs{$jobid}{detailedstatus}) = &get_state($jobs{$jobid}{state}); 
}

open(OUT,"> $filename") || die "cannot open file $filename";
printf(OUT "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n");
printf(OUT "<lml:lgui xmlns:lml=\"http://www.llview.de\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n");
printf(OUT "        xsi:schemaLocation=\"http://www.llview.de lgui.xsd\"\n");
printf(OUT "        version=\"0.7\"\>\n");
printf(OUT "<objects>\n");
$count=0;
for my $jobid (sort(keys(%jobs))) {
    $count++;$jobnr{$jobid}=$count;
    printf(OUT "<object id=\"j%06d\" name=\"%s\" type=\"job\"/>\n",$count,$jobid);
}
printf(OUT "</objects>\n");
printf(OUT "<information>\n");
for my $jobid (sort(keys(%jobs))) {
    printf(OUT "<info oid=\"j%06d\" type=\"short\">\n",$jobnr{$jobid});
    foreach $key (sort(keys(%{$jobs{$jobid}}))) {
        if(exists($mapping{$key})) {
            if($mapping{$key} ne "") {
                $value=&modify($key,$mapping{$key},$jobs{$jobid}{$key});
                if($value) {
                    printf(OUT " <data %-20s value=\"%s\"/>\n","key=\"".$mapping{$key}."\"",$value);
                }
            } else {
                $notmappedkeys{$key}++;
            }
        } else {
            $notfoundkeys{$key}++;
        }
    }
    printf(OUT "</info>\n");
}
printf(OUT "</information>\n");
printf(OUT "</lml:lgui>\n");
close(OUT);

foreach $key (sort(keys(%notfoundkeys))) {
    printf("%-40s => \"\",\n","\"".$key."\"",$notfoundkeys{$key});
}


sub get_state {
    my($job_state)=@_;
    my($state,$detailed_state);

    $state="UNDETERMINED";$detailed_state="";

    if($job_state eq "zombie") {
        $state="COMPLETED";$detailed_state="JOB_OUTERR_READY";
    }
    if($job_state eq "pending") {
        $state="SUBMITTED";
        $detailed_state="";
    }
    if($job_state eq "running") {
        $state="RUNNING";$detailed_state="";
    }    

    return($state,$detailed_state);
}

sub modify {
    my($key,$mkey,$value)=@_;
    my $ret=$value;

    if(!$ret) {
        return(undef);
    }

    if($mkey eq "state") {
        $ret="Completed"   if ($value eq "zombie");
        $ret="Idle"        if ($value eq "pending");
        $ret="Running"     if ($value eq "running");
    }

    if(($mkey eq "wall") || ($mkey eq "wallsoft")) {
        if($value=~/^$patint[:]$patint[:]$patint$/) {
            $ret=$1*60*60+$2*60+$3;
        }
    }

    # mask & in user input
    if($ret=~/\&/) {
        $ret=~s/\&/\&amp\;/gs;
    } 

    return($ret);
}




#!/usr/bin/perl -w
#*******************************************************************************
#* Copyright (c) 2011 Forschungszentrum Juelich GmbH and others.
#* All rights reserved. This program and the accompanying materials
#* are made available under the terms of the Eclipse Public License v1.0
#* which accompanies this distribution, and is available at
#* http://www.eclipse.org/legal/epl-v10.html
#*
#* Contributors:
#*    Wolfgang Frings (Forschungszentrum Juelich GmbH)
#*    Jeff Overbey (Illinois/NCSA) - Grid Engine support
#*******************************************************************************/ 
use strict;

use FindBin;                # Find the directory containing this script
use lib "$FindBin::Bin";    # Search for modules in this script's directory
use GEHelper;               # Now look for our GEHelper module

my $patint="([\\+\\-\\d]+)";   # Pattern for Integer number
my ($line,%nodes,%nodenr,$key,$value,$count,%notmappedkeys,%notfoundkeys);

if ($#ARGV != 0) {
  die " Usage: $0 <filename> $#ARGV\n";
}
my $filename = $ARGV[0];

my $system_sysprio=-1;
my $maxtopdogs=-1;

my %mapping = map { $_ => $_ } (
    "availmem",
    "id",
    "ncores",
    "physmem",
    "ntype",
    "state"
    );


%nodes = get_nodes();

if (should_group_nodes()) {
    my ($node_groups, $node_index, $nodes_per_group) = group_nodes();
    my %groups = ();
    for my $nodeid (keys %nodes) {
        my $groupid = $node_groups->{$nodeid};
        if (!defined($groups{$groupid})) {
            $groups{$groupid}{id}     = $groupid; #$nodes{$nodeid}{id};
            $groups{$groupid}{ntype}  = $nodes{$nodeid}{ntype};
            $groups{$groupid}{ncores} = 1;
        } else {
            # $groups{$groupid}{id} .= "," . $nodes{$nodeid}{id};
            if ($nodes{$nodeid}{ntype} ne '-' && $nodes{$nodeid}{ntype} ne $groups{$groupid}{ntype}) {
                $groups{$groupid}{ntype} = "(mixed)";
            }
            $groups{$groupid}{ncores} = $nodes_per_group;
        }
    }
    %nodes = %groups;
}

# add unknown but manatory attributes to nodes
for my $nodeid (keys(%nodes)) {
    my($key,$value,$pair);
    if(exists($nodes{$nodeid}{status})) {
        foreach $pair (split(/,/,$nodes{$nodeid}{status})) {
            ($key,$value)=split(/=/,$pair);
            $nodes{$nodeid}{$key}=$value;
        }
    } 

}

open(OUT,"> $filename") || die "cannot open file $filename";

printf(OUT "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n");
printf(OUT "<lml:lgui xmlns:lml=\"http://www.llview.de\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n");
printf(OUT "        xsi:schemaLocation=\"http://www.llview.de lgui.xsd\"\n");
printf(OUT "        version=\"0.7\"\>\n");
printf(OUT "<objects>\n");
$count=0;
for my $nodeid (sort(keys(%nodes))) {
    $count++;$nodenr{$nodeid}=$count;
    printf(OUT "<object id=\"nd%06d\" name=\"%s\" type=\"node\"/>\n",$count,$nodeid);
}
printf(OUT "</objects>\n");
printf(OUT "<information>\n");
for my $nodeid (sort(keys(%nodes))) {
    printf(OUT "<info oid=\"nd%06d\" type=\"short\">\n",$nodenr{$nodeid});
    foreach $key (sort(keys(%{$nodes{$nodeid}}))) {
        if(exists($mapping{$key})) {
            if($mapping{$key} ne "") {
                $value=&modify($key,$mapping{$key},$nodes{$nodeid}{$key});
                if($value) {
                    printf(OUT " <data %-20s value=\"%s\"/>\n","key=\"".$mapping{$key}."\"",$value);
                }
            } else {
                $notmappedkeys{$key}++;
            }
        } else {
            $notfoundkeys{$key}++;
        }
    }
    printf(OUT "</info>\n");
}
printf(OUT "</information>\n");
printf(OUT "</lml:lgui>\n");

close(OUT);

foreach $key (sort(keys(%notfoundkeys))) {
    printf("%-40s => \"\",\n","\"".$key."\"",$notfoundkeys{$key});
}

sub modify {
    my($key,$mkey,$value)=@_;
    my $ret=$value;

    if(!$ret) {
        return(undef);
    }

    # mask & in user input
    if($ret=~/\&/) {
        $ret=~s/\&/\&amp\;/gs;
    } 

    return($ret);
}




#!/usr/bin/perl -w
#*******************************************************************************
#* Copyright (c) 2011 Forschungszentrum Juelich GmbH and others.
#* All rights reserved. This program and the accompanying materials
#* are made available under the terms of the Eclipse Public License v1.0
#* which accompanies this distribution, and is available at
#* http://www.eclipse.org/legal/epl-v10.html
#*
#* Contributors:
#*    Wolfgang Frings (Forschungszentrum Juelich GmbH)
#*    Jeff Overbey (Illinois/NCSA) - Grid Engine support
#*******************************************************************************/ 
use strict;

if ($#ARGV != 0) {
  die " Usage: $0 <filename> $#ARGV\n";
}
my $filename = $ARGV[0];

my $system_time = &get_current_date();
my $hostname = `hostname`; chomp($hostname);

open(OUT,"> $filename") || die "cannot open file $filename";
printf OUT <<EOF;
<?xml version="1.0" encoding="UTF-8"?>
<lml:lgui xmlns:lml="http://www.llview.de" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xsi:schemaLocation="http://www.llview.de/lgui.xsd"
        version="0.7">
  <objects>
    <object id="sys000001" name="cluster" type="system"/>
  </objects>
  <information>
    <info oid="sys000001" type="short">
      <data key="system_time"    value="$system_time"/>
      <data key="hostname"       value="$hostname"/>
      <data key="type"           value="Cluster"/>
    </info>
  </information>
</lml:lgui>
EOF
close(OUT);

sub get_current_date {
    my($sec,$min,$hour,$mday,$mon,$year,$wday,$yday,$idst)=localtime(time());
    my($date);
    $year=substr($year,1,2);
    $date=sprintf("%02d/%02d/%02d-%02d:%02d:%02d",$mon+1,$mday,$year,$hour,$min,$sec);
    return($date);
}




#*******************************************************************************/ 
use strict;

sub check_rms_LL {
    my($rmsref,$cmdsref,$verbose)=@_;
    my($key,$cmd);
    my $rc=1;
    
    my %cmdname=(
	"job"  => "llq",
	"node" => "llstatus",
	);
    my %cmdpath=(
	"job" => "/usr/bin/llq",
	"node" => "/usr/bin/llstatus",
	);
    
    foreach $key (keys(%cmdname)) {
	# check for job query cmd
	if (exists($cmdsref->{"cmd_${key}info"})) {
	    $cmd=$cmdsref->{"cmd_${key}info"};
		} else {
		    $cmd=$cmdpath{$key};
		}
		if (!-f $cmd) {
		    my $cmdpath=`which $cmdname{$key} 2>/dev/null`; 	# last try: which 
		    if (!$?) {
				chomp($cmdpath);
				$cmd=$cmdpath;
				print STDERR "$0: check_rms: found $cmdname{$key} by which ($cmd)\n" if ($verbose);
		    } else {
				last;
		    }
		}
		if (-f $cmd) {
		    $cmdsref->{"cmd_${key}info"}=$cmd;
		    $rc=1;
		}
	}
	
	if ($rc) {
		$$rmsref="LL";
	} else {
	    $cmd=$cmdpath{$key};
	}
	if (!-f $cmd) {
	    my $cmdpath=`which $cmdname{$key} 2>/dev/null`; 	# last try: which 
	    if (!$?) {
		chomp($cmdpath);
		$cmd=$cmdpath;
		&report_if_verbose("%s","$0: check_rms_LL: found $cmdname{$key} by which ($cmd)\n");
	    } 
	}
	if (-f $cmd) {
	    $cmdsref->{"cmd_${key}info"}=$cmd;
	} else {
	    &report_if_verbose("%s","$0: check_rms_LL: no cmd found for $cmdname{$key}\n");
	    $rc=0;
	}

    }
    
    if ($rc==1) {
	$$rmsref="LL";
	&report_if_verbose("%s%s%s", "$0: check_rms_LL: found LL commands (",
			   join(",",(values(%{$cmdsref}))),
			   ")\n");
    } else {
	&report_if_verbose("%s","$0: check_rms_LL: seems not to be a LL system\n");
    }
    
    return $rc;
}

sub generate_step_rms_LL {
    my($workflowxml, $laststep, $cmdsref)=@_;
    my($step,$envs,$key,$ukey);
    
    $envs="";
    foreach $key (keys(%{$cmdsref})) {
	$ukey=uc($key);
	$envs.="$ukey=$cmdsref->{$key} ";
    }
    
    $step="getdata";
    &add_exec_step_to_workflow($workflowxml,$step, $laststep, 
			       "$envs $^X rms/LL/da_system_info_LML.pl               \$tmpdir/sysinfo_LML.xml",
			       "$envs $^X rms/LL/da_nodes_info_LML.pl                \$tmpdir/nodes_LML.xml",
			       "$envs $^X rms/LL/da_jobs_info_LML.pl                 \$tmpdir/jobs_LML.xml");
    $laststep=$step;
    
    $step="combineLML";
    &add_exec_step_to_workflow($workflowxml,$step, $laststep, 
			       "$^X \$instdir/LML_combiner/LML_combine_obj.pl  -v -o \$stepoutfile ".
			       "\$tmpdir/sysinfo_LML.xml \$tmpdir/jobs_LML.xml \$tmpdir/nodes_LML.xml");
    $laststep=$step;
    
    return($laststep);
}

$main::check_functions->{LL}   =\&check_rms_LL;
$main::generate_functions->{LL}=\&generate_step_rms_LL;

1;




#*******************************************************************************/ 
use strict;

sub check_rms_OPENMPI {
    my($rmsref,$cmdsref,$verbose)=@_;
    my($key,$infocmd,$cmd);
    my $rc=1;

    my %cmdname=(
		"job"  => "orte-ps",


    # first:  check if ompi_info is given by request info
    if (exists($cmdsref->{"cmd_sysinfo"})) {
	if (-f $cmdsref->{"cmd_sysinfo"}) {
	    $infocmd=$cmdsref->{"cmd_sysinfo"}." --path bindir";
	}
    }

    # second: check if ompi_info is given in PATH
    if (!$infocmd) {
	my $cmdpath=`which $cmdname{sys} 2>/dev/null`; 	
	if(!$?) {
	    chomp($cmdpath);
	    $infocmd=$cmdpath." --path bindir";
	}
    }
    
    # second: check if ompi_info is given in default path
    if (!$infocmd) {
	my $cmdpath=$cmdpath{sys}; 	
	if (!-f $cmdpath) {
	    $infocmd=$cmdpath." --path bindir";
	}
    }
    
    # return if no ompi_info found
    if (!$infocmd) {
	return($rc);
    }
    
    # get openmpi bindir
    my $bindir=`$infocmd`;
    chomp($bindir);
    $bindir=~s/^Bindir:\s*//gs;
    
    foreach $key (keys(%cmdname)) {
	$cmdpath{$key}=$bindir."/".$cmdname{$key};
	
	if (exists($cmdsref->{"cmd_${key}info"})) {
	    $cmd=$cmdsref->{"cmd_${key}info"};
	} else {
	    $cmd=$cmdpath{$key};
	}
	if (! -f $cmd) {
	    my $cmdpath=`which $cmdname{$key} 2>/dev/null`; 	# last try: which 
	    if(!$?) {
		chomp($cmdpath);
		$cmd=$cmdpath;
		&report_if_verbose("%s","$0: check_rms_OPENMPI: found $cmdname{$key} by which ($cmd)\n");
	    } 
	}
	if (-f $cmd) {
	    $cmdsref->{"cmd_${key}info"}=$cmd;
	} else {
	    &report_if_verbose("%s","$0: check_rms_OPENMPI: no cmd found for $cmdname{$key}\n");
	    $rc=0;
	}
    }
    if ($rc) {
	$$rmsref="OPENMPI";
	&report_if_verbose("%s%s%s", "$0: check_rms_OPENMPI: found OPENMPI commands (",
			   join(",",(values(%{$cmdsref}))),
			   ")\n");
    } else {
	&report_if_verbose("%s","$0: check_rms_OPENMPI: seems not to be a OPENMPI system\n");
    }
    
    return($rc);
}


sub generate_step_rms_OPENMPI {
    my($workflowxml, $laststep, $cmdsref)=@_;
    my($step,$envs,$key,$ukey);


    return($laststep);
}

$main::check_functions->{OPENMPI}   =\&check_rms_OPENMPI;
$main::generate_functions->{OPENMPI}=\&generate_step_rms_OPENMPI;


1;




my $cmd="orte-ps";
$cmd=$ENV{"CMD_JOBINFO"} if($ENV{"CMD_JOBINFO"}); 

if(open(IN,"$cmd -n |")) {
    my $firstrankpid=undef;
    $jobid="-";
    while($line=<IN>) {
	chomp($line);
	if($line=~/Information from $patwrd \[$patint,$patint\]$/) {
	    my($call,$pid,$num)=($1,$2,$3);
	    print "found job $pid\n";
	    $jobid=$pid;
	    $jobs{$jobid}{step}=$jobid;
		print "found job $pid with vpid $vpid\n";
#
# Disable until ompi-ps is fixed
#
#    } elsif($line=~/Information from $patwrd \[$patint,$patint\]$/) {
#	    my($call,$vpid,$num)=($1,$2,$3);
#	    print "found vpid $vpid\n";
#	    $jobid=$pid;
#	    $jobs{$jobid}{step}=$jobid;
	} elsif($line=~/^\s*Node Name \|/) {
	    # scan node table
	    print "line 1: $line\n";

	    if($line=~/^\s*\[$patint,$patint\]\s*\|\s*$patwrd\s*\|\s*$patwrd\s*\|\s*$patwrd\s*\|/) {
		my($ppid,$num,$state,$slots,$numproc)=($1,$2,$3,$4,$5);
		print "found joblist $ppid,$num,$state,$slots,$numproc\n";
		$jobs{$jobid}{id}              = $ppid;
		$jobs{$jobid}{id}              = $jobid;
		$jobs{$jobid}{totaltasks}      = $numproc;
		$jobs{$jobid}{job_state}       = $state;
		$line=<IN>;

    $nodes{$nodeid}{id}       = $nodeid;
    $nodes{$nodeid}{arch}     = `uname -p`;
    $nodes{$nodeid}{state}    = "Up";
    $nodes{$nodeid}{slots}    = `grep family /proc/cpuinfo | wc -l`;
    	$nodes{$nodeid}{slots}    = `grep family /proc/cpuinfo | wc -l`;
    }
    foreach $key (keys(%{$nodes{$nodeid}})) {
	chomp($nodes{$nodeid}{$key});
    }




#*******************************************************************************/ 
use strict;

sub check_rms_PBS {
    my($rmsref,$cmdsref,$verbose)=@_;
    my($key, $cmd);
    my $rc=1;
    
    my %cmdname=(
		"job"  => "qstat",

		"job" => "/usr/bin/qstat",
		"node" => "/usr/bin/pbsnodes",
	);
    
    foreach $key (keys(%cmdname)) {
	# check for job query cmd
	if (exists($cmdsref->{"cmd_${key}info"})) {
	    $cmd=$cmdsref->{"cmd_${key}info"};
	} else {
	    $cmd=$cmdpath{$key};
	}
	if (! -f $cmd) {
	    my $cmdpath=`which $cmdname{$key} 2>/dev/null`; 	# last try: which 
	    if (!$?) {
		chomp($cmdpath);
		$cmd=$cmdpath;
		&report_if_verbose("%s","$0: check_rms_PBS: found $cmdname{$key} by which ($cmd)\n");
	    }
	}
	if (-f $cmd) {
	    $cmdsref->{"cmd_${key}info"}=$cmd;
	} else {
	    &report_if_verbose("%s","$0: check_rms_PBS: no cmd found for $cmdname{$key}\n");
	    $rc=0;
	}
    }
    
    # Ensure it is a PBSpro system
    if (exists($cmdsref->{"cmd_jobinfo"})) {
	$cmd=$cmdsref->{"cmd_jobinfo"}." --version";
	    my $cmdversion=`$cmd 2>/dev/null`; 	
	chomp($cmdversion);
	if ($cmdversion=~/version/) {
	    if ($cmdversion=~/PBSPro/) {
		print STDERR "$0: check_rms: PBSpro found\n" if($verbose);
	    	}
	    } else {
			print STDERR "$0: check_rms: could not obtain version info from command $cmd\n" if($verbose);
			$rc=0;
	    }
	} else {
	    &report_if_verbose("%s","$0: check_rms_PBS: could not obtain version info from command $cmd\n");
	    $rc=0;
	}
    }
    
    if ($rc==1)  {
    	$$rmsref = "PBS";
	&report_if_verbose("%s%s%s", "$0: check_rms_PBS: found PBS commands (",
			   join(",",(values(%{$cmdsref}))),
			   ")\n");
    } else {
	&report_if_verbose("%s","$0: check_rms_PBS: seems not to be a PBS system\n");
    }
    
    return($rc);
}

sub generate_step_rms_PBS {
    my($workflowxml, $laststep, $cmdsref)=@_;
    my($step,$envs,$key,$ukey);


    return($laststep);
}

$main::check_functions->{PBS}   =\&check_rms_PBS;
$main::generate_functions->{PBS}=\&generate_step_rms_PBS;

1;




    "Resource_List.depend"                   => "dependency",
    "Resource_List.mem"                      => "",
    "Resource_List.nodect"                   => "",
    "Resource_List.nodes"                    => "totalcores",
    "Resource_List.pmem"                     => "",
    "Resource_List.walltime"                 => "wall",
    "Shell_Path_List"                        => "",

    "fault_tolerant"                         => "",
    "interactive"                            => "",
    "job_state"                              => "state",
    "mtime"                                  => "dispatchdate",
    "qtime"                                  => "queuedate",
    "queue"                                  => "queue",
    "resources_used.cput"                    => "",

    "server"                                 => "",
    "session_id"                             => "",
    "start_count"                            => "",
    "start_time"                             => "",
    "submit_args"                            => "",

    "step"                                   => "step",
    "totaltasks"                             => "totaltasks",
    "totalcores"                             => "totalcores",
    "spec"                                   => "spec",

    "status"                                 => "status",

    "resources_used.ncpus"                   => "",
    "stime"                                  => "",
    "substate"                               => "",

# unknown attributes
    "group"                                  => "group",
    "Account_Name"                           => "",
    "Exit_status"                            => "",
    "Resource_List.Qlist"                    => "",
    "estimated.exec_vnode"                   => "",
    "estimated.start_time"                   => "",
    "Resource_List.nodes"                    => "",
    "argument_list"                          => "",
    "array"                                  => "",
    "array_indices_remaining"                => "",
    "array_indices_submitted"                => "",
    "array_state_count"                      => "",
    "executable"                             => "",
    "group_list"                             => "",
    "umask"                                  => "",
    );

my $cmd="/usr/bin/qstat";

open(IN,"$cmd -f |");
my $jobid="-";
my $lastkey="-";


while($line=<IN>) {
    chomp($line);

foreach $jobid (sort(keys(%jobs))) {
    $jobs{$jobid}{group}      = "unknown" if(!exists($jobs{$jobid}{group}));
    $jobs{$jobid}{exec_host}  = "-" if(!exists($jobs{$jobid}{exec_host}));
    if(!exists($jobs{$jobid}{totaltasks})) {
	$jobs{$jobid}{totaltasks} = $jobs{$jobid}{"Resource_List.nodes"} if(exists($jobs{$jobid}{"Resource_List.nodes"}));
	$jobs{$jobid}{totaltasks} = $jobs{$jobid}{"Resource_List.ncpus"} if(exists($jobs{$jobid}{"Resource_List.ncpus"}));
    }
    if(!exists($jobs{$jobid}{spec})) {
	$jobs{$jobid}{spec}       = $jobs{$jobid}{"Resource_List.nodes"} if(!exists($jobs{$jobid}{"Resource_List.nodes"}));
	$jobs{$jobid}{spec}       = $jobs{$jobid}{"Resource_List.ncpus"} if(!exists($jobs{$jobid}{"Resource_List.ncpus"}));
	
    }    
    # check state
    ($jobs{$jobid}{status},$jobs{$jobid}{detailedstatus}) = &get_state($jobs{$jobid}{job_state},
								       $jobs{$jobid}{Hold_Types}); 
    $jobs{$jobid}{"totalcores"}=$jobs{$jobid}{"totaltasks"} if(!exists($jobs{$jobid}{"totalcores"}));
}

open(OUT,"> $filename") || die "cannot open file $filename";


    if($mkey eq "vnodelist") {
	if($ret ne "-") {
#	    my $save=$ret;
	    $ret=~s/\(//gs;$ret=~s/\)//gs;
	    my @nodes = split(/\+/,$ret);
	    my ($c,$nd,$num,$rest);
	    for($c=0;$c<=$#nodes;$c++) {
		# get nodename
		if($nodes[$c]=~/^([^\:]+)\:(.*)$/s) {
		    ($nd,$rest)=($1,$2);
		    # get number of procs
		    if($rest=~/ncpus=(\d+)/) {
			$num=$1;
		    } elsif($rest=~/mpiprocs=(\d+)/) {
			$num=$1;
		    } else {
			# default:  1 core
			$num=1;
		    }
		    $nodes[$c]="$nd,$num";
		} elsif($nodes[$c]=~/^([^\:]+)$/s) {
		    $nd=$1;
		    $num=1;
		} elsif($nodes[$c]=~/([^\(\)\:]+)/s) {
		    $nd=$1;$num=1;
		    $nodes[$c]="$nd,$num";
		} else {
		    print STDERR "Error in job node list: $nodes[$c]\n";
		    $nodes[$c]="unknown,0";
		}
	    }
	    $ret="(".join(')(',@nodes).")";
#	    print "$save -> $ret\n";
	}
    }


Lines 86-91 Link Here

(-)a/rms/org.eclipse.ptp.rm.lml.da/rms/PBS/da_nodes_info_LML.pl (+8 lines)
86	"resv_enable" => "",	86	"resv_enable" => "",
87	"sharing" => "",	87	"sharing" => "",
88	# unknown attributes	88	# unknown attributes
		89	"resources_available.Cluster" => "",
		90	"resources_available.IB" => "",
		91	"resources_available.NodeInfo" => "",
		92	"resources_available.Qlist" => "",
		93	"resources_available.Rack" => "",
		94	"resources_available.groupn" => "",
		95	"resources_available.nodemem" => "",
		96
89	);	97	);
90		98
91		99




#*******************************************************************************/ 
use strict;

sub check_rms_PE {
    my($rmsref,$cmdsref,$verbose)=@_;
    my($key,$cmd);
    my $rc=1;
    
    my %cmdname=(
		"job"  => "poe",
	);
    
    my %cmdpath=(
	"job"  => "/usr/bin/poe",
	);
    
    foreach $key (keys(%cmdname)) {
	if (exists($cmdsref->{"cmd_${key}info"})) {
	    $cmd=$cmdsref->{"cmd_${key}info"};
	} else {
	    $cmd=$cmdpath{$key};
	}
	if (! -f $cmd) {
	    my $cmdpath=`which $cmdname{$key} 2>/dev/null`; 	# last try: which 
	    if(!$?) {
		chomp($cmdpath);
		$cmd=$cmdpath;
		&report_if_verbose("%s","$0: check_rms_PE: found $cmdname{$key} by which ($cmd)\n");
	    }
	}
	if (-f $cmd) {
	    $cmdsref->{"cmd_${key}info"}=$cmd;
	} else {
	    &report_if_verbose("%s","$0: check_rms_PE: no cmd found for $cmdname{$key}\n");
	    $rc=0;
	}
    }
    if ($rc==1) {
	$$rmsref="PE";
	&report_if_verbose("%s%s%s", "$0: check_rms_PE: found PE commands (",
			   join(",",(values(%{$cmdsref}))),
			   ")\n");
    } else {
	&report_if_verbose("%s","$0: check_rms_PE: seems not to be a PE system\n");
    }
    
    return($rc);
}


sub generate_step_rms_PE {
    my($workflowxml, $laststep, $cmdsref)=@_;
    my($step,$envs,$key,$ukey);


    return($laststep);
}

$main::check_functions->{PE}   =\&check_rms_PE;
$main::generate_functions->{PE}=\&generate_step_rms_PE;

1;




#*******************************************************************************/ 
use strict;

sub check_rms_TORQUE {
    my($rmsref,$cmdsref,$verbose)=@_;
    my($key, $cmd);
    my $rc=1;
    
    my %cmdname=(
		"job"  => "qstat",

		    if (!$?) {
				chomp($cmdpath);
				$cmd=$cmdpath;
				&report_if_verbose("%s","$0: check_rms_TORQUE: found $cmdname{$key} by which ($cmd)\n");
		    } 
				last;
		    }
		}
		if (-f $cmd) {
		    $cmdsref->{"cmd_${key}info"}=$cmd;
		}  else {
		    &report_if_verbose("%s","$0: check_rms_TORQUE: no cmd found for $cmdname{$key}\n");
		    $rc=0;
		}
    }
    

	    my $cmdversion=`$cmd 2>/dev/null`; 	
	    chomp($cmdversion);
	    if ($cmdversion=~/version/) {
		if ($cmdversion=~/PBSPro/) {
		    &report_if_verbose("%s","$0: check_rms_TORQUE: PBSpro found\n");
		    $rc=0;
	    	}
	    } else {
		&report_if_verbose("%s","$0: check_rms_TORQUE: could not obtain version info from command $cmd\n");
	    }
    }

    if ($rc==1)  {
    	$$rmsref = "TORQUE";
	&report_if_verbose("%s%s%s", "$0: check_rms_TORQUE: found TORQUE commands (",
			   join(",",(values(%{$cmdsref}))),
			   ")\n");
    } else {
	&report_if_verbose("%s","$0: check_rms_TORQUE: seems not to be a TORQUE system\n");
    }
    
    return($rc);
}

sub generate_step_rms_TORQUE {
    my($workflowxml, $laststep, $cmdsref)=@_;
    my($step,$envs,$key,$ukey);



}

$main::check_functions->{TORQUE}   =\&check_rms_TORQUE;
$main::generate_functions->{TORQUE}=\&generate_step_rms_TORQUE;

1;

Lines 13-19 Link Here

(-)a/rms/org.eclipse.ptp.rm.lml.monitor.core/src/org/eclipse/ptp/rm/lml/monitor/core/LMLResourceManagerMonitor.java (-27 / +101 lines)
13	import java.io.StringReader;	13	import java.io.StringReader;
14	import java.io.StringWriter;	14	import java.io.StringWriter;
15	import java.util.ArrayList;	15	import java.util.ArrayList;
		16	import java.util.HashMap;
		17	import java.util.LinkedList;
16	import java.util.List;	18	import java.util.List;
		19	import java.util.Map;
		20	import java.util.Map.Entry;
17		21
18	import org.eclipse.core.runtime.CoreException;	22	import org.eclipse.core.runtime.CoreException;
19	import org.eclipse.core.runtime.IProgressMonitor;	23	import org.eclipse.core.runtime.IProgressMonitor;
Lines 41-50 Link Here
41	import org.eclipse.ptp.rm.jaxb.core.data.SimpleCommandType;	45	import org.eclipse.ptp.rm.jaxb.core.data.SimpleCommandType;
42	import org.eclipse.ptp.rm.lml.core.JobStatusData;	46	import org.eclipse.ptp.rm.lml.core.JobStatusData;
43	import org.eclipse.ptp.rm.lml.core.LMLManager;	47	import org.eclipse.ptp.rm.lml.core.LMLManager;
		48	import org.eclipse.ptp.rm.lml.core.model.IPattern;
44	import org.eclipse.ptp.rm.lml.da.server.core.LMLDAServer;	49	import org.eclipse.ptp.rm.lml.da.server.core.LMLDAServer;
45	import org.eclipse.ptp.rm.lml.internal.core.elements.CommandType;	50	import org.eclipse.ptp.rm.lml.internal.core.elements.CommandType;
46	import org.eclipse.ptp.rm.lml.internal.core.elements.DriverType;	51	import org.eclipse.ptp.rm.lml.internal.core.elements.DriverType;
47	import org.eclipse.ptp.rm.lml.internal.core.elements.RequestType;	52	import org.eclipse.ptp.rm.lml.internal.core.elements.RequestType;
		53	import org.eclipse.ptp.rm.lml.internal.core.model.Pattern;
48	import org.eclipse.ptp.rm.lml.monitor.LMLMonitorCorePlugin;	54	import org.eclipse.ptp.rm.lml.monitor.LMLMonitorCorePlugin;
49	import org.eclipse.ptp.rm.lml.monitor.core.messages.Messages;	55	import org.eclipse.ptp.rm.lml.monitor.core.messages.Messages;
50	import org.eclipse.ptp.rmsystem.AbstractResourceManagerConfiguration;	56	import org.eclipse.ptp.rmsystem.AbstractResourceManagerConfiguration;
Lines 166-171 Link Here
166		172
167	private static final String LAYOUT = "layout";//$NON-NLS-1$	173	private static final String LAYOUT = "layout";//$NON-NLS-1$
168	private static final String LAYOUT_STRING = "layoutString";//$NON-NLS-1$	174	private static final String LAYOUT_STRING = "layoutString";//$NON-NLS-1$
		175	private static final String PATTERN_GID_ATTR = "gid";//$NON-NLS-1$
		176	private static final String FILTER_TITLE_ATTR = "columnTitle";//$NON-NLS-1$
		177	private static final String FILTER_TYPE_ATTR = "type";//$NON-NLS-1$
		178	private static final String FILTER_RANGE_ATTR = "range";//$NON-NLS-1$
		179	private static final String FILTER_RELATION_ATTR = "relation";//$NON-NLS-1$
		180	private static final String FILTER_MAX_VALUE_RANGE_ATTR = "maxValueRange";//$NON-NLS-1$
		181	private static final String FILTER_MIN_VALUE_RANGE_ATTR = "minValueRange";//$NON-NLS-1$
		182	private static final String FILTER_RELATION_OPERATOR_ATTR = "relationOperartor";//$NON-NLS-1$
		183	private static final String FILTER_RELATION_VALUE_ATTR = "relationValue";//$NON-NLS-1$
169	private static final String JOB_ID_ATTR = "job_id";//$NON-NLS-1$	184	private static final String JOB_ID_ATTR = "job_id";//$NON-NLS-1$
170	private static final String RM_ID_ATTR = "rm_id";//$NON-NLS-1$	185	private static final String RM_ID_ATTR = "rm_id";//$NON-NLS-1$
171	private static final String STDOUT_REMOTE_FILE_ATTR = "stdout_remote_path";//$NON-NLS-1$	186	private static final String STDOUT_REMOTE_FILE_ATTR = "stdout_remote_path";//$NON-NLS-1$
Lines 243-249 Link Here
243	return null;	258	return null;
244	}	259	}
245		260
246	private JobStatusData[] reload(IMemento memento) {	261	private JobStatusData[] reloadJobs(IMemento memento) {
247	final List<JobStatusData> jobs = new ArrayList<JobStatusData>();	262	final List<JobStatusData> jobs = new ArrayList<JobStatusData>();
248	if (memento != null) {	263	if (memento != null) {
249	final IMemento[] children = memento.getChildren(JOB_ID_ATTR);	264	final IMemento[] children = memento.getChildren(JOB_ID_ATTR);
Lines 257-263 Link Here
257	return jobs.toArray(new JobStatusData[jobs.size()]);	272	return jobs.toArray(new JobStatusData[jobs.size()]);
258	}	273	}
259		274
260	private void save(JobStatusData job, XMLMemento memento) {	275	private Map<String, List<IPattern>> reloadPattern(IMemento memento) {
		276	final Map<String, List<IPattern>> pattern = new HashMap<String, List<IPattern>>();
		277	if (memento != null) {
		278	final IMemento[] childrenPattern = memento.getChildren(PATTERN_GID_ATTR);
		279	for (final IMemento childPattern : childrenPattern) {
		280	final List<IPattern> filters = new LinkedList<IPattern>();
		281	final IMemento[] childrenFilter = childPattern.getChildren(FILTER_TITLE_ATTR);
		282	for (final IMemento childFilter : childrenFilter) {
		283	final IPattern filter = new Pattern(childFilter.getID(), childFilter.getString(FILTER_TYPE_ATTR));
		284	if (childFilter.getBoolean(FILTER_RANGE_ATTR)) {
		285	filter.setRange(childFilter.getString(FILTER_MIN_VALUE_RANGE_ATTR),
		286	childFilter.getString(FILTER_MAX_VALUE_RANGE_ATTR));
		287	} else if (childFilter.getBoolean(FILTER_RELATION_ATTR)) {
		288	filter.setRelation(childFilter.getString(FILTER_RELATION_OPERATOR_ATTR),
		289	childFilter.getString(FILTER_RELATION_VALUE_ATTR));
		290	}
		291	filters.add(filter);
		292	}
		293
		294	if (filters.size() > 0) {
		295	pattern.put(childPattern.getID(), filters);
		296	}
		297	}
		298	}
		299	return pattern;
		300	}
		301
		302	private void saveJob(JobStatusData job, XMLMemento memento) {
261	final IMemento jobMemento = memento.createChild(JOB_ID_ATTR, job.getJobId());	303	final IMemento jobMemento = memento.createChild(JOB_ID_ATTR, job.getJobId());
262	jobMemento.putString(RM_ID_ATTR, job.getRmId());	304	jobMemento.putString(RM_ID_ATTR, job.getRmId());
263	jobMemento.putString(STATE_ATTR, job.getState());	305	jobMemento.putString(STATE_ATTR, job.getState());
Lines 269-274 Link Here
269	jobMemento.putString(OWNER_ATTR, job.getOwner());	311	jobMemento.putString(OWNER_ATTR, job.getOwner());
270	jobMemento.putString(OID_ATTR, job.getOid());	312	jobMemento.putString(OID_ATTR, job.getOid());
271		313
		314	}
		315
		316	private void savePattern(String key, List<IPattern> value, IMemento memento) {
		317	final IMemento patternMemento = memento.createChild(PATTERN_GID_ATTR, key);
		318	for (final IPattern filterValue : value) {
		319	final IMemento filterMemento = patternMemento.createChild(FILTER_TITLE_ATTR, filterValue.getColumnTitle());
		320	filterMemento.putString(FILTER_TYPE_ATTR, filterValue.getType());
		321	filterMemento.putBoolean(FILTER_RANGE_ATTR, filterValue.isRange());
		322	filterMemento.putBoolean(FILTER_RELATION_ATTR, filterValue.isRelation());
		323	if (filterValue.isRange()) {
		324	filterMemento.putString(FILTER_MIN_VALUE_RANGE_ATTR, filterValue.getMinValueRange());
		325	filterMemento.putString(FILTER_MAX_VALUE_RANGE_ATTR, filterValue.getMaxValueRange());
		326	} else if (filterValue.isRelation()) {
		327	filterMemento.putString(FILTER_RELATION_OPERATOR_ATTR, filterValue.getRelationOperator());
		328	filterMemento.putString(FILTER_RELATION_VALUE_ATTR, filterValue.getRelationValue());
		329	}
		330	}
272	}	331	}
273		332
274	@Override	333	@Override
Lines 301-306 Link Here
301	if (memento != null) {	360	if (memento != null) {
302	final String layout = fLMLManager.getCurrentLayout(getResourceManager().getUniqueName());	361	final String layout = fLMLManager.getCurrentLayout(getResourceManager().getUniqueName());
303	final JobStatusData[] jobs = fLMLManager.getUserJobs(getResourceManager().getUniqueName());	362	final JobStatusData[] jobs = fLMLManager.getUserJobs(getResourceManager().getUniqueName());
		363	final Map<String, List<IPattern>> patternMap = fLMLManager.getCurrentPattern(getResourceManager().getUniqueName());
304		364
305	if (layout != null) {	365	if (layout != null) {
306	final IMemento layoutMemento = memento.createChild(LAYOUT);	366	final IMemento layoutMemento = memento.createChild(LAYOUT);
Lines 310-317 Link Here
310	if (jobs != null && jobs.length > 0) {	370	if (jobs != null && jobs.length > 0) {
311	for (final JobStatusData status : jobs) {	371	for (final JobStatusData status : jobs) {
312	if (!status.isRemoved()) {	372	if (!status.isRemoved()) {
313	save(status, memento);	373	saveJob(status, memento);
314	}	374	}
		375	}
		376	}
		377
		378	if (patternMap != null && patternMap.keySet().size() > 0) {
		379	for (final Entry<String, List<IPattern>> pattern : patternMap.entrySet()) {
		380	savePattern(pattern.getKey(), pattern.getValue(), memento);
315	}	381	}
316	}	382	}
317	}	383	}
Lines 354-395 Link Here
354		420
355	final StringBuilder layout = new StringBuilder();	421	final StringBuilder layout = new StringBuilder();
356	JobStatusData[] jobs = null;	422	JobStatusData[] jobs = null;
		423	Map<String, List<IPattern>> pattern = null;
357		424
358	if (memento != null) {	425	if (memento != null) {
359	final IMemento child = memento.getChild(LAYOUT);	426	final IMemento childLayout = memento.getChild(LAYOUT);
360	if (child != null) {	427	if (childLayout != null) {
361	final String childString = child.getString(LAYOUT_STRING);	428	final String childLayoutString = childLayout.getString(LAYOUT_STRING);
362	layout.append(childString);	429	layout.append(childLayoutString);
363	}	430	}
364		431
365	jobs = reload(memento);	432	pattern = reloadPattern(memento);
		433	jobs = reloadJobs(memento);
366	}	434	}
367	/*
368	* Initialize LML classes
369	*/
370	fLMLManager.openLgui(getResourceManager().getUniqueName(), getMonitorConfigurationRequestType(), layout, jobs);
371	/*
372	* Open connection and launch periodic job
373	*/
374	final IRemoteConnection conn = getRemoteConnection(monitor);	435	final IRemoteConnection conn = getRemoteConnection(monitor);
375	if (conn != null) {	436	if (conn == null) {
376	if (!conn.isOpen()) {	437	throw new CoreException(new Status(IStatus.ERROR, LMLMonitorCorePlugin.getUniqueIdentifier(),
377	try {	438	Messages.LMLResourceManagerMonitor_unableToOpenConnection));
378	conn.open(monitor);	439	}
379	} catch (final RemoteConnectionException e) {	440
380	throw new CoreException(new Status(IStatus.ERROR, LMLMonitorCorePlugin.getUniqueIdentifier(), e.getMessage()));	441	if (!conn.isOpen()) {
381	}	442	try {
		443	conn.open(monitor);
		444	} catch (final RemoteConnectionException e) {
		445	throw new CoreException(new Status(IStatus.ERROR, LMLMonitorCorePlugin.getUniqueIdentifier(), e.getMessage()));
382	}	446	}
383	if (!conn.isOpen()) {	447	if (!conn.isOpen()) {
384	throw new CoreException(new Status(IStatus.ERROR, LMLMonitorCorePlugin.getUniqueIdentifier(),	448	throw new CoreException(new Status(IStatus.ERROR, LMLMonitorCorePlugin.getUniqueIdentifier(),
385	Messages.LMLResourceManagerMonitor_unableToOpenConnection));	449	Messages.LMLResourceManagerMonitor_unableToOpenConnection));
386	}	450	}
387	synchronized (this) {	451	}
388	if (fMonitorJob == null) {	452
389	fMonitorJob = new MonitorJob(Messages.LMLResourceManagerMonitor_LMLMonitorJob, conn);	453	/*
390	}	454	* Initialize LML classes
391	fMonitorJob.schedule();	455	*/
		456	fLMLManager.openLgui(getResourceManager().getUniqueName(), conn.getUsername(), getMonitorConfigurationRequestType(),
		457	layout, jobs, pattern);
		458
		459	/*
		460	* Start monitoring job
		461	*/
		462	synchronized (this) {
		463	if (fMonitorJob == null) {
		464	fMonitorJob = new MonitorJob(Messages.LMLResourceManagerMonitor_LMLMonitorJob, conn);
392	}	465	}
		466	fMonitorJob.schedule();
393	}	467	}
394		468
395	/*	469	/*

Lines 32-35 Link Here

(-)a/rms/org.eclipse.ptp.rm.lml.ui/src/org/eclipse/ptp/rm/lml/ui/ILMLUIConstants.java (+1 lines)
32	public static final String VIEW_TABLE_2 = "joblistwait"; //$NON-NLS-1$	32	public static final String VIEW_TABLE_2 = "joblistwait"; //$NON-NLS-1$
33		33
34	public static final int INTERNAL_ERROR = 150;	34	public static final int INTERNAL_ERROR = 150;
		35	public static final String COLUMN_STATUS = "status";//$NON-NLS-1$
35	}	36	}




package org.eclipse.ptp.rm.lml.ui.providers;

import org.eclipse.swt.widgets.Button;
import org.eclipse.swt.widgets.Combo;
import org.eclipse.swt.widgets.Text;

/**
 * This class contains all the information about a row in the FilterDialog.
 * 
 * For every active column (with exception) in a table one object of this class
 * should be generated.
 */
public class FilterDataRow {

	// Type of the data displayed in the column
	private String type;

	// To activate the filter function for this row
	private final Button checkbox;

	// To active a relation; only for the types numeric and date
	private Button radioButoonRelation;

	// To active a range; only for the types numeric and date
	private Button radioButtonRange;

	// The value for comparison, only for type alpha
	private Text valueAlpha;

	// The operator how to compare a value of the input with an given value; only for the type numeric and date
	private Combo relationComboNumericDate;

	// The value for comparison; only for the type numeric
	private Text valueNumeric;

	// The value for comparison; only for the type date
	private Button valueDate;

	// The minimal value in a range; only for the type numeric
	private Text minValueNumeric;

	// The maximal value in a range; only for the type numeric
	private Text maxValueNumeric;

	// The minimal value in a range; only for the type date
	private Button minValueDate;

	// The maximal value in a range; only for the type date
	private Button maxValueDate;

	// The value for comparison; only for the type alpha
	private Combo relationComboAlpha;

	/**
	 * Constructor.
	 * 
	 * @param type
	 * @param checkbox
	 */
	public FilterDataRow(String type, Button checkbox) {
		this.type = type;
		this.checkbox = checkbox;
		if (type == null) {
			this.type = "alpha";
		}
	}

	/**
	 * Adding a input button for the maximal value (date).
	 * 
	 * @param value
	 */
	public void addMaxValueDate(Button value) {
		maxValueDate = value;
	}

	/**
	 * Adding a input text for the maximal value (numeric).
	 * 
	 * @param value
	 */
	public void addMaxValueNumeric(Text value) {
		maxValueNumeric = value;
	}

	/**
	 * Adding a input button for the minimal value (date).
	 * 
	 * @param value
	 */
	public void addMinValueDate(Button value) {
		minValueDate = value;
	}

	/**
	 * Adding a input text for the minimal value (numeric).
	 * 
	 * @param value
	 */
	public void addMinValueNumeric(Text value) {
		minValueNumeric = value;
	}

	/**
	 * Adding a radio button for range.
	 * 
	 * @param button
	 */
	public void addRadioRange(Button button) {
		radioButtonRange = button;
	}

	/**
	 * Adding a radio button for relation.
	 * 
	 * @param button
	 */
	public void addRadioRelation(Button button) {
		radioButoonRelation = button;
	}

	/**
	 * Adding a combo box which includes all possible relation operators for alpha.
	 * 
	 * @param relation
	 */
	public void addRelationComboAlpha(Combo relation) {
		relationComboAlpha = relation;
	}

	/**
	 * Adding a combo box which includes all possible relation operators for numeric and date.
	 * 
	 * @param relation
	 */
	public void addRelationComboNumericDate(Combo relation) {
		relationComboNumericDate = relation;
	}

	/**
	 * Adding a input text for the comparison value (alpha).
	 * 
	 * @param value
	 */
	public void addRelationValueAlpha(Text value) {
		valueAlpha = value;
	}

	/**
	 * Adding a input button for the comparison value (date).
	 * 
	 * @param value
	 */
	public void addRelationValueDate(Button value) {
		valueDate = value;
	}

	/**
	 * Adding a input text for comparison value (numeric).
	 * 
	 * @param value
	 */
	public void addRelationValueNumeric(Text value) {
		valueNumeric = value;
	}

	public Button getCheckbox() {
		return checkbox;
	}

	/**
	 * Getting the button with the maximal value (date).
	 * 
	 * @return button
	 */
	public Button getMaxValueButtonDate() {
		return maxValueDate;
	}

	/**
	 * Getting the text with the maximal value (numeric).
	 * 
	 * @return text
	 */
	public Text getMaxValueTextNumeric() {
		return maxValueNumeric;
	}

	/**
	 * Getting the button with the minimal value (date).
	 * 
	 * @return button
	 */
	public Button getMinValueButtonDate() {
		return minValueDate;
	}

	/**
	 * Getting the text with the minimal value (numeric).
	 * 
	 * @return text
	 */
	public Text getMinValueTextNumeric() {
		return minValueNumeric;
	}

	/**
	 * Getting the button for range.
	 * 
	 * @return button for range
	 */
	public Button getRadioButtonRange() {
		return radioButtonRange;
	}

	/**
	 * Getting the button for relation.
	 * 
	 * @return button for relation.
	 */
	public Button getRadioButtonRelation() {
		return radioButoonRelation;
	}

	/**
	 * Getting the combo box including all comparison operators (alpha).
	 * 
	 * @return combo box
	 */
	public Combo getRelationComboAlpha() {
		return relationComboAlpha;
	}

	/**
	 * Getting the combo box including all comparison operators (numeric and date).
	 * 
	 * @return combo box
	 */
	public Combo getRelationComboNumericDate() {
		return relationComboNumericDate;
	}

	/**
	 * Getting the button with the comparison value (date).
	 * 
	 * @return button
	 */
	public Button getRelationValueButtonDate() {
		return valueDate;
	}

	/**
	 * Getting the text with the comparison value (alpha).
	 * 
	 * @return text
	 */
	public Text getRelationValueTextAlpha() {
		return valueAlpha;
	}

	/**
	 * Getting the text with the comparison value (numeric).
	 * 
	 * @return
	 */
	public Text getRelationValueTextNumeric() {
		return valueNumeric;
	}

	/**
	 * Getting the title of the row
	 * 
	 * @return title
	 */
	public String getTitle() {
		return checkbox.getText();
	}

	/**
	 * Getting the sort type of the row.
	 * 
	 * @return type
	 */
	public String getType() {
		return type;
	}

	/**
	 * Checks if the checkbox is set.
	 * 
	 * @return
	 */
	public boolean isCheckboxSet() {
		return checkbox.getSelection();
	}

	public void setCheckbox(boolean value) {
		checkbox.setSelection(value);
	}
}




package org.eclipse.ptp.rm.lml.ui.providers;

import java.text.DecimalFormat;
import java.text.NumberFormat;
import java.util.LinkedList;
import java.util.List;

import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Status;
import org.eclipse.jface.dialogs.Dialog;
import org.eclipse.jface.dialogs.ErrorDialog;
import org.eclipse.jface.dialogs.IDialogConstants;
import org.eclipse.jface.layout.GridDataFactory;
import org.eclipse.ptp.rm.lml.core.LMLManager;
import org.eclipse.ptp.rm.lml.core.model.ILguiItem;
import org.eclipse.ptp.rm.lml.core.model.IPattern;
import org.eclipse.ptp.rm.lml.core.model.ITableColumnLayout;
import org.eclipse.ptp.rm.lml.internal.core.model.Pattern;
import org.eclipse.ptp.rm.lml.ui.ILMLUIConstants;
import org.eclipse.swt.SWT;
import org.eclipse.swt.custom.ScrolledComposite;
import org.eclipse.swt.events.SelectionAdapter;
import org.eclipse.swt.events.SelectionEvent;
import org.eclipse.swt.events.SelectionListener;
import org.eclipse.swt.events.VerifyEvent;
import org.eclipse.swt.events.VerifyListener;
import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.layout.GridLayout;
import org.eclipse.swt.widgets.Button;
import org.eclipse.swt.widgets.Combo;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Control;
import org.eclipse.swt.widgets.DateTime;
import org.eclipse.swt.widgets.Label;
import org.eclipse.swt.widgets.Shell;
import org.eclipse.swt.widgets.Text;

public class FilterDialog extends Dialog {

	public class SelectDateAdpater extends SelectionAdapter {

		private final Button button;

		private String date;

		private Button comparisonButton = null;

		public SelectDateAdpater(Button button) {
			super();
			this.button = button;
			if (button.getText() == null) {
				date = new String();
			} else {
				date = button.getText();
			}
		}

		public SelectDateAdpater(Button button, Button comparisonButton) {
			super();
			this.button = button;
			this.comparisonButton = comparisonButton;
			date = comparisonButton.getText();
		}

		@Override
		public void widgetSelected(SelectionEvent e) {
			final Shell dialog = new Shell(shell, SWT.DIALOG_TRIM | SWT.APPLICATION_MODAL);
			dialog.setLayout(new GridLayout(5, false));

			if (button.getText().length() == 0 && comparisonButton != null && comparisonButton.getText().length() > 0) {
				date = comparisonButton.getText();
			}

			final DateTime calendar = new DateTime(dialog, SWT.CALENDAR | SWT.BORDER);
			final DateTime time = new DateTime(dialog, SWT.TIME);

			calendar.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false, 5, 1));
			time.setLayoutData(new GridData());

			final Button ok = new Button(dialog, SWT.PUSH);
			ok.setText("OK");
			ok.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
			ok.addSelectionListener(new SelectionAdapter() {
				@Override
				public void widgetSelected(SelectionEvent e) {
					final NumberFormat formatter = new DecimalFormat("00");
					button.setText(calendar.getYear() + "-" + formatter.format(calendar.getMonth() + 1) + "-"
							+ formatter.format(calendar.getDay()) + " " + formatter.format(time.getHours()) + ":"
							+ formatter.format(time.getMinutes()) + ":" + formatter.format(time.getSeconds()));
					date = button.getText();
					dialog.close();
				}
			});

			final Button delete = new Button(dialog, SWT.PUSH);
			delete.setText("Delete");
			delete.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
			delete.addSelectionListener(new SelectionAdapter() {
				@Override
				public void widgetSelected(SelectionEvent e) {
					button.setText("");
					date = new String();
					dialog.close();
				}
			});

			final Button cancel = new Button(dialog, SWT.PUSH);
			cancel.setText("Cancel");
			cancel.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
			cancel.addSelectionListener(new SelectionAdapter() {
				@Override
				public void widgetSelected(SelectionEvent e) {
					dialog.close();
				}
			});

			if (!date.isEmpty()) {
				calendar.setDate(Integer.valueOf(date.substring(0, 4)), Integer.valueOf(date.substring(5, 7)) - 1,
						Integer.valueOf(date.substring(8, 10)));
				time.setTime(Integer.valueOf(date.substring(11, 13)), Integer.valueOf(date.substring(14, 16)),
						Integer.valueOf(date.substring(17)));
			}

			dialog.setDefaultButton(ok);
			dialog.pack();
			dialog.open();
		}

	}

	private FilterDataRow[] filterData;

	private final ILguiItem lguiItem;
	private final String gid;

	private final Shell shell;

	private final List<IPattern> filterOld;

	public FilterDialog(Shell parentShell, String gid) {
		super(parentShell);
		lguiItem = LMLManager.getInstance().getSelectedLguiItem();
		this.gid = gid;
		filterOld = lguiItem.getPattern(gid);
		setShellStyle(SWT.RESIZE | SWT.APPLICATION_MODAL);
		this.shell = parentShell;
	}

	private boolean includeStatus(ITableColumnLayout[] columnLayouts) {
		for (final ITableColumnLayout columnLayout : columnLayouts) {
			if (columnLayout.getTitle().equals(ILMLUIConstants.COLUMN_STATUS)) {
				return true;
			}
		}
		return false;
	}

	@Override
	protected void buttonPressed(int buttonId) {

		if (buttonId == IDialogConstants.CANCEL_ID) {
			// Cancel Button
			LMLManager.getInstance().filterLgui(gid, filterOld);
			lguiItem.setPattern(gid, filterOld);
			close();
			return;
		}

		boolean error = false;
		for (final FilterDataRow row : filterData) {

			if (!row.isCheckboxSet()) {
				continue;
			}
			if (row.getType().equals("alpha")) {
				if (row.getRelationValueTextAlpha().getText().equals("")) {
					error = true;
					break;
				}
			} else {
				if (row.getRadioButtonRelation().getSelection()) {
					if (row.getType().equals("numeric")) {
						if (row.getRelationValueTextNumeric().getText().equals("")) {
							error = true;
							break;
						}
					} else if (row.getType().equals("date")) {
						if (row.getRelationValueButtonDate().getText().equals("")) {
							error = true;
							break;
						}
					}
				} else if (row.getRadioButtonRange().getSelection()) {
					if (row.getType().equals("numeric")) {
						if (row.getMinValueTextNumeric().getText().equals("")
								|| row.getMaxValueTextNumeric().equals("")
								|| (Integer.parseInt(row.getMinValueTextNumeric().getText()) >= Integer.parseInt(row
										.getMaxValueTextNumeric().getText()))) {
							error = true;
							break;
						}
					} else if (row.getType().equals("date")) {
						if (row.getMinValueButtonDate().getText().equals("") || row.getMaxValueButtonDate().equals("")
								|| (row.getMinValueButtonDate().getText().compareTo(row.getMaxValueButtonDate().getText()) >= 0)) {
							error = true;
							break;
						}
					}
				}
			}
		}

		if (error) {
			final Status status = new Status(
					IStatus.ERROR,
					"Missing/wrong arguments",
					0,
					"- there is/are one/more requested value(s) missing\n- or the minimal value of a range is bigger than the maximal value.",
					null);
			final ErrorDialog dialog = new ErrorDialog(
					shell,
					"Missing/wrong arguments",
					"An error occured!",
					status, IStatus.ERROR);
			dialog.open();
			return;
		}

		final List<IPattern> filterValues = new LinkedList<IPattern>();
		// Apply and Okay Button
		for (final FilterDataRow row : filterData) {
			boolean complete = false;
			if (!row.isCheckboxSet()) {
				continue;
			}
			final IPattern pattern = new Pattern(row.getTitle(), row.getType());
			if (row.getType().equals("alpha")) {
				pattern.setRelation(row.getRelationComboAlpha().getText(), row.getRelationValueTextAlpha().getText());
				complete = true;
			} else {
				if (row.getRadioButtonRelation().getSelection()) {
					if (row.getType().equals("numeric")) {
						pattern.setRelation(row.getRelationComboNumericDate().getText(), row.getRelationValueTextNumeric()
								.getText());
						complete = true;
					} else if (row.getType().equals("date")) {
						pattern.setRelation(row.getRelationComboNumericDate().getText(), row.getRelationValueButtonDate().getText());
						complete = true;
					}
				} else if (row.getRadioButtonRange().getSelection()) {
					if (row.getType().equals("numeric")) {
						pattern.setRange(row.getMinValueTextNumeric().getText(), row.getMaxValueTextNumeric().getText());
						complete = true;
					} else if (row.getType().equals("date")) {
						pattern.setRange(row.getMinValueButtonDate().getText(), row.getMaxValueButtonDate().getText());
						complete = true;
					}
				}
			}
			if (complete) {
				filterValues.add(pattern);
			}
		}

		lguiItem.setPattern(gid, filterValues);
		LMLManager.getInstance().filterLgui(gid, filterValues);

		if (buttonId == IDialogConstants.OK_ID) {
			// Okay Button
			close();
		}

	}

	@Override
	protected void configureShell(Shell shell) {
		super.configureShell(shell);
		shell.setText("Filters");

	}

	@Override
	protected void createButtonsForButtonBar(Composite parent) {
		createButton(parent, IDialogConstants.OK_ID, IDialogConstants.OK_LABEL, true);
		createButton(parent, 5, "Apply", false);
		createButton(parent, IDialogConstants.CANCEL_ID, IDialogConstants.CANCEL_LABEL, false);
	}

	@Override
	protected Control createDialogArea(Composite parent) {

		final ScrolledComposite scrolledComposite = new ScrolledComposite(parent, SWT.H_SCROLL | SWT.V_SCROLL);
		GridDataFactory.swtDefaults().align(SWT.FILL, SWT.FILL).hint(SWT.DEFAULT, SWT.DEFAULT).grab(true, true)
				.applyTo(scrolledComposite);
		final Composite composite = new Composite(scrolledComposite, SWT.NONE);
		boolean error = false;
		if (lguiItem == null || lguiItem.getTableHandler() == null) {
			error = true;
		}
		ITableColumnLayout[] columnLayouts = new ITableColumnLayout[0];
		if (!error) {
			columnLayouts = lguiItem.getTableHandler().getActiveTableColumnLayout(gid);
		}
		if (columnLayouts.length == 0) {
			error = true;
		}
		if (error) {
			final Label errorLabel = new Label(composite, SWT.NONE);
			errorLabel.setText("An error occured!");
			filterData = new FilterDataRow[0];
			return composite;
		}

		int length = columnLayouts.length;
		if (gid.equals(ILMLUIConstants.VIEW_TABLE_1)
				&& includeStatus(columnLayouts)) {
			length = length - 1;
		}

		filterData = new FilterDataRow[length];

		final VerifyListener numericListener = new VerifyListener() {

			public void verifyText(VerifyEvent e) {
				final String s = ((Text) e.widget).getText() + e.text;
				e.doit = s.matches("0|([1-9][0-9]*)");
			}
		};

		final VerifyListener alphaListener = new VerifyListener() {

			public void verifyText(VerifyEvent e) {
				final String s = ((Text) e.widget).getText() + e.text;
				e.doit = s.matches(".+");
			}
		};

		composite.setLayout(new GridLayout(2, false));

		int dif = 0;
		for (int i = 0; i < columnLayouts.length; i++) {
			if (gid.equals(ILMLUIConstants.VIEW_TABLE_1) && columnLayouts[i].getTitle().equals(ILMLUIConstants.COLUMN_STATUS)) {
				dif = 1;
				continue;
			}

			final String type = columnLayouts[i].getOrder();

			final Button checkbox = new Button(composite, SWT.CHECK);

			checkbox.setText(columnLayouts[i].getTitle());
			checkbox.setLayoutData(new GridData());

			final FilterDataRow row = new FilterDataRow(type, checkbox);

			if (type == "alpha") {
				// Input in text elements with choosing a relation operator before
				final Composite compositeText = new Composite(composite, SWT.NONE);
				compositeText.setLayout(new GridLayout(2, false));
				final Combo relationCombo = new Combo(compositeText, SWT.READ_ONLY);
				relationCombo.setItems(new String[] { "=", "!=", "=~", "!~" });
				relationCombo.select(0);
				relationCombo.setLayoutData(new GridData());
				relationCombo.setEnabled(false);
				row.addRelationComboAlpha(relationCombo);

				final Text relationValue = new Text(compositeText, SWT.LEAD | SWT.SINGLE);
				relationValue.setEnabled(false);
				relationValue.addVerifyListener(alphaListener);
				relationValue.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
				row.addRelationValueAlpha(relationValue);

				compositeText.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
			} else {
				// Choose between 2 different kinds of input
				final Composite compositeRadio = new Composite(composite, SWT.NONE);
				compositeRadio.setLayout(new GridLayout(2, false));
				// 1. A relation to one number
				final Button radioButtonRelation = new Button(compositeRadio, SWT.RADIO);
				radioButtonRelation.setLayoutData(new GridData());
				radioButtonRelation.setSelection(true);
				radioButtonRelation.setEnabled(false);

				row.addRadioRelation(radioButtonRelation);

				final Composite compositeRelation = new Composite(compositeRadio, SWT.NONE);
				compositeRelation.setLayout(new GridLayout(2, false));
				final Combo relations = new Combo(compositeRelation, SWT.READ_ONLY);
				relations.setItems(new String[] { "=", "<", "<=", ">", ">=",
						"!=" });
				relations.select(0);

				relations.setEnabled(false);
				relations.setLayoutData(new GridData(GridData.FILL));
				row.addRelationComboNumericDate(relations);

				if (type == "numeric") {
					final Text relationValueText = new Text(compositeRelation, SWT.SINGLE | SWT.TRAIL);
					relationValueText.addVerifyListener(numericListener);
					relationValueText.setEnabled(false);
					relationValueText.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
					row.addRelationValueNumeric(relationValueText);
				} else {
					final Button relationValueButton = new Button(compositeRelation, SWT.NONE);
					relationValueButton.setEnabled(false);
					relationValueButton.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
					relationValueButton.addSelectionListener(new SelectDateAdpater(relationValueButton));
					row.addRelationValueDate(relationValueButton);
				}

				radioButtonRelation.addSelectionListener(new SelectionListener() {

					public void widgetDefaultSelected(SelectionEvent e) {
					}

					public void widgetSelected(SelectionEvent e) {
						final boolean selected = radioButtonRelation.getSelection();
						if (row.getRelationComboNumericDate() != null) {
							row.getRelationComboNumericDate().setEnabled(selected);
						}
						if (row.getRelationValueTextNumeric() != null) {
							row.getRelationValueTextNumeric().setEnabled(selected);
						}
						if (row.getRelationValueButtonDate() != null) {
							row.getRelationValueButtonDate().setEnabled(selected);
						}
					}
				});

				compositeRelation.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));

				// 2. A range between two numbers
				final Button radioButtonRange = new Button(compositeRadio, SWT.RADIO);
				radioButtonRange.setEnabled(false);
				radioButtonRange.setLayoutData(new GridData());

				row.addRadioRange(radioButtonRange);

				final Composite compositeRange = new Composite(compositeRadio, SWT.NONE);
				compositeRange.setLayout(new GridLayout(3, false));
				if (type == "numeric") {
					final Text textValueMin = new Text(compositeRange, SWT.SINGLE | SWT.TRAIL);
					textValueMin.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
					textValueMin.setEnabled(false);
					textValueMin.addVerifyListener(numericListener);

					// TODO replace with another combo box
					final Label labelMinus = new Label(compositeRange, SWT.NONE);
					labelMinus.setText(" - ");
					labelMinus.setLayoutData(new GridData(GridData.FILL));

					final Text textValueMax = new Text(compositeRange, SWT.SINGLE | SWT.TRAIL);
					textValueMax.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
					textValueMax.setEnabled(false);
					textValueMax.addVerifyListener(numericListener);

					row.addMinValueNumeric(textValueMin);
					row.addMaxValueNumeric(textValueMax);
				} else {
					final Button buttonValueMin = new Button(compositeRange, SWT.NONE);
					buttonValueMin.setEnabled(false);
					buttonValueMin.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));

					final Label labelMinus = new Label(compositeRange, SWT.NONE);
					labelMinus.setText(" - ");
					labelMinus.setLayoutData(new GridData(GridData.FILL));

					final Button buttonValueMax = new Button(compositeRange, SWT.NONE);
					buttonValueMax.setEnabled(false);
					buttonValueMax.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));

					buttonValueMin.addSelectionListener(new SelectDateAdpater(buttonValueMin, buttonValueMax));
					buttonValueMax.addSelectionListener(new SelectDateAdpater(buttonValueMax, buttonValueMin));

					row.addMinValueDate(buttonValueMin);
					row.addMaxValueDate(buttonValueMax);
				}

				radioButtonRange.addSelectionListener(new SelectionListener() {

					public void widgetDefaultSelected(SelectionEvent e) {
					}

					public void widgetSelected(SelectionEvent e) {
						final boolean selected = radioButtonRange.getSelection();
						if (row.getMinValueTextNumeric() != null
								&& row.getMaxValueTextNumeric() != null) {
							row.getMinValueTextNumeric().setEnabled(selected);
							row.getMaxValueTextNumeric().setEnabled(selected);
						}
						if (row.getMinValueButtonDate() != null
								&& row.getMaxValueButtonDate() != null) {
							row.getMinValueButtonDate().setEnabled(selected);
							row.getMaxValueButtonDate().setEnabled(selected);
						}
					}
				});

				compositeRange.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));

				compositeRadio.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
			}

			checkbox.addSelectionListener(new SelectionListener() {

				public void widgetDefaultSelected(SelectionEvent e) {
				}

				public void widgetSelected(SelectionEvent e) {
					final boolean selected = checkbox.getSelection();
					if (row.getRelationValueTextAlpha() != null) {
						row.getRelationValueTextAlpha().setEnabled(selected);
					}
					if (row.getRelationComboAlpha() != null) {
						row.getRelationComboAlpha().setEnabled(selected);
					}
					if (row.getRadioButtonRelation() != null && row.getRadioButtonRange() != null) {
						row.getRadioButtonRelation().setEnabled(selected);
						row.getRadioButtonRange().setEnabled(checkbox.getSelection());
						if (row.getRadioButtonRelation().getSelection()) {
							if (row.getRelationComboNumericDate() != null) {
								row.getRelationComboNumericDate().setEnabled(selected);
							}
							if (row.getRelationValueTextNumeric() != null) {
								row.getRelationValueTextNumeric().setEnabled(selected);
							}
							if (row.getRelationValueButtonDate() != null) {
								row.getRelationValueButtonDate().setEnabled(
										selected);
							}
						} else {
							if (row.getMinValueTextNumeric() != null && row.getMaxValueTextNumeric() != null) {
								row.getMinValueTextNumeric().setEnabled(selected);
								row.getMaxValueTextNumeric().setEnabled(selected);
							}
							if (row.getMinValueButtonDate() != null && row.getMaxValueButtonDate() != null) {
								row.getMinValueButtonDate().setEnabled(selected);
								row.getMaxValueButtonDate().setEnabled(selected);
							}
						}
					}
				}
			});

			final List<IPattern> oldFilters = lguiItem.getPattern(gid);
			if (oldFilters.size() > 0) {
				for (final IPattern filter : oldFilters) {
					if (!filter.getColumnTitle().equals(row.getTitle())) {
						continue;
					}
					row.getCheckbox().setSelection(true);
					if (filter.getType().equals("alpha")) {
						row.getRelationValueTextAlpha().setText(filter.getRelationValue());
						row.getRelationValueTextAlpha().setEnabled(true);
						final String[] items = row.getRelationComboAlpha().getItems();
						row.getRelationComboAlpha().setEnabled(true);
						for (int j = 0; j < items.length; j++) {
							if (filter.getRelationOperator().equals(items[j])) {
								row.getRelationComboAlpha().select(j);
							}
						}
					} else {
						row.getRadioButtonRange().setEnabled(true);
						row.getRadioButtonRelation().setEnabled(true);
						if (filter.isRange()) {
							row.getRadioButtonRange().setSelection(true);
							row.getRadioButtonRelation().setSelection(false);
							if (filter.getType().equals("numeric")) {
								row.getMinValueTextNumeric().setText(filter.getMinValueRange());
								row.getMaxValueTextNumeric().setText(filter.getMaxValueRange());
								row.getMinValueTextNumeric().setEnabled(true);
								row.getMaxValueTextNumeric().setEnabled(true);
							} else {
								row.getMinValueButtonDate().setText(filter.getMinValueRange());
								row.getMaxValueButtonDate().setText(filter.getMaxValueRange());
								row.getMinValueButtonDate().setEnabled(true);
								row.getMaxValueButtonDate().setEnabled(true);
							}
						} else if (filter.isRelation()) {
							row.getRadioButtonRelation().setSelection(true);
							row.getRelationComboNumericDate().setEnabled(true);
							final String[] items = row.getRelationComboNumericDate().getItems();
							for (int j = 0; j < items.length; j++) {
								if (filter.getRelationOperator().equals(items[j])) {
									row.getRelationComboNumericDate().select(j);
								}
							}
							if (filter.getType().equals("numeric")) {
								row.getRelationValueTextNumeric().setText(filter.getRelationValue());
								row.getRelationValueTextNumeric().setEnabled(true);
							} else {
								row.getRelationValueButtonDate().setText(filter.getRelationValue());
								row.getRelationValueButtonDate().setEnabled(true);
							}
						}
					}
				}
			}

			filterData[i - dif] = row;
		}

		scrolledComposite.setContent(composite);

		scrolledComposite.setExpandHorizontal(true);
		scrolledComposite.setExpandVertical(true);

		scrolledComposite.setMinSize(composite.computeSize(SWT.DEFAULT, SWT.DEFAULT));
		scrolledComposite.setSize(100, 400);

		return scrolledComposite;
	}
}

Lines 18-23 Link Here

(-)a/rms/org.eclipse.ptp.rm.lml.ui/src/org/eclipse/ptp/rm/lml/ui/views/NodesView.java (+6 lines)
18	import org.eclipse.ptp.rm.lml.core.events.ILguiRemovedEvent;	18	import org.eclipse.ptp.rm.lml.core.events.ILguiRemovedEvent;
19	import org.eclipse.ptp.rm.lml.core.events.IMarkObjectEvent;	19	import org.eclipse.ptp.rm.lml.core.events.IMarkObjectEvent;
20	import org.eclipse.ptp.rm.lml.core.events.ISelectObjectEvent;	20	import org.eclipse.ptp.rm.lml.core.events.ISelectObjectEvent;
		21	import org.eclipse.ptp.rm.lml.core.events.ITableFilterEvent;
21	import org.eclipse.ptp.rm.lml.core.events.ITableSortedEvent;	22	import org.eclipse.ptp.rm.lml.core.events.ITableSortedEvent;
22	import org.eclipse.ptp.rm.lml.core.events.IUnmarkObjectEvent;	23	import org.eclipse.ptp.rm.lml.core.events.IUnmarkObjectEvent;
23	import org.eclipse.ptp.rm.lml.core.events.IUnselectedObjectEvent;	24	import org.eclipse.ptp.rm.lml.core.events.IUnselectedObjectEvent;
Lines 80-85 Link Here
80	}	81	}
81	}	82	}
82		83
		84	public void handleEvent(ITableFilterEvent event) {
		85	// TODO Auto-generated method stub
		86
		87	}
		88
83	public void handleEvent(ITableSortedEvent e) {	89	public void handleEvent(ITableSortedEvent e) {
84	}	90	}
85		91




package org.eclipse.ptp.rm.lml.ui.views;

import java.util.ArrayList;
import java.util.LinkedList;
import java.util.List;

import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Status;
import org.eclipse.jface.action.Action;
import org.eclipse.jface.action.ActionContributionItem;
import org.eclipse.jface.action.IAction;
import org.eclipse.jface.action.IMenuManager;
import org.eclipse.jface.action.MenuManager;
import org.eclipse.jface.action.Separator;
import org.eclipse.jface.layout.TreeColumnLayout;
import org.eclipse.jface.util.SafeRunnable;
import org.eclipse.jface.viewers.CellLabelProvider;

import org.eclipse.ptp.rm.lml.core.events.ILguiRemovedEvent;
import org.eclipse.ptp.rm.lml.core.events.IMarkObjectEvent;
import org.eclipse.ptp.rm.lml.core.events.ISelectObjectEvent;
import org.eclipse.ptp.rm.lml.core.events.ITableFilterEvent;
import org.eclipse.ptp.rm.lml.core.events.ITableSortedEvent;
import org.eclipse.ptp.rm.lml.core.events.IUnmarkObjectEvent;
import org.eclipse.ptp.rm.lml.core.events.IUnselectedObjectEvent;
import org.eclipse.ptp.rm.lml.core.events.IViewUpdateEvent;
import org.eclipse.ptp.rm.lml.core.listeners.ILMLListener;
import org.eclipse.ptp.rm.lml.core.model.ILguiItem;
import org.eclipse.ptp.rm.lml.core.model.IPattern;
import org.eclipse.ptp.rm.lml.core.model.ITableColumnLayout;
import org.eclipse.ptp.rm.lml.internal.core.model.Cell;
import org.eclipse.ptp.rm.lml.internal.core.model.LMLColor;
import org.eclipse.ptp.rm.lml.internal.core.model.Pattern;
import org.eclipse.ptp.rm.lml.internal.core.model.Row;
import org.eclipse.ptp.rm.lml.ui.UIUtils;
import org.eclipse.ptp.rm.lml.ui.messages.Messages;
import org.eclipse.ptp.rm.lml.ui.providers.EventForwarder;
import org.eclipse.ptp.rm.lml.ui.providers.FilterDialog;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.ControlAdapter;
import org.eclipse.swt.events.ControlEvent;

import org.eclipse.swt.widgets.Listener;
import org.eclipse.swt.widgets.Menu;
import org.eclipse.swt.widgets.MenuItem;
import org.eclipse.swt.widgets.Shell;
import org.eclipse.swt.widgets.Tree;
import org.eclipse.swt.widgets.TreeColumn;
import org.eclipse.swt.widgets.TreeItem;


		}

		public void handleEvent(final ITableFilterEvent event) {
			if (event.getGid().equals(gid)) {
				UIUtils.safeRunSyncInUIThread(new SafeRunnable() {
					public void run() throws Exception {
						if (composite != null && fLguiItem != null && viewCreated) {
							if (componentAdded) {
								fLguiItem.getObjectStatus().removeComponent(eventForwarder);
								componentAdded = false;
							}
							saveColumnLayout();
							disposeTable();
							viewCreated = false;
						}
						if (composite != null && !viewCreated) {
							fLguiItem = lmlManager.getSelectedLguiItem();
							if (fLguiItem != null) {
								createTable();
								viewCreated = true;
								if (fLguiItem.getObjectStatus() != null) {
									fLguiItem.getObjectStatus().addComponent(eventForwarder);
									componentAdded = true;
								}
							}
						}
					}
				});
			}
		}

		/*
		 * (non-Javadoc)
		 * 

							&& tree.getSortColumn() != null) {
						fLguiItem.getTableHandler().sort(gid, SWT.UP, getSortIndex(), tree.getSortDirection());
					}
					if (fLguiItem.getPattern(gid).size() > 0) {
						setViewerInput(fLguiItem.getPattern(gid));
					} else {
						setViewerInput();
					}
				}
			});


							fLguiItem.getTableHandler().getSortProperties(gid);
							fLguiItem.getTableHandler().sort(gid, SWT.UP, getSortIndex(), tree.getSortDirection());
						}
						if (fLguiItem.getPattern(gid).size() > 0) {
							setViewerInput(fLguiItem.getPattern(gid));
						} else {
							setViewerInput();
						}
						if (fLguiItem != null && fLguiItem.getTableHandler() != null) {
							fLguiItem.getObjectStatus().addComponent(eventForwarder);
							componentAdded = true;

	private String gid = null;
	private final ILMLListener lmlListener = new LMLTableListListener();
	private final LMLManager lmlManager = LMLManager.getInstance();
	private IMenuManager viewMenuManager;
	private ActionContributionItem filterActionItem;
	private ActionContributionItem filterOwnJobsActionItem;
	private TreeItem selectedItem = null;
	private String selectedOid = null;
	private boolean componentAdded = false;
	private boolean viewCreated = false;
	private IViewSite viewSite = null;

	private boolean isMouseDown = false;
	private final EventForwarder eventForwarder = new EventForwarder();

		 */
		fLguiItem = lmlManager.getSelectedLguiItem();

		// ViewMenuManager
		viewMenuManager = getViewSite().getActionBars().getMenuManager();
		final IAction filterOwnJobsAction = new Action("Show only my jobs", IAction.AS_CHECK_BOX) {

			@Override
			public void run() {
				final List<IPattern> filterValues = new LinkedList<IPattern>();
				if (isChecked()) {
					filterValues.add((new Pattern("owner", "alpha")).setRelation("=", fLguiItem.getUsername()));
				}
				// TODO After decision about new structure of LML and server side
				fLguiItem.setPattern(gid, filterValues);
				setViewerInput(filterValues);
			}

		};
		final IAction filterAction = new Action("Filters...") {

			@Override
			public void run() {
				final FilterDialog dialog = new FilterDialog(new Shell(
						viewSite.getShell()), gid);
				dialog.open();
			}
		};

		filterOwnJobsActionItem = new ActionContributionItem(filterOwnJobsAction);
		filterActionItem = new ActionContributionItem(filterAction);
		viewMenuManager.add(filterOwnJobsActionItem);
		viewMenuManager.add(new Separator());
		viewMenuManager.add(filterActionItem);
		filterOwnJobsActionItem.getAction().setEnabled(false);
		filterActionItem.getAction().setEnabled(false);

		createTable();

		tree.addDisposeListener(new DisposeListener() {
			public void widgetDisposed(DisposeEvent e) {
				if (fLguiItem != null) {

			e.printStackTrace();
		}
		lmlManager.addListener(lmlListener, this.getClass().getName());
		viewSite = site;
	}

	/**

			@Override
			public IStatus runInUIThread(IProgressMonitor monitor) {
				if (viewer != null) {
					if (fLguiItem.getPattern(gid).size() > 0) {
						setViewerInput(fLguiItem.getPattern(gid));
					} else {
						setViewerInput();
					}
					viewer.refresh();
				}
				return Status.OK_STATUS;

		}

		final ITableColumnLayout[] tableColumnLayouts = fLguiItem.getTableHandler().getTableColumnLayout(gid);
		if (tableColumnLayouts.length == 0) {
			return;
		}

		treeColumns = new TreeColumn[tableColumnLayouts.length];
		savedColumnWidths = new int[tableColumnLayouts.length + 1];

		final String[] columnTitlesPattern = fLguiItem.getColumnTitlePattern(gid);

		// first column with color rectangle
		TreeViewerColumn treeViewerColumn = new TreeViewerColumn(viewer, SWT.NONE);

			});
			treeColumn = treeViewerColumn.getColumn();
			treeColumn.setMoveable(true);
			boolean isFiltered = false;
			for (final String title : columnTitlesPattern) {
				if (title.equals(tableColumnLayouts[i].getTitle())) {
					isFiltered = true;
				}
			}
			if (isFiltered) {
				treeColumn.setText(tableColumnLayouts[i].getTitle() + " #");
			} else {
				treeColumn.setText(tableColumnLayouts[i].getTitle());
			}

			treeColumn.setAlignment(getColumnAlignment(tableColumnLayouts[i].getStyle()));

			if (tableColumnLayouts[i].isActive()) {

					tree.setSortColumn(getSortColumn((Integer) sortProperties[0]));
					fLguiItem.getTableHandler().sort(gid, SWT.UP, getSortIndex(), tree.getSortDirection());
				}
			}
		}

				filterOwnJobsActionItem.getAction().setEnabled(true);
				filterActionItem.getAction().setEnabled(true);
			}

			// Insert the input
			if (fLguiItem.getPattern(gid).size() > 0) {
				setViewerInput(fLguiItem.getPattern(gid));
			} else {
				setViewerInput();
			}

		}
		composite.layout();
	}


	private void disposeTable() {
		tree.setSortColumn(null);
		tree.setSortDirection(0);

		filterOwnJobsActionItem.getAction().setEnabled(false);
		filterActionItem.getAction().setEnabled(false);

		/*
		 * Remove columns
		 */

		for (final MenuItem item : headerMenu.getItems()) {
			item.dispose();
		}
		getViewSite().getActionBars().getMenuManager().removeAll();
	}

	private int getColumnAlignment(String alignment) {

			}
		}
	}

	/**
	 * 
	 */
	private void setViewerInput(List<IPattern> filterValues) {
		/*
		 * Don't change input if mouse is down as this causes a SIGSEGV in SWT!
		 */
		if (!isMouseDown) {
			Row[] input = new Row[0];
			if (fLguiItem != null && fLguiItem.getTableHandler() != null) {
				input = fLguiItem.getTableHandler()
						.getTableDataWithColor(gid, gid.equals(ILguiItem.ACTIVE_JOB_TABLE), filterValues);
			}
			if (!composite.isDisposed()) {
				viewer.setInput(input);
				viewer.setChildCount(input, input.length);
			}
		}
	}
}

Lines 2-8 Link Here

(-)a/rms/org.eclipse.ptp.rm.slurm.proxy/META-INF/MANIFEST.MF (-1 / +1 lines)
2	Bundle-SymbolicName: org.eclipse.ptp.rm.slurm.proxy	2	Bundle-SymbolicName: org.eclipse.ptp.rm.slurm.proxy
3	Bundle-ManifestVersion: 2	3	Bundle-ManifestVersion: 2
4	Bundle-Name: %pluginName	4	Bundle-Name: %pluginName
5	Bundle-Version: 5.0.4.qualifier	5	Bundle-Version: 5.0.5.qualifier
6	Bundle-Vendor: %pluginProvider	6	Bundle-Vendor: %pluginProvider
7	Bundle-Localization: plugin	7	Bundle-Localization: plugin
8	Require-Bundle: org.eclipse.ptp.utils,org.eclipse.ptp.proxy	8	Require-Bundle: org.eclipse.ptp.utils,org.eclipse.ptp.proxy

Lines 2-7 Link Here

(-)a/tools/sci/org.eclipse.ptp.sci/META-INF/MANIFEST.MF (-1 / +1 lines)
2	Bundle-ManifestVersion: 2	2	Bundle-ManifestVersion: 2
3	Bundle-Name: %pluginName	3	Bundle-Name: %pluginName
4	Bundle-SymbolicName: org.eclipse.ptp.sci	4	Bundle-SymbolicName: org.eclipse.ptp.sci
5	Bundle-Version: 5.0.4.qualifier	5	Bundle-Version: 5.0.5.qualifier
6	Bundle-Vendor: %pluginProvider	6	Bundle-Vendor: %pluginProvider
7	Bundle-Localization: plugin	7	Bundle-Localization: plugin

Return to bug 368356

Lines 39-44 Link Here

(-)a/core/org.eclipse.ptp.remote.remotetools.ui/src/org/eclipse/ptp/remote/remotetools/ui/RemoteToolsUIFileManager.java (+3 lines)
39	connection, shell, RemoteResourceBrowser.SINGLE);	39	connection, shell, RemoteResourceBrowser.SINGLE);
40	browser.setType(RemoteResourceBrowser.DIRECTORY_BROWSER);	40	browser.setType(RemoteResourceBrowser.DIRECTORY_BROWSER);
41	browser.setInitialPath(filterPath);	41	browser.setInitialPath(filterPath);
		42	browser.setTitle(message);
42	browser.showConnections(showConnections);	43	browser.showConnections(showConnections);
43	if (browser.open() == Window.CANCEL) {	44	if (browser.open() == Window.CANCEL) {
44	return null;	45	return null;
Lines 64-69 Link Here
64	connection, shell, RemoteResourceBrowser.SINGLE);	65	connection, shell, RemoteResourceBrowser.SINGLE);
65	browser.setType(RemoteResourceBrowser.FILE_BROWSER);	66	browser.setType(RemoteResourceBrowser.FILE_BROWSER);
66	browser.setInitialPath(filterPath);	67	browser.setInitialPath(filterPath);
		68	browser.setTitle(message);
67	browser.showConnections(showConnections);	69	browser.showConnections(showConnections);
68	if (browser.open() == Window.CANCEL) {	70	if (browser.open() == Window.CANCEL) {
69	return null;	71	return null;
Lines 89-94 Link Here
89	connection, shell, RemoteResourceBrowser.MULTI);	91	connection, shell, RemoteResourceBrowser.MULTI);
90	browser.setType(RemoteResourceBrowser.FILE_BROWSER);	92	browser.setType(RemoteResourceBrowser.FILE_BROWSER);
91	browser.setInitialPath(filterPath);	93	browser.setInitialPath(filterPath);
		94	browser.setTitle(message);
92	browser.showConnections(showConnections);	95	browser.showConnections(showConnections);
93	if (browser.open() == Window.CANCEL) {	96	if (browser.open() == Window.CANCEL) {
94	return null;	97	return null;

Lines 57-72 Link Here

(-)a/releng/org.eclipse.ptp.repo/update_versions (+27 lines)
57	org.eclipse.ptp.services-feature \	57	org.eclipse.ptp.services-feature \
58	org.eclipse.ptp.utils-feature"	58	org.eclipse.ptp.utils-feature"
59		59
		60	PTP_PLUGINS="\
		61	releng/org.eclipse.ptp.aix.ppc \
		62	releng/org.eclipse.ptp.linux.ppc \
		63	releng/org.eclipse.ptp.linux.x86 \
		64	releng/org.eclipse.ptp.linux.x86_64 \
		65	releng/org.eclipse.ptp.macosx.ppc \
		66	releng/org.eclipse.ptp.macosx.x86 \
		67	releng/org.eclipse.ptp \
		68	debug/org.eclipse.ptp.debug.sdm \
		69	core/org.eclipse.ptp.utils \
		70	core/org.eclipse.ptp.proxy \
		71	rms/org.eclipse.ptp.rm.ibm.pe.proxy \
		72	rms/org.eclipse.ptp.rm.ibm.ll.proxy \
		73	rms/org.eclipse.ptp.rm.slurm.proxy \
		74	tools/sci/org.eclipse.ptp.sci \
		75	rdt/org.eclipse.ptp.rdt.core.remotejars"
		76
60	update_feature() {	77	update_feature() {
61	sed -e "s/^\([ \t]*\)version=\"[0-9]\.[0-9]\.[0-9]\.qualifier\"/\1version=\"$2\.qualifier\"/" < releng/$1/feature.xml > $TMP_DIR/${1}_feature.xml	78	sed -e "s/^\([ \t]*\)version=\"[0-9]\.[0-9]\.[0-9]\.qualifier\"/\1version=\"$2\.qualifier\"/" < releng/$1/feature.xml > $TMP_DIR/${1}_feature.xml
62	mv $TMP_DIR/${1}_feature.xml releng/$1/feature.xml	79	mv $TMP_DIR/${1}_feature.xml releng/$1/feature.xml
63	}	80	}
64		81
		82	update_manifest() {
		83	sed -e "s/^Bundle-Version: *[0-9]\.[0-9]\.[0-9]\.qualifier/Bundle-Version: $2.qualifier/" < $1/META-INF/MANIFEST.MF > $TMP_DIR/${1}_MANIFEST.MF
		84	mv $TMP_DIR/${1}_MANIFEST.MF $1/META-INF/MANIFEST.MF
		85	}
		86
65	for feature in $PTP_FEATURES; do	87	for feature in $PTP_FEATURES; do
66	echo "Updating $feature..."	88	echo "Updating $feature..."
67	update_feature $feature $ptp_version	89	update_feature $feature $ptp_version
68	done	90	done
69		91
		92	for plugin in $PTP_PLUGINS; do
		93	echo "Updating $plugin..."
		94	update_manifest $plugin $ptp_version
		95	done
		96
70	(cd releng/org.eclipse.ptp.repo && ant -DnewVersion="$ptp_version" -f fixModules.xml)	97	(cd releng/org.eclipse.ptp.repo && ant -DnewVersion="$ptp_version" -f fixModules.xml)
71		98
72	exit 0	99	exit 0

Lines 18-27 Link Here

(-)a/rms/org.eclipse.ptp.rm.lml.core/src/org/eclipse/ptp/rm/lml/core/ILMLCoreConstants.java (+227 lines)
18		18
19	public static final int UNDEFINED = -1;	19	public static final int UNDEFINED = -1;
20		20
		21	public static final int COPY_BUFFER_SIZE = 64 * 1024;
		22	public static final int STREAM_BUFFER_SIZE = 8 * 1024;
		23	public static final int EOF = -1;
		24	public static final long MINUTE_IN_MS = 60 * 60 * 1000;
		25	public static final long VALIDATE_TIMER = 500;
		26	public static final long STANDARD_WAIT = 1000;
		27	public static final int READY_FILE_BLOCK = 60;
		28
		29	/* CHARACTERS */
		30	public static final String LEN = "N";//$NON-NLS-1$
		31	public static final String ZEROSTR = "";//$NON-NLS-1$
		32	public static final String TAB = "\t"; //$NON-NLS-1$
		33	public static final String SP = " ";//$NON-NLS-1$
		34	public static final String EQ = "=";//$NON-NLS-1$
		35	public static final String QT = "\"";//$NON-NLS-1$
		36	public static final String QM = "?";//$NON-NLS-1$
		37	public static final String PD = "#";//$NON-NLS-1$
		38	public static final String PDRX = "[#]";//$NON-NLS-1$
		39	public static final String CM = ",";//$NON-NLS-1$
		40	public static final String CO = ":";//$NON-NLS-1$
		41	public static final String SC = ";";//$NON-NLS-1$
		42	public static final String LT = "<"; //$NON-NLS-1$
		43	public static final String LTS = "</";//$NON-NLS-1$
		44	public static final String GT = ">";//$NON-NLS-1$
		45	public static final String GTLT = "><";//$NON-NLS-1$
		46	public static final String HYPH = "-";//$NON-NLS-1$
		47	public static final String AT = "@";//$NON-NLS-1$
		48	public static final String DOL = "$";//$NON-NLS-1$
		49	public static final String PIP = "\|";//$NON-NLS-1$
		50	public static final String REGPIP = "[\|]";//$NON-NLS-1$
		51	public static final String DOT = ".";//$NON-NLS-1$
		52	public static final String Z3 = "000";//$NON-NLS-1$
		53	public static final String OPENP = "(";//$NON-NLS-1$
		54	public static final String OPENSQ = "[";//$NON-NLS-1$
		55	public static final String OPENV = "${";//$NON-NLS-1$
		56	public static final String OPENVRM = "${rm:";//$NON-NLS-1$
		57	public static final String OPENVLT = "${lt:";//$NON-NLS-1$
		58	public static final String VRM = "rm:";//$NON-NLS-1$
		59	public static final String VLC = "lc:";//$NON-NLS-1$
		60	public static final String CLOSP = ")";//$NON-NLS-1$
		61	public static final String CLOSSQ = "]";//$NON-NLS-1$
		62	public static final String CLOSV = "}";//$NON-NLS-1$
		63	public static final String CLOSVAL = "#value}";//$NON-NLS-1$
		64	public static final String BKESC = "\\\\";//$NON-NLS-1$
		65	public static final String BKBKESC = "\\\\\\\\";//$NON-NLS-1$
		66	public static final String DLESC = "\\$";//$NON-NLS-1$
		67	public static final String DLESCESC = "\\\\\\$";//$NON-NLS-1$
		68	public static final String SPESC = "\\\\s";//$NON-NLS-1$
		69	public static final String LNSEPESC = "\\\\n";//$NON-NLS-1$
		70	public static final String TBESC = "\\t";//$NON-NLS-1$
		71	public static final String TBESCESC = "\\\\t";//$NON-NLS-1$
		72	public static final String LNESC = "\\n";//$NON-NLS-1$
		73	public static final String RTESC = "\\r";//$NON-NLS-1$
		74	public static final String LINE_SEP = System.getProperty("line.separator"); //$NON-NLS-1$
		75	public static final String REMOTE_LINE_SEP = "\n"; //$NON-NLS-1$
		76	public static final String REMOTE_PATH_SEP = "/"; //$NON-NLS-1$
		77	public static final String PATH_SEP = System.getProperty("file.separator"); //$NON-NLS-1$
		78
		79	/* KEY WORDS */
		80	public static final String TRUE = "true";//$NON-NLS-1$
		81	public static final String FALSE = "false";//$NON-NLS-1$
		82	public static final String YES = "yes";//$NON-NLS-1$
		83	public static final String NO = "no";//$NON-NLS-1$
		84	public static final String NOT = "not";//$NON-NLS-1$
85	public static final String OR = "or";//$NON-NLS-1$
86	public static final String AND = "and";//$NON-NLS-1$
87	public static final String xEQ = "EQ";//$NON-NLS-1$
88	public static final String xLT = "LT";//$NON-NLS-1$
89	public static final String xGT = "GT";//$NON-NLS-1$
90	public static final String xLE = "LE";//$NON-NLS-1$
91	public static final String xGE = "GE";//$NON-NLS-1$
92	public static final String GET = "get";//$NON-NLS-1$
93	public static final String SET = "set";//$NON-NLS-1$
94	public static final String IS = "is";//$NON-NLS-1$
95	public static final String CLASS = "class";//$NON-NLS-1$
96	public static final String STRING = "string";//$NON-NLS-1$
97	public static final String NAME = "name";//$NON-NLS-1$
98	public static final String VALUE = "value";//$NON-NLS-1$
99	public static final String BASIC = "basic";//$NON-NLS-1$
100	public static final String CHOICE = "choice";//$NON-NLS-1$
101	public static final String sDEFAULT = "default";//$NON-NLS-1$
102	public static final String DESC = "description";//$NON-NLS-1$
103	public static final String MAX = "max";//$NON-NLS-1$
104	public static final String MIN = "min";//$NON-NLS-1$
105	public static final String READONLY = "readOnly";//$NON-NLS-1$
106	public static final String STATUS = "status";//$NON-NLS-1$
107	public static final String TOOLTIP = "tooltip";//$NON-NLS-1$
108	public static final String TYPE = "type";//$NON-NLS-1$
109	public static final String VALIDATOR = "validator";//$NON-NLS-1$
110	public static final String SELECTED = "visible";//$NON-NLS-1$
111	public static final String LOCAL = "local";//$NON-NLS-1$
112	public static final String JOB_ID_TAG = "@jobId";//$NON-NLS-1$
113	public static final String NAME_TAG = AT + NAME;
114	public static final String VALUE_TAG = AT + VALUE;
115
116	/* TYPE MATCHING */
117	public static final String NT = "nt";//$NON-NLS-1$
118	public static final String BOOL = "bool";//$NON-NLS-1$
119	public static final String ET = "et";//$NON-NLS-1$
120	public static final String IST = "ist";//$NON-NLS-1$
121	public static final String ECTOR = "ector";//$NON-NLS-1$
122
123	/* STANDARD PROPERTIES */
124	public static final String ID = "id";//$NON-NLS-1$
125	public static final String JAVA_USER_HOME = "user.home";//$NON-NLS-1$
126	public static final String JAVA_TMP_DIR = "java.io.tmpdir";//$NON-NLS-1$
127	public static final String FILE_SCHEME = "file";//$NON-NLS-1$
128	public static final String XMLSchema = "http://www.w3.org/2001/XMLSchema"; //$NON-NLS-1$
129	public static final String SCHEMA = "schema/"; //$NON-NLS-1$
130	public static final String RM_XSD = SCHEMA + "lgui.xsd";//$NON-NLS-1$
131	public static final String JAXB = "JAXB";//$NON-NLS-1$
132	public static final String JAXB_CONTEXT = "org.eclipse.ptp.rm.jaxb.core.data";//$NON-NLS-1$
133	public static final String RM_CONFIG_PROPS = "rm_configurations.properties";//$NON-NLS-1$
134	public static final String RM_XSD_PATH = "rm_schema_path";//$NON-NLS-1$
135	public static final String RM_XSD_URL = "rm_schema_url";//$NON-NLS-1$
136	public static final String PREV_RM_XSD_PATH = "prev_rm_schema_path";//$NON-NLS-1$
137	public static final String EXTERNAL_RM_XSD_PATHS = "external_rm_schema_paths";//$NON-NLS-1$
138	public static final String CHECKED_ATTRIBUTES = "checked_attributes";//$NON-NLS-1$
139	public static final String SHOW_ONLY_CHECKED = "show_only_checked";//$NON-NLS-1$
140	public static final String IS_PRESET = "is_preset";//$NON-NLS-1$
141	public static final String SCRIPT_PATH = "script_path";//$NON-NLS-1$
142	public static final String SCRIPT = "script";//$NON-NLS-1$
143	public static final String SCRIPT_FILE = "managed_file_for_script";//$NON-NLS-1$
144	public static final String CSH = "csh";//$NON-NLS-1$
145	public static final String SH = ".sh";//$NON-NLS-1$
146	public static final String SETENV = "setenv";//$NON-NLS-1$
147	public static final String EXPORT = "export";//$NON-NLS-1$
148	public static final String DATE_FORMAT = "yyyy/MM/dd HH:mm:ss";//$NON-NLS-1$
149
150	public static final String RESOURCE_MANAGERS = "resourceManagers";//$NON-NLS-1$
151	public static final String CUSTOM = "custom";//$NON-NLS-1$
152	public static final String CONTROL_USER_NAME = "controlUserName";//$NON-NLS-1$
153	public static final String MONITOR_USER_NAME = "monitorUserName";//$NON-NLS-1$
154	public static final String CONTROL_CONNECTION_NAME = "controlConnectionName";//$NON-NLS-1$
155	public static final String MONITOR_CONNECTION_NAME = "monitorConnectionName";//$NON-NLS-1$
156	public static final String LOCALHOST = "localhost";//$NON-NLS-1$
157	public static final String CONTROL_PATH = "controlPath"; //$NON-NLS-1$
158	public static final String MONITOR_PATH = "monitorPath"; //$NON-NLS-1$
159	public static final String CONTROL_OPTIONS = "controlOptions"; //$NON-NLS-1$
160	public static final String MONITOR_OPTIONS = "monitorOptions"; //$NON-NLS-1$
161	public static final String CONTROL_INVOCATION_OPTIONS = "controlInvocationOptions"; //$NON-NLS-1$
162	public static final String MONITOR_INVOCATION_OPTIONS = "monitorInvocationOptions"; //$NON-NLS-1$
163	public static final String CONTROL_ADDRESS = "controlAddress"; //$NON-NLS-1$
164	public static final String LOCAL_ADDRESS = "localAddress"; //$NON-NLS-1$
165	public static final String MONITOR_ADDRESS = "monitorAddress"; //$NON-NLS-1$
166	public static final String CONTROL_USER_VAR = "control.user.name";//$NON-NLS-1$
167	public static final String CONTROL_ADDRESS_VAR = "control.address";//$NON-NLS-1$
168	public static final String MONITOR_USER_VAR = "monitor.user.name";//$NON-NLS-1$
169	public static final String MONITOR_ADDRESS_VAR = "monitor.address";//$NON-NLS-1$
170	public static final String ARPA = ".in-addr.arpa";//$NON-NLS-1$
171	public static final String ECLIPSESETTINGS = ".eclipsesettings";//$NON-NLS-1$
172	public static final String DEBUG_PACKAGE = "org.eclipse.debug";//$NON-NLS-1$
173	public static final String PTP_PACKAGE = "org.eclipse.ptp";//$NON-NLS-1$
174
175	// public static final String STARTUP = "OnStartUp";//$NON-NLS-1$
176	// public static final String SHUTDOWN = "OnShutDown";//$NON-NLS-1$
177	// public static final String DISCATTR = "DiscoverAttributes";//$NON-NLS-1$
178	// public static final String JOBSTATUS = "GetJobStatus";//$NON-NLS-1$
179	// public static final String VALIDATE = "ValidateJob";//$NON-NLS-1$
180
181	public static final String JOB_ATTRIBUTE = "jobAttribute";//$NON-NLS-1$
182	public static final String ATTRIBUTE = "attribute";//$NON-NLS-1$
183	public static final String PROPERTY = "property";//$NON-NLS-1$
184	public static final String QUEUES = "available_queues";//$NON-NLS-1$
185	public static final String JOB_ID = "job_id";//$NON-NLS-1$
186	public static final String RM_ID = "rm_id";//$NON-NLS-1$
187	public static final String STDOUT_REMOTE_FILE = "stdout_remote_path";//$NON-NLS-1$
188	public static final String STDERR_REMOTE_FILE = "stderr_remote_path";//$NON-NLS-1$
189	public static final String EXEC_PATH = "executablePath";//$NON-NLS-1$
190	public static final String PROG_ARGS = "progArgs";//$NON-NLS-1$
191	public static final String DIRECTORY = "directory";//$NON-NLS-1$
192	public static final String MPI_CMD = "mpiCommand";//$NON-NLS-1$
193	public static final String MPI_ARGS = "mpiArgs";//$NON-NLS-1$
194
195	public static final String CASE_INSENSITIVE = "CASE_INSENSITIVE";//$NON-NLS-1$
196	public static final String MULTILINE = "MULTILINE";//$NON-NLS-1$
197	public static final String DOTALL = "DOTALL";//$NON-NLS-1$
198	public static final String UNICODE_CASE = "UNICODE_CASE";//$NON-NLS-1$
199	public static final String CANON_EQ = "CANON_EQ";//$NON-NLS-1$
200	public static final String LITERAL = "LITERAL";//$NON-NLS-1$
201	public static final String COMMENTS = "COMMENTS";//$NON-NLS-1$
202
203	public static final String DOT_XML = ".xml";//$NON-NLS-1$
204	public static final String TOKENIZER_EXT_PT = "streamParserTokenizer";//$NON-NLS-1$
205	public static final String TAIL = "tail";//$NON-NLS-1$
206	public static final String MINUS_F = "-F";//$NON-NLS-1$
207	public static final String CONFIGURATION_FILE_ATTRIBUTE = "configurationFile"; //$NON-NLS-1$
208	public static final String RM_CONFIG_EXTENSION_POINT = "org.eclipse.ptp.rm.jaxb.core.JAXBResourceManagerConfigurations"; //$NON-NLS-1$
209	public static final String IMPORTED_JAXB_CONFIG = "org.eclipse.ptp.rm.jaxb.ImportedConfigurations"; //$NON-NLS-1$
210	/*
211	* EFS Attributes
212	*/
213	public static final String ATTRIBUTE_READ_ONLY = "ATTRIBUTE_READ_ONLY";//$NON-NLS-1$
214	public static final String ATTRIBUTE_IMMUTABLE = "ATTRIBUTE_IMMUTABLE";//$NON-NLS-1$
215	public static final String ATTRIBUTE_OWNER_READ = "ATTRIBUTE_OWNER_READ";//$NON-NLS-1$
216	public static final String ATTRIBUTE_OWNER_WRITE = "ATTRIBUTE_OWNER_WRITE";//$NON-NLS-1$
217	public static final String ATTRIBUTE_OWNER_EXECUTE = "ATTRIBUTE_OWNER_EXECUTE";//$NON-NLS-1$
218	public static final String ATTRIBUTE_GROUP_READ = "ATTRIBUTE_GROUP_READ";//$NON-NLS-1$
219	public static final String ATTRIBUTE_GROUP_WRITE = "ATTRIBUTE_GROUP_WRITE";//$NON-NLS-1$
220	public static final String ATTRIBUTE_GROUP_EXECUTE = "ATTRIBUTE_GROUP_EXECUTE";//$NON-NLS-1$
221	public static final String ATTRIBUTE_OTHER_READ = "ATTRIBUTE_OTHER_READ";//$NON-NLS-1$
222	public static final String ATTRIBUTE_OTHER_WRITE = "ATTRIBUTE_OTHER_WRITE";//$NON-NLS-1$
223	public static final String ATTRIBUTE_OTHER_EXECUTE = "ATTRIBUTE_OTHER_EXECUTE";//$NON-NLS-1$
224	public static final String ATTRIBUTE_EXECUTABLE = "ATTRIBUTE_EXECUTABLE";//$NON-NLS-1$
225	public static final String ATTRIBUTE_ARCHIVE = "ATTRIBUTE_ARCHIVE";//$NON-NLS-1$
226	public static final String ATTRIBUTE_HIDDEN = "ATTRIBUTE_HIDDEN";//$NON-NLS-1$
227	public static final String ATTRIBUTE_SYMLINK = "ATTRIBUTE_SYMLINK";//$NON-NLS-1$
228	public static final String ATTRIBUTE_LINK_TARGET = "ATTRIBUTE_LINK_TARGET";//$NON-NLS-1$
229
230	/*
231	* IRemoteProcessBuilder
232	*/
233	public static final String TAG_NONE = "NONE";//$NON-NLS-1$
234	public static final String TAG_ALLOCATE_PTY = "ALLOCATE_PTY";//$NON-NLS-1$
235	public static final String TAG_FORWARD_X11 = "FORWARD_X11";//$NON-NLS-1$
236
21	/*	237	/*
22	* Element keywords	238	* Element keywords
23	*/	239	*/
24	public static String INCLUDE_ELEMENT = "include"; //$NON-NLS-1$	240	public static String INCLUDE_ELEMENT = "include"; //$NON-NLS-1$
25	public static String TABLE_ELEMENT = "table"; //$NON-NLS-1$	241	public static String TABLE_ELEMENT = "table"; //$NON-NLS-1$
		242	public static String USAGEBAR_ELEMENT = "usagebar"; //$NON-NLS-1$
		243	public static String TEXT_ELEMENT = "text"; //$NON-NLS-1$
		244	public static String INFOBOX_ELEMENT = "infobox"; //$NON-NLS-1$
		245	public static String CHART_ELEMENT = "chart"; //$NON-NLS-1$
		246	public static String CHARTGROUP_ELEMENT = "chartgroup"; //$NON-NLS-1$
		247	public static String NODEDISPLAY_ELEMENT = "nodedisplay"; //$NON-NLS-1$
		248	public static String ABSLAYOUT_ELEMENT = "abslayout"; //$NON-NLS-1$
		249	public static String SPLITLAYOUT_ELEMENT = "splitlayout"; //$NON-NLS-1$
		250	public static String TABLELAYOUT_ELEMENT = "tablelayout"; //$NON-NLS-1$
		251	public static String COMPONENTLAYOUT_ELEMENT = "componentlayout"; //$NON-NLS-1$
		252	public static String NODEDISPLAYLAYOUT_ELEMENT = "nodedisplaylayout"; //$NON-NLS-1$
26	public static String TITLE_PREFIX = "title_"; //$NON-NLS-1$	253	public static String TITLE_PREFIX = "title_"; //$NON-NLS-1$
27	}	254	}

Lines 21-46 Link Here

(-)a/rms/org.eclipse.ptp.rm.lml.core/src/org/eclipse/ptp/rm/lml/core/LMLCorePlugin.java (-98 / +16 lines)
21	*******************************************************************************/	21	*******************************************************************************/
22	package org.eclipse.ptp.rm.lml.core;	22	package org.eclipse.ptp.rm.lml.core;
23		23
24	import java.net.MalformedURLException;	24	import java.io.File;
		25	import java.io.IOException;
25	import java.net.URL;	26	import java.net.URL;
26	import java.util.MissingResourceException;	27	import java.util.MissingResourceException;
27	import java.util.ResourceBundle;	28	import java.util.ResourceBundle;
28		29
29	import javax.xml.XMLConstants;	30	import org.eclipse.core.runtime.FileLocator;
30	import javax.xml.bind.JAXBContext;
31	import javax.xml.bind.JAXBException;
32	import javax.xml.bind.Marshaller;
33	import javax.xml.bind.Unmarshaller;
34	import javax.xml.validation.Schema;
35	import javax.xml.validation.SchemaFactory;
36
37	import org.eclipse.core.runtime.IStatus;	31	import org.eclipse.core.runtime.IStatus;
		32	import org.eclipse.core.runtime.Path;
38	import org.eclipse.core.runtime.Plugin;	33	import org.eclipse.core.runtime.Plugin;
39	import org.eclipse.core.runtime.Status;	34	import org.eclipse.core.runtime.Status;
40	import org.eclipse.ptp.rm.lml.core.messages.Messages;	35	import org.eclipse.ptp.rm.lml.core.messages.Messages;
41	import org.eclipse.ptp.rm.lml.core.util.DebugUtil;	36	import org.eclipse.ptp.rm.lml.core.util.DebugUtil;
		37	import org.osgi.framework.Bundle;
42	import org.osgi.framework.BundleContext;	38	import org.osgi.framework.BundleContext;
43	import org.xml.sax.SAXException;
44		39
45	public class LMLCorePlugin extends Plugin {	40	public class LMLCorePlugin extends Plugin {
46	public static final String PLUGIN_ID = "org.eclipse.ptp.rm.lml.core"; //$NON-NLS-1$	41	public static final String PLUGIN_ID = "org.eclipse.ptp.rm.lml.core"; //$NON-NLS-1$
Lines 48-68 Link Here
48	// The shared instance.	43	// The shared instance.
49	private static LMLCorePlugin fPlugin;	44	private static LMLCorePlugin fPlugin;
50		45
51	/*
52	* Unmarshaller for JAXB-generator
53	*/
54	private static Unmarshaller unmarshaller;
55
56	/*
57	* Marshaller for JAXB-model
58	*/
59	private static Marshaller marshaller;
60
61	/**	46	/**
62	* Returns the shared instance.	47	* Returns the shared instance.
63	*/	48	*/
64	public static LMLCorePlugin getDefault() {	49	public static LMLCorePlugin getDefault() {
65	return fPlugin;	50	return fPlugin;
		51	}
		52
		53	public static URL getResource(String resource) throws IOException {
		54	URL url = null;
		55	if (getDefault() != null) {
		56	final Bundle bundle = getDefault().getBundle();
		57	url = FileLocator.find(bundle, new Path(ILMLCoreConstants.PATH_SEP + resource), null);
		58	} else {
		59	url = new File(resource).toURI().toURL();
		60	}
		61	return url;
66	}	62	}
67		63
68	/**	64	/**
Lines 144-187 Link Here
144	}	140	}
145		141
146	/**	142	/**
147	* Get the JAXB marshaller
148	*
149	* @return the JAXB marshaller
150	*/
151	public Marshaller getMarshaller() {
152	if (marshaller == null) {
153	try {
154	createMarshaller();
155	} catch (final JAXBException e) {
156	log(e);
157	}
158	}
159	return marshaller;
160	}
161
162	/**
163	* Returns the plugin's resource bundle,	143	* Returns the plugin's resource bundle,
164	*/	144	*/
165	public ResourceBundle getResourceBundle() {	145	public ResourceBundle getResourceBundle() {
166	return resourceBundle;	146	return resourceBundle;
167	}
168
169	/**
170	* Get the JAXB unmarshaller.
171	*
172	* @return the JAXB unmarshaller
173	*/
174	public Unmarshaller getUnmarshaller() {
175	if (unmarshaller == null) {
176	try {
177	createUnmarshaller();
178	} catch (final JAXBException e) {
179	log(e);
180	} catch (final MalformedURLException e) {
181	log(e);
182	}
183	}
184	return unmarshaller;
185	}	147	}
186		148
187	/**	149	/**
Lines 190-196 Link Here
190	@Override	152	@Override
191	public void start(BundleContext context) throws Exception {	153	public void start(BundleContext context) throws Exception {
192	super.start(context);	154	super.start(context);
193	createUnmarshaller();
194	DebugUtil.configurePluginDebugOptions();	155	DebugUtil.configurePluginDebugOptions();
195	}	156	}
196		157
Lines 204-252 Link Here
204	} finally {	165	} finally {
205	super.stop(context);	166	super.stop(context);
206	fPlugin = null;	167	fPlugin = null;
207	}
208	}
209
210	private void createMarshaller() throws JAXBException {
211	final JAXBContext jc = JAXBContext.newInstance("org.eclipse.ptp.rm.lml.internal.core.elements", //$NON-NLS-1$
212	LMLCorePlugin.class.getClassLoader());
213	marshaller = jc.createMarshaller();
214	}
215
216	/**
217	* For the generation of instances from classes by JAXB a unmarshaller is
218	* needed. In the method the needed unmarshaller is created. It is said
219	* where the classes for the instantiation are.
220	*
221	* @throws MalformedURLException
222	* @throws JAXBException
223	*/
224	private void createUnmarshaller() throws MalformedURLException, JAXBException {
225	final URL xsd = getBundle().getEntry("/schema/lgui.xsd"); //$NON-NLS-1$
226
227	final JAXBContext jc = JAXBContext.newInstance("org.eclipse.ptp.rm.lml.internal.core.elements", //$NON-NLS-1$
228	LMLCorePlugin.class.getClassLoader());
229
230	unmarshaller = jc.createUnmarshaller();
231
232	// if xsd is null => do not check for validity
233	if (xsd != null) {
234
235	Schema mySchema;
236	final SchemaFactory sf = SchemaFactory.newInstance(XMLConstants.W3C_XML_SCHEMA_NS_URI);
237
238	try {
239
240	mySchema = sf.newSchema(xsd);
241	} catch (final SAXException saxe) {
242	// ...(error handling)
243	mySchema = null;
244
245	}
246
247	// Connect schema to unmarshaller
248	unmarshaller.setSchema(mySchema);
249
250	}	168	}
251	}	169	}
252		170

Added Link Here

(-)a/rms/org.eclipse.ptp.rm.lml.core/src/org/eclipse/ptp/rm/lml/core/events/ITableFilterEvent.java (+27 lines)
1	/*******************************************************************************
2	* Copyright (c) 2007 IBM Corporation and others.
3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at
6	* http://www.eclipse.org/legal/epl-v10.html
7	*
8	* Contributors:
9	* IBM Corporation - Initial API and implementation
10	*
11	* Modified by:
12	* Claudia Knobloch, Forschungszentrum Juelich GmbH
13	*******************************************************************************/
14
15	package org.eclipse.ptp.rm.lml.core.events;
16
17	import java.util.List;
18
19	import org.eclipse.ptp.rm.lml.core.model.IPattern;
20
21	public interface ITableFilterEvent {
22
23	public String getGid();
24
25	public List<IPattern> getPattern();
26
27	}

Added Link Here

(-)a/rms/org.eclipse.ptp.rm.lml.core/src/org/eclipse/ptp/rm/lml/core/model/IPattern.java (+34 lines)
1	/**
2	* Copyright (c) 2011 Forschungszentrum Juelich GmbH
3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution and is available at
6	* http://www.eclipse.org/legal/epl-v10.html
7	*
8	* Contributors:
9	* Claudia Knobloch, FZ Juelich
10	*/
11	package org.eclipse.ptp.rm.lml.core.model;
12
13	public interface IPattern {
14
15	public String getColumnTitle();
16
17	public String getMaxValueRange();
18
19	public String getMinValueRange();
20
21	public String getRelationOperator();
22
23	public String getType();
24
25	public String getRelationValue();
26
27	public boolean isRange();
28
29	public boolean isRelation();
30
31	public IPattern setRange(String minValueRange, String maxValueRange);
32
33	public IPattern setRelation(String relationOperator, String valueRelation);
34	}

Added Link Here

(-)a/rms/org.eclipse.ptp.rm.lml.core/src/org/eclipse/ptp/rm/lml/core/util/JAXBUtil.java (+552 lines)
1	package org.eclipse.ptp.rm.lml.core.util;
2
3	import java.io.IOException;
4	import java.io.OutputStream;
5	import java.io.StringReader;
6	import java.io.StringWriter;
7	import java.math.BigInteger;
8	import java.net.URISyntaxException;
9	import java.net.URL;
10	import java.util.ArrayList;
11	import java.util.HashSet;
12	import java.util.List;
13
14	import javax.xml.bind.JAXBContext;
15	import javax.xml.bind.JAXBElement;
16	import javax.xml.bind.JAXBException;
17	import javax.xml.bind.Marshaller;
18	import javax.xml.bind.PropertyException;
19	import javax.xml.bind.Unmarshaller;
20	import javax.xml.namespace.QName;
21	import javax.xml.transform.Source;
22	import javax.xml.transform.stream.StreamSource;
23	import javax.xml.validation.Schema;
24	import javax.xml.validation.SchemaFactory;
25	import javax.xml.validation.Validator;
26
27	import org.eclipse.ptp.rm.lml.core.ILMLCoreConstants;
28	import org.eclipse.ptp.rm.lml.core.LMLCorePlugin;
29	import org.eclipse.ptp.rm.lml.core.model.ILguiItem;
30	import org.eclipse.ptp.rm.lml.internal.core.elements.AbslayoutType;
31	import org.eclipse.ptp.rm.lml.internal.core.elements.ChartType;
32	import org.eclipse.ptp.rm.lml.internal.core.elements.ChartgroupType;
33	import org.eclipse.ptp.rm.lml.internal.core.elements.ColumnType;
34	import org.eclipse.ptp.rm.lml.internal.core.elements.ComponentType;
35	import org.eclipse.ptp.rm.lml.internal.core.elements.ComponentlayoutType;
36	import org.eclipse.ptp.rm.lml.internal.core.elements.DataType;
37	import org.eclipse.ptp.rm.lml.internal.core.elements.GobjectType;
38	import org.eclipse.ptp.rm.lml.internal.core.elements.InfoboxType;
39	import org.eclipse.ptp.rm.lml.internal.core.elements.LayoutType;
40	import org.eclipse.ptp.rm.lml.internal.core.elements.LguiType;
41	import org.eclipse.ptp.rm.lml.internal.core.elements.Nodedisplay;
42	import org.eclipse.ptp.rm.lml.internal.core.elements.NodedisplaylayoutType;
43	import org.eclipse.ptp.rm.lml.internal.core.elements.ObjectFactory;
44	import org.eclipse.ptp.rm.lml.internal.core.elements.PaneType;
45	import org.eclipse.ptp.rm.lml.internal.core.elements.PatternMatchType;
46	import org.eclipse.ptp.rm.lml.internal.core.elements.PatternType;
47	import org.eclipse.ptp.rm.lml.internal.core.elements.SchemeType;
48	import org.eclipse.ptp.rm.lml.internal.core.elements.SplitlayoutType;
49	import org.eclipse.ptp.rm.lml.internal.core.elements.TableType;
50	import org.eclipse.ptp.rm.lml.internal.core.elements.TablelayoutType;
51	import org.eclipse.ptp.rm.lml.internal.core.elements.TextboxType;
52	import org.eclipse.ptp.rm.lml.internal.core.elements.UsagebarType;
53	import org.eclipse.ptp.rm.lml.internal.core.model.LguiItem;
54	import org.xml.sax.SAXException;
55	import org.xml.sax.SAXParseException;
56
57	public class JAXBUtil {
58
59	private static JAXBUtil jaxbUtil;
60
61	private static Unmarshaller unmarshaller;
62
63	private static Marshaller marshaller;
64
65	private static String JAXB_CLASSES = "org.eclipse.ptp.rm.lml.internal.core.elements";//$NON-NLS-1$
66
67	private static String SCHEMA_LOCATION = "jaxb.schemaLocation";//$NON-NLS-1$
68	private static String SCHEMA_FILE = "lgui.xsd";//$NON-NLS-1$
69	private static String SCHEMA_LGUI = "lgui";//$NON-NLS-1$
70	private static String SCHEMA_LML = "lml";//$NON-NLS-1$
71	private static String SCHEMA_DIRECTORY = "http://www.llview.de";//$NON-NLS-1$
72
73	private static Validator validator;
74
75	public static JAXBUtil getInstance() {
76	if (jaxbUtil == null) {
77	jaxbUtil = new JAXBUtil();
78	}
79	return jaxbUtil;
80	}
81
82	/**
83	* Take a graphical object and minimize the data so that this instance is
84	* valid against the LML-Schema but at the same time as small as possible.
85	*
86	* @param gobject
87	* @return a copy of gobj with minimal size, only attributes in GobjectType
88	* are copied and lower special elements which are needed to make
89	* lml-model valid
90	*/
91	@SuppressWarnings("unchecked")
92	public static JAXBElement<GobjectType> minimizeGobjectType(
93	GobjectType gobject, ObjectFactory objectFactory) {
94
95	String qName = null;
96	GobjectType value = null;
97
98	if (gobject instanceof TableType) {
99	value = objectFactory.createTableType();
100	final TableType origin = (TableType) gobject;
101	((TableType) value).setContenttype(origin.getContenttype());
102	// copy all columns with pattern to table
103	for (final ColumnType column : origin.getColumn()) {
104	if (column.getPattern() != null) {
105	((TableType) value).getColumn().add(column);
106	}
107	}
108
109	qName = ILMLCoreConstants.TABLE_ELEMENT;
110	} else if (gobject instanceof UsagebarType) {
111	value = objectFactory.createUsagebarType();
112
113	((UsagebarType) value).setCpucount(BigInteger.valueOf(0));
114
115	qName = ILMLCoreConstants.USAGEBAR_ELEMENT;
116	} else if (gobject instanceof TextboxType) {
117	value = objectFactory.createTextboxType();
118	((TextboxType) value).setText(ILMLCoreConstants.ZEROSTR);
119
120	qName = ILMLCoreConstants.TEXT_ELEMENT;
121	} else if (gobject instanceof InfoboxType) {
122	value = objectFactory.createInfoboxType();
123
124	qName = ILMLCoreConstants.INFOBOX_ELEMENT;
125	} else if (gobject instanceof Nodedisplay) {
126	value = objectFactory.createNodedisplay();
127	final SchemeType scheme = objectFactory.createSchemeType();
128	scheme.getEl1().add(objectFactory.createSchemeElement1());
129	((Nodedisplay) value).setScheme(scheme);
130
131	final DataType dat = objectFactory.createDataType();
132	dat.getEl1().add(objectFactory.createDataElement1());
133	((Nodedisplay) value).setData(dat);
134
135	qName = ILMLCoreConstants.NODEDISPLAY_ELEMENT;
136	} else if (gobject instanceof ChartType) {
137	value = objectFactory.createChartType();
138
139	qName = ILMLCoreConstants.CHART_ELEMENT;
140	} else if (gobject instanceof ChartgroupType) {
141	final ChartgroupType chartgroupType = objectFactory
142	.createChartgroupType();
143	// Add lower chart-elements to the minimized chart-group
144	// Go through all charts minimize them and add them to ut
145	for (final ChartType chart : ((ChartgroupType) gobject).getChart()) {
146	final ChartType minimal = (ChartType) (minimizeGobjectType(
147	chart, objectFactory).getValue());
148	chartgroupType.getChart().add(minimal);
149	}
150
151	value = chartgroupType;
152
153	qName = ILMLCoreConstants.CHARTGROUP_ELEMENT;
154	}
155
156	value.setDescription(gobject.getDescription());
157	value.setId(gobject.getId());
158	value.setTitle(gobject.getTitle());
159
160	return new JAXBElement<GobjectType>(new QName(qName),
161	(Class<GobjectType>) gobject.getClass(), value);
162	}
163
164	/**
165	* Replace a global layout within the lml-model by a new one
166	*
167	* @param newLayout
168	* new layout, which replaces the old in model with the same id
169	* @param lgui
170	* lgui-instance, which is changed
171	*/
172	@SuppressWarnings("unchecked")
173	public static void replaceGlobalLayout(LguiType newLayout, LguiType lgui) {
174
175	for (final JAXBElement<?> layout : newLayout
176	.getObjectsAndRelationsAndInformation()) {
177	if (layout.getValue() instanceof LayoutType) {
178	boolean replaced = false;
179	for (final JAXBElement<?> object : lgui
180	.getObjectsAndRelationsAndInformation()) {
181	if (object.getValue() instanceof LayoutType) {
182	if (((LayoutType) object.getValue()).getId().equals(
183	((LayoutType) layout.getValue()).getId())) {
184	((JAXBElement<LayoutType>) object)
185	.setValue((LayoutType) layout.getValue());
186	replaced = true;
187	break;
188	}
189	}
190	}
191	if (!replaced) {
192	lgui.getObjectsAndRelationsAndInformation().add(layout);
193	}
194	}
195	}
196	}
197
198	/**
199	* Search for gid-attributes of a pane and put it into neededComponents
200	* Recursively search all graphical objects referenced by this pane
201	*
202	* @param pane
203	* part of SplitLayout, which is scanned for gid-attributes
204	* @param components
205	* resulting Hashset
206	*/
207	private static void collectComponents(PaneType pane, HashSet<String> components) {
208
209	if (pane.getGid() != null) {
210	components.add(pane.getGid());
211	} else {
212	// top and bottom components?
213	if (pane.getBottom() != null) {
214	collectComponents(pane.getBottom(), components);
215	collectComponents(pane.getTop(), components);
216	} else {// Left and right
217	collectComponents(pane.getLeft(), components);
218	collectComponents(pane.getRight(), components);
219	}
220	}
221
222	}
223
224	/**
225	* * Uses the ResourceManagerData schema.
226	*
227	* @return static singleton
228	* @throws IOException
229	* @throws SAXException
230	*/
231	@SuppressWarnings("unused")
232	private synchronized static Validator getValidator() throws IOException, SAXException {
233	if (validator == null) {
234
235	final URL xsd = LMLCorePlugin.getResource(ILMLCoreConstants.RM_XSD);
236	final SchemaFactory factory = SchemaFactory.newInstance(ILMLCoreConstants.XMLSchema);
237	final Schema schema = factory.newSchema(xsd);
238	validator = schema.newValidator();
239	}
240	return validator;
241	}
242
243	private static void validate(Source source) throws SAXException, IOException, URISyntaxException {
244	try {
245	getValidator().validate(source);
246	} catch (final SAXParseException sax) {
247	throw sax;
248	}
249	}
250
251	private JAXBUtil() {
252	jaxbUtil = this;
253	try {
254	final JAXBContext jaxbContext = JAXBContext.newInstance(JAXB_CLASSES);
255	marshaller = jaxbContext.createMarshaller();
256	unmarshaller = jaxbContext.createUnmarshaller();
257
258	} catch (final JAXBException e) {
259	marshaller = null;
260	unmarshaller = null;
261	// TODO Error Message?
262	}
263	}
264
265	public void addComponentLayoutElement(LguiType lgui,
266	ComponentlayoutType component) {
267	if (component instanceof TablelayoutType) {
268	lgui.getObjectsAndRelationsAndInformation()
269	.add(new JAXBElement<TablelayoutType>(new QName(
270	ILMLCoreConstants.TABLELAYOUT_ELEMENT),
271	TablelayoutType.class, (TablelayoutType) component));
272	} else if (component instanceof NodedisplaylayoutType) {
273	lgui.getObjectsAndRelationsAndInformation().add(
274	new JAXBElement<NodedisplaylayoutType>(new QName(
275	ILMLCoreConstants.NODEDISPLAYLAYOUT_ELEMENT),
276	NodedisplaylayoutType.class,
277	(NodedisplaylayoutType) component));
278	} else {
279	lgui.getObjectsAndRelationsAndInformation().add(
280	new JAXBElement<ComponentlayoutType>(new QName(
281	ILMLCoreConstants.COMPONENTLAYOUT_ELEMENT),
282	ComponentlayoutType.class, component));
283	}
284	}
285
286	public void addLayoutElement(LguiType lgui, Object object) {
287	if (object instanceof SplitlayoutType) {
288	lgui.getObjectsAndRelationsAndInformation().add(
289	new JAXBElement<SplitlayoutType>(new QName(
290	ILMLCoreConstants.SPLITLAYOUT_ELEMENT),
291	SplitlayoutType.class, (SplitlayoutType) object));
292	} else if (object instanceof AbslayoutType) {
293	lgui.getObjectsAndRelationsAndInformation().add(
294	new JAXBElement<AbslayoutType>(new QName(
295	ILMLCoreConstants.ABSLAYOUT_ELEMENT),
296	AbslayoutType.class, (AbslayoutType) object));
297	}
298
299	}
300
301	/**
302	* Add a new created layout to the model
303	*
304	* @param layout
305	* absolute or splitlayout
306	*/
307	public void addLayoutTag(LguiType lgui, ILguiItem lguiItem,
308	LayoutType layout) {
309
310	if (layout.getId() == null) {
311	layout.setId(ILMLCoreConstants.ZEROSTR);
312	}
313
314	JAXBElement<? extends LayoutType> jaxbElement = null;
315	// Create jaxbelement corresponding to the class-type
316	if (layout instanceof AbslayoutType) {
317
318	final AbslayoutType absLayout = (AbslayoutType) layout;
319
320	jaxbElement = new JAXBElement<AbslayoutType>(new QName(
321	ILMLCoreConstants.ABSLAYOUT_ELEMENT), AbslayoutType.class,
322	absLayout);
323
324	} else if (layout instanceof SplitlayoutType) {
325
326	final SplitlayoutType splitLayout = (SplitlayoutType) layout;
327
328	jaxbElement = new JAXBElement<SplitlayoutType>(new QName(
329	ILMLCoreConstants.SPLITLAYOUT_ELEMENT),
330	SplitlayoutType.class, splitLayout);
331
332	} else {
333	return;
334	}
335
336	lgui.getObjectsAndRelationsAndInformation().add(jaxbElement);
337
338	lguiItem.notifyListeners();
339
340	}
341
342	public void addPatternInclude(PatternType pattern,
343	PatternMatchType patternMatch) {
344	pattern.getIncludeAndExclude().add(
345	new JAXBElement<PatternMatchType>(new QName(
346	ILMLCoreConstants.INCLUDE_ELEMENT),
347	PatternMatchType.class, patternMatch));
348	}
349
350	public void addTable(LguiType lgui, TableType table) {
351	lgui.getObjectsAndRelationsAndInformation().add(
352	new JAXBElement<TableType>(new QName(
353	ILMLCoreConstants.TABLE_ELEMENT), TableType.class,
354	table));
355	}
356
357	public void getLayoutComponents(LguiType result, LguiType lgui, HashSet<String> components) {
358
359	for (final JAXBElement<?> element : lgui.getObjectsAndRelationsAndInformation()) {
360
361	final Object object = element.getValue();
362
363	if (object instanceof LayoutType) {
364	if (object instanceof SplitlayoutType) {
365	lgui.getObjectsAndRelationsAndInformation().add(element);
366	} else if (object instanceof AbslayoutType) {
367	lgui.getObjectsAndRelationsAndInformation().add(element);
368	}
369
370	if (object instanceof SplitlayoutType) {
371	if (((SplitlayoutType) object).getLeft() != null) {
372	collectComponents(((SplitlayoutType) object).getLeft(), components);
373	collectComponents(((SplitlayoutType) object).getRight(), components);
374	}
375	} else if (object instanceof AbslayoutType) {
376	for (final ComponentType component : ((AbslayoutType) object).getComp()) {
377	components.add(component.getGid());
378	}
379	}
380	} else if (object instanceof ComponentlayoutType) {
381	if (((ComponentlayoutType) object).isActive()) {
382	addComponentLayoutElement(result, (ComponentlayoutType) object);
383	components.add(((ComponentlayoutType) object).getGid());
384	}
385	}
386	}
387	}
388
389	public ArrayList<Object> getObjects(LguiType lgui) {
390	final ArrayList<Object> list = new ArrayList<Object>();
391	for (final JAXBElement<?> element : lgui
392	.getObjectsAndRelationsAndInformation()) {
393	list.add(element.getValue());
394	}
395	return list;
396	}
397
398	public void marshal(LguiType lgui, OutputStream output) {
399	try {
400	marshaller.setProperty(SCHEMA_LOCATION, SCHEMA_DIRECTORY + SCHEMA_FILE);
401	marshaller.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, Boolean.TRUE);
402	final QName tagname = new QName(SCHEMA_DIRECTORY, SCHEMA_LGUI, SCHEMA_LML);
403
404	final JAXBElement<LguiType> rootElement = new JAXBElement<LguiType>(
405	tagname, LguiType.class, lgui);
406	/*
407	* Synchronize to avoid the dreaded
408	* "FWK005 parse may not be called while parsing" message
409	*/
410	synchronized (LguiItem.class) {
411	marshaller.marshal(rootElement, output);
412	}
413	output.close(); // Must close to flush stream
414	} catch (final PropertyException e) {
415	// TODO ErrorMessage
416	} catch (final IOException e) {
417	// TODO ErrorMessage
418	} catch (final JAXBException e) {
419	// TODO ErrorMessage
420	}
421	}
422
423	public void marshal(LguiType lgui, StringWriter writer) {
424	try {
425	marshaller.setProperty(SCHEMA_LOCATION, SCHEMA_DIRECTORY + SCHEMA_FILE);
426	marshaller.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, Boolean.TRUE);
427	final QName tagname = new QName(SCHEMA_DIRECTORY, SCHEMA_LGUI, SCHEMA_LML);
428
429	final JAXBElement<LguiType> rootElement = new JAXBElement<LguiType>(
430	tagname, LguiType.class, lgui);
431	/*
432	* Synchronize to avoid the dreaded
433	* "FWK005 parse may not be called while parsing" message
434	*/
435	synchronized (LguiItem.class) {
436	marshaller.marshal(rootElement, writer);
437	}
438
439	} catch (final PropertyException e) {
440	// TODO ErrorMessage
441	} catch (final JAXBException e) {
442	// TODO ErrorMessage
443	}
444	}
445
446	/**
447	* Replace all componentlayouts for a graphical object with given gid
448	* through newlayout.getGid() with newlayout
449	*
450	* @param newLayout
451	* new layout, which is placed into the positions of old layouts
452	*/
453	@SuppressWarnings("unchecked")
454	public void replaceComponentLayout(LguiType lgui, ILguiItem lguiItem, ComponentlayoutType newLayout) {
455	if (newLayout == null) {
456	return;
457	}
458	final List<JAXBElement<?>> objects = lgui.getObjectsAndRelationsAndInformation();
459
460	boolean replaced = false;
461
462	// Over all objects in lml-file
463	for (int i = 0; i < objects.size(); i++) {
464	final JAXBElement<?> object = objects.get(i);
465
466	// Over all Componentlayouts
467	if (object.getValue() instanceof ComponentlayoutType) {
468
469	if (((ComponentlayoutType) object.getValue()).getGid() != null
470	&& ((ComponentlayoutType) object.getValue()).getGid()
471	.equals(newLayout.getGid())) {
472
473	if (!replaced) {
474
475	((JAXBElement<ComponentlayoutType>) object)
476	.setValue(newLayout);
477	lguiItem.notifyListeners();
478	replaced = true;
479	} else {// Delete this object
480	objects.remove(object);
481	// One step back
482	i--;
483	}
484	}
485
486	}
487	}
488
489	if (!replaced) {
490	// Insert new layout, if there was nothing to replace
491	// Takes any componentlayout
492	JAXBElement<?> newElement = null;
493
494	// Differ between several layouts, create different JAXBElements
495	if (newLayout instanceof TablelayoutType) {
496	newElement = new JAXBElement<TablelayoutType>(new QName(
497	ILMLCoreConstants.TABLELAYOUT_ELEMENT),
498	TablelayoutType.class, (TablelayoutType) newLayout);
499	} else if (newLayout instanceof NodedisplaylayoutType) {
500	newElement = new JAXBElement<NodedisplaylayoutType>(new QName(
501	ILMLCoreConstants.NODEDISPLAYLAYOUT_ELEMENT),
502	NodedisplaylayoutType.class,
503	(NodedisplaylayoutType) newLayout);
504	}
505
506	if (newElement != null) {
507	lgui.getObjectsAndRelationsAndInformation().add(newElement);
508	lguiItem.notifyListeners();
509	}
510	}
511
512	}
513
514	/**
515	* Parsing an XML file. The method generates from an XML file an instance of
516	* LguiType.
517	*
518	* @param string
519	* String containing the information from the server side
520	* @return the generated LguiType
521	*/
522	@SuppressWarnings("unchecked")
523	public LguiType unmarshal(String string) {
524	/*
525	* Synchronize to avoid the dreaded
526	* "FWK005 parse may not be called while parsing" message
527	*/
528	Source source = new StreamSource(new StringReader(string));
529	try {
530	validate(source);
531	} catch (final SAXException e1) {
532	// TODO Auto-generated catch block
533	e1.printStackTrace();
534	} catch (final IOException e1) {
535	// TODO Auto-generated catch block
536	e1.printStackTrace();
537	} catch (final URISyntaxException e1) {
538	// TODO Auto-generated catch block
539	e1.printStackTrace();
540	}
541	source = new StreamSource(new StringReader(string));
542	JAXBElement<LguiType> jaxb = null;
543	try {
544	synchronized (LguiItem.class) {
545	jaxb = (JAXBElement<LguiType>) unmarshaller.unmarshal(source);
546	}
547	} catch (final JAXBException e) {
548	// TODO ErrorMessage
549	}
550	return jaxb.getValue();
551	}
552	}

Added Link Here

(-)a/rms/org.eclipse.ptp.rm.lml.core/src/org/eclipse/ptp/rm/lml/internal/core/events/TableFilterEvent.java (+52 lines)
1	/*******************************************************************************
2	* Copyright (c) 2005, 2006, 2007 Los Alamos National Security, LLC.
3	* This material was produced under U.S. Government contract DE-AC52-06NA25396
4	* for Los Alamos National Laboratory (LANL), which is operated by the Los Alamos
5	* National Security, LLC (LANS) for the U.S. Department of Energy. The U.S. Government has
6	* rights to use, reproduce, and distribute this software. NEITHER THE
7	* GOVERNMENT NOR LANS MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR
8	* ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified
9	* to produce derivative works, such modified software should be clearly marked,
10	* so as not to confuse it with the version available from LANL.
11	*
12	* Additionally, this program and the accompanying materials
13	* are made available under the terms of the Eclipse Public License v1.0
14	* which accompanies this distribution, and is available at
15	* http://www.eclipse.org/legal/epl-v10.html
16	*
17	* Modified by:
18	* Claudia Knobloch, Forschungszentrum Juelich GmbH
19	*******************************************************************************/
20
21	package org.eclipse.ptp.rm.lml.internal.core.events;
22
23	import java.util.LinkedList;
24	import java.util.List;
25
26	import org.eclipse.ptp.rm.lml.core.events.ITableFilterEvent;
27	import org.eclipse.ptp.rm.lml.core.model.IPattern;
28
29	public class TableFilterEvent implements ITableFilterEvent {
30
31	private List<IPattern> pattern;
32
33	private final String gid;
34
35	public TableFilterEvent(String gid, List<IPattern> pattern) {
36	this.gid = gid;
37	if (pattern == null) {
38	pattern = new LinkedList<IPattern>();
39	} else {
40	this.pattern = pattern;
41	}
42	}
43
44	public String getGid() {
45	return gid;
46	}
47
48	public List<IPattern> getPattern() {
49	return pattern;
50	}
51
52	}

Added Link Here

(-)a/rms/org.eclipse.ptp.rm.lml.core/src/org/eclipse/ptp/rm/lml/internal/core/model/Pattern.java (+105 lines)
1	/* Copyright (c) 2011 Forschungszentrum Juelich GmbH
2	* All rights reserved. This program and the accompanying materials
3	* are made available under the terms of the Eclipse Public License v1.0
4	* which accompanies this distribution and is available at
5	* http://www.eclipse.org/legal/epl-v10.html
6	*
7	* Contributors:
8	* Claudia Knobloch, Carsten Karbach, FZ Juelich
9	*/
10	package org.eclipse.ptp.rm.lml.internal.core.model;
11
12	import org.eclipse.ptp.rm.lml.core.model.IPattern;
13
14	public class Pattern implements IPattern {
15
16	private String columntitle;
17
18	private String type;
19
20	private boolean relation;
21
22	private boolean range;
23
24	// Relation
25	private String valueRelation;
26
27	private String relationOperator;
28
29	// Range
30	private String minValueRange;
31
32	private String maxValueRange;
33
34	public Pattern(String title, String type) {
35	columntitle = title;
36	this.type = type;
37	if (columntitle == null) {
38	columntitle = new String();
39	}
40	if (this.type == null) {
41	this.type = new String("alpha");
42	}
43	}
44
45	public String getColumnTitle() {
46	return columntitle;
47	}
48
49	public String getMaxValueRange() {
50	return maxValueRange;
51	}
52
53	public String getMinValueRange() {
54	return minValueRange;
55	}
56
57	public String getRelationOperator() {
58	return relationOperator;
59	}
60
61	public String getType() {
62	return type;
63	}
64
65	public String getRelationValue() {
66	return valueRelation;
67	}
68
69	public boolean isRange() {
70	return (range && !relation);
71	}
72
73	public boolean isRelation() {
74	return (relation && !range);
75	}
76
77	public IPattern setRange(String minValueRange, String maxValueRange) {
78	this.range = true;
79	this.relation = false;
80	this.minValueRange = minValueRange;
81	this.maxValueRange = maxValueRange;
82	if (minValueRange == null) {
83	this.minValueRange = new String();
84	}
85	if (maxValueRange == null) {
86	this.maxValueRange = new String();
87	}
88	return this;
89	}
90
91	public IPattern setRelation(String relationOperator, String valueRelation) {
92	this.relation = true;
93	this.range = false;
94	this.relationOperator = relationOperator;
95	this.valueRelation = valueRelation;
96	if (relationOperator == null) {
97	this.relationOperator = new String("=");
98	}
99	if (valueRelation == null) {
100	this.valueRelation = new String();
101	}
102	return this;
103	}
104
105	}

Lines 83-88 Link Here

(-)a/rms/org.eclipse.ptp.rm.lml.da/LML2LML/LML_gen_nodedisplay.pm (-1 / +344 lines)
83	$self->_adjust_layout_bg();	83	$self->_adjust_layout_bg();
84		84
85		85
		86	} elsif($self->{SYSTEMTYPE} eq "CRAYXT") {
		87	my($maxpcol,$maxprow,$maxpcage,$maxpslot,$maxpnode)=$self->_get_system_size_crayxt();
		88	if(!$self->_init_trees_crayxt($maxpcol,$maxprow,$maxpcage,$maxpslot,$maxpnode)) {
		89	print "ERROR: could not init internal data structures, system type: $self->{SYSTEMTYPE}, aborting ...\n";
		90	return(-1);
		91	}
		92	# init data tree with empty root nodes
		93	$self->_add_empty_root_elements();
		94
		95	$self->_adjust_layout_crayxt();
		96
		97
		98
86	} elsif($self->{SYSTEMTYPE} eq "Cluster") {	99	} elsif($self->{SYSTEMTYPE} eq "Cluster") {
87		100
88	# user define scheme given	101	# user define scheme given
Lines 165-174 Link Here
165	$inforef=$self->{LMLFH}->{DATA}->{INFODATA}->{$key};	178	$inforef=$self->{LMLFH}->{DATA}->{INFODATA}->{$key};
166	next if($inforef->{status} ne 'RUNNING');	179	next if($inforef->{status} ne 'RUNNING');
167	if(exists($inforef->{vnodelist})) {	180	if(exists($inforef->{vnodelist})) {
168	$nodelist=$self->_remap_nodes($inforef->{vnodelist});	181	$nodelist=$self->_remap_nodes_vnode($inforef->{vnodelist});
169	} else {	182	} else {
170	$nodelist=$self->_remap_nodes($inforef->{nodelist});	183	$nodelist=$self->_remap_nodes($inforef->{nodelist});
171	}	184	}
		185	# print "_insert_run_jobs job $key nodelist $nodelist\n";
172	$self->insert_job_into_nodedisplay($self->{SCHEMEROOT},$self->{DATAROOT},$nodelist,$key);	186	$self->insert_job_into_nodedisplay($self->{SCHEMEROOT},$self->{DATAROOT},$nodelist,$key);
173	push(@idlist,$key);	187	push(@idlist,$key);
174	$jcount++;	188	$jcount++;
Lines 331-336 Link Here
331	}	345	}
332	$newnodelist.="," if($newnodelist);	346	$newnodelist.="," if($newnodelist);
333	$newnodelist.=sprintf("%s-c%02d",$newnode,$num);	347	$newnodelist.=sprintf("%s-c%02d",$newnode,$num);
		348	}
		349	return($newnodelist);
		350	}
		351
		352	sub _remap_nodes_vnode {
		353	my($self) = shift;
		354	my($nodelist)=shift;
		355	my($newnodelist,$spec,$node,$num,$number,$newnode,$start);
		356	if($self->{SYSTEMTYPE} eq "BG/P") {
		357	return($nodelist);
		358	}
		359	foreach $spec (split(/\),?\(/,$nodelist)) {
		360	# change form '(node,number tasks)' to (node-c<num>, ...)
		361	if($spec=~/\(?([^,]+),(\d+)\)?/) {
		362	$node=$1;$number=$2;
		363	} elsif($spec=~/^([^,]+)$/) {
		364	$node=$1;$number=0;
		365	} else {
		366	print "ERROR: _remap_nodes: unknown node in spec '$spec', skipping\n";
		367	}
		368
		369	if(exists($self->{NODEMAPPING}->{$node})) {
		370	$newnode=$self->{NODEMAPPING}->{$node};
		371	} else {
		372	$newnode=$node;
		373	}
		374
		375	if(!exists($self->{NODELASTTASKNUMBER}->{$node})) {
		376	$self->{NODELASTTASKNUMBER}->{$node}=-1;
		377	}
		378	$start=$self->{NODELASTTASKNUMBER}->{$node}+1;
		379	for($num=$start;$num<$start+$number;$num++) {
		380	$newnodelist.="," if($newnodelist);
		381	$newnodelist.=sprintf("%s-c%02d",$newnode,$num);
		382	}
334	}	383	}
335	return($newnodelist);	384	return($newnodelist);
336	}	385	}
Lines 890-893 Link Here
890	}	939	}
891		940
892		941
		942	###############################################
		943	# Cray XT related
		944	###############################################
		945	sub _adjust_layout_crayxt {
		946	my($self) = shift;
		947	my($root_layout,$root_scheme,$treenode,$ltreenode,$streenode,$num,$min,$max,$lmin,$lmax);
		948	my $rc=1;
		949	my $maxlevel=6;
		950
		951	$root_layout=$self->{LAYOUT}->{tree};
		952	$root_scheme=$self->{SCHEMEROOT};
		953
		954	# COLS
		955	######
		956	$streenode=$root_scheme->get_child({_name => "el1" });
		957	$ltreenode=$root_layout->get_child({_name => "el0" });
		958
		959	# get number of rows (in el1 of scheme)
		960	if($streenode) {
		961	$min=$streenode->{ATTR}->{min};
		962	$max=$streenode->{ATTR}->{max};
		963	$num=$max-$min+1;
		964
		965	} else {
		966	print STDERR "$0: ERROR: inconsistent scheme tree for Cray XT system (cols) ...\n";return(0);
		967	}
		968
		969	if(!$ltreenode) {
		970	$ltreenode=$root_layout->new_child();
		971	}
		972	# set size attributes
		973	$ltreenode->{ATTR}->{rows}=1;
		974	$ltreenode->{ATTR}->{cols}=$num;
		975
		976	# set some default layout attributes
		977	# $ltreenode->{ATTR}->{maxlevel} = 6 if(!exists($ltreenode->{ATTR}->{maxlevel}));
		978	$ltreenode->{ATTR}->{maxlevel} = 4 ;
		979	$ltreenode->{ATTR}->{vgap} = 5 if(!exists($ltreenode->{ATTR}->{vgap}));
		980	$ltreenode->{ATTR}->{hgap} = 0 if(!exists($ltreenode->{ATTR}->{hgap}));
		981	$ltreenode->{ATTR}->{fontsize} = 10 if(!exists($ltreenode->{ATTR}->{fontsize}));
		982	$ltreenode->{ATTR}->{border} = 0 if(!exists($ltreenode->{ATTR}->{border}));
		983	$ltreenode->{ATTR}->{fontfamily} = "Monospaced" if(!exists($ltreenode->{ATTR}->{fontfamily}));
		984	$ltreenode->{ATTR}->{showtitle} = "false" if(!exists($ltreenode->{ATTR}->{showtitle}));
		985	$ltreenode->{ATTR}->{background} = "#777" if(!exists($ltreenode->{ATTR}->{background}));
		986	$ltreenode->{ATTR}->{mouseborder}= 0 if(!exists($ltreenode->{ATTR}->{mouseborder}));
		987	$ltreenode->{ATTR}->{transparent}= "false" if(!exists($ltreenode->{ATTR}->{transparent}));
		988	$lmin=$min;$lmax=$max;
		989
		990	# Rack
		991	######
		992	$streenode=$streenode->get_child({_name => "el2" });
		993
		994	# get number of rows (in el1 of scheme)
		995	if($streenode) {
		996	$min=$streenode->{ATTR}->{min};
		997	$max=$streenode->{ATTR}->{max};
		998	$num=$max-$min+1;
		999	} else {
		1000	print STDERR "$0: ERROR: inconsistent scheme tree for Cray XT system (rows) ...\n";return(0);
		1001	}
		1002
		1003	$treenode=$ltreenode->get_child({_name => "el1" });
		1004	if(!$treenode) {
		1005	$treenode=$ltreenode->new_child();
1006	}
1007	$ltreenode=$treenode;
1008
1009	# set size attributes
1010	$ltreenode->{ATTR}->{rows}=$num;
1011	$ltreenode->{ATTR}->{cols}=1;
1012
1013	# set some default layout attributes
1014	# $ltreenode->{ATTR}->{maxlevel} = 5 if(!exists($ltreenode->{ATTR}->{maxlevel}));
1015	$ltreenode->{ATTR}->{maxlevel} = 5;
1016	$ltreenode->{ATTR}->{vgap} = 5 if(!exists($ltreenode->{ATTR}->{vgap}));
1017	$ltreenode->{ATTR}->{hgap} = 0 if(!exists($ltreenode->{ATTR}->{hgap}));
1018	# $ltreenode->{ATTR}->{fontsize} = 10 if(!exists($ltreenode->{ATTR}->{fontsize}));
1019	# $ltreenode->{ATTR}->{border} = 0 if(!exists($ltreenode->{ATTR}->{border}));
1020	# $ltreenode->{ATTR}->{fontfamily} = "Monospaced" if(!exists($ltreenode->{ATTR}->{fontfamily}));
1021	$ltreenode->{ATTR}->{showtitle} = "true" if(!exists($ltreenode->{ATTR}->{showtitle}));
1022	# $ltreenode->{ATTR}->{background} = "#777" if(!exists($ltreenode->{ATTR}->{background}));
1023	# $ltreenode->{ATTR}->{mouseborder}= 0 if(!exists($ltreenode->{ATTR}->{mouseborder}));
1024	# $ltreenode->{ATTR}->{transparent}= "false" if(!exists($ltreenode->{ATTR}->{transparent}));
1025	$lmin=$min;$lmax=$max;
1026
1027	# Cage
1028	#######
1029	$streenode=$streenode->get_child({_name => "el3" });
1030
1031	# get number of cages (in el2 of scheme)
1032	if($streenode) {
1033	$min=$streenode->{ATTR}->{min};
1034	$max=$streenode->{ATTR}->{max};
1035	$num=$max-$min+1;
1036	} else {
1037	print STDERR "$0: ERROR: inconsistent scheme tree for BG system (racks) ...\n";return(0);
1038	}
1039
1040	$treenode=$ltreenode->get_child({_name => "el2" });
1041	if(!$treenode) {
1042	$treenode=$ltreenode->new_child();
1043	}
1044	$ltreenode=$treenode;
1045
1046	# set size attributes
1047	$ltreenode->{ATTR}->{rows}=$num; $ltreenode->{ATTR}->{cols}=1;
1048	$ltreenode->{ATTR}->{min}=$lmin; $ltreenode->{ATTR}->{max}=$lmax;
1049
1050	# set some default layout attributes
1051	$ltreenode->{ATTR}->{maxlevel} = 6 if(!exists($ltreenode->{ATTR}->{maxlevel}));
1052	$ltreenode->{ATTR}->{showtitle} = "true" if(!exists($ltreenode->{ATTR}->{showtitle}));
1053	$lmin=$min;$lmax=$max;
1054
1055	# blade
1056	#######
1057	$streenode=$streenode->get_child({_name => "el4" });
1058
1059	# get number of slots (in el3 of scheme)
1060	if($streenode) {
1061	$min=$streenode->{ATTR}->{min};
1062	$max=$streenode->{ATTR}->{max};
1063	$num=$max-$min+1;
1064	} else {
1065	print STDERR "$0: ERROR: inconsistent scheme tree for BG system (midplanes) ...\n";return(0);
1066	}
1067
1068	$treenode=$ltreenode->get_child({_name => "el3" });
1069	if(!$treenode) {
1070	$treenode=$ltreenode->new_child();
1071	}
1072	$ltreenode=$treenode;
1073
1074	# set size attributes
1075	$ltreenode->{ATTR}->{rows}=1; $ltreenode->{ATTR}->{cols}=$num;
1076	$ltreenode->{ATTR}->{min}=$lmin; $ltreenode->{ATTR}->{max}=$lmax;
1077
1078	# set some default layout attributes
1079	$ltreenode->{ATTR}->{maxlevel} = 6 if(!exists($ltreenode->{ATTR}->{maxlevel}));
1080	$ltreenode->{ATTR}->{showtitle} = "false" if(!exists($ltreenode->{ATTR}->{showtitle}));
1081	$ltreenode->{ATTR}->{highestrowfirst} = "true" if(!exists($ltreenode->{ATTR}->{highestrowfirst}));
1082	$ltreenode->{ATTR}->{showfulltitle} = "false" if(!exists($ltreenode->{ATTR}->{showfulltitle}));
1083	$lmin=$min;$lmax=$max;
1084
1085
1086	# Node
1087	######
1088	$streenode=$streenode->get_child({_name => "el5" });
1089
1090	# get number of midplanes (in el4 of scheme)
1091	if($streenode) {
1092	$min=$streenode->{ATTR}->{min};
1093	$max=$streenode->{ATTR}->{max};
1094	$num=$max-$min+1;
1095	} else {
1096	print STDERR "$0: ERROR: inconsistent scheme tree for BG system (nodeboards) ...\n";return(0);
1097	}
1098
1099	$treenode=$ltreenode->get_child({_name => "el4" });
1100	if(!$treenode) {
1101	$treenode=$ltreenode->new_child();
1102	}
1103	$ltreenode=$treenode;
1104
1105	# set size attributes
1106	$ltreenode->{ATTR}->{rows}=$num; $ltreenode->{ATTR}->{cols}=1;
1107	$ltreenode->{ATTR}->{min}=$lmin; $ltreenode->{ATTR}->{max}=$lmax;
1108
1109	# set some default layout attributes
1110	$ltreenode->{ATTR}->{maxlevel} = $maxlevel if(!exists($ltreenode->{ATTR}->{maxlevel}));
1111	$ltreenode->{ATTR}->{showtitle} = "false" if(!exists($ltreenode->{ATTR}->{showtitle}));
1112	$ltreenode->{ATTR}->{fontsize} = 8 if(!exists($ltreenode->{ATTR}->{fontsize}));
1113	$ltreenode->{ATTR}->{vgap} = 0 if(!exists($ltreenode->{ATTR}->{vgap}));
1114	$ltreenode->{ATTR}->{hgap} = 0 if(!exists($ltreenode->{ATTR}->{hgap}));
1115	$ltreenode->{ATTR}->{highestrowfirst} = "true" if(!exists($ltreenode->{ATTR}->{highestrowfirst}));
1116	$ltreenode->{ATTR}->{showfulltitle} = "false" if(!exists($ltreenode->{ATTR}->{showfulltitle}));
1117	$lmin=$min;$lmax=$max;
1118
1119	# cores
1120	#######
1121	$streenode=$streenode->get_child({_name => "el6" });
1122
1123	# get number of midplanes (in el6 of scheme)
1124	if($streenode) {
1125	$min=$streenode->{ATTR}->{min};
1126	$max=$streenode->{ATTR}->{max};
1127	$num=$max-$min+1;
1128	} else {
1129	print STDERR "$0: ERROR: inconsistent scheme tree for BG system (cores) ...\n";return(0);
1130	}
1131
1132	$treenode=$ltreenode->get_child({_name => "el5" });
1133	if(!$treenode) {
1134	$treenode=$ltreenode->new_child();
1135	}
1136	$ltreenode=$treenode;
1137
1138	# set size attributes
1139	$ltreenode->{ATTR}->{rows}=1; $ltreenode->{ATTR}->{cols}=12;
1140	$ltreenode->{ATTR}->{min}=$lmin; $ltreenode->{ATTR}->{max}=$lmax;
1141
1142	# set some default layout attributes
1143	$ltreenode->{ATTR}->{maxlevel} = $maxlevel if(!exists($ltreenode->{ATTR}->{maxlevel}));
1144	$lmin=$min;$lmax=$max;
1145
1146
1147	# print "$0: LAYOUT: ",Dumper($root_layout);
1148	# print "$0: SCHEME: ",Dumper($root_scheme);
1149
1150	return($rc);
1151	}
1152
1153
1154	###############################################
1155	# Cray XT related
1156	###############################################
1157	sub _get_system_size_crayxt {
1158	my($self) = shift;
1159	my($indataref) = $self->{INDATA};
1160	my($nodename,$pcol,$prow,$pcage,$pslot,$pnode);
1161	my($maxpcol,$maxprow,$maxpcage,$maxpslot,$maxpnode);
1162
1163	my ($key,$ref);
1164
1165	$maxpcol= $maxprow= $maxpcage= $maxpslot= $maxpnode= 0;
1166	keys(%{$self->{LMLFH}->{DATA}->{OBJECT}}); # reset iterator
1167	while(($key,$ref)=each(%{$self->{LMLFH}->{DATA}->{OBJECT}})) {
1168	next if($ref->{type} ne 'node');
1169	$nodename=$self->{LMLFH}->{DATA}->{OBJECT}->{$key}->{name};
1170	if($nodename=~/^c(\d+)-(\d+)c(\d+)s(\d+)n(\d+)$/) {
1171	($pcol,$prow,$pcage,$pslot,$pnode)=($1,$2,$3,$4,$5);
1172	} else {
1173	print "_get_system_size_crayxt: node name could not be parsed: $nodename\n";
1174	}
1175	$maxpcol=$pcol if($pcol>$maxpcol);
1176	$maxprow=$prow if($prow>$maxprow);
1177	$maxpcage=$pcage if($pcage>$maxpcage);
1178	$maxpslot=$pslot if($pslot>$maxpslot);
1179	$maxpnode=$pnode if($pnode>$maxpnode);
1180	}
1181
1182	printf("_get_system_size_crayxt: Cray XT system found of size: %dx%dx%d\n",
1183	$maxpcol+1,$maxprow+1,$maxpcage+1,$maxpslot+1,$maxpnode+1 ) if($self->{VERBOSE});
1184
1185	return($maxpcol,$maxprow,$maxpcage,$maxpslot,$maxpnode);
1186	}
1187
1188
1189	sub _init_trees_crayxt {
1190	my($self) = shift;
1191	my($maxpcol,$maxprow,$maxpcage,$maxpslot,$maxpnode)=@_;
1192	my($id,$subid,$treenode,$schemeroot,$bgsystem);
1193
1194	$schemeroot=$self->{SCHEMEROOT};
1195	$treenode=$schemeroot;
1196	$bgsystem=$treenode=$treenode->new_child();
1197	$treenode->add_attr({ tagname => 'col',
1198	min => 0,
1199	max => $maxpcol,
1200	mask => 'c%d-' });
1201
1202	$treenode=$treenode->new_child();
1203	$treenode->add_attr({ tagname => 'rack',
1204	min => 0,
1205	max => $maxprow,
1206	mask => '%01d' });
1207
1208	$treenode=$treenode->new_child();
1209	$treenode->add_attr({ tagname => 'cage',
1210	min => 0,
1211	max => $maxpcage,
1212	mask => 'c%01d' });
1213
1214	$treenode=$treenode->new_child();
1215	$treenode->add_attr({ tagname => 'blade',
1216	min => 0,
1217	max => $maxpslot,
1218	mask => 's%01d' });
1219
1220	$treenode=$treenode->new_child();
1221	$treenode->add_attr({ tagname => 'node',
1222	min => 0,
1223	max => $maxpnode,
1224	mask => 'n%01d' });
1225
1226	$treenode=$treenode->new_child();
1227	$treenode->add_attr({ tagname => 'core',
1228	min => 0,
1229	max => 11,
1230	mask => '-c%02d' });
1231
1232	return(1);
1233	}
1234
1235
893	1;	1236	1;

Lines 20-25 Link Here

(-)a/rms/org.eclipse.ptp.rm.lml.da/LML_combiner/LML_combine_obj.pl (+6 lines)
20	use LML_combine_file_obj;	20	use LML_combine_file_obj;
21	use LML_combine_obj_check;	21	use LML_combine_obj_check;
22	use LML_combine_obj_bgp;	22	use LML_combine_obj_bgp;
		23	use LML_combine_obj_xt;
23		24
24		25
25	my $patint="([\\+\\-\\d]+)"; # Pattern for Integer number	26	my $patint="([\\+\\-\\d]+)"; # Pattern for Integer number
Lines 89-99 Link Here
89	}	90	}
90	}	91	}
91		92
		93	print "system_type=$system_type\n";
92		94
93	if($system_type eq "BG/P") {	95	if($system_type eq "BG/P") {
94	&LML_combine_obj_bgp::update($filehandler->get_data_ref(),$opt_dbdir);	96	&LML_combine_obj_bgp::update($filehandler->get_data_ref(),$opt_dbdir);
95	}	97	}
96		98
		99	if($system_type eq "CRAYXT") {
		100	&LML_combine_obj_crayxt::update($filehandler->get_data_ref(),$opt_dbdir);
		101	}
		102
97	# check if Cluster is a PBS controlled Altix SMP Cluster	103	# check if Cluster is a PBS controlled Altix SMP Cluster
98	if($system_type eq "Cluster") {	104	if($system_type eq "Cluster") {
99	keys(%{$filehandler->{DATA}->{OBJECT}}); # reset iterator	105	keys(%{$filehandler->{DATA}->{OBJECT}}); # reset iterator

Added Link Here

(-)a/rms/org.eclipse.ptp.rm.lml.da/LML_combiner/LML_combine_obj_xt.pm (+203 lines)
1	#*******************************************************************************
2	#* Copyright (c) 2011 Forschungszentrum Juelich GmbH.
3	#* All rights reserved. This program and the accompanying materials
4	#* are made available under the terms of the Eclipse Public License v1.0
5	#* which accompanies this distribution, and is available at
6	#* http://www.eclipse.org/legal/epl-v10.html
7	#*
8	#* Contributors:
9	#* Wolfgang Frings (Forschungszentrum Juelich GmbH)
10	#*******************************************************************************/
11	package LML_combine_obj_crayxt;
12	use strict;
13	use Data::Dumper;
14
15	my($debug)=0;
16
17	my $patint="([\\+\\-\\d]+)"; # Pattern for Integer number
18	my $patfp ="([\\+\\-\\d.E]+)"; # Pattern for Floating Point number
19	my $patwrd="([\^\\s]+)"; # Pattern for Work (all noblank characters)
20	my $patbl ="\\s+"; # Pattern for blank space (variable length)
21
22	sub update {
23	my($dataptr) = shift;
24	my($dbdir) = shift;
25
26	my $nodemapref=&get_mapping_info($dataptr);
27
28	&update_node_info($dataptr,$nodemapref);
29
30	my $appmapref=&get_app_mapping_info($dataptr,$nodemapref);
31
32	&update_job_info($dataptr,$appmapref);
33	return(1);
34	}
35
36	# returns hash: NID -> nodename
37	sub get_mapping_info {
38	my($dataptr) = shift;
39	my($id,$nid,$nodename,%nodemap);
40
41	# scan for partition names
42	foreach $id (keys(%{$dataptr->{OBJECT}})) {
43	if($dataptr->{OBJECT}->{$id}->{type} eq "nodemap") {
44	$nid=$dataptr->{OBJECT}->{$id}->{name};
45	$nodename=$dataptr->{INFODATA}->{$id}->{name};
46	$nodemap{$nid}=$nodename;
47	delete($dataptr->{OBJECT}->{$id});
48	delete($dataptr->{INFO}->{$id});
49	delete($dataptr->{INFODATA}->{$id});
50	}
51	}
52	return(\%nodemap);
53	}
54
55	# returns hash: apid-> vnodelist
56	sub get_app_mapping_info {
57	my($dataptr) = shift;
58	my($nodemapref) = shift;
59	my($id,$apid,$nodename,%appmap,$numtasks);
60
61	# scan for partition names
62	foreach $id (keys(%{$dataptr->{OBJECT}})) {
63	if($dataptr->{OBJECT}->{$id}->{type} eq "node") {
64	next if(!(exists($dataptr->{INFODATA}->{$id}->{Apids})));
65	next if($dataptr->{INFODATA}->{$id}->{Apids} eq "-");
66	$apid=$dataptr->{INFODATA}->{$id}->{Apids}; # todo: more apid's possible?
67	$numtasks=1;
68	if(exists($dataptr->{INFODATA}->{$id}->{Pl})) {
69	$numtasks=$dataptr->{INFODATA}->{$id}->{Pl};
70	}
71	$appmap{$apid}.="(".$dataptr->{OBJECT}->{$id}->{name}.",$numtasks)";
72	}
73	}
74	return(\%appmap);
75	}
76
77
78	sub update_node_info {
79	my($dataptr) = shift;
80	my($nodemapref) = shift;
81	my($id,$nid,$noderef);
82
83	# update node info
84	foreach $id (keys(%{$dataptr->{OBJECT}})) {
85	if($dataptr->{OBJECT}->{$id}->{type} eq "node") {
86	$noderef=$dataptr->{INFODATA}->{$id};
87	$nid=$dataptr->{OBJECT}->{$id}->{name};
88	if(exists($nodemapref->{$nid})) {
89	$dataptr->{OBJECT}->{$id}->{name}=$nodemapref->{$nid};
90	} else {
91	print "update_node_info(Cray XT): warning unknown nid: '$nid'\n";
92	}
93
94	# update attribute: memory
95	my $memfactor=1;
96	if(exists($noderef->{PgSz})) {
97	if($noderef->{PgSz}=~/$patint[K]/) {
98	$memfactor=$1 / 1024.0; # --> MB
99	}
100	delete($noderef->{PgSz});
101	}
102	if(exists($noderef->{Conf})) {
103	$noderef->{physmem}=int($memfactor*$noderef->{Conf});
104	delete($noderef->{Conf});
105	}else {
106	$noderef->{physmem}="0";
107	}
108
109	if(exists($noderef->{Placed})) {
110	$noderef->{availmem}=$noderef->{physmem}-int($memfactor*$noderef->{Placed});
111	$noderef->{availmem}=int($memfactor*$noderef->{Placed});
112	delete($noderef->{Placed});
113	} else {
114	$noderef->{availmem}="0";
115	}
116
117	if(exists($noderef->{State})) {
118	$noderef->{state}="Running" if ($noderef->{State} eq "UP");
119	$noderef->{state}="Down" if ($noderef->{State} eq "DN");
120	delete($noderef->{State});
121	} else {
122	$noderef->{state}="Unknown";
123	}
124	}
125	}
126
127	return(1);
128	}
129
130
131	sub update_job_info {
132	my($dataptr) = shift;
133	my($appmapnodemapref) = shift;
134	my($id,$jobref,$apid,$batchid,%batchtoappid);
135
136	# scan for app
137	foreach $id (keys(%{$dataptr->{OBJECT}})) {
138	if($dataptr->{OBJECT}->{$id}->{type} eq "app") {
139	$apid=$dataptr->{INFODATA}->{$id}->{apid};
140	$batchid=$dataptr->{INFODATA}->{$id}->{batchid};
141	$batchtoappid{$batchid}=$apid;
142	delete($dataptr->{OBJECT}->{$id});
143	delete($dataptr->{INFO}->{$id});
144	delete($dataptr->{INFODATA}->{$id});
145	}
146	}
147	# update job info
148	foreach $id (keys(%{$dataptr->{OBJECT}})) {
149	if($dataptr->{OBJECT}->{$id}->{type} eq "job") {
150	$jobref=$dataptr->{INFODATA}->{$id};
151
152	# update nodelist
153	if($jobref->{state} ne "Running") {
154	if(!exists($jobref->{nodelist})) {
155	$jobref->{nodelist}="-";
156	$jobref->{totaltasks}=0;
157	}
158	if(!exists($jobref->{vnodelist})) {
159	$jobref->{vnodelist}="-";
160	}
161	}
162	# update totalcores
163	if(!exists($jobref->{totalcores})) {
164	print "update_job_info: could not find attributes for job $id to compute totalcores\n";
165	}
166
167	if($jobref->{state} eq "Running") {
168	$batchid=$dataptr->{OBJECT}->{$id}->{name};
169	$batchid=~s/\..*$//gs;
170	if(exists($batchtoappid{$batchid})) {
171	$apid=$batchtoappid{$batchid};
172	} else {
173	print "update_job_info: could not find apid for batch job '$batchid'\n";
174	}
175	if(exists($appmapnodemapref->{$apid})) {
176	$jobref->{vnodelist}=$appmapnodemapref->{$apid};
177	} else {
178	print "update_job_info: could not find nodelist for app '$apid' of batch job '$batchid'\n";
179	}
180	}
181	}
182	}
183	return(1);
184	}
185
186	sub update_class_info {
187	my($dataptr) = shift;
188	my($id,$class);
189	my(%classes);
190
191	# get class info
192	foreach $id (keys(%{$dataptr->{OBJECT}})) {
193	if($dataptr->{OBJECT}->{$id}->{type} eq "class") {
194	$class=$dataptr->{INFODATA}->{$id}->{name};
195	$classes{$class}{include}=$dataptr->{INFODATA}->{$id}->{crayxt_incl_bg};
196	$classes{$class}{exclude}=$dataptr->{INFODATA}->{$id}->{crayxt_excl_bg};
197	}
198	}
199
200	return(1);
201	}
202
203	1;

Lines 410-412 Link Here

(-)a/rms/org.eclipse.ptp.rm.lml.da/README.txt (+24 lines)
410	- persistent color management	410	- persistent color management
411	- color db will be stored in a file in the perm-directory	411	- color db will be stored in a file in the perm-directory
412	- first driver for PBSpro controlled systems	412	- first driver for PBSpro controlled systems
		413
		414	1.10:
		415	- bug fixes
		416
		417	1.11:
		418	- bug fixes
		419
		420	1.12:
		421	- bug fixes
		422
		423	1.13:
		424	- improved reporting: option -verbose control debug output on stderr
		425	full debugging report will written $tmpdir/report.log
		426	- improved support for PBS (vnodes)
		427	- bug fixes
		428
		429	1.14:
		430	- Improvements for testing and demonstration purpose
		431	- option -test: use existing workflow input in tmpdir
		432	- options specification file .LML_da_options
		433	- will be read if exists in current directory
		434	- will overwrite command line option
		435	- incoporated support for new RMS (GridEngine, PE)
		436	(contributed by others)

Lines 555-561 Link Here

(-)a/rms/org.eclipse.ptp.rm.lml.da/lib/LML_file_obj.pm (-2 / +4 lines)
555	sub write_lml {	555	sub write_lml {
556	my($self) = shift;	556	my($self) = shift;
557	my $outfile = shift;	557	my $outfile = shift;
558	my($k,$rc,$id,$c,$key,$ref);	558	my($k,$rc,$id,$c,$key,$ref,$t);
559	my $tstart=time;	559	my $tstart=time;
560	$rc=1;	560	$rc=1;
561		561
Lines 572-581 Link Here
572	printf(OUT "<objects>\n");	572	printf(OUT "<objects>\n");
573	foreach $id (sort keys %{$self->{DATA}->{OBJECT}}) {	573	foreach $id (sort keys %{$self->{DATA}->{OBJECT}}) {
574	printf(OUT "<object");	574	printf(OUT "<object");
		575	$t=0;
575	foreach $k (sort keys %{$self->{DATA}->{OBJECT}->{$id}}) {	576	foreach $k (sort keys %{$self->{DATA}->{OBJECT}->{$id}}) {
576	printf(OUT " %s=\"%s\"",$k,$self->{DATA}->{OBJECT}->{$id}->{$k});	577	printf(OUT " %s=\"%s\"",$k,$self->{DATA}->{OBJECT}->{$id}->{$k});$t=1;
577	}	578	}
578	printf(OUT "/>\n");	579	printf(OUT "/>\n");
		580	print "write_lml: WARNING object with id '$id' has no attributes\n" if($t==0);
579	}	581	}
580	printf(OUT "</objects>\n");	582	printf(OUT "</objects>\n");
581		583

Added Link Here

(-)a/rms/org.eclipse.ptp.rm.lml.da/rms/GridEngine/GEHelper.pm (+405 lines)
1	#!/usr/bin/perl -w
2	#*******************************************************************************
3	#* Copyright (c) 2011 University of Illinois and others. All rights reserved.
4	#* This program and the accompanying materials are made available under the
5	#* terms of the Eclipse Public License v1.0 which accompanies this distribution,
6	#* and is available at http://www.eclipse.org/legal/epl-v10.html
7	#*
8	#* Contributors:
9	#* Jeff Overbey (Illinois/NCSA) - Design and implementation
10	#*******************************************************************************
11
12	package GEHelper;
13
14	use strict;
15	use warnings;
16
17	use POSIX qw(ceil floor);
18
19	use Exporter;
20	our @ISA= qw( Exporter );
21	our @EXPORT_OK = qw( parsexml trimtext get_jobs get_job_nodes get_nodes should_group_nodes group_nodes MAX_CORES );
22	our @EXPORT = qw( get_jobs get_job_nodes get_nodes should_group_nodes group_nodes MAX_CORES );
23
24	use constant {
25	MAX_NODES => 64, # If the system has more nodes than this, nodes will be
26	# grouped so that LML displays one node per box rather
27	# than one core per box
28	MAX_CORES => 64, # If nodes are not grouped, this is the maximum number
29	# of cores that will be displayed for a single node
30	};
31
32	# The return value of get_nodes() is cached here to avoid re-executing qhost
33	my %cached_nodes = ();
34
35	my $cmd_jobinfo="/usr/bin/qstat";
36	$cmd_jobinfo=$ENV{"CMD_JOBINFO"} if($ENV{"CMD_JOBINFO"});
37
38	my $cmd_nodeinfo="/usr/bin/qhost";
39	$cmd_nodeinfo=$ENV{"CMD_NODEINFO"} if($ENV{"CMD_NODEINFO"});
40
41
42
43	###############################################################################
44	# get_jobs - Returns a hash containing information about jobs (from qstat)
45	###############################################################################
46	#
47	# The returned hash has job numbers as its keys and dictionaries of LML
48	# attributes as its values.
49	#
50	sub get_jobs {
51	my %qstat_xml = parsexml("$cmd_jobinfo -u '*' -s prsz -r -xml \|");
52	trimtext(\%qstat_xml);
53
54	my %jobs = ();
55
56	my @jobs_in_queue = @{$qstat_xml{queue_info}[0]{job_list}};
57	my @jobs_not_in_queue = @{$qstat_xml{job_info}[0]{job_list}};
58	for my $job (@jobs_in_queue, @jobs_not_in_queue) {
59	# The hash referenced by $job corresponds to an XML element like this:
60	# <job_list state="running">
61	# <JB_job_number>344911</JB_job_number>
62	# <JAT_prio>0.12923</JAT_prio>
63	# <JB_name>RF-38</JB_name>
64	# <JB_owner>tg458455</JB_owner>
65	# <state>r</state>
66	# <JAT_start_time>2011-11-29T03:21:14</JAT_start_time>
67	# <queue_name>normal@c327-104.ls4.tacc.utexas.edu</queue_name>
68	# <slots>24</slots>
69	# <full_job_name>RF-38</full_job_name>
70	# <requested_pe name="12way">24</requested_pe>
71	# <granted_pe name="12way">24</granted_pe>
72	# <hard_request name="h_rt" resource_contribution="0.000000">86400</hard_request>
73	# <hard_request name="mem_total" resource_contribution="0.000000">23.4G</hard_request>
74	# <hard_req_queue>normal</hard_req_queue>
75	# </job_list>
76	my $jobid = $job->{JB_job_number}[0]{_text};
77	$jobs{$jobid}{step} = $jobid;
78	$jobs{$jobid}{name} = $jobid; #$job->{JB_name}[0]{_text};
79	$jobs{$jobid}{owner} = $job->{JB_owner}[0]{_text};
80	$jobs{$jobid}{state} = $job->{_attrs}{state};
81	$jobs{$jobid}{totalcores} = $job->{slots}[0]{_text};
82	$jobs{$jobid}{queue} = $job->{queue_name}[0]{_text};
83	if ($job->{_attrs}{state} ne "running") {
84	$jobs{$jobid}{queuedate} = $job->{JB_submission_time}[0]{_text};
85	} else {
86	$jobs{$jobid}{dispatchdate} = $job->{JAT_start_time}[0]{_text};
87	}
88	$jobs{$jobid}{wall} = '-';
89	if (defined ($job->{hard_request})) {
90	for my $request (@{$job->{hard_request}}) {
91	if ($request->{_attrs}{name} eq 'h_rt') {
92	$jobs{$jobid}{wall} = $request->{_text};
93	}
94	}
95	}
96	}
97
98	return %jobs;
99	}
100
101
102
103	###############################################################################
104	# get_job_nodes - Returns a hash containing information about what nodes each
105	# job is running on (from qhost)
106	###############################################################################
107	#
108	# The returned hash has job numbers as its keys and a comma-separated list of
109	# node names as its values. Unfortunately, there is no information about what
110	# cores a job is assigned to on nodes with multiple cores.
111	#
112	sub get_job_nodes {
113	my %qhost_xml = parsexml("$cmd_nodeinfo -j -xml \|");
114	trimtext(\%qhost_xml);
115
116	my %job_hosts = ();
117	for my $host (@{$qhost_xml{host}}) {
118	# The hash referenced by $host corresponds to an XML element like
119	# <host name='c300-001.ls4.tacc.utexas.edu'>
120	# <hostvalue name='arch_string'>lx24-amd64</hostvalue>
121	# <hostvalue name='num_proc'>12</hostvalue>
122	# <hostvalue name='load_avg'>0.02</hostvalue>
123	# <hostvalue name='mem_total'>47.2G</hostvalue>
124	# <hostvalue name='mem_used'>892.5M</hostvalue>
125	# <hostvalue name='swap_total'>0.0</hostvalue>
126	# <hostvalue name='swap_used'>0.0</hostvalue>
127	# </host>
128	my $hostname = $host->{_attrs}{name};
129	$hostname =~ s/\..*//;
130	if (defined($host->{job})) {
131	for my $jobelt (@{$host->{job}}) {
132	# The hash referenced by $jobelt corresponds to an XML element like
133	# <job name='353538'>
134	# <jobvalue jobid='353538' name='priority'>'0.005689'</jobvalue>
135	# <jobvalue jobid='353538' name='qinstance_name'>grace@c300-003.ls4.tacc.utexas.edu</jobvalue>
136	# <jobvalue jobid='353538' name='job_name'>acc+att.2008-01</jobvalue>
137	# <jobvalue jobid='353538' name='job_owner'>byaa705</jobvalue>
138	# <jobvalue jobid='353538' name='job_state'>r</jobvalue>
139	# <jobvalue jobid='353538' name='start_time'>1322585173</jobvalue>
140	# <jobvalue jobid='353538' name='queue_name'>grace@c300-003.ls4.tacc.utexas.edu</jobvalue>
141	# <jobvalue jobid='353538' name='pe_master'>SLAVE</jobvalue>
142	# </job>
143	my $jobid = $jobelt->{_attrs}{name};
144	if (!defined($job_hosts{$jobid})) {
145	$job_hosts{$jobid} = {};
146	}
147	$job_hosts{$jobid}->{$hostname} = 1;
148	}
149	}
150	}
151
152	for my $jobid (keys %job_hosts) {
153	my $nodelist = '';
154	for my $node (keys %{$job_hosts{$jobid}}) {
155	$nodelist .= "$node,";
156	}
157	chop($nodelist);
158	$job_hosts{$jobid} = $nodelist;
159	}
160
161	return %job_hosts;
162	}
163
164
165
166	###############################################################################
167	# get_nodes - Returns a hash containing information about nodes (from qhost)
168	###############################################################################
169	#
170	# The returned hash has node names as its keys and dictionaries of LML
171	# attributes as its values.
172	#
173	sub get_nodes {
174	if (scalar keys %cached_nodes > 0) {
175	return %cached_nodes;
176	}
177
178	my %qhost_xml = parsexml("$cmd_nodeinfo -xml \|");
179	trimtext(\%qhost_xml);
180
181	my %nodes = ();
182	for my $host (@{$qhost_xml{host}}) {
183	# The hash referenced by $host corresponds to an XML element like
184	# <host name='c300-001.ls4.tacc.utexas.edu'>
185	# <hostvalue name='arch_string'>lx24-amd64</hostvalue>
186	# <hostvalue name='num_proc'>12</hostvalue>
187	# <hostvalue name='load_avg'>0.02</hostvalue>
188	# <hostvalue name='mem_total'>47.2G</hostvalue>
189	# <hostvalue name='mem_used'>892.5M</hostvalue>
190	# <hostvalue name='swap_total'>0.0</hostvalue>
191	# <hostvalue name='swap_used'>0.0</hostvalue>
192	# </host>
193
194	my $nodeid = $host->{_attrs}{name};
195	$nodeid =~ s/\..*//;
196
197	my %hostvalues = ();
198	for my $hostvalue (@{$host->{hostvalue}}) {
199	my $key = $hostvalue->{_attrs}{name};
200	my $value = $hostvalue->{_text};
201	$hostvalues{$key} = $value;
202	}
203
204	$nodes{$nodeid}{id} = $nodeid;
205
206	$nodes{$nodeid}{ntype} = $hostvalues{arch_string};
207
208	if (defined($hostvalues{num_proc})) {
209	my $ncores = $hostvalues{num_proc};
210	if ($ncores =~ /^[0-9]+$/) {
211	if ($ncores > MAX_CORES) {
212	$ncores = MAX_CORES;
213	} else {
214	$nodes{$nodeid}{ncores} = $ncores;
215	}
216	} else {
217	$nodes{$nodeid}{ncores} = 1;
218	}
219	}
220
221	$nodes{$nodeid}{physmem} = $hostvalues{mem_total};
222	}
223
224	%cached_nodes = %nodes;
225	return %nodes;
226	}
227
228
229
230	###############################################################################
231	# should_group_nodes - Returns true if nodes should be grouped in the LML
232	# display (for performance reasons)
233	###############################################################################
234	sub should_group_nodes {
235	my %nodes = get_nodes();
236	my $num_nodes = scalar keys %nodes;
237	return $num_nodes > MAX_NODES;
238	}
239
240
241
242	###############################################################################
243	# group_nodes - Places the system's nodes into groups such that there are no
244	# more than MAX_NODES groups.
245	###############################################################################
246	#
247	# Three values are returned:
248	# - A reference to a hash mapping node names to group names
249	# - A reference to a hash mapping node names to their 0-based indices in the group
250	# - The (maximum) number of nodes in each group
251	#
252	sub group_nodes {
253	my %nodes = get_nodes();
254	my @nodeids = sort(keys(%nodes));
255	my $num_nodes = $#nodeids + 1;
256
257	my %node_group = ();
258	my %node_index = ();
259	my $nodes_per_group = ceil($num_nodes / MAX_NODES);
260	if ($num_nodes <= MAX_NODES) {
261	%node_group = map { $_ => $_ } @nodeids;
262	%node_index = map { $_ => 0 } @nodeids;
263	} else {
264	my $nodenum = 0;
265	for my $nodeid (@nodeids) {
266	$node_group{$nodeid} = "Group" . floor($nodenum / $nodes_per_group);
267	$node_index{$nodeid} = $nodenum % $nodes_per_group;
268	$nodenum++;
269	}
270	}
271	return (\%node_group, \%node_index, $nodes_per_group);
272	}
273
274
275
276	###### (PRIVATE) ##############################################################
277	# parsexml - Parses the given XML file into a hash.
278	###############################################################################
279	#
280	# The hash is keyed by the names of child elements. It also contains
281	# the keys '_attrs' and '_text'.
282	#
283	# As an example, the XML file
284	# <?xml version='1.0'?>
285	# <aaa xxx="1">
286	# <bbb xxx="" yyy=" 2">This is child 1</bbb>
287	# <bbb>This is child 2
288	# <ccc/>
289	# </bbb>
290	# </aaa>
291	# is parsed into the hash
292	# { '_text' => '\n\n\n',
293	# '_attrs' => { 'xxx' => '1' },
294	# 'bbb' => [ { '_text' => 'This is child 1',
295	# '_attrs' => { 'xxx' => '',
296	# 'yyy' => ' 2' }
297	# },
298	# { '_text' => 'This is child 2\n \n ',
299	# '_attrs' => {},
300	# 'ccc' => [ { '_text' => '',
301	# '_attrs' => {} }
302	# ]
303	# }
304	# ]
305	# };
306	#
307	# This isn't fully general (e.g., it doesn't handle CDATA,
308	# and it assumes there won't be any child elements with the
309	# names '_attrs' or '_text') but it works for our purposes.
310	#
311	# Ideally, we could use XML::Simple and avoid this, except the
312	# TACC machines only have the XML::Parser module available.
313	sub parsexml {
314	my ($file) = @_;
315
316	use XML::Parser;
317
318	# When we encounter a start tag, we will push the hash
319	# for that XML element onto the stack.
320	my @stack = ();
321
322	my $parser = new XML::Parser(ErrorContext => 2);
323	$parser->setHandlers(
324	Start => sub {
325	my ($parser, $elt, %attrs) = @_;
326	# When we encounter an XML start tag, create a hash
327	# for that XML element and push it onto the stack.
328	my %element = ( _attrs => \%attrs, _text => '' );
329	push(@stack, \%element);
330	},
331	Char => sub {
332	my ($parser, $text) = @_;
333	# When we encounter text, append it to the _text
334	# for the current XML element.
335	my $topref = $stack[-1];
336	${$topref}{_text} .= $text;
337	},
338	End => sub {
339	my ($parser, $elt) = @_;
340	# When we encounter an XML end tag, pop that
341	# element's hash from the stack and mark it
342	# as a child of the parent element.
343	if ($#stack > 0) {
344	my $childref = pop(@stack);
345	my $parentref = $stack[-1];
346	if (not exists ${$parentref}{$elt}) {
347	${$parentref}{$elt} = [];
348	}
349	my $arrayref = @{$parentref}{$elt};
350	push(@{$arrayref}, $childref);
351	}
352	});
353	$parser->parsefile($file);
354	if ($#stack == -1) {
355	return undef;
356	} else {
357	return %{$stack[-1]};
358	}
359	}
360
361
362
363	###### (PRIVATE) ##############################################################
364	# trimtext - Traverses the a tree returned by parsexml, removing leading and
365	# trailing whitespace from all '_text' values.
366	###############################################################################
367	#
368	# As an example, when trimtext is applied to the example for parsexml above,
369	# the hash becomes the following:
370	# { '_text' => '',
371	# '_attrs' => { 'xxx' => '1' },
372	# 'bbb' => [ { '_text' => 'This is child 1',
373	# '_attrs' => { 'xxx' => '',
374	# 'yyy' => ' 2' }
375	# },
376	# { '_text' => 'This is child 2',
377	# '_attrs' => {},
378	# 'ccc' => [ { '_text' => '',
379	# '_attrs' => {} }
380	# ]
381	# }
382	# ]
383	# };
384	#
385	# Note that only the '_text' values are trimmed. The attribute values (e.g.,
386	# for 'yyy') are not trimmed.
387	#
388	sub trimtext {
389	my ($xml) = @_;
390	for my $key (keys %{$xml}) {
391	my $val = $xml->{$key};
392	if ($key eq '_text') {
393	$xml->{_text} =~ s/^\s+//;
394	$xml->{_text} =~ s/\s+$//;
395	} elsif (ref($val) eq "ARRAY") {
396	for my $elt (@{$val}) {
397	trimtext($elt);
398	}
399	} elsif (ref($val) eq "HASH") {
400	trimtext($val);
401	}
402	}
403	return $xml;
404	}
405

Lines 11-86 Link Here

(-)a/rms/org.eclipse.ptp.rm.lml.da/rms/LL/da_check_info_LML.pl (-41 / +48 lines)
11	#*******************************************************************************/	11	#*******************************************************************************/
12	use strict;	12	use strict;
13		13
14	sub check_rms {	14	sub check_rms_LL {
15	my($rmsref,$cmdsref,$verbose)=@_;	15	my($rmsref,$cmdsref,$verbose)=@_;
16	my($key,$cmd);	16	my($key,$cmd);
17	my $rc=0;	17	my $rc=1;
18		18
19	my %cmdname=(	19	my %cmdname=(
20	"job" => "llq",	20	"job" => "llq",
21	"node" => "llstatus",	21	"node" => "llstatus",
22	);	22	);
23	my %cmdpath=(	23	my %cmdpath=(
24	"job" => "/usr/bin/llq",	24	"job" => "/usr/bin/llq",
25	"node" => "/usr/bin/llstatus",	25	"node" => "/usr/bin/llstatus",
26	);	26	);
27		27
28	foreach $key (keys(%cmdname)) {	28	foreach $key (keys(%cmdname)) {
29	# check for job query cmd	29	# check for job query cmd
30	if (exists($cmdsref->{"cmd_${key}info"})) {	30	if (exists($cmdsref->{"cmd_${key}info"})) {
31	$cmd=$cmdsref->{"cmd_${key}info"};	31	$cmd=$cmdsref->{"cmd_${key}info"};
32	} else {
33	$cmd=$cmdpath{$key};
34	}
35	if (!-f $cmd) {
36	my $cmdpath=`which $cmdname{$key} 2>/dev/null`; # last try: which
37	if (!$?) {
38	chomp($cmdpath);
39	$cmd=$cmdpath;
40	print STDERR "$0: check_rms: found $cmdname{$key} by which ($cmd)\n" if ($verbose);
41	} else {
42	last;
43	}
44	}
45	if (-f $cmd) {
46	$cmdsref->{"cmd_${key}info"}=$cmd;
47	$rc=1;
48	}
49	}
50
51	if ($rc) {
52	$$rmsref="LL";
53	} else {	32	} else {
54	print STDERR "$0: check_rms: seems not to be a LL system\n" if ($verbose);	33	$cmd=$cmdpath{$key};
55	}	34	}
		35	if (!-f $cmd) {
		36	my $cmdpath=`which $cmdname{$key} 2>/dev/null`; # last try: which
		37	if (!$?) {
		38	chomp($cmdpath);
		39	$cmd=$cmdpath;
		40	&report_if_verbose("%s","$0: check_rms_LL: found $cmdname{$key} by which ($cmd)\n");
		41	}
		42	}
		43	if (-f $cmd) {
		44	$cmdsref->{"cmd_${key}info"}=$cmd;
		45	} else {
		46	&report_if_verbose("%s","$0: check_rms_LL: no cmd found for $cmdname{$key}\n");
		47	$rc=0;
		48	}
56		49
		50	}
		51
		52	if ($rc==1) {
		53	$$rmsref="LL";
		54	&report_if_verbose("%s%s%s", "$0: check_rms_LL: found LL commands (",
		55	join(",",(values(%{$cmdsref}))),
		56	")\n");
		57	} else {
		58	&report_if_verbose("%s","$0: check_rms_LL: seems not to be a LL system\n");
		59	}
		60
57	return $rc;	61	return $rc;
58	}	62	}
59		63
60	sub generate_step_rms {	64	sub generate_step_rms_LL {
61	my($workflowxml, $laststep, $cmdsref)=@_;	65	my($workflowxml, $laststep, $cmdsref)=@_;
62	my($step,$envs,$key,$ukey);	66	my($step,$envs,$key,$ukey);
63		67
64	$envs="";	68	$envs="";
65	foreach $key (keys(%{$cmdsref})) {	69	foreach $key (keys(%{$cmdsref})) {
66	$ukey=uc($key);	70	$ukey=uc($key);
67	$envs.="$ukey=$cmdsref->{$key} ";	71	$envs.="$ukey=$cmdsref->{$key} ";
68	}	72	}
69		73
70	$step="getdata";	74	$step="getdata";
71	&add_exec_step_to_workflow($workflowxml,$step, $laststep,	75	&add_exec_step_to_workflow($workflowxml,$step, $laststep,
72	"$envs $^X rms/LL/da_system_info_LML.pl \$tmpdir/sysinfo_LML.xml",	76	"$envs $^X rms/LL/da_system_info_LML.pl \$tmpdir/sysinfo_LML.xml",
73	"$envs $^X rms/LL/da_nodes_info_LML.pl \$tmpdir/nodes_LML.xml",	77	"$envs $^X rms/LL/da_nodes_info_LML.pl \$tmpdir/nodes_LML.xml",
74	"$envs $^X rms/LL/da_jobs_info_LML.pl \$tmpdir/jobs_LML.xml");	78	"$envs $^X rms/LL/da_jobs_info_LML.pl \$tmpdir/jobs_LML.xml");
75	$laststep=$step;	79	$laststep=$step;
76		80
77	$step="combineLML";	81	$step="combineLML";
78	&add_exec_step_to_workflow($workflowxml,$step, $laststep,	82	&add_exec_step_to_workflow($workflowxml,$step, $laststep,
79	"$^X \$instdir/LML_combiner/LML_combine_obj.pl -v -o \$stepoutfile ".	83	"$^X \$instdir/LML_combiner/LML_combine_obj.pl -v -o \$stepoutfile ".
80	"\$tmpdir/sysinfo_LML.xml \$tmpdir/jobs_LML.xml \$tmpdir/nodes_LML.xml");	84	"\$tmpdir/sysinfo_LML.xml \$tmpdir/jobs_LML.xml \$tmpdir/nodes_LML.xml");
81	$laststep=$step;	85	$laststep=$step;
82		86
83	return($laststep);	87	return($laststep);
84	}	88	}
85		89
86	1;	90	$main::check_functions->{LL} =\&check_rms_LL;
		91	$main::generate_functions->{LL}=\&generate_step_rms_LL;
		92
		93	1;

Lines 11-20 Link Here

(-)a/rms/org.eclipse.ptp.rm.lml.da/rms/OPENMPI/da_check_info_LML.pl (-46 / +53 lines)
11	#*******************************************************************************/	11	#*******************************************************************************/
12	use strict;	12	use strict;
13		13
14	sub check_rms {	14	sub check_rms_OPENMPI {
15	my($rmsref,$cmdsref,$verbose)=@_;	15	my($rmsref,$cmdsref,$verbose)=@_;
16	my($key,$infocmd,$cmd);	16	my($key,$infocmd,$cmd);
17	my $rc=0;	17	my $rc=1;
18		18
19	my %cmdname=(	19	my %cmdname=(
20	"job" => "orte-ps",	20	"job" => "orte-ps",
Lines 32-103 Link Here
32		32
33	# first: check if ompi_info is given by request info	33	# first: check if ompi_info is given by request info
34	if (exists($cmdsref->{"cmd_sysinfo"})) {	34	if (exists($cmdsref->{"cmd_sysinfo"})) {
35	if (-f $cmdsref->{"cmd_sysinfo"}) {	35	if (-f $cmdsref->{"cmd_sysinfo"}) {
36	$infocmd=$cmdsref->{"cmd_sysinfo"}." --path bindir";	36	$infocmd=$cmdsref->{"cmd_sysinfo"}." --path bindir";
37	}	37	}
38	}	38	}
39		39
40	# second: check if ompi_info is given in PATH	40	# second: check if ompi_info is given in PATH
41	if (!$infocmd) {	41	if (!$infocmd) {
42	my $cmdpath=`which $cmdname{sys} 2>/dev/null`;	42	my $cmdpath=`which $cmdname{sys} 2>/dev/null`;
43	if(!$?) {	43	if(!$?) {
44	chomp($cmdpath);	44	chomp($cmdpath);
45	$infocmd=$cmdpath." --path bindir";	45	$infocmd=$cmdpath." --path bindir";
46	}	46	}
47	}	47	}
48		48
49	# second: check if ompi_info is given in default path	49	# second: check if ompi_info is given in default path
50	if (!$infocmd) {	50	if (!$infocmd) {
51	my $cmdpath=$cmdpath{sys};	51	my $cmdpath=$cmdpath{sys};
52	if (!-f $cmdpath) {	52	if (!-f $cmdpath) {
53	$infocmd=$cmdpath." --path bindir";	53	$infocmd=$cmdpath." --path bindir";
54	}	54	}
55	}	55	}
56		56
57	# return if no ompi_info found	57	# return if no ompi_info found
58	if (!$infocmd) {	58	if (!$infocmd) {
59	return($rc);	59	return($rc);
60	}	60	}
61		61
62	# get openmpi bindir	62	# get openmpi bindir
63	my $bindir=`$infocmd`;	63	my $bindir=`$infocmd`;
64	chomp($bindir);	64	chomp($bindir);
65	$bindir=~s/^Bindir:\s*//gs;	65	$bindir=~s/^Bindir:\s*//gs;
66		66
67	foreach $key (keys(%cmdname)) {	67	foreach $key (keys(%cmdname)) {
68	$cmdpath{$key}=$bindir."/".$cmdname{$key};	68	$cmdpath{$key}=$bindir."/".$cmdname{$key};
69		69
70	if (exists($cmdsref->{"cmd_${key}info"})) {	70	if (exists($cmdsref->{"cmd_${key}info"})) {
71	$cmd=$cmdsref->{"cmd_${key}info"};	71	$cmd=$cmdsref->{"cmd_${key}info"};
72	} else {	72	} else {
73	$cmd=$cmdpath{$key};	73	$cmd=$cmdpath{$key};
74	}	74	}
75	if (! -f $cmd) {	75	if (! -f $cmd) {
76	my $cmdpath=`which $cmdname{$key} 2>/dev/null`; # last try: which	76	my $cmdpath=`which $cmdname{$key} 2>/dev/null`; # last try: which
77	if(!$?) {	77	if(!$?) {
78	chomp($cmdpath);	78	chomp($cmdpath);
79	$cmd=$cmdpath;	79	$cmd=$cmdpath;
80	print STDERR "$0: check_rms: found $cmdname{$key} by which ($cmd)\n" if($verbose);	80	&report_if_verbose("%s","$0: check_rms_OPENMPI: found $cmdname{$key} by which ($cmd)\n");
81	} else {	81	}
82	last;	82	}
83	}	83	if (-f $cmd) {
84	}	84	$cmdsref->{"cmd_${key}info"}=$cmd;
85	if (-f $cmd) {	85	} else {
86	$cmdsref->{"cmd_${key}info"}=$cmd;	86	&report_if_verbose("%s","$0: check_rms_OPENMPI: no cmd found for $cmdname{$key}\n");
87	$rc=1;	87	$rc=0;
88	}	88	}
89	}	89	}
90	if ($rc) {	90	if ($rc) {
91	$$rmsref="OPENMPI";	91	$$rmsref="OPENMPI";
		92	&report_if_verbose("%s%s%s", "$0: check_rms_OPENMPI: found OPENMPI commands (",
		93	join(",",(values(%{$cmdsref}))),
		94	")\n");
92	} else {	95	} else {
93	print STDERR "$0: check_rms: seems not to be a OpenMPI system\n" if($verbose);	96	&report_if_verbose("%s","$0: check_rms_OPENMPI: seems not to be a OPENMPI system\n");
94	}	97	}
95		98
96	return($rc);	99	return($rc);
97	}	100	}
98		101
99		102
100	sub generate_step_rms {	103	sub generate_step_rms_OPENMPI {
101	my($workflowxml, $laststep, $cmdsref)=@_;	104	my($workflowxml, $laststep, $cmdsref)=@_;
102	my($step,$envs,$key,$ukey);	105	my($step,$envs,$key,$ukey);
103		106
Lines 122-125 Link Here
122	return($laststep);	125	return($laststep);
123	}	126	}
124		127
125	1;	128	$main::check_functions->{OPENMPI} =\&check_rms_OPENMPI;
		129	$main::generate_functions->{OPENMPI}=\&generate_step_rms_OPENMPI;
		130
		131
		132	1;

Lines 73-96 Link Here

(-)a/rms/org.eclipse.ptp.rm.lml.da/rms/OPENMPI/da_jobs_info_LML.pl (-18 / +7 lines)
73	my $cmd="orte-ps";	73	my $cmd="orte-ps";
74	$cmd=$ENV{"CMD_JOBINFO"} if($ENV{"CMD_JOBINFO"});	74	$cmd=$ENV{"CMD_JOBINFO"} if($ENV{"CMD_JOBINFO"});
75		75
76	if(open(IN,"$cmd -n -v 2>&1 \|")) {	76	if(open(IN,"$cmd -n \|")) {
77	my $firstrankpid=undef;	77	my $firstrankpid=undef;
78	$jobid="-";	78	$jobid="-";
79	while($line=<IN>) {	79	while($line=<IN>) {
80	chomp($line);	80	chomp($line);
81	if ($line=~/Gathering Information for HNP: \[\[$patint,$patint\],$patint\]:$patint/) {	81	if($line=~/Information from $patwrd \[$patint,$patint\]$/) {
82	my($vpid,$pid)=($1,$4);	82	my($call,$pid,$num)=($1,$2,$3);
83	$jobid=$pid;	83	print "found job $pid\n";
		84	$jobid=$pid;
84	$jobs{$jobid}{step}=$jobid;	85	$jobs{$jobid}{step}=$jobid;
85	print "found job $pid with vpid $vpid\n";
86	#
87	# Disable until ompi-ps is fixed
88	#
89	# } elsif($line=~/Information from $patwrd \[$patint,$patint\]$/) {
90	# my($call,$vpid,$num)=($1,$2,$3);
91	# print "found vpid $vpid\n";
92	# $jobid=$pid;
93	# $jobs{$jobid}{step}=$jobid;
94	} elsif($line=~/^\s*Node Name \\|/) {	86	} elsif($line=~/^\s*Node Name \\|/) {
95	# scan node table	87	# scan node table
96	print "line 1: $line\n";	88	print "line 1: $line\n";
Lines 121-128 Link Here
121	if($line=~/^\s\[$patint,$patint\]\s\\|\s$patwrd\s\\|\s$patwrd\s\\|\s$patwrd\s\\|/) {	113	if($line=~/^\s\[$patint,$patint\]\s\\|\s$patwrd\s\\|\s$patwrd\s\\|\s$patwrd\s\\|/) {
122	my($ppid,$num,$state,$slots,$numproc)=($1,$2,$3,$4,$5);	114	my($ppid,$num,$state,$slots,$numproc)=($1,$2,$3,$4,$5);
123	print "found joblist $ppid,$num,$state,$slots,$numproc\n";	115	print "found joblist $ppid,$num,$state,$slots,$numproc\n";
124	# $jobs{$jobid}{id} = $ppid;	116	$jobs{$jobid}{id} = $ppid;
125	$jobs{$jobid}{id} = $jobid;
126	$jobs{$jobid}{totaltasks} = $numproc;	117	$jobs{$jobid}{totaltasks} = $numproc;
127	$jobs{$jobid}{job_state} = $state;	118	$jobs{$jobid}{job_state} = $state;
128	$line=<IN>;	119	$line=<IN>;
Lines 174-182 Link Here
174	$nodes{$nodeid}{id} = $nodeid;	165	$nodes{$nodeid}{id} = $nodeid;
175	$nodes{$nodeid}{arch} = `uname -p`;	166	$nodes{$nodeid}{arch} = `uname -p`;
176	$nodes{$nodeid}{state} = "Up";	167	$nodes{$nodeid}{state} = "Up";
177	if (-e '/proc/cpuinfo') {	168	$nodes{$nodeid}{slots} = `grep family /proc/cpuinfo \| wc -l`;
178	$nodes{$nodeid}{slots} = `grep family /proc/cpuinfo \| wc -l`;
179	}
180	foreach $key (keys(%{$nodes{$nodeid}})) {	169	foreach $key (keys(%{$nodes{$nodeid}})) {
181	chomp($nodes{$nodeid}{$key});	170	chomp($nodes{$nodeid}{$key});
182	}	171	}

Lines 56-62 Link Here

(-)a/rms/org.eclipse.ptp.rm.lml.da/rms/PBS/da_jobs_info_LML.pl (-16 / +49 lines)
56	"Resource_List.depend" => "dependency",	56	"Resource_List.depend" => "dependency",
57	"Resource_List.mem" => "",	57	"Resource_List.mem" => "",
58	"Resource_List.nodect" => "",	58	"Resource_List.nodect" => "",
59	"Resource_List.nodes" => "totalcores",
60	"Resource_List.pmem" => "",	59	"Resource_List.pmem" => "",
61	"Resource_List.walltime" => "wall",	60	"Resource_List.walltime" => "wall",
62	"Shell_Path_List" => "",	61	"Shell_Path_List" => "",
Lines 71-77 Link Here
71	"fault_tolerant" => "",	70	"fault_tolerant" => "",
72	"interactive" => "",	71	"interactive" => "",
73	"job_state" => "state",	72	"job_state" => "state",
74	"mtime" => "",	73	"mtime" => "dispatchdate",
75	"qtime" => "queuedate",	74	"qtime" => "queuedate",
76	"queue" => "queue",	75	"queue" => "queue",
77	"resources_used.cput" => "",	76	"resources_used.cput" => "",
Lines 81-91 Link Here
81	"server" => "",	80	"server" => "",
82	"session_id" => "",	81	"session_id" => "",
83	"start_count" => "",	82	"start_count" => "",
84	"start_time" => "dispatchdate",	83	"start_time" => "",
85	"submit_args" => "",	84	"submit_args" => "",
86		85
87	"step" => "step",	86	"step" => "step",
88	"totaltasks" => "totaltasks",	87	"totaltasks" => "totaltasks",
		88	"totalcores" => "totalcores",
89	"spec" => "spec",	89	"spec" => "spec",
90		90
91	"status" => "status",	91	"status" => "status",
Lines 110-118 Link Here
110	"resources_used.ncpus" => "",	110	"resources_used.ncpus" => "",
111	"stime" => "",	111	"stime" => "",
112	"substate" => "",	112	"substate" => "",
113		113
114	# unknown attributes	114	# unknown attributes
115	"group" => "group",	115	"group" => "group",
		116	"Account_Name" => "",
		117	"Exit_status" => "",
		118	"Resource_List.Qlist" => "",
		119	"estimated.exec_vnode" => "",
		120	"estimated.start_time" => "",
		121	"Resource_List.nodes" => "",
		122	"argument_list" => "",
		123	"array" => "",
		124	"array_indices_remaining" => "",
		125	"array_indices_submitted" => "",
		126	"array_state_count" => "",
		127	"executable" => "",
		128	"group_list" => "",
		129	"umask" => "",
116	);	130	);
117		131
118	my $cmd="/usr/bin/qstat";	132	my $cmd="/usr/bin/qstat";
Lines 121-127 Link Here
121	open(IN,"$cmd -f \|");	135	open(IN,"$cmd -f \|");
122	my $jobid="-";	136	my $jobid="-";
123	my $lastkey="-";	137	my $lastkey="-";
124
125		138
126	while($line=<IN>) {	139	while($line=<IN>) {
127	chomp($line);	140	chomp($line);
Lines 145-155 Link Here
145	foreach $jobid (sort(keys(%jobs))) {	158	foreach $jobid (sort(keys(%jobs))) {
146	$jobs{$jobid}{group} = "unknown" if(!exists($jobs{$jobid}{group}));	159	$jobs{$jobid}{group} = "unknown" if(!exists($jobs{$jobid}{group}));
147	$jobs{$jobid}{exec_host} = "-" if(!exists($jobs{$jobid}{exec_host}));	160	$jobs{$jobid}{exec_host} = "-" if(!exists($jobs{$jobid}{exec_host}));
148	$jobs{$jobid}{totaltasks} = $jobs{$jobid}{"Resource_List.nodes"} if(!exists($jobs{$jobid}{totaltasks}));	161	if(!exists($jobs{$jobid}{totaltasks})) {
149	$jobs{$jobid}{spec} = $jobs{$jobid}{"Resource_List.nodes"} if(!exists($jobs{$jobid}{spec}));	162	$jobs{$jobid}{totaltasks} = $jobs{$jobid}{"Resource_List.nodes"} if(exists($jobs{$jobid}{"Resource_List.nodes"}));
		163	$jobs{$jobid}{totaltasks} = $jobs{$jobid}{"Resource_List.ncpus"} if(exists($jobs{$jobid}{"Resource_List.ncpus"}));
		164	}
		165	if(!exists($jobs{$jobid}{spec})) {
		166	$jobs{$jobid}{spec} = $jobs{$jobid}{"Resource_List.nodes"} if(!exists($jobs{$jobid}{"Resource_List.nodes"}));
		167	$jobs{$jobid}{spec} = $jobs{$jobid}{"Resource_List.ncpus"} if(!exists($jobs{$jobid}{"Resource_List.ncpus"}));
		168
		169	}
150	# check state	170	# check state
151	($jobs{$jobid}{status},$jobs{$jobid}{detailedstatus}) = &get_state($jobs{$jobid}{job_state},	171	($jobs{$jobid}{status},$jobs{$jobid}{detailedstatus}) = &get_state($jobs{$jobid}{job_state},
152	$jobs{$jobid}{Hold_Types});	172	$jobs{$jobid}{Hold_Types});
		173	$jobs{$jobid}{"totalcores"}=$jobs{$jobid}{"totaltasks"} if(!exists($jobs{$jobid}{"totalcores"}));
153	}	174	}
154		175
155	open(OUT,"> $filename") \|\| die "cannot open file $filename";	176	open(OUT,"> $filename") \|\| die "cannot open file $filename";
Lines 274-296 Link Here
274		295
275	if($mkey eq "vnodelist") {	296	if($mkey eq "vnodelist") {
276	if($ret ne "-") {	297	if($ret ne "-") {
		298	# my $save=$ret;
		299	$ret=~s/\(//gs;$ret=~s/\)//gs;
277	my @nodes = split(/\+/,$ret);	300	my @nodes = split(/\+/,$ret);
278	my ($c,$nd,$num);	301	my ($c,$nd,$num,$rest);
279	for($c=0;$c<$#nodes;$c++) {	302	for($c=0;$c<=$#nodes;$c++) {
280	if($nodes[$c]=~/([^\(\)\:]+)\:.*ncpus=(\d+)/s) {	303	# get nodename
281	$nd=$1;$num=$2;	304	if($nodes[$c]=~/^([^\:]+)\:(.*)$/s) {
		305	($nd,$rest)=($1,$2);
		306	# get number of procs
		307	if($rest=~/ncpus=(\d+)/) {
		308	$num=$1;
		309	} elsif($rest=~/mpiprocs=(\d+)/) {
		310	$num=$1;
		311	} else {
		312	# default: 1 core
		313	$num=1;
		314	}
282	$nodes[$c]="$nd,$num";	315	$nodes[$c]="$nd,$num";
283	} elsif($nodes[$c]=~/([^\(\)\:]+)\:.*mpiprocs=(\d+)/s) {	316	} elsif($nodes[$c]=~/^([^\:]+)$/s) {
284	$nd=$1;$num=$2;	317	$nd=$1;
285	$nodes[$c]="$nd,$num";	318	$num=1;
286	} elsif($nodes[$c]=~/([^\(\)\:]+)/s) {
287	$nd=$1;$num=1;
288	$nodes[$c]="$nd,$num";	319	$nodes[$c]="$nd,$num";
289	} else {	320	} else {
290	print STDERR "Error in job node list: $nodes[$c]\n";	321	print STDERR "Error in job node list: $nodes[$c]\n";
		322	$nodes[$c]="unknown,0";
291	}	323	}
292	}	324	}
293	$ret="(".join(')(',@nodes).")";	325	$ret="(".join(')(',@nodes).")";
		326	# print "$save -> $ret\n";
294	}	327	}
295	}	328	}
296		329

Lines 11-20 Link Here

(-)a/rms/org.eclipse.ptp.rm.lml.da/rms/TORQUE/da_check_info_LML.pl (-15 / +21 lines)
11	#*******************************************************************************/	11	#*******************************************************************************/
12	use strict;	12	use strict;
13		13
14	sub check_rms {	14	sub check_rms_TORQUE {
15	my($rmsref,$cmdsref,$verbose)=@_;	15	my($rmsref,$cmdsref,$verbose)=@_;
16	my($key, $cmd);	16	my($key, $cmd);
17	my $rc=0;	17	my $rc=1;
18		18
19	my %cmdname=(	19	my %cmdname=(
20	"job" => "qstat",	20	"job" => "qstat",
Lines 38-51 Link Here
38	if (!$?) {	38	if (!$?) {
39	chomp($cmdpath);	39	chomp($cmdpath);
40	$cmd=$cmdpath;	40	$cmd=$cmdpath;
41	print STDERR "$0: check_rms: found $cmdname{$key} by which ($cmd)\n" if($verbose);	41	&report_if_verbose("%s","$0: check_rms_TORQUE: found $cmdname{$key} by which ($cmd)\n");
42	} else {	42	}
43	last;
44	}
45	}	43	}
46	if (-f $cmd) {	44	if (-f $cmd) {
47	$cmdsref->{"cmd_${key}info"}=$cmd;	45	$cmdsref->{"cmd_${key}info"}=$cmd;
48	$rc=1;	46	} else {
		47	&report_if_verbose("%s","$0: check_rms_TORQUE: no cmd found for $cmdname{$key}\n");
		48	$rc=0;
49	}	49	}
50	}	50	}
51		51
Lines 55-79 Link Here
55	my $cmdversion=`$cmd 2>/dev/null`;	55	my $cmdversion=`$cmd 2>/dev/null`;
56	chomp($cmdversion);	56	chomp($cmdversion);
57	if ($cmdversion=~/version/) {	57	if ($cmdversion=~/version/) {
58	if ($cmdversion=~/PBSPro/) {	58	if ($cmdversion=~/PBSPro/) {
59	print STDERR "$0: check_rms: PBSpro found\n" if($verbose);	59	&report_if_verbose("%s","$0: check_rms_TORQUE: PBSpro found\n");
60	$rc=0;	60	$rc=0;
61	}	61	}
62	} else {	62	} else {
63	print STDERR "$0: check_rms: could not obtain version info from command $cmd\n" if($verbose);	63	&report_if_verbose("%s","$0: check_rms_TORQUE: could not obtain version info from command $cmd\n");
64	}	64	}
65	}	65	}
66		66
67	if ($rc) {	67	if ($rc==1) {
68	$$rmsref = "TORQUE";	68	$$rmsref = "TORQUE";
		69	&report_if_verbose("%s%s%s", "$0: check_rms_TORQUE: found TORQUE commands (",
		70	join(",",(values(%{$cmdsref}))),
		71	")\n");
69	} else {	72	} else {
70	print STDERR "$0: check_rms: seems not to be a torque system\n" if($verbose);	73	&report_if_verbose("%s","$0: check_rms_TORQUE: seems not to be a TORQUE system\n");
71	}	74	}
72		75
73	return($rc);	76	return($rc);
74	}	77	}
75		78
76	sub generate_step_rms_torque {	79	sub generate_step_rms_TORQUE {
77	my($workflowxml, $laststep, $cmdsref)=@_;	80	my($workflowxml, $laststep, $cmdsref)=@_;
78	my($step,$envs,$key,$ukey);	81	my($step,$envs,$key,$ukey);
79		82
Lines 99-102 Link Here
99		102
100	}	103	}
101		104
102	1;	105	$main::check_functions->{TORQUE} =\&check_rms_TORQUE;
		106	$main::generate_functions->{TORQUE}=\&generate_step_rms_TORQUE;
		107
		108	1;

Added Link Here

(-)a/rms/org.eclipse.ptp.rm.lml.ui/src/org/eclipse/ptp/rm/lml/ui/providers/FilterDataRow.java (+300 lines)
1	package org.eclipse.ptp.rm.lml.ui.providers;
2
3	import org.eclipse.swt.widgets.Button;
4	import org.eclipse.swt.widgets.Combo;
5	import org.eclipse.swt.widgets.Text;
6
7	/**
8	* This class contains all the information about a row in the FilterDialog.
9	*
10	* For every active column (with exception) in a table one object of this class
11	* should be generated.
12	*/
13	public class FilterDataRow {
14
15	// Type of the data displayed in the column
16	private String type;
17
18	// To activate the filter function for this row
19	private final Button checkbox;
20
21	// To active a relation; only for the types numeric and date
22	private Button radioButoonRelation;
23
24	// To active a range; only for the types numeric and date
25	private Button radioButtonRange;
26
27	// The value for comparison, only for type alpha
28	private Text valueAlpha;
29
30	// The operator how to compare a value of the input with an given value; only for the type numeric and date
31	private Combo relationComboNumericDate;
32
33	// The value for comparison; only for the type numeric
34	private Text valueNumeric;
35
36	// The value for comparison; only for the type date
37	private Button valueDate;
38
39	// The minimal value in a range; only for the type numeric
40	private Text minValueNumeric;
41
42	// The maximal value in a range; only for the type numeric
43	private Text maxValueNumeric;
44
45	// The minimal value in a range; only for the type date
46	private Button minValueDate;
47
48	// The maximal value in a range; only for the type date
49	private Button maxValueDate;
50
51	// The value for comparison; only for the type alpha
52	private Combo relationComboAlpha;
53
54	/**
55	* Constructor.
56	*
57	* @param type
58	* @param checkbox
59	*/
60	public FilterDataRow(String type, Button checkbox) {
61	this.type = type;
62	this.checkbox = checkbox;
63	if (type == null) {
64	this.type = "alpha";
65	}
66	}
67
68	/**
69	* Adding a input button for the maximal value (date).
70	*
71	* @param value
72	*/
73	public void addMaxValueDate(Button value) {
74	maxValueDate = value;
75	}
76
77	/**
78	* Adding a input text for the maximal value (numeric).
79	*
80	* @param value
81	*/
82	public void addMaxValueNumeric(Text value) {
83	maxValueNumeric = value;
84	}
85
86	/**
87	* Adding a input button for the minimal value (date).
88	*
89	* @param value
90	*/
91	public void addMinValueDate(Button value) {
92	minValueDate = value;
93	}
94
95	/**
96	* Adding a input text for the minimal value (numeric).
97	*
98	* @param value
99	*/
100	public void addMinValueNumeric(Text value) {
101	minValueNumeric = value;
102	}
103
104	/**
105	* Adding a radio button for range.
106	*
107	* @param button
108	*/
109	public void addRadioRange(Button button) {
110	radioButtonRange = button;
111	}
112
113	/**
114	* Adding a radio button for relation.
115	*
116	* @param button
117	*/
118	public void addRadioRelation(Button button) {
119	radioButoonRelation = button;
120	}
121
122	/**
123	* Adding a combo box which includes all possible relation operators for alpha.
124	*
125	* @param relation
126	*/
127	public void addRelationComboAlpha(Combo relation) {
128	relationComboAlpha = relation;
129	}
130
131	/**
132	* Adding a combo box which includes all possible relation operators for numeric and date.
133	*
134	* @param relation
135	*/
136	public void addRelationComboNumericDate(Combo relation) {
137	relationComboNumericDate = relation;
138	}
139
140	/**
141	* Adding a input text for the comparison value (alpha).
142	*
143	* @param value
144	*/
145	public void addRelationValueAlpha(Text value) {
146	valueAlpha = value;
147	}
148
149	/**
150	* Adding a input button for the comparison value (date).
151	*
152	* @param value
153	*/
154	public void addRelationValueDate(Button value) {
155	valueDate = value;
156	}
157
158	/**
159	* Adding a input text for comparison value (numeric).
160	*
161	* @param value
162	*/
163	public void addRelationValueNumeric(Text value) {
164	valueNumeric = value;
165	}
166
167	public Button getCheckbox() {
168	return checkbox;
169	}
170
171	/**
172	* Getting the button with the maximal value (date).
173	*
174	* @return button
175	*/
176	public Button getMaxValueButtonDate() {
177	return maxValueDate;
178	}
179
180	/**
181	* Getting the text with the maximal value (numeric).
182	*
183	* @return text
184	*/
185	public Text getMaxValueTextNumeric() {
186	return maxValueNumeric;
187	}
188
189	/**
190	* Getting the button with the minimal value (date).
191	*
192	* @return button
193	*/
194	public Button getMinValueButtonDate() {
195	return minValueDate;
196	}
197
198	/**
199	* Getting the text with the minimal value (numeric).
200	*
201	* @return text
202	*/
203	public Text getMinValueTextNumeric() {
204	return minValueNumeric;
205	}
206
207	/**
208	* Getting the button for range.
209	*
210	* @return button for range
211	*/
212	public Button getRadioButtonRange() {
213	return radioButtonRange;
214	}
215
216	/**
217	* Getting the button for relation.
218	*
219	* @return button for relation.
220	*/
221	public Button getRadioButtonRelation() {
222	return radioButoonRelation;
223	}
224
225	/**
226	* Getting the combo box including all comparison operators (alpha).
227	*
228	* @return combo box
229	*/
230	public Combo getRelationComboAlpha() {
231	return relationComboAlpha;
232	}
233
234	/**
235	* Getting the combo box including all comparison operators (numeric and date).
236	*
237	* @return combo box
238	*/
239	public Combo getRelationComboNumericDate() {
240	return relationComboNumericDate;
241	}
242
243	/**
244	* Getting the button with the comparison value (date).
245	*
246	* @return button
247	*/
248	public Button getRelationValueButtonDate() {
249	return valueDate;
250	}
251
252	/**
253	* Getting the text with the comparison value (alpha).
254	*
255	* @return text
256	*/
257	public Text getRelationValueTextAlpha() {
258	return valueAlpha;
259	}
260
261	/**
262	* Getting the text with the comparison value (numeric).
263	*
264	* @return
265	*/
266	public Text getRelationValueTextNumeric() {
267	return valueNumeric;
268	}
269
270	/**
271	* Getting the title of the row
272	*
273	* @return title
274	*/
275	public String getTitle() {
276	return checkbox.getText();
277	}
278
279	/**
280	* Getting the sort type of the row.
281	*
282	* @return type
283	*/
284	public String getType() {
285	return type;
286	}
287
288	/**
289	* Checks if the checkbox is set.
290	*
291	* @return
292	*/
293	public boolean isCheckboxSet() {
294	return checkbox.getSelection();
295	}
296
297	public void setCheckbox(boolean value) {
298	checkbox.setSelection(value);
299	}
300	}

Lines 12-23 Link Here

(-)a/rms/org.eclipse.ptp.rm.lml.ui/src/org/eclipse/ptp/rm/lml/ui/views/TableView.java (-10 / +146 lines)
12	package org.eclipse.ptp.rm.lml.ui.views;	12	package org.eclipse.ptp.rm.lml.ui.views;
13		13
14	import java.util.ArrayList;	14	import java.util.ArrayList;
		15	import java.util.LinkedList;
15	import java.util.List;	16	import java.util.List;
16		17
17	import org.eclipse.core.runtime.IProgressMonitor;	18	import org.eclipse.core.runtime.IProgressMonitor;
18	import org.eclipse.core.runtime.IStatus;	19	import org.eclipse.core.runtime.IStatus;
19	import org.eclipse.core.runtime.Status;	20	import org.eclipse.core.runtime.Status;
		21	import org.eclipse.jface.action.Action;
		22	import org.eclipse.jface.action.ActionContributionItem;
		23	import org.eclipse.jface.action.IAction;
		24	import org.eclipse.jface.action.IMenuManager;
20	import org.eclipse.jface.action.MenuManager;	25	import org.eclipse.jface.action.MenuManager;
		26	import org.eclipse.jface.action.Separator;
21	import org.eclipse.jface.layout.TreeColumnLayout;	27	import org.eclipse.jface.layout.TreeColumnLayout;
22	import org.eclipse.jface.util.SafeRunnable;	28	import org.eclipse.jface.util.SafeRunnable;
23	import org.eclipse.jface.viewers.CellLabelProvider;	29	import org.eclipse.jface.viewers.CellLabelProvider;
Lines 35-53 Link Here
35	import org.eclipse.ptp.rm.lml.core.events.ILguiRemovedEvent;	41	import org.eclipse.ptp.rm.lml.core.events.ILguiRemovedEvent;
36	import org.eclipse.ptp.rm.lml.core.events.IMarkObjectEvent;	42	import org.eclipse.ptp.rm.lml.core.events.IMarkObjectEvent;
37	import org.eclipse.ptp.rm.lml.core.events.ISelectObjectEvent;	43	import org.eclipse.ptp.rm.lml.core.events.ISelectObjectEvent;
		44	import org.eclipse.ptp.rm.lml.core.events.ITableFilterEvent;
38	import org.eclipse.ptp.rm.lml.core.events.ITableSortedEvent;	45	import org.eclipse.ptp.rm.lml.core.events.ITableSortedEvent;
39	import org.eclipse.ptp.rm.lml.core.events.IUnmarkObjectEvent;	46	import org.eclipse.ptp.rm.lml.core.events.IUnmarkObjectEvent;
40	import org.eclipse.ptp.rm.lml.core.events.IUnselectedObjectEvent;	47	import org.eclipse.ptp.rm.lml.core.events.IUnselectedObjectEvent;
41	import org.eclipse.ptp.rm.lml.core.events.IViewUpdateEvent;	48	import org.eclipse.ptp.rm.lml.core.events.IViewUpdateEvent;
42	import org.eclipse.ptp.rm.lml.core.listeners.ILMLListener;	49	import org.eclipse.ptp.rm.lml.core.listeners.ILMLListener;
43	import org.eclipse.ptp.rm.lml.core.model.ILguiItem;	50	import org.eclipse.ptp.rm.lml.core.model.ILguiItem;
		51	import org.eclipse.ptp.rm.lml.core.model.IPattern;
44	import org.eclipse.ptp.rm.lml.core.model.ITableColumnLayout;	52	import org.eclipse.ptp.rm.lml.core.model.ITableColumnLayout;
45	import org.eclipse.ptp.rm.lml.internal.core.model.Cell;	53	import org.eclipse.ptp.rm.lml.internal.core.model.Cell;
46	import org.eclipse.ptp.rm.lml.internal.core.model.LMLColor;	54	import org.eclipse.ptp.rm.lml.internal.core.model.LMLColor;
		55	import org.eclipse.ptp.rm.lml.internal.core.model.Pattern;
47	import org.eclipse.ptp.rm.lml.internal.core.model.Row;	56	import org.eclipse.ptp.rm.lml.internal.core.model.Row;
48	import org.eclipse.ptp.rm.lml.ui.UIUtils;	57	import org.eclipse.ptp.rm.lml.ui.UIUtils;
49	import org.eclipse.ptp.rm.lml.ui.messages.Messages;	58	import org.eclipse.ptp.rm.lml.ui.messages.Messages;
50	import org.eclipse.ptp.rm.lml.ui.providers.EventForwarder;	59	import org.eclipse.ptp.rm.lml.ui.providers.EventForwarder;
		60	import org.eclipse.ptp.rm.lml.ui.providers.FilterDialog;
51	import org.eclipse.swt.SWT;	61	import org.eclipse.swt.SWT;
52	import org.eclipse.swt.events.ControlAdapter;	62	import org.eclipse.swt.events.ControlAdapter;
53	import org.eclipse.swt.events.ControlEvent;	63	import org.eclipse.swt.events.ControlEvent;
Lines 67-72 Link Here
67	import org.eclipse.swt.widgets.Listener;	77	import org.eclipse.swt.widgets.Listener;
68	import org.eclipse.swt.widgets.Menu;	78	import org.eclipse.swt.widgets.Menu;
69	import org.eclipse.swt.widgets.MenuItem;	79	import org.eclipse.swt.widgets.MenuItem;
		80	import org.eclipse.swt.widgets.Shell;
70	import org.eclipse.swt.widgets.Tree;	81	import org.eclipse.swt.widgets.Tree;
71	import org.eclipse.swt.widgets.TreeColumn;	82	import org.eclipse.swt.widgets.TreeColumn;
72	import org.eclipse.swt.widgets.TreeItem;	83	import org.eclipse.swt.widgets.TreeItem;
Lines 198-203 Link Here
198		209
199	}	210	}
200		211
		212	public void handleEvent(final ITableFilterEvent event) {
		213	if (event.getGid().equals(gid)) {
		214	UIUtils.safeRunSyncInUIThread(new SafeRunnable() {
		215	public void run() throws Exception {
		216	if (composite != null && fLguiItem != null && viewCreated) {
		217	if (componentAdded) {
		218	fLguiItem.getObjectStatus().removeComponent(eventForwarder);
		219	componentAdded = false;
		220	}
		221	saveColumnLayout();
		222	disposeTable();
		223	viewCreated = false;
		224	}
		225	if (composite != null && !viewCreated) {
		226	fLguiItem = lmlManager.getSelectedLguiItem();
		227	if (fLguiItem != null) {
		228	createTable();
		229	viewCreated = true;
		230	if (fLguiItem.getObjectStatus() != null) {
		231	fLguiItem.getObjectStatus().addComponent(eventForwarder);
		232	componentAdded = true;
		233	}
		234	}
		235	}
		236	}
		237	});
		238	}
		239	}
		240
201	/*	241	/*
202	* (non-Javadoc)	242	* (non-Javadoc)
203	*	243	*
Lines 210-216 Link Here
210	&& tree.getSortColumn() != null) {	250	&& tree.getSortColumn() != null) {
211	fLguiItem.getTableHandler().sort(gid, SWT.UP, getSortIndex(), tree.getSortDirection());	251	fLguiItem.getTableHandler().sort(gid, SWT.UP, getSortIndex(), tree.getSortDirection());
212	}	252	}
213	setViewerInput();	253	if (fLguiItem.getPattern(gid).size() > 0) {
		254	setViewerInput(fLguiItem.getPattern(gid));
		255	} else {
		256	setViewerInput();
		257	}
214	}	258	}
215	});	259	});
216		260
Lines 276-282 Link Here
276	fLguiItem.getTableHandler().getSortProperties(gid);	320	fLguiItem.getTableHandler().getSortProperties(gid);
277	fLguiItem.getTableHandler().sort(gid, SWT.UP, getSortIndex(), tree.getSortDirection());	321	fLguiItem.getTableHandler().sort(gid, SWT.UP, getSortIndex(), tree.getSortDirection());
278	}	322	}
279	setViewerInput();	323	if (fLguiItem.getPattern(gid).size() > 0) {
		324	setViewerInput(fLguiItem.getPattern(gid));
		325	} else {
		326	setViewerInput();
		327	}
280	if (fLguiItem != null && fLguiItem.getTableHandler() != null) {	328	if (fLguiItem != null && fLguiItem.getTableHandler() != null) {
281	fLguiItem.getObjectStatus().addComponent(eventForwarder);	329	fLguiItem.getObjectStatus().addComponent(eventForwarder);
282	componentAdded = true;	330	componentAdded = true;
Lines 300-309 Link Here
300	private String gid = null;	348	private String gid = null;
301	private final ILMLListener lmlListener = new LMLTableListListener();	349	private final ILMLListener lmlListener = new LMLTableListListener();
302	private final LMLManager lmlManager = LMLManager.getInstance();	350	private final LMLManager lmlManager = LMLManager.getInstance();
		351	private IMenuManager viewMenuManager;
		352	private ActionContributionItem filterActionItem;
		353	private ActionContributionItem filterOwnJobsActionItem;
303	private TreeItem selectedItem = null;	354	private TreeItem selectedItem = null;
304	private String selectedOid = null;	355	private String selectedOid = null;
305	private boolean componentAdded = false;	356	private boolean componentAdded = false;
306	private boolean viewCreated = false;	357	private boolean viewCreated = false;
		358	private IViewSite viewSite = null;
307		359
308	private boolean isMouseDown = false;	360	private boolean isMouseDown = false;
309	private final EventForwarder eventForwarder = new EventForwarder();	361	private final EventForwarder eventForwarder = new EventForwarder();
Lines 383-389 Link Here
383	*/	435	*/
384	fLguiItem = lmlManager.getSelectedLguiItem();	436	fLguiItem = lmlManager.getSelectedLguiItem();
385		437
		438	// ViewMenuManager
		439	viewMenuManager = getViewSite().getActionBars().getMenuManager();
		440	final IAction filterOwnJobsAction = new Action("Show only my jobs", IAction.AS_CHECK_BOX) {
		441
		442	@Override
		443	public void run() {
		444	final List<IPattern> filterValues = new LinkedList<IPattern>();
		445	if (isChecked()) {
		446	filterValues.add((new Pattern("owner", "alpha")).setRelation("=", fLguiItem.getUsername()));
		447	}
		448	// TODO After decision about new structure of LML and server side
		449	fLguiItem.setPattern(gid, filterValues);
		450	setViewerInput(filterValues);
		451	}
		452
		453	};
		454	final IAction filterAction = new Action("Filters...") {
		455
		456	@Override
		457	public void run() {
		458	final FilterDialog dialog = new FilterDialog(new Shell(
		459	viewSite.getShell()), gid);
		460	dialog.open();
		461	}
		462	};
		463
		464	filterOwnJobsActionItem = new ActionContributionItem(filterOwnJobsAction);
		465	filterActionItem = new ActionContributionItem(filterAction);
		466	viewMenuManager.add(filterOwnJobsActionItem);
		467	viewMenuManager.add(new Separator());
		468	viewMenuManager.add(filterActionItem);
		469	filterOwnJobsActionItem.getAction().setEnabled(false);
		470	filterActionItem.getAction().setEnabled(false);
		471
386	createTable();	472	createTable();
		473
387	tree.addDisposeListener(new DisposeListener() {	474	tree.addDisposeListener(new DisposeListener() {
388	public void widgetDisposed(DisposeEvent e) {	475	public void widgetDisposed(DisposeEvent e) {
389	if (fLguiItem != null) {	476	if (fLguiItem != null) {
Lines 406-411 Link Here
406	e.printStackTrace();	493	e.printStackTrace();
407	}	494	}
408	lmlManager.addListener(lmlListener, this.getClass().getName());	495	lmlManager.addListener(lmlListener, this.getClass().getName());
		496	viewSite = site;
409	}	497	}
410		498
411	/**	499	/**
Lines 416-422 Link Here
416	@Override	504	@Override
417	public IStatus runInUIThread(IProgressMonitor monitor) {	505	public IStatus runInUIThread(IProgressMonitor monitor) {
418	if (viewer != null) {	506	if (viewer != null) {
419	setViewerInput();	507	if (fLguiItem.getPattern(gid).size() > 0) {
		508	setViewerInput(fLguiItem.getPattern(gid));
		509	} else {
		510	setViewerInput();
		511	}
420	viewer.refresh();	512	viewer.refresh();
421	}	513	}
422	return Status.OK_STATUS;	514	return Status.OK_STATUS;
Lines 440-451 Link Here
440	}	532	}
441		533
442	final ITableColumnLayout[] tableColumnLayouts = fLguiItem.getTableHandler().getTableColumnLayout(gid);	534	final ITableColumnLayout[] tableColumnLayouts = fLguiItem.getTableHandler().getTableColumnLayout(gid);
443	if (tableColumnLayouts == null) {	535	if (tableColumnLayouts.length == 0) {
444	return;	536	return;
445	}	537	}
446		538
447	treeColumns = new TreeColumn[tableColumnLayouts.length];	539	treeColumns = new TreeColumn[tableColumnLayouts.length];
448	savedColumnWidths = new int[tableColumnLayouts.length + 1];	540	savedColumnWidths = new int[tableColumnLayouts.length + 1];
		541
		542	final String[] columnTitlesPattern = fLguiItem.getColumnTitlePattern(gid);
449		543
450	// first column with color rectangle	544	// first column with color rectangle
451	TreeViewerColumn treeViewerColumn = new TreeViewerColumn(viewer, SWT.NONE);	545	TreeViewerColumn treeViewerColumn = new TreeViewerColumn(viewer, SWT.NONE);
Lines 514-520 Link Here
514	});	608	});
515	treeColumn = treeViewerColumn.getColumn();	609	treeColumn = treeViewerColumn.getColumn();
516	treeColumn.setMoveable(true);	610	treeColumn.setMoveable(true);
517	treeColumn.setText(tableColumnLayouts[i].getTitle());	611	boolean isFiltered = false;
		612	for (final String title : columnTitlesPattern) {
		613	if (title.equals(tableColumnLayouts[i].getTitle())) {
		614	isFiltered = true;
		615	}
		616	}
		617	if (isFiltered) {
		618	treeColumn.setText(tableColumnLayouts[i].getTitle() + " #");
		619	} else {
		620	treeColumn.setText(tableColumnLayouts[i].getTitle());
		621	}
		622
518	treeColumn.setAlignment(getColumnAlignment(tableColumnLayouts[i].getStyle()));	623	treeColumn.setAlignment(getColumnAlignment(tableColumnLayouts[i].getStyle()));
519		624
520	if (tableColumnLayouts[i].isActive()) {	625	if (tableColumnLayouts[i].isActive()) {
Lines 674-684 Link Here
674	tree.setSortColumn(getSortColumn((Integer) sortProperties[0]));	779	tree.setSortColumn(getSortColumn((Integer) sortProperties[0]));
675	fLguiItem.getTableHandler().sort(gid, SWT.UP, getSortIndex(), tree.getSortDirection());	780	fLguiItem.getTableHandler().sort(gid, SWT.UP, getSortIndex(), tree.getSortDirection());
676	}	781	}
677	}
678	}
679		782
680	// Insert the input	783	filterOwnJobsActionItem.getAction().setEnabled(true);
681	setViewerInput();	784	filterActionItem.getAction().setEnabled(true);
		785	}
		786
		787	// Insert the input
		788	if (fLguiItem.getPattern(gid).size() > 0) {
		789	setViewerInput(fLguiItem.getPattern(gid));
		790	} else {
		791	setViewerInput();
		792	}
		793
		794	}
682	composite.layout();	795	composite.layout();
683	}	796	}
684		797
Lines 691-696 Link Here
691	private void disposeTable() {	804	private void disposeTable() {
692	tree.setSortColumn(null);	805	tree.setSortColumn(null);
693	tree.setSortDirection(0);	806	tree.setSortDirection(0);
		807
		808	filterOwnJobsActionItem.getAction().setEnabled(false);
		809	filterActionItem.getAction().setEnabled(false);
		810
694	/*	811	/*
695	* Remove columns	812	* Remove columns
696	*/	813	*/
Lines 710-716 Link Here
710	for (final MenuItem item : headerMenu.getItems()) {	827	for (final MenuItem item : headerMenu.getItems()) {
711	item.dispose();	828	item.dispose();
712	}	829	}
713	getViewSite().getActionBars().getMenuManager().removeAll();
714	}	830	}
715		831
716	private int getColumnAlignment(String alignment) {	832	private int getColumnAlignment(String alignment) {
Lines 861-864 Link Here
861	}	977	}
862	}	978	}
863	}	979	}
		980
		981	/**
		982	*
		983	*/
		984	private void setViewerInput(List<IPattern> filterValues) {
		985	/*
		986	* Don't change input if mouse is down as this causes a SIGSEGV in SWT!
		987	*/
		988	if (!isMouseDown) {
		989	Row[] input = new Row[0];
		990	if (fLguiItem != null && fLguiItem.getTableHandler() != null) {
		991	input = fLguiItem.getTableHandler()
		992	.getTableDataWithColor(gid, gid.equals(ILguiItem.ACTIVE_JOB_TABLE), filterValues);
		993	}
		994	if (!composite.isDisposed()) {
		995	viewer.setInput(input);
		996	viewer.setChildCount(input, input.length);
		997	}
		998	}
		999	}
864	}	1000	}