mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-07-14 04:25:21 +02:00
Code Issues Wiki Activity

[releng] Fix version and api tooling filters for 3.1.1

Browse source
This commit is contained in:
Martin Oberhuber 2009-07-30 07:59:59 +00:00
parent 6be3c3a568
commit 45a2400a0b
3 changed files with 92 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

84
rse/plugins/org.eclipse.rse.services/.settings/.api_filters
View file

@ -1,13 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?> <?xml version="1.0" encoding="UTF-8" standalone="no"?>
<component id="org.eclipse.rse.services" version="2"> <component id="org.eclipse.rse.services" version="2">
<resource path="META-INF/MANIFEST.MF" type="org.eclipse.rse.internal.services.terminals.ITerminalShell">
<filter id="305324134">
<message_arguments>
<message_argument value="org.eclipse.rse.internal.services.terminals.ITerminalShell"/>
<message_argument value="org.eclipse.rse.services_3.1.0"/>
</message_arguments>
</filter>
</resource>
<resource path="META-INF/MANIFEST.MF" type="org.eclipse.rse.internal.services.terminals.AbstractTerminalService"> <resource path="META-INF/MANIFEST.MF" type="org.eclipse.rse.internal.services.terminals.AbstractTerminalService">
<filter id="305324134"> <filter id="305324134">
<message_arguments> <message_arguments>
@ -15,6 +7,54 @@
<message_argument value="org.eclipse.rse.services_3.1.0"/> <message_argument value="org.eclipse.rse.services_3.1.0"/>
</message_arguments> </message_arguments>
</filter> </filter>
<filter id="305324134">
<message_arguments>
<message_argument value="org.eclipse.rse.internal.services.terminals.AbstractTerminalService"/>
<message_argument value="org.eclipse.rse.services_3.1.1"/>
</message_arguments>
</filter>
</resource>
<resource path="META-INF/MANIFEST.MF" type="org.eclipse.rse.internal.services.terminals.AbstractTerminalShell">
<filter id="305324134">
<message_arguments>
<message_argument value="org.eclipse.rse.internal.services.terminals.AbstractTerminalShell"/>
<message_argument value="org.eclipse.rse.services_3.1.0"/>
</message_arguments>
</filter>
<filter id="305324134">
<message_arguments>
<message_argument value="org.eclipse.rse.internal.services.terminals.AbstractTerminalShell"/>
<message_argument value="org.eclipse.rse.services_3.1.1"/>
</message_arguments>
</filter>
</resource>
<resource path="META-INF/MANIFEST.MF" type="org.eclipse.rse.internal.services.terminals.BaseShellDecorator">
<filter id="305324134">
<message_arguments>
<message_argument value="org.eclipse.rse.internal.services.terminals.BaseShellDecorator"/>
<message_argument value="org.eclipse.rse.services_3.1.1"/>
</message_arguments>
</filter>
<filter id="305324134">
<message_arguments>
<message_argument value="org.eclipse.rse.internal.services.terminals.BaseShellDecorator"/>
<message_argument value="org.eclipse.rse.services_3.1.0"/>
</message_arguments>
</filter>
</resource>
<resource path="META-INF/MANIFEST.MF" type="org.eclipse.rse.internal.services.terminals.IBaseShell">
<filter id="305324134">
<message_arguments>
<message_argument value="org.eclipse.rse.internal.services.terminals.IBaseShell"/>
<message_argument value="org.eclipse.rse.services_3.1.1"/>
</message_arguments>
</filter>
<filter id="305324134">
<message_arguments>
<message_argument value="org.eclipse.rse.internal.services.terminals.IBaseShell"/>
<message_argument value="org.eclipse.rse.services_3.1.0"/>
</message_arguments>
</filter>
</resource> </resource>
<resource path="META-INF/MANIFEST.MF" type="org.eclipse.rse.internal.services.terminals.ITerminalService"> <resource path="META-INF/MANIFEST.MF" type="org.eclipse.rse.internal.services.terminals.ITerminalService">
<filter id="305324134"> <filter id="305324134">
@ -23,40 +63,48 @@
<message_argument value="org.eclipse.rse.services_3.1.0"/> <message_argument value="org.eclipse.rse.services_3.1.0"/>
</message_arguments> </message_arguments>
</filter> </filter>
</resource>
<resource path="META-INF/MANIFEST.MF" type="org.eclipse.rse.internal.services.terminals.AbstractTerminalShell">
<filter id="305324134"> <filter id="305324134">
<message_arguments> <message_arguments>
<message_argument value="org.eclipse.rse.internal.services.terminals.AbstractTerminalShell"/> <message_argument value="org.eclipse.rse.internal.services.terminals.ITerminalService"/>
<message_argument value="org.eclipse.rse.services_3.1.0"/> <message_argument value="org.eclipse.rse.services_3.1.1"/>
</message_arguments> </message_arguments>
</filter> </filter>
</resource> </resource>
<resource path="META-INF/MANIFEST.MF" type="org.eclipse.rse.internal.services.terminals.BaseShellDecorator"> <resource path="META-INF/MANIFEST.MF" type="org.eclipse.rse.internal.services.terminals.ITerminalShell">
<filter id="305324134"> <filter id="305324134">
<message_arguments> <message_arguments>
<message_argument value="org.eclipse.rse.internal.services.terminals.BaseShellDecorator"/> <message_argument value="org.eclipse.rse.internal.services.terminals.ITerminalShell"/>
<message_argument value="org.eclipse.rse.services_3.1.0"/> <message_argument value="org.eclipse.rse.services_3.1.0"/>
</message_arguments> </message_arguments>
</filter> </filter>
<filter id="305324134">
<message_arguments>
<message_argument value="org.eclipse.rse.internal.services.terminals.ITerminalShell"/>
<message_argument value="org.eclipse.rse.services_3.1.1"/>
</message_arguments>
</filter>
</resource> </resource>
<resource path="META-INF/MANIFEST.MF" type="org.eclipse.rse.internal.services.terminals.TerminalShellDecorator"> <resource path="META-INF/MANIFEST.MF" type="org.eclipse.rse.internal.services.terminals.TerminalShellDecorator">
<filter id="305324134"> <filter id="305324134">
<message_arguments> <message_arguments>
<message_argument value="org.eclipse.rse.internal.services.terminals.TerminalShellDecorator"/> <message_argument value="org.eclipse.rse.internal.services.terminals.TerminalShellDecorator"/>
<message_argument value="org.eclipse.rse.services_3.1.0"/> <message_argument value="org.eclipse.rse.services_3.1.1"/>
</message_arguments> </message_arguments>
</filter> </filter>
</resource>
<resource path="META-INF/MANIFEST.MF" type="org.eclipse.rse.internal.services.terminals.IBaseShell">
<filter id="305324134"> <filter id="305324134">
<message_arguments> <message_arguments>
<message_argument value="org.eclipse.rse.internal.services.terminals.IBaseShell"/> <message_argument value="org.eclipse.rse.internal.services.terminals.TerminalShellDecorator"/>
<message_argument value="org.eclipse.rse.services_3.1.0"/> <message_argument value="org.eclipse.rse.services_3.1.0"/>
</message_arguments> </message_arguments>
</filter> </filter>
</resource> </resource>
<resource path="src/org/eclipse/rse/internal/services/terminals/ProcessBaseShell.java" type="org.eclipse.rse.internal.services.terminals.ProcessBaseShell"> <resource path="src/org/eclipse/rse/internal/services/terminals/ProcessBaseShell.java" type="org.eclipse.rse.internal.services.terminals.ProcessBaseShell">
<filter id="305365105">
<message_arguments>
<message_argument value="org.eclipse.rse.internal.services.terminals.ProcessBaseShell"/>
<message_argument value="org.eclipse.rse.services_3.1.1"/>
</message_arguments>
</filter>
<filter id="305365105"> <filter id="305365105">
<message_arguments> <message_arguments>
<message_argument value="org.eclipse.rse.internal.services.terminals.ProcessBaseShell"/> <message_argument value="org.eclipse.rse.internal.services.terminals.ProcessBaseShell"/>

2
rse/plugins/org.eclipse.rse.services/META-INF/MANIFEST.MF
View file

@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2 Bundle-ManifestVersion: 2
Bundle-Name: %pluginName Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.rse.services;singleton:=true Bundle-SymbolicName: org.eclipse.rse.services;singleton:=true
Bundle-Version: 3.1.0.qualifier Bundle-Version: 3.1.1.qualifier
Bundle-Activator: org.eclipse.rse.internal.services.Activator Bundle-Activator: org.eclipse.rse.internal.services.Activator
Bundle-Vendor: %providerName Bundle-Vendor: %providerName
Bundle-Localization: plugin Bundle-Localization: plugin

43
rse/plugins/org.eclipse.rse.services/clientserver/org/eclipse/rse/services/clientserver/processes/handlers/UniversalSolarisProcessHandler.java
View file

@ -1,13 +1,13 @@
/******************************************************************************** /********************************************************************************
* Copyright (c) 2009 IBM Corporation. All rights reserved. * Copyright (c) 2009 IBM Corporation. All rights reserved.
* This program and the accompanying materials are made available under the terms * 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 * of the Eclipse Public License v1.0 which accompanies this distribution, and is
* available at http://www.eclipse.org/legal/epl-v10.html * available at http://www.eclipse.org/legal/epl-v10.html
* *
* Initial Contributors: * Initial Contributors:
* The following IBM employees contributed to the Remote System Explorer * The following IBM employees contributed to the Remote System Explorer
* component that contains this file: David McKnight. * component that contains this file: David McKnight.
* *
* Contributors: * Contributors:
* David McKnight (IBM) - [175293] [dstore] Processes do not work on Dstore-UNIX connection to Solaris * David McKnight (IBM) - [175293] [dstore] Processes do not work on Dstore-UNIX connection to Solaris
********************************************************************************/ ********************************************************************************/
@ -23,14 +23,21 @@ import org.eclipse.rse.services.clientserver.processes.IHostProcess;
import org.eclipse.rse.services.clientserver.processes.IHostProcessFilter; import org.eclipse.rse.services.clientserver.processes.IHostProcessFilter;
/** /**
* @since 3.1 * ProcessHandler implementation for Solaris. This is part of internal
* implementation, and should not be used by clients directly. Use
* {@link ProcessHandlerManager#getNewProcessHandler()} on a Solaris system
* instead.
*
* @since 3.1.1
* @noextend This class is not intended to be subclassed by clients.
* @noinstantiate This class is not intended to be instantiated by clients.
*/ */
public class UniversalSolarisProcessHandler extends UniversalAIXProcessHandler { public class UniversalSolarisProcessHandler extends UniversalAIXProcessHandler {
private static final String[] processAttributes = {"pid","ppid","comm","uid","user","gid","vsz","s"}; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$ private static final String[] processAttributes = {"pid","ppid","comm","uid","user","gid","vsz","s"}; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$
private static final String firstColumnHeader = "PID"; //$NON-NLS-1$ private static final String firstColumnHeader = "PID"; //$NON-NLS-1$
public IHostProcess kill(IHostProcess process, String type) public IHostProcess kill(IHostProcess process, String type)
throws Exception { throws Exception {
return super.kill(process, type); return super.kill(process, type);
@ -43,7 +50,7 @@ public class UniversalSolarisProcessHandler extends UniversalAIXProcessHandler {
throws Exception throws Exception
{ {
SortedSet results = new TreeSet(new ProcessComparator()); SortedSet results = new TreeSet(new ProcessComparator());
// create the remote command with the UNIX specific attributes // create the remote command with the UNIX specific attributes
String cmdLine = "/usr/bin/ps -A -o "; //$NON-NLS-1$ String cmdLine = "/usr/bin/ps -A -o "; //$NON-NLS-1$
for (int i = 0; i < processAttributes.length; i++) for (int i = 0; i < processAttributes.length; i++)
@ -69,59 +76,59 @@ public class UniversalSolarisProcessHandler extends UniversalAIXProcessHandler {
nextLine = reader.readLine(); nextLine = reader.readLine();
continue; continue;
} }
String pid = (String) psLineContents.get("pid"); //$NON-NLS-1$ String pid = (String) psLineContents.get("pid"); //$NON-NLS-1$
statusLine = pid + "|"; //$NON-NLS-1$ statusLine = pid + "|"; //$NON-NLS-1$
// add the name to the status string // add the name to the status string
String name = (String) psLineContents.get("comm"); //$NON-NLS-1$ String name = (String) psLineContents.get("comm"); //$NON-NLS-1$
if (name == null) name = " "; //$NON-NLS-1$ if (name == null) name = " "; //$NON-NLS-1$
statusLine = statusLine + name + "|"; //$NON-NLS-1$ statusLine = statusLine + name + "|"; //$NON-NLS-1$
// add the status letter to the status string // add the status letter to the status string
String state = (String) psLineContents.get("s"); //$NON-NLS-1$ String state = (String) psLineContents.get("s"); //$NON-NLS-1$
if (state == null) state = " "; //$NON-NLS-1$ if (state == null) state = " "; //$NON-NLS-1$
String stateCode = convertToStateCode(state); String stateCode = convertToStateCode(state);
statusLine = statusLine + stateCode + "|"; //$NON-NLS-1$ statusLine = statusLine + stateCode + "|"; //$NON-NLS-1$
// add the Tgid // add the Tgid
String tgid = (String) psLineContents.get("tgid"); //$NON-NLS-1$ String tgid = (String) psLineContents.get("tgid"); //$NON-NLS-1$
if (tgid == null) tgid = " "; //$NON-NLS-1$ if (tgid == null) tgid = " "; //$NON-NLS-1$
statusLine = statusLine + tgid + "|"; //$NON-NLS-1$ statusLine = statusLine + tgid + "|"; //$NON-NLS-1$
// add the Ppid // add the Ppid
String pPid = (String) psLineContents.get("ppid"); //$NON-NLS-1$ String pPid = (String) psLineContents.get("ppid"); //$NON-NLS-1$
if (pPid == null) pPid = " "; //$NON-NLS-1$ if (pPid == null) pPid = " "; //$NON-NLS-1$
statusLine = statusLine + pPid + "|"; //$NON-NLS-1$ statusLine = statusLine + pPid + "|"; //$NON-NLS-1$
// add the TracerPid // add the TracerPid
String tracerpid = (String) psLineContents.get("tracerpid"); //$NON-NLS-1$ String tracerpid = (String) psLineContents.get("tracerpid"); //$NON-NLS-1$
if (tracerpid == null) tracerpid = " "; //$NON-NLS-1$ if (tracerpid == null) tracerpid = " "; //$NON-NLS-1$
statusLine = statusLine + tracerpid + "|"; //$NON-NLS-1$ statusLine = statusLine + tracerpid + "|"; //$NON-NLS-1$
String uid = (String) psLineContents.get("uid"); //$NON-NLS-1$ String uid = (String) psLineContents.get("uid"); //$NON-NLS-1$
if (uid == null) uid = " "; //$NON-NLS-1$ if (uid == null) uid = " "; //$NON-NLS-1$
statusLine = statusLine + uid + "|"; // add the uid to the status string //$NON-NLS-1$ statusLine = statusLine + uid + "|"; // add the uid to the status string //$NON-NLS-1$
String username = (String) psLineContents.get("user"); //$NON-NLS-1$ String username = (String) psLineContents.get("user"); //$NON-NLS-1$
if (username == null) username = " "; //$NON-NLS-1$ if (username == null) username = " "; //$NON-NLS-1$
statusLine = statusLine + username + "|"; // add the username to the status string //$NON-NLS-1$ statusLine = statusLine + username + "|"; // add the username to the status string //$NON-NLS-1$
// add the gid to the status string // add the gid to the status string
String gid = (String) psLineContents.get("gid"); //$NON-NLS-1$ String gid = (String) psLineContents.get("gid"); //$NON-NLS-1$
if (gid == null) gid = " "; //$NON-NLS-1$ if (gid == null) gid = " "; //$NON-NLS-1$
statusLine = statusLine + gid + "|"; //$NON-NLS-1$ statusLine = statusLine + gid + "|"; //$NON-NLS-1$
// add the VmSize to the status string // add the VmSize to the status string
String vmsize = (String) psLineContents.get("vsz"); //$NON-NLS-1$ String vmsize = (String) psLineContents.get("vsz"); //$NON-NLS-1$
if (vmsize == null) vmsize = " "; //$NON-NLS-1$ if (vmsize == null) vmsize = " "; //$NON-NLS-1$
statusLine = statusLine + vmsize +"|"; //$NON-NLS-1$ statusLine = statusLine + vmsize +"|"; //$NON-NLS-1$
// add a dummy vmrss to the status string // add a dummy vmrss to the status string
// vmRss is not available on ZOS // vmRss is not available on ZOS
String vmrss = " "; //$NON-NLS-1$ String vmrss = " "; //$NON-NLS-1$
statusLine = statusLine + vmrss; statusLine = statusLine + vmrss;
if (rpfs.allows(statusLine)) if (rpfs.allows(statusLine))
{ {
UniversalServerProcessImpl usp = new UniversalServerProcessImpl(statusLine); UniversalServerProcessImpl usp = new UniversalServerProcessImpl(statusLine);