From c271b012d280c61dbe449ce92a72c46c6a776ec1 Mon Sep 17 00:00:00 2001 From: Anithra P Janakiraman Date: Mon, 15 Mar 2010 15:39:27 +0000 Subject: 2010-03-15 Anithra P Janakiraman * Fix for BZ #304206 --- systemtap/org.eclipse.linuxtools.systemtap.ui.ide/ChangeLog | 4 ++++ .../linuxtools/systemtap/ui/ide/actions/RunScriptAction.java | 7 ++++--- 2 files changed, 8 insertions(+), 3 deletions(-) (limited to 'systemtap') diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/ChangeLog b/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/ChangeLog index eb4385eeed..37e17d5837 100644 --- a/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/ChangeLog +++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/ChangeLog @@ -1,3 +1,7 @@ +2010-03-15 Anithra P Janakiraman + + * src/org/eclipse/linuxtools/systemtap/ui/ide/actions/RunScriptAction.java (getFilePath): Bz 304206 + 2010-01-29 Anithra P Janakiraman * src/org/eclipse/linuxtools/systemtap/ui/ide/actions/RunScriptChartAction.java: Removed. diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/src/org/eclipse/linuxtools/systemtap/ui/ide/actions/RunScriptAction.java b/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/src/org/eclipse/linuxtools/systemtap/ui/ide/actions/RunScriptAction.java index 239f555a72..dad3e2d8ed 100644 --- a/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/src/org/eclipse/linuxtools/systemtap/ui/ide/actions/RunScriptAction.java +++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/src/org/eclipse/linuxtools/systemtap/ui/ide/actions/RunScriptAction.java @@ -1,12 +1,11 @@ /******************************************************************************* - * Copyright (c) 2006 IBM Corporation. * 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 - Jeff Briggs, Henry Hughes, Ryan Morse + * Jeff Briggs, Henry Hughes, Ryan Morse, Roland Grunberg, Anithra P J *******************************************************************************/ package org.eclipse.linuxtools.systemtap.ui.ide.actions; @@ -47,6 +46,7 @@ import org.eclipse.ui.IEditorPart; import org.eclipse.ui.IWorkbenchWindow; import org.eclipse.ui.IWorkbenchWindowActionDelegate; import org.eclipse.ui.PlatformUI; +import org.eclipse.ui.ide.ResourceUtil; @@ -115,7 +115,8 @@ public class RunScriptAction extends Action implements IWorkbenchWindowActionDel */ protected String getFilePath() { IEditorPart ed = fWindow.getActivePage().getActiveEditor(); - return ((PathEditorInput)ed.getEditorInput()).getPath().toString(); + return ResourceUtil.getFile(ed.getEditorInput()).getLocation().toString(); + //return ((PathEditorInput)ed.getEditorInput()).getPath().toString(); } /** -- cgit v1.2.3 From 59c3a70260e4854df9e54bb8aeb9023af5e8000e Mon Sep 17 00:00:00 2001 From: Roland Grunberg Date: Mon, 22 Mar 2010 19:44:20 +0000 Subject: 2010-03-22 Roland Grunberg * src/org/eclipse/linuxtools/callgraph/tests/MouseListenerTest.java: Remove printline call. --- systemtap/org.eclipse.linuxtools.callgraph.tests/ChangeLog | 4 ++++ .../src/org/eclipse/linuxtools/callgraph/tests/MouseListenerTest.java | 1 - 2 files changed, 4 insertions(+), 1 deletion(-) (limited to 'systemtap') diff --git a/systemtap/org.eclipse.linuxtools.callgraph.tests/ChangeLog b/systemtap/org.eclipse.linuxtools.callgraph.tests/ChangeLog index 5fe1e65718..5831001654 100644 --- a/systemtap/org.eclipse.linuxtools.callgraph.tests/ChangeLog +++ b/systemtap/org.eclipse.linuxtools.callgraph.tests/ChangeLog @@ -1,3 +1,7 @@ +2010-03-22 Roland Grunberg + + * src/org/eclipse/linuxtools/callgraph/tests/MouseListenerTest.java: Remove printline call. + 2009-12-15 Charley Wang * (all).graph: Modify to remove semi-colon from ends of lines diff --git a/systemtap/org.eclipse.linuxtools.callgraph.tests/src/org/eclipse/linuxtools/callgraph/tests/MouseListenerTest.java b/systemtap/org.eclipse.linuxtools.callgraph.tests/src/org/eclipse/linuxtools/callgraph/tests/MouseListenerTest.java index 1c472cc9de..b5a49be6ef 100644 --- a/systemtap/org.eclipse.linuxtools.callgraph.tests/src/org/eclipse/linuxtools/callgraph/tests/MouseListenerTest.java +++ b/systemtap/org.eclipse.linuxtools.callgraph.tests/src/org/eclipse/linuxtools/callgraph/tests/MouseListenerTest.java @@ -47,7 +47,6 @@ public class MouseListenerTest extends TestCase { GraphItem[] nodes = { g.getNode(g.getFirstUsefulNode()) }; g.setSelection(nodes); - System.out.println(mListener.controlDoubleClick()); mListener.mouseDownEvent(0, 0); g.draw(StapGraph.CONSTANT_DRAWMODE_TREE, StapGraph.CONSTANT_ANIMATION_FASTEST, g.getFirstUsefulNode()); -- cgit v1.2.3 From 9e176d016f558d571e5bcd575ace4d7b46d4c2fc Mon Sep 17 00:00:00 2001 From: Roland Grunberg Date: Mon, 22 Mar 2010 19:48:12 +0000 Subject: 2010-03-22 Roland Grunberg * src/org/eclipse/linuxtools/callgraph/graphlisteners/StapGraphMouseListener.java (controlDoubleClick): Remove unnecessary return value from this method. --- systemtap/org.eclipse.linuxtools.callgraph/ChangeLog | 5 +++++ .../callgraph/graphlisteners/StapGraphMouseListener.java | 12 +++++------- 2 files changed, 10 insertions(+), 7 deletions(-) (limited to 'systemtap') diff --git a/systemtap/org.eclipse.linuxtools.callgraph/ChangeLog b/systemtap/org.eclipse.linuxtools.callgraph/ChangeLog index 3e9e2053e9..866b77104c 100644 --- a/systemtap/org.eclipse.linuxtools.callgraph/ChangeLog +++ b/systemtap/org.eclipse.linuxtools.callgraph/ChangeLog @@ -1,3 +1,8 @@ +2010-03-22 Roland Grunberg + + * src/org/eclipse/linuxtools/callgraph/graphlisteners/StapGraphMouseListener.java (controlDoubleClick): + Remove unnecessary return value from this method. + 2010-02-23 Charley Wang * src/org/eclipse/linuxtools/callgraph/StapGraphParser.java: Fix markers to work with threads diff --git a/systemtap/org.eclipse.linuxtools.callgraph/src/org/eclipse/linuxtools/callgraph/graphlisteners/StapGraphMouseListener.java b/systemtap/org.eclipse.linuxtools.callgraph/src/org/eclipse/linuxtools/callgraph/graphlisteners/StapGraphMouseListener.java index 0530f51d78..66699b7ef8 100644 --- a/systemtap/org.eclipse.linuxtools.callgraph/src/org/eclipse/linuxtools/callgraph/graphlisteners/StapGraphMouseListener.java +++ b/systemtap/org.eclipse.linuxtools.callgraph/src/org/eclipse/linuxtools/callgraph/graphlisteners/StapGraphMouseListener.java @@ -170,22 +170,21 @@ public class StapGraphMouseListener implements MouseListener { return node; } - public String controlDoubleClick() { - String output = null; + public void controlDoubleClick() { if (graph.getDrawMode() == StapGraph.CONSTANT_DRAWMODE_AGGREGATE) { GraphNode node = getAggregateNodeFromSelection(); if (node == null) - return null; + return; String functionName = (String) node.getData("AGGREGATE_NAME"); //$NON-NLS-1$ - output= FileFinderOpener.findAndOpen(graph.getProject(), functionName); + FileFinderOpener.findAndOpen(graph.getProject(), functionName); node.unhighlight(); } else { StapNode node = getNodeFromSelection(); if (node == null) - return null; + return; int caller = node.getData().id; @@ -194,12 +193,11 @@ public class StapGraphMouseListener implements MouseListener { // main caller = graph.getFirstUsefulNode(); } - output = FileFinderOpener.findAndOpen(graph.getProject(), graph.getNodeData(caller).name); + FileFinderOpener.findAndOpen(graph.getProject(), graph.getNodeData(caller).name); node.unhighlight(); } graph.setSelection(null); - return output; } public void mouseDownEvent(int x, int y) { -- cgit v1.2.3 From 5ad674ba5e87488205c99e7b2b93661455608c4d Mon Sep 17 00:00:00 2001 From: Roland Grunberg Date: Mon, 22 Mar 2010 21:27:14 +0000 Subject: 2010-03-22 Roland Grunberg * META-INF/MANIFEST.MF: Add o.e.l.profiling.ui to imported packages. * src/org/eclipse/linuxtools/callgraph/core/FileFinderOpener.java: Clean up code by using openEditorAndSelect which is now in profiling framework. * src/org/eclipse/linuxtools/callgraph/core/messages.properties: Remove these strings. --- .../ChangeLog | 7 +++ .../META-INF/MANIFEST.MF | 1 + .../callgraph/core/FileFinderOpener.java | 62 +++++----------------- .../linuxtools/callgraph/core/messages.properties | 3 -- 4 files changed, 21 insertions(+), 52 deletions(-) (limited to 'systemtap') diff --git a/systemtap/org.eclipse.linuxtools.callgraph.core/ChangeLog b/systemtap/org.eclipse.linuxtools.callgraph.core/ChangeLog index 07a8eb816b..2779a7d977 100644 --- a/systemtap/org.eclipse.linuxtools.callgraph.core/ChangeLog +++ b/systemtap/org.eclipse.linuxtools.callgraph.core/ChangeLog @@ -1,3 +1,10 @@ +2010-03-22 Roland Grunberg + + * META-INF/MANIFEST.MF: Add o.e.l.profiling.ui to imported packages. + * src/org/eclipse/linuxtools/callgraph/core/FileFinderOpener.java: + Clean up code by using openEditorAndSelect which is now in profiling framework. + * src/org/eclipse/linuxtools/callgraph/core/messages.properties: Remove these strings. + 2010-02-26 Roland Grunberg * src/org/eclipse/linuxtools/callgraph/core/SystemTapParser.java: diff --git a/systemtap/org.eclipse.linuxtools.callgraph.core/META-INF/MANIFEST.MF b/systemtap/org.eclipse.linuxtools.callgraph.core/META-INF/MANIFEST.MF index 0dec39c6f5..f79409a93e 100644 --- a/systemtap/org.eclipse.linuxtools.callgraph.core/META-INF/MANIFEST.MF +++ b/systemtap/org.eclipse.linuxtools.callgraph.core/META-INF/MANIFEST.MF @@ -15,6 +15,7 @@ Import-Package: org.eclipse.cdt.core, org.eclipse.cdt.core.model, org.eclipse.core.filesystem, org.eclipse.jface.text, + org.eclipse.linuxtools.profiling.ui, org.eclipse.ui, org.eclipse.ui.console, org.eclipse.ui.ide, diff --git a/systemtap/org.eclipse.linuxtools.callgraph.core/src/org/eclipse/linuxtools/callgraph/core/FileFinderOpener.java b/systemtap/org.eclipse.linuxtools.callgraph.core/src/org/eclipse/linuxtools/callgraph/core/FileFinderOpener.java index 5c7fa787b6..5d650db8a5 100644 --- a/systemtap/org.eclipse.linuxtools.callgraph.core/src/org/eclipse/linuxtools/callgraph/core/FileFinderOpener.java +++ b/systemtap/org.eclipse.linuxtools.callgraph.core/src/org/eclipse/linuxtools/callgraph/core/FileFinderOpener.java @@ -10,7 +10,6 @@ *******************************************************************************/ package org.eclipse.linuxtools.callgraph.core; -import java.io.File; import java.util.ArrayList; import java.util.HashMap; @@ -24,18 +23,12 @@ import org.eclipse.cdt.core.index.IIndexManager; import org.eclipse.cdt.core.index.IIndexName; import org.eclipse.cdt.core.index.IndexFilter; import org.eclipse.cdt.core.model.ICProject; -import org.eclipse.core.filesystem.EFS; -import org.eclipse.core.filesystem.IFileStore; import org.eclipse.core.runtime.CoreException; import org.eclipse.jface.viewers.LabelProvider; +import org.eclipse.linuxtools.profiling.ui.ProfileUIUtils; import org.eclipse.swt.widgets.Shell; -import org.eclipse.ui.IEditorPart; -import org.eclipse.ui.IWorkbenchPage; import org.eclipse.ui.PartInitException; -import org.eclipse.ui.PlatformUI; import org.eclipse.ui.dialogs.ElementListSelectionDialog; -import org.eclipse.ui.ide.IDE; -import org.eclipse.ui.texteditor.ITextEditor; /** * Helper class that finds and opens files. Finds based on function names, * opens based on path and in the current default editor. @@ -45,7 +38,6 @@ public class FileFinderOpener { private static HashMap offset = new HashMap(); private static HashMap length = new HashMap(); - /** * Returns a list of files locations for all files that contain the selected @@ -104,24 +96,22 @@ public class FileFinderOpener { * @param functionName * @return */ - public static String findAndOpen(ICProject project, String functionName) { + public static void findAndOpen(ICProject project, String functionName) { //Safety valve: Do not enforce use of project names if (project == null) - return null; + return; offset.clear(); length.clear(); ArrayList files = findFunctionsInProject(project, functionName); if (files == null || files.size() < 1) - return null; - StringBuilder output = new StringBuilder(); + return; if (files.size() == 1) { open(files.get(0), offset.get(files.get(0)), length.get(files.get(0))); } else { - ElementListSelectionDialog d = new ElementListSelectionDialog( - new Shell(), new LabelProvider()); + ElementListSelectionDialog d = new ElementListSelectionDialog(new Shell(), new LabelProvider()); d.setTitle(Messages.getString("FileFinderOpener.MultipleFilesDialog")); //$NON-NLS-1$ d.setMessage(Messages.getString("FileFinderOpener.MultFilesDialogM1") + functionName + Messages.getString("FileFinderOpener.MultFilesDialogM2") + //$NON-NLS-1$ //$NON-NLS-2$ Messages.getString("FileFinderOpener.MultFilesDialogM3")); //$NON-NLS-1$ @@ -129,51 +119,25 @@ public class FileFinderOpener { d.open(); if (d.getResult() == null) { - return null; + return; } for (Object o : d.getResult()) { if (o instanceof String) { String s = (String) o; - output.append(open(s, offset.get(s), length.get(s))); + open(s, offset.get(s), length.get(s)); } } } - - return output.toString(); } - /** - * Open a file in the Editor at the specified offset, highlighting the given length - * - * @param path : Absolute path pointing to the file which will be opened. - * @param offset : Offset of the function to be highlighted. - * @param length : Length of the function to be highlighted. - * @return The title of the workbench. - */ - public static String open(String path, int offset, int length) { + public static void open(String path, int offset, int length) { if (path == null) - return null; - File fileToOpen = new File(path); - - if (fileToOpen.exists() && fileToOpen.isFile()) { - IFileStore fileStore = EFS.getLocalFileSystem().getStore(fileToOpen.toURI()); - IWorkbenchPage page = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage(); - - try { - IEditorPart ed = IDE.openEditorOnFileStore( page, fileStore ); - if (ed instanceof ITextEditor && offset > 0) { - ITextEditor text = (ITextEditor) ed; - text.selectAndReveal(offset, length); - return text.getTitle(); - } - } catch ( PartInitException e ) { - } - } else { - SystemTapUIErrorMessages mess = new SystemTapUIErrorMessages(Messages.getString("FileFinderOpener.FileNotFound"), //$NON-NLS-1$ - Messages.getString("FileFinderOpener.FileNotFound1"), Messages.getString("FileFinderOpener.FileNotFound2") + path); //$NON-NLS-1$ //$NON-NLS-2$ - mess.schedule(); + return; + try { + ProfileUIUtils.openEditorAndSelect(path, offset, length); + } catch (PartInitException e) { + e.printStackTrace(); } - return null; } } diff --git a/systemtap/org.eclipse.linuxtools.callgraph.core/src/org/eclipse/linuxtools/callgraph/core/messages.properties b/systemtap/org.eclipse.linuxtools.callgraph.core/src/org/eclipse/linuxtools/callgraph/core/messages.properties index 7a2ed1073e..05d4338715 100644 --- a/systemtap/org.eclipse.linuxtools.callgraph.core/src/org/eclipse/linuxtools/callgraph/core/messages.properties +++ b/systemtap/org.eclipse.linuxtools.callgraph.core/src/org/eclipse/linuxtools/callgraph/core/messages.properties @@ -8,13 +8,10 @@ # Contributors: # Red Hat - initial API and implementation ############################################################################### -FileFinderOpener.FileNotFound1=File not found -FileFinderOpener.FileNotFound2=Could not find file to open:\n\n FileFinderOpener.MultFilesDialogM1=Multiple files found which define a function ' FileFinderOpener.MultFilesDialogM2='. FileFinderOpener.MultFilesDialogM3=Please select a file or files to open FileFinderOpener.MultipleFilesDialog=Multiple files found -FileFinderOpener.FileNotFound=File not found SystemTapErrorHandler.NoErrRecognized=No recognizable errors detected. SystemTapErrorHandler.NoErrRecognizedMsg=Please consult error log for more information. SystemTapErrorHandler.ErrorMessage=One or more errors were encountered and logged in the error log. -- cgit v1.2.3 From ccc0cf2cd08693ad2e6d25a0ff3809a37604d37d Mon Sep 17 00:00:00 2001 From: Roland Grunberg Date: Thu, 8 Apr 2010 20:57:38 +0000 Subject: Remove unnecessary imported packages. --- systemtap/org.eclipse.linuxtools.callgraph.launch/META-INF/MANIFEST.MF | 2 -- 1 file changed, 2 deletions(-) (limited to 'systemtap') diff --git a/systemtap/org.eclipse.linuxtools.callgraph.launch/META-INF/MANIFEST.MF b/systemtap/org.eclipse.linuxtools.callgraph.launch/META-INF/MANIFEST.MF index c89a2439f5..8a1d13015b 100644 --- a/systemtap/org.eclipse.linuxtools.callgraph.launch/META-INF/MANIFEST.MF +++ b/systemtap/org.eclipse.linuxtools.callgraph.launch/META-INF/MANIFEST.MF @@ -14,8 +14,6 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Import-Package: org.eclipse.cdt.core.model, org.eclipse.cdt.debug.core, org.eclipse.cdt.launch, - org.eclipse.cdt.utils.pty, - org.eclipse.cdt.utils.spawner, org.eclipse.core.resources, org.eclipse.debug.core, org.eclipse.debug.ui, -- cgit v1.2.3 From 718d9bad8e7d86ec5f516f71b3cc390816f6d2de Mon Sep 17 00:00:00 2001 From: Roland Grunberg Date: Thu, 8 Apr 2010 20:58:43 +0000 Subject: 2010-04-08 Roland Grunberg * META-INF/MANIFEST.MF: Add required import packages. * src/org/eclipse/linuxtools/callgraph/core/FileFinderOpener.java (findAndOpen): Simplify logic by using functions in profiling framework o.e.l.profiling to link to source code. --- .../ChangeLog | 7 +++ .../META-INF/MANIFEST.MF | 11 +--- .../callgraph/core/FileFinderOpener.java | 71 ++-------------------- 3 files changed, 16 insertions(+), 73 deletions(-) (limited to 'systemtap') diff --git a/systemtap/org.eclipse.linuxtools.callgraph.core/ChangeLog b/systemtap/org.eclipse.linuxtools.callgraph.core/ChangeLog index 2779a7d977..e72478a952 100644 --- a/systemtap/org.eclipse.linuxtools.callgraph.core/ChangeLog +++ b/systemtap/org.eclipse.linuxtools.callgraph.core/ChangeLog @@ -1,3 +1,10 @@ +2010-04-08 Roland Grunberg + + * META-INF/MANIFEST.MF: Add required import packages. + * src/org/eclipse/linuxtools/callgraph/core/FileFinderOpener.java + (findAndOpen): Simplify logic by using functions in profiling + framework o.e.l.profiling to link to source code. + 2010-03-22 Roland Grunberg * META-INF/MANIFEST.MF: Add o.e.l.profiling.ui to imported packages. diff --git a/systemtap/org.eclipse.linuxtools.callgraph.core/META-INF/MANIFEST.MF b/systemtap/org.eclipse.linuxtools.callgraph.core/META-INF/MANIFEST.MF index f79409a93e..c3bf8607d2 100644 --- a/systemtap/org.eclipse.linuxtools.callgraph.core/META-INF/MANIFEST.MF +++ b/systemtap/org.eclipse.linuxtools.callgraph.core/META-INF/MANIFEST.MF @@ -9,15 +9,10 @@ Require-Bundle: org.eclipse.ui, Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Export-Package: org.eclipse.linuxtools.callgraph.core -Import-Package: org.eclipse.cdt.core, - org.eclipse.cdt.core.dom.ast, - org.eclipse.cdt.core.index, - org.eclipse.cdt.core.model, - org.eclipse.core.filesystem, +Import-Package: org.eclipse.cdt.core.model, + org.eclipse.debug.ui.sourcelookup, org.eclipse.jface.text, org.eclipse.linuxtools.profiling.ui, org.eclipse.ui, - org.eclipse.ui.console, - org.eclipse.ui.ide, - org.eclipse.ui.texteditor + org.eclipse.ui.console Bundle-Vendor: Eclipse diff --git a/systemtap/org.eclipse.linuxtools.callgraph.core/src/org/eclipse/linuxtools/callgraph/core/FileFinderOpener.java b/systemtap/org.eclipse.linuxtools.callgraph.core/src/org/eclipse/linuxtools/callgraph/core/FileFinderOpener.java index 5d650db8a5..6b7fd4d16d 100644 --- a/systemtap/org.eclipse.linuxtools.callgraph.core/src/org/eclipse/linuxtools/callgraph/core/FileFinderOpener.java +++ b/systemtap/org.eclipse.linuxtools.callgraph.core/src/org/eclipse/linuxtools/callgraph/core/FileFinderOpener.java @@ -13,22 +13,13 @@ package org.eclipse.linuxtools.callgraph.core; import java.util.ArrayList; import java.util.HashMap; -import org.eclipse.cdt.core.CCorePlugin; -import org.eclipse.cdt.core.dom.ast.IBinding; -import org.eclipse.cdt.core.dom.ast.IFunction; -import org.eclipse.cdt.core.index.IIndex; -import org.eclipse.cdt.core.index.IIndexFile; -import org.eclipse.cdt.core.index.IIndexFileLocation; -import org.eclipse.cdt.core.index.IIndexManager; -import org.eclipse.cdt.core.index.IIndexName; -import org.eclipse.cdt.core.index.IndexFilter; import org.eclipse.cdt.core.model.ICProject; -import org.eclipse.core.runtime.CoreException; import org.eclipse.jface.viewers.LabelProvider; import org.eclipse.linuxtools.profiling.ui.ProfileUIUtils; import org.eclipse.swt.widgets.Shell; import org.eclipse.ui.PartInitException; import org.eclipse.ui.dialogs.ElementListSelectionDialog; + /** * Helper class that finds and opens files. Finds based on function names, * opens based on path and in the current default editor. @@ -36,56 +27,7 @@ import org.eclipse.ui.dialogs.ElementListSelectionDialog; */ public class FileFinderOpener { - private static HashMap offset = new HashMap(); - private static HashMap length = new HashMap(); - - /** - * Returns a list of files locations for all files that contain the selected - * function name. - * - * @param project : C Project Type - * @param functionName : name of a function - * @return an ArrayList of String paths (relative to current workspace) of - * files with specified function name - */ - private static ArrayList findFunctionsInProject(ICProject project, - String functionName) { - ArrayList files = new ArrayList() ; - - IIndexManager manager = CCorePlugin.getIndexManager(); - IIndex index = null; - try { - index = manager.getIndex(project); - index.acquireReadLock(); - IBinding[] bindings = index.findBindings(functionName.toCharArray(), IndexFilter.ALL, null); - for (IBinding bind : bindings) { - if (bind instanceof IFunction) { - IFunction ifunction = (IFunction) bind; - IIndexName[] names = index.findNames(ifunction, - IIndex.FIND_DEFINITIONS); - for (IIndexName iname : names) { - IIndexFile file = iname.getFile(); - if (file != null) { - IIndexFileLocation filelocation = file.getLocation(); - String loc = filelocation.getURI().getPath(); - files.add(loc); - offset.put(loc, iname.getNodeOffset()); - length.put(loc, iname.getNodeLength()); - } - } - } - } - - } catch (CoreException e) { - e.printStackTrace(); - } catch (InterruptedException e) { - e.printStackTrace(); - } - - index.releaseReadLock(); - return files; - } - + private static HashMap map = new HashMap(); /** * Seeks all functions in the given proejct that contains the given function name. @@ -101,15 +43,14 @@ public class FileFinderOpener { if (project == null) return; - offset.clear(); - length.clear(); - ArrayList files = findFunctionsInProject(project, functionName); + map = ProfileUIUtils.findFunctionsInProject(project, functionName, -1, null); + ArrayList files = new ArrayList(map.keySet()); if (files == null || files.size() < 1) return; if (files.size() == 1) { - open(files.get(0), offset.get(files.get(0)), length.get(files.get(0))); + open(files.get(0), map.get(files.get(0))[0], map.get(files.get(0))[1]); } else { ElementListSelectionDialog d = new ElementListSelectionDialog(new Shell(), new LabelProvider()); d.setTitle(Messages.getString("FileFinderOpener.MultipleFilesDialog")); //$NON-NLS-1$ @@ -125,7 +66,7 @@ public class FileFinderOpener { for (Object o : d.getResult()) { if (o instanceof String) { String s = (String) o; - open(s, offset.get(s), length.get(s)); + open(s, map.get(s)[0], map.get(s)[1]); } } } -- cgit v1.2.3 From f4a06847363ca68f658099dff9c7c9d84a14c121 Mon Sep 17 00:00:00 2001 From: Andrew Overholt Date: Mon, 12 Apr 2010 14:55:38 +0000 Subject: 2010-04-12 Andrew Overholt * feature.properties: Match consistent license text (bug #306627). --- .../ChangeLog | 4 ++ .../feature.properties | 80 ++++++++++------------ 2 files changed, 42 insertions(+), 42 deletions(-) (limited to 'systemtap') diff --git a/systemtap/org.eclipse.linuxtools.systemtap.backup-feature/ChangeLog b/systemtap/org.eclipse.linuxtools.systemtap.backup-feature/ChangeLog index 64f4688042..d4fb337637 100644 --- a/systemtap/org.eclipse.linuxtools.systemtap.backup-feature/ChangeLog +++ b/systemtap/org.eclipse.linuxtools.systemtap.backup-feature/ChangeLog @@ -1,3 +1,7 @@ +2010-04-12 Andrew Overholt + + * feature.properties: Match consistent license text (bug #306627). + 2009-08-06 Anithra P Janakiraman * feature.xml:renaming to systemtap.backup diff --git a/systemtap/org.eclipse.linuxtools.systemtap.backup-feature/feature.properties b/systemtap/org.eclipse.linuxtools.systemtap.backup-feature/feature.properties index 9ffd1f8d0e..3b720e73ae 100644 --- a/systemtap/org.eclipse.linuxtools.systemtap.backup-feature/feature.properties +++ b/systemtap/org.eclipse.linuxtools.systemtap.backup-feature/feature.properties @@ -14,7 +14,7 @@ provider=Eclipse copyright=Copyright 2008 Phillip Muldoon. licenseURL=epl-v10.html license=\ -ECLIPSE FOUNDATION SOFTWARE USER AGREEMENT\n\ +Eclipse Foundation Software User Agreement\n\ March 17, 2005\n\ \n\ Usage Of Content\n\ @@ -23,20 +23,20 @@ THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/ OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\ USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\ AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\ -NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\ +NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\ AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\ AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\ -OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\ +OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\ TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\ OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\ BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\ \n\ Applicable Licenses\n\ \n\ -Unless otherwise indicated, all Content made available by the Eclipse Foundation\n\ -is provided to you under the terms and conditions of the Eclipse Public\n\ -License Version 1.0 ("EPL"). A copy of the EPL is provided with this\n\ -Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\ +Unless otherwise indicated, all Content made available by the\n\ +Eclipse Foundation is provided to you under the terms and conditions of\n\ +the Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is\n\ +provided with this Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\ For purposes of the EPL, "Program" will mean the Content.\n\ \n\ Content includes, but is not limited to, source code, object code,\n\ @@ -44,21 +44,17 @@ documentation and other files maintained in the Eclipse.org CVS\n\ repository ("Repository") in CVS modules ("Modules") and made available\n\ as downloadable archives ("Downloads").\n\ \n\ - - Content may be structured and packaged into modules to facilitate delivering,\n\ - extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\ - plug-in fragments ("Fragments"), and features ("Features").\n\ - - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\ - in a directory named "plugins".\n\ - - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\ - Each Feature may be packaged as a sub-directory in a directory named "features".\n\ - Within a Feature, files named "feature.xml" may contain a list of the names and version\n\ - numbers of the Plug-ins and/or Fragments associated with that Feature.\n\ - - Features may also include other Features ("Included Features"). Within a Feature, files\n\ - named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\ -\n\ -Features may also include other Features ("Included Features"). Files named\n\ -"feature.xml" may contain a list of the names and version numbers of\n\ -Included Features.\n\ + - Content may be structured and packaged into modules to facilitate delivering,\n\ + extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\ + plug-in fragments ("Fragments"), and features ("Features").\n\ + - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\ + in a directory named "plugins".\n\ + - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\ + Each Feature may be packaged as a sub-directory in a directory named "features".\n\ + Within a Feature, files named "feature.xml" may contain a list of the names and version\n\ + numbers of the Plug-ins and/or Fragments associated with that Feature.\n\ + - Features may also include other Features ("Included Features"). Within a Feature, files\n\ + named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\ \n\ The terms and conditions governing Plug-ins and Fragments should be\n\ contained in files named "about.html" ("Abouts"). The terms and\n\ @@ -67,11 +63,11 @@ in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\ Licenses may be located in any directory of a Download or Module\n\ including, but not limited to the following locations:\n\ \n\ - - The top-level (root) directory\n\ - - Plug-in and Fragment directories\n\ - - Inside Plug-ins and Fragments packaged as JARs\n\ - - Sub-directories of the directory named "src" of certain Plug-ins\n\ - - Feature directories\n\ + - The top-level (root) directory\n\ + - Plug-in and Fragment directories\n\ + - Inside Plug-ins and Fragments packaged as JARs\n\ + - Sub-directories of the directory named "src" of certain Plug-ins\n\ + - Feature directories\n\ \n\ Note: if a Feature made available by the Eclipse Foundation is installed using the\n\ Eclipse Update Manager, you must agree to a license ("Feature Update\n\ @@ -79,24 +75,24 @@ License") during the installation process. If the Feature contains\n\ Included Features, the Feature Update License should either provide you\n\ with the terms and conditions governing the Included Features or inform\n\ you where you can locate them. Feature Update Licenses may be found in\n\ -the "license" property of files named "feature.properties". Such Abouts,\n\ -Feature Licenses and Feature Update Licenses contain the terms and\n\ -conditions (or references to such terms and conditions) that govern your\n\ -use of the associated Content in that directory.\n\ +the "license" property of files named "feature.properties" found within a Feature.\n\ +Such Abouts, Feature Licenses, and Feature Update Licenses contain the\n\ +terms and conditions (or references to such terms and conditions) that\n\ +govern your use of the associated Content in that directory.\n\ \n\ -THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER\n\ +THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER\n\ TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\ SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\ \n\ - - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\ - - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\ - - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\ - - IBM Public License 1.0 (available at http://oss.software.ibm.com/developerworks/opensource/license10.html)\n\ - - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\ - - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\ + - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\ + - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\ + - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\ + - IBM Public License 1.0 (available at http://oss.software.ibm.com/developerworks/opensource/license10.html)\n\ + - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\ + - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\ \n\ IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\ -TO USE OF THE CONTENT. If no About, Feature License or Feature Update License\n\ +TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License\n\ is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\ govern that particular Content.\n\ \n\ @@ -106,7 +102,7 @@ Content may contain encryption software. The country in which you are\n\ currently may have restrictions on the import, possession, and use,\n\ and/or re-export to another country, of encryption software. BEFORE\n\ using any encryption software, please check the country's laws,\n\ -regulations and policies concerning the import, possession, or use,\n\ -and re-export of encryption software, to see if this is permitted.\n\ +regulations and policies concerning the import, possession, or use, and\n\ +re-export of encryption software, to see if this is permitted.\n\ \n\ -Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.\n \ No newline at end of file +Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.\n -- cgit v1.2.3 From ce647410e74b3737d49c6f743c73521896206ac0 Mon Sep 17 00:00:00 2001 From: Andrew Overholt Date: Mon, 12 Apr 2010 14:56:24 +0000 Subject: 2010-04-12 Andrew Overholt * feature.properties: Match consistent license text (bug #306627). --- .../ChangeLog | 4 ++ .../feature.properties | 80 ++++++++++------------ 2 files changed, 42 insertions(+), 42 deletions(-) (limited to 'systemtap') diff --git a/systemtap/org.eclipse.linuxtools.systemtap-feature/ChangeLog b/systemtap/org.eclipse.linuxtools.systemtap-feature/ChangeLog index 57110e2495..104651db4b 100644 --- a/systemtap/org.eclipse.linuxtools.systemtap-feature/ChangeLog +++ b/systemtap/org.eclipse.linuxtools.systemtap-feature/ChangeLog @@ -1,3 +1,7 @@ +2010-04-12 Andrew Overholt + + * feature.properties: Match consistent license text (bug #306627). + 2010-02-08 Andrew Overholt * feature.properties: Capitalize feature name. diff --git a/systemtap/org.eclipse.linuxtools.systemtap-feature/feature.properties b/systemtap/org.eclipse.linuxtools.systemtap-feature/feature.properties index 6498b07927..306ff088e3 100644 --- a/systemtap/org.eclipse.linuxtools.systemtap-feature/feature.properties +++ b/systemtap/org.eclipse.linuxtools.systemtap-feature/feature.properties @@ -17,7 +17,7 @@ of the Eclipse Public License v1.0 which accompanies this distribution, and is\n available at http://www.eclipse.org/legal/epl-v10.html\n licenseURL=epl-v10.html license=\ -ECLIPSE FOUNDATION SOFTWARE USER AGREEMENT\n\ +Eclipse Foundation Software User Agreement\n\ March 17, 2005\n\ \n\ Usage Of Content\n\ @@ -26,20 +26,20 @@ THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/ OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\ USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\ AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\ -NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\ +NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\ AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\ AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\ -OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\ +OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\ TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\ OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\ BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\ \n\ Applicable Licenses\n\ \n\ -Unless otherwise indicated, all Content made available by the Eclipse Foundation\n\ -is provided to you under the terms and conditions of the Eclipse Public\n\ -License Version 1.0 ("EPL"). A copy of the EPL is provided with this\n\ -Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\ +Unless otherwise indicated, all Content made available by the\n\ +Eclipse Foundation is provided to you under the terms and conditions of\n\ +the Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is\n\ +provided with this Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\ For purposes of the EPL, "Program" will mean the Content.\n\ \n\ Content includes, but is not limited to, source code, object code,\n\ @@ -47,21 +47,17 @@ documentation and other files maintained in the Eclipse.org CVS\n\ repository ("Repository") in CVS modules ("Modules") and made available\n\ as downloadable archives ("Downloads").\n\ \n\ - - Content may be structured and packaged into modules to facilitate delivering,\n\ - extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\ - plug-in fragments ("Fragments"), and features ("Features").\n\ - - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\ - in a directory named "plugins".\n\ - - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\ - Each Feature may be packaged as a sub-directory in a directory named "features".\n\ - Within a Feature, files named "feature.xml" may contain a list of the names and version\n\ - numbers of the Plug-ins and/or Fragments associated with that Feature.\n\ - - Features may also include other Features ("Included Features"). Within a Feature, files\n\ - named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\ -\n\ -Features may also include other Features ("Included Features"). Files named\n\ -"feature.xml" may contain a list of the names and version numbers of\n\ -Included Features.\n\ + - Content may be structured and packaged into modules to facilitate delivering,\n\ + extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\ + plug-in fragments ("Fragments"), and features ("Features").\n\ + - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\ + in a directory named "plugins".\n\ + - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\ + Each Feature may be packaged as a sub-directory in a directory named "features".\n\ + Within a Feature, files named "feature.xml" may contain a list of the names and version\n\ + numbers of the Plug-ins and/or Fragments associated with that Feature.\n\ + - Features may also include other Features ("Included Features"). Within a Feature, files\n\ + named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\ \n\ The terms and conditions governing Plug-ins and Fragments should be\n\ contained in files named "about.html" ("Abouts"). The terms and\n\ @@ -70,11 +66,11 @@ in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\ Licenses may be located in any directory of a Download or Module\n\ including, but not limited to the following locations:\n\ \n\ - - The top-level (root) directory\n\ - - Plug-in and Fragment directories\n\ - - Inside Plug-ins and Fragments packaged as JARs\n\ - - Sub-directories of the directory named "src" of certain Plug-ins\n\ - - Feature directories\n\ + - The top-level (root) directory\n\ + - Plug-in and Fragment directories\n\ + - Inside Plug-ins and Fragments packaged as JARs\n\ + - Sub-directories of the directory named "src" of certain Plug-ins\n\ + - Feature directories\n\ \n\ Note: if a Feature made available by the Eclipse Foundation is installed using the\n\ Eclipse Update Manager, you must agree to a license ("Feature Update\n\ @@ -82,24 +78,24 @@ License") during the installation process. If the Feature contains\n\ Included Features, the Feature Update License should either provide you\n\ with the terms and conditions governing the Included Features or inform\n\ you where you can locate them. Feature Update Licenses may be found in\n\ -the "license" property of files named "feature.properties". Such Abouts,\n\ -Feature Licenses and Feature Update Licenses contain the terms and\n\ -conditions (or references to such terms and conditions) that govern your\n\ -use of the associated Content in that directory.\n\ +the "license" property of files named "feature.properties" found within a Feature.\n\ +Such Abouts, Feature Licenses, and Feature Update Licenses contain the\n\ +terms and conditions (or references to such terms and conditions) that\n\ +govern your use of the associated Content in that directory.\n\ \n\ -THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER\n\ +THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER\n\ TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\ SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\ \n\ - - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\ - - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\ - - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\ - - IBM Public License 1.0 (available at http://oss.software.ibm.com/developerworks/opensource/license10.html)\n\ - - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\ - - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\ + - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\ + - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\ + - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\ + - IBM Public License 1.0 (available at http://oss.software.ibm.com/developerworks/opensource/license10.html)\n\ + - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\ + - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\ \n\ IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\ -TO USE OF THE CONTENT. If no About, Feature License or Feature Update License\n\ +TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License\n\ is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\ govern that particular Content.\n\ \n\ @@ -109,7 +105,7 @@ Content may contain encryption software. The country in which you are\n\ currently may have restrictions on the import, possession, and use,\n\ and/or re-export to another country, of encryption software. BEFORE\n\ using any encryption software, please check the country's laws,\n\ -regulations and policies concerning the import, possession, or use,\n\ -and re-export of encryption software, to see if this is permitted.\n\ +regulations and policies concerning the import, possession, or use, and\n\ +re-export of encryption software, to see if this is permitted.\n\ \n\ -Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.\n \ No newline at end of file +Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.\n -- cgit v1.2.3 From 14e52e9853f0bf26ae0dfc67a93348b927edc5b5 Mon Sep 17 00:00:00 2001 From: Andrew Overholt Date: Tue, 13 Apr 2010 19:21:49 +0000 Subject: 2010-04-13 Andrew Overholt * feature.xml: Restrict to os=linux. --- systemtap/org.eclipse.linuxtools.callgraph-feature/ChangeLog | 4 ++++ systemtap/org.eclipse.linuxtools.callgraph-feature/feature.xml | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-) (limited to 'systemtap') diff --git a/systemtap/org.eclipse.linuxtools.callgraph-feature/ChangeLog b/systemtap/org.eclipse.linuxtools.callgraph-feature/ChangeLog index 9d7731a74c..ff08d62148 100644 --- a/systemtap/org.eclipse.linuxtools.callgraph-feature/ChangeLog +++ b/systemtap/org.eclipse.linuxtools.callgraph-feature/ChangeLog @@ -1,3 +1,7 @@ +2010-04-13 Andrew Overholt + + * feature.xml: Restrict to os=linux. + 2009-11-03 Charley Wang * feature.properties: Change description for Callgraph feature. Add Changelog diff --git a/systemtap/org.eclipse.linuxtools.callgraph-feature/feature.xml b/systemtap/org.eclipse.linuxtools.callgraph-feature/feature.xml index fe8e7f2094..0c4550c779 100644 --- a/systemtap/org.eclipse.linuxtools.callgraph-feature/feature.xml +++ b/systemtap/org.eclipse.linuxtools.callgraph-feature/feature.xml @@ -3,7 +3,8 @@ id="org.eclipse.linuxtools.callgraph" label="%featureName" version="0.0.1.qualifier" - provider-name="%featureProvider"> + provider-name="%featureProvider" + os="linux"> %description -- cgit v1.2.3 From 577dc3d6b9d12c35fdad3db03c3b05c022ef50ae Mon Sep 17 00:00:00 2001 From: Roland Grunberg Date: Tue, 13 Apr 2010 19:54:04 +0000 Subject: 2010-04-13 Roland Grunberg * src/org/eclipse/linuxtools/callgraph/launch/SystemTapLaunchConfigurationDelegate.java: Clean up code. --- .../ChangeLog | 5 +++ .../SystemTapLaunchConfigurationDelegate.java | 46 +--------------------- 2 files changed, 7 insertions(+), 44 deletions(-) (limited to 'systemtap') diff --git a/systemtap/org.eclipse.linuxtools.callgraph.launch/ChangeLog b/systemtap/org.eclipse.linuxtools.callgraph.launch/ChangeLog index a009cbc8b7..4986af1528 100644 --- a/systemtap/org.eclipse.linuxtools.callgraph.launch/ChangeLog +++ b/systemtap/org.eclipse.linuxtools.callgraph.launch/ChangeLog @@ -1,3 +1,8 @@ +2010-04-13 Roland Grunberg + + * src/org/eclipse/linuxtools/callgraph/launch/SystemTapLaunchConfigurationDelegate.java: + Clean up code. + 2010-03-05 Charley Wang * src/org/eclipse/linuxtools/callgraph/launch/SystemTapLaunchConfigurationDelegate.java: Stop passsing a useless argument to finishLaunch diff --git a/systemtap/org.eclipse.linuxtools.callgraph.launch/src/org/eclipse/linuxtools/callgraph/launch/SystemTapLaunchConfigurationDelegate.java b/systemtap/org.eclipse.linuxtools.callgraph.launch/src/org/eclipse/linuxtools/callgraph/launch/SystemTapLaunchConfigurationDelegate.java index 7eaddc673c..d8df555d3e 100644 --- a/systemtap/org.eclipse.linuxtools.callgraph.launch/src/org/eclipse/linuxtools/callgraph/launch/SystemTapLaunchConfigurationDelegate.java +++ b/systemtap/org.eclipse.linuxtools.callgraph.launch/src/org/eclipse/linuxtools/callgraph/launch/SystemTapLaunchConfigurationDelegate.java @@ -40,7 +40,6 @@ import org.eclipse.linuxtools.callgraph.core.SystemTapUIErrorMessages; import org.eclipse.linuxtools.profiling.launch.ProfileLaunchConfigurationDelegate; import org.eclipse.ui.console.TextConsole; - /** * Delegate for Stap scripts. The Delegate generates part of the command string * and schedules a job to finish generation of the command and execute. @@ -69,7 +68,6 @@ public class SystemTapLaunchConfigurationDelegate extends protected String getPluginID() { return null; } - /** * Sets strings to blank, booleans to false and everything else to null @@ -101,8 +99,6 @@ public class SystemTapLaunchConfigurationDelegate extends if (monitor.isCanceled()) { return; } - - /* * Set variables @@ -182,7 +178,6 @@ public class SystemTapLaunchConfigurationDelegate extends finishLaunch(launch, config, m, true); } - /** * Returns the current SystemTap command, or returns an error message. @@ -194,7 +189,6 @@ public class SystemTapLaunchConfigurationDelegate extends else return Messages.getString("SystemTapLaunchConfigurationDelegate.NoCommand"); //$NON-NLS-1$ } - private void finishLaunch(ILaunch launch, ILaunchConfiguration config, IProgressMonitor monitor, boolean retry) { @@ -249,7 +243,6 @@ public class SystemTapLaunchConfigurationDelegate extends } monitor.worked(1); - /* * Launch */ @@ -259,7 +252,6 @@ public class SystemTapLaunchConfigurationDelegate extends StreamListener s = new StreamListener(); process.getStreamsProxy().getErrorStreamMonitor().addListener(s); - while (!process.isTerminated()) { Thread.sleep(100); @@ -272,7 +264,6 @@ public class SystemTapLaunchConfigurationDelegate extends Thread.sleep(100); s.close(); parser.setKillButtonEnabled(false); - if (process.getExitValue() != 0) { parser.cancelJob(); @@ -286,32 +277,6 @@ public class SystemTapLaunchConfigurationDelegate extends if ((monitor != null && monitor.isCanceled())) return; - - //If we are meant to retry, and the conditions for retry are met - //Currently conditions only met if there are mismatched probe points present - //TODO: Do we need a retry now that we cannot think of a case where we need to relaunch? - /*if (retry) { - - SystemTapUIErrorMessages mess = new SystemTapUIErrorMessages(Messages.getString("SystemTapLaunchConfigurationDelegate.Relaunch1"), //$NON-NLS-1$ - Messages.getString("SystemTapLaunchConfigurationDelegate.Relaunch2"), //$NON-NLS-1$ - Messages.getString("SystemTapLaunchConfigurationDelegate.Relaunch3")); //$NON-NLS-1$ - mess.schedule(); - - //If finishHandling determines that errors are not fixable, return - if (!errorHandler.finishHandling(monitor, scriptPath)) - return; - - - //Abort job - if ((monitor != null && monitor.isCanceled()) || parser.isJobCancelled()) { - monitor.setCanceled(true); - parser.cancelJob(); - return; - } - finishLaunch(launch, config, options, monitor, false); - return; - }*/ - errorHandler.finishHandling(monitor, scriptPath); if (errorHandler.isErrorRecognized()) { SystemTapUIErrorMessages errorDialog = new SystemTapUIErrorMessages @@ -331,7 +296,6 @@ public class SystemTapLaunchConfigurationDelegate extends if (parser != null) parser.cancelJob(); } - monitor.worked(1); @@ -340,7 +304,6 @@ public class SystemTapLaunchConfigurationDelegate extends DocWriter dw = new DocWriter(Messages.getString("SystemTapLaunchConfigurationDelegate.DocWriterName"), //$NON-NLS-1$ ((TextConsole)Helper.getConsoleByName(config.getName())), message); dw.schedule(); - } catch (IOException e) { e.printStackTrace(); @@ -354,7 +317,6 @@ public class SystemTapLaunchConfigurationDelegate extends } } - private String generateErrorMessage(String configName, String binaryCommand) { String output = ""; //$NON-NLS-1$ @@ -368,8 +330,7 @@ public class SystemTapLaunchConfigurationDelegate extends Messages.getString("SystemTapLaunchConfigurationDelegate.Relaunch9") + //$NON-NLS-1$ "configuration in Profile As --> Profile Configurations." + //$NON-NLS-1$ PluginConstants.NEW_LINE + PluginConstants.NEW_LINE; - } - else { + } else { output = PluginConstants.NEW_LINE + PluginConstants.NEW_LINE +"-------------" //$NON-NLS-1$ + PluginConstants.NEW_LINE @@ -385,7 +346,6 @@ public class SystemTapLaunchConfigurationDelegate extends return output; } - private class StreamListener implements IStreamListener{ private int counter; @@ -398,6 +358,7 @@ public class SystemTapLaunchConfigurationDelegate extends bw = Helper.setBufferedWriter(TEMP_ERROR_OUTPUT); //$NON-NLS-1$ counter = 0; } + @Override public void streamAppended(String text, IStreamMonitor monitor) { try { @@ -408,16 +369,13 @@ public class SystemTapLaunchConfigurationDelegate extends } catch (IOException e) { e.printStackTrace(); } - } public void close() throws IOException { bw.close(); } - } - @Override public String generateCommand(ILaunchConfiguration config) { // Generate the command -- cgit v1.2.3 From 0665581cb26d952e3f71c9153b96e6ccaf457d8f Mon Sep 17 00:00:00 2001 From: Roland Grunberg Date: Tue, 13 Apr 2010 19:55:00 +0000 Subject: 2010-04-13 Roland Grunberg * src/org/eclipse/linuxtools/callgraph/core/SystemTapTextParser.java: * src/org/eclipse/linuxtools/callgraph/core/SystemTapErrorHandler.java: Clean up code. --- .../ChangeLog | 6 ++++ .../callgraph/core/SystemTapErrorHandler.java | 36 ++++++++++------------ .../callgraph/core/SystemTapTextParser.java | 2 +- 3 files changed, 23 insertions(+), 21 deletions(-) (limited to 'systemtap') diff --git a/systemtap/org.eclipse.linuxtools.callgraph.core/ChangeLog b/systemtap/org.eclipse.linuxtools.callgraph.core/ChangeLog index e72478a952..e1de72d6d1 100644 --- a/systemtap/org.eclipse.linuxtools.callgraph.core/ChangeLog +++ b/systemtap/org.eclipse.linuxtools.callgraph.core/ChangeLog @@ -1,3 +1,9 @@ +2010-04-13 Roland Grunberg + + * src/org/eclipse/linuxtools/callgraph/core/SystemTapTextParser.java: + * src/org/eclipse/linuxtools/callgraph/core/SystemTapErrorHandler.java: + Clean up code. + 2010-04-08 Roland Grunberg * META-INF/MANIFEST.MF: Add required import packages. diff --git a/systemtap/org.eclipse.linuxtools.callgraph.core/src/org/eclipse/linuxtools/callgraph/core/SystemTapErrorHandler.java b/systemtap/org.eclipse.linuxtools.callgraph.core/src/org/eclipse/linuxtools/callgraph/core/SystemTapErrorHandler.java index 23bcac930d..cf54203699 100644 --- a/systemtap/org.eclipse.linuxtools.callgraph.core/src/org/eclipse/linuxtools/callgraph/core/SystemTapErrorHandler.java +++ b/systemtap/org.eclipse.linuxtools.callgraph.core/src/org/eclipse/linuxtools/callgraph/core/SystemTapErrorHandler.java @@ -30,11 +30,11 @@ import org.eclipse.core.runtime.Status; public class SystemTapErrorHandler { public static final String FILE_PROP = "errors.prop"; //$NON-NLS-1$ + private final int LINE_LIMIT = 300; private boolean errorRecognized; private StringBuilder errorMessage = new StringBuilder(""); //$NON-NLS-1$ private StringBuilder logContents; - public SystemTapErrorHandler() { errorRecognized = false; errorMessage.append(Messages @@ -58,14 +58,13 @@ public class SystemTapErrorHandler { try { BufferedReader buff = new BufferedReader(new FileReader(file)); String line; - int index; for (String message : errorsList) { buff = new BufferedReader(new FileReader(file)); while ((line = buff.readLine()) != null) { if (m != null && m.isCanceled()) return; - index = line.indexOf('='); + int index = line.indexOf('='); Pattern pat = Pattern.compile(line.substring(0, index),Pattern.DOTALL); Matcher matcher = pat.matcher(message); @@ -78,7 +77,7 @@ public class SystemTapErrorHandler { String errorFound = line.substring(index+1); if (!errorMessage.toString().contains(errorFound)) { - errorMessage.append(errorFound+ PluginConstants.NEW_LINE); + errorMessage.append(errorFound + PluginConstants.NEW_LINE); } break; } @@ -95,14 +94,12 @@ public class SystemTapErrorHandler { } - /** * Append to the log contents */ public void appendToLog (String header){ logContents.append(header); } - /** * Handle the error. @@ -119,11 +116,10 @@ public class SystemTapErrorHandler { int counter = 0; while ((line = br.readLine()) != null) { counter++; - builder.append(line); - builder.append("\n"); //$NON-NLS-1$ + builder.append(line + "\n"); //$NON-NLS-1$ if (m != null && m.isCanceled()) return; - if (counter == 300) { + if (counter == LINE_LIMIT) { handle(m, builder.toString()); builder = new StringBuilder(); counter = 0; @@ -145,7 +141,6 @@ public class SystemTapErrorHandler { writeToLog(); } - /** * Writes the contents of logContents to the error log, along with date and @@ -157,11 +152,10 @@ public class SystemTapErrorHandler { logContents = new StringBuilder(); //$NON-NLS-1$ } - /** * Delete the log at File and replace it with a new (empty) file - * @param log + * @param log The File object for the log file to delete and refresh */ public static void deleteLog(File log) { log.delete(); @@ -172,11 +166,9 @@ public class SystemTapErrorHandler { } } - /** - * Returns true if an error matches one of the regex's in error.prop - * - * @return + * @return Returns true if an error matches one of the regex's in error.prop + * and false otherwise. */ public boolean isErrorRecognized() { return errorRecognized; @@ -184,19 +176,23 @@ public class SystemTapErrorHandler { /** * Convenience method to change the error recognition value. - * - * @param errorsRecognized + * @param errorsRecognized True if the handler recognizes some error + * and false otherwise. */ private void setErrorRecognized(boolean errorsRecognized) { errorRecognized = errorsRecognized; } - + /** + * @return The error message string + */ public String getErrorMessage(){ return errorMessage.toString(); } - + /** + * @return The string contents of what will be printed to the log + */ public String getLogContents(){ return logContents.toString(); } diff --git a/systemtap/org.eclipse.linuxtools.callgraph.core/src/org/eclipse/linuxtools/callgraph/core/SystemTapTextParser.java b/systemtap/org.eclipse.linuxtools.callgraph.core/src/org/eclipse/linuxtools/callgraph/core/SystemTapTextParser.java index 5d3f78066b..6c533f9b11 100644 --- a/systemtap/org.eclipse.linuxtools.callgraph.core/src/org/eclipse/linuxtools/callgraph/core/SystemTapTextParser.java +++ b/systemtap/org.eclipse.linuxtools.callgraph.core/src/org/eclipse/linuxtools/callgraph/core/SystemTapTextParser.java @@ -44,7 +44,7 @@ public class SystemTapTextParser extends SystemTapParser{ while ((line = buff.readLine()) != null) { if (monitor.isCanceled()) return Status.CANCEL_STATUS; - text.append(line + "\n"); + text.append(line + "\n"); //$NON-NLS-1$ } setData(text.toString()); if (text.length() > 0) -- cgit v1.2.3 From 3b3c93a3b3eb6de67e62ba3ba73540b11380fd21 Mon Sep 17 00:00:00 2001 From: Andrew Overholt Date: Wed, 14 Apr 2010 13:40:44 +0000 Subject: 2010-04-14 Andrew Overholt * feature.xml: Add OS filter for Linux (won't work on other OSes). --- systemtap/org.eclipse.linuxtools.systemtap-feature/ChangeLog | 4 ++++ systemtap/org.eclipse.linuxtools.systemtap-feature/feature.xml | 5 +++-- 2 files changed, 7 insertions(+), 2 deletions(-) (limited to 'systemtap') diff --git a/systemtap/org.eclipse.linuxtools.systemtap-feature/ChangeLog b/systemtap/org.eclipse.linuxtools.systemtap-feature/ChangeLog index 104651db4b..30e6d36a1e 100644 --- a/systemtap/org.eclipse.linuxtools.systemtap-feature/ChangeLog +++ b/systemtap/org.eclipse.linuxtools.systemtap-feature/ChangeLog @@ -1,3 +1,7 @@ +2010-04-14 Andrew Overholt + + * feature.xml: Add OS filter for Linux (won't work on other OSes). + 2010-04-12 Andrew Overholt * feature.properties: Match consistent license text (bug #306627). diff --git a/systemtap/org.eclipse.linuxtools.systemtap-feature/feature.xml b/systemtap/org.eclipse.linuxtools.systemtap-feature/feature.xml index 6fc143adee..64513a22cc 100644 --- a/systemtap/org.eclipse.linuxtools.systemtap-feature/feature.xml +++ b/systemtap/org.eclipse.linuxtools.systemtap-feature/feature.xml @@ -3,7 +3,8 @@ id="org.eclipse.linuxtools.systemtap" label="%description" version="0.3.0.qualifier" - provider-name="%provider"> + provider-name="%provider" + os="linux"> %description @@ -16,7 +17,7 @@ %license - + -- cgit v1.2.3 From b360785354bee88d4ce01789fcdfe82db5ea9058 Mon Sep 17 00:00:00 2001 From: Andrew Overholt Date: Mon, 26 Apr 2010 15:53:26 +0000 Subject: 2010-04-26 Andrew Overholt * feature.properties: Match consistent license text (bug #306627). Update copyright year. * license.html: New file. HTML version of SUA (bug #306627). * build.properties: Include license.html. --- .../ChangeLog | 7 ++ .../build.properties | 3 +- .../feature.properties | 126 ++++++++++++--------- .../license.html | 107 +++++++++++++++++ 4 files changed, 191 insertions(+), 52 deletions(-) create mode 100644 systemtap/org.eclipse.linuxtools.callgraph-feature/license.html (limited to 'systemtap') diff --git a/systemtap/org.eclipse.linuxtools.callgraph-feature/ChangeLog b/systemtap/org.eclipse.linuxtools.callgraph-feature/ChangeLog index ff08d62148..b6c4466817 100644 --- a/systemtap/org.eclipse.linuxtools.callgraph-feature/ChangeLog +++ b/systemtap/org.eclipse.linuxtools.callgraph-feature/ChangeLog @@ -1,3 +1,10 @@ +2010-04-26 Andrew Overholt + + * feature.properties: Match consistent license text (bug #306627). Update + copyright year. + * license.html: New file. HTML version of SUA (bug #306627). + * build.properties: Include license.html. + 2010-04-13 Andrew Overholt * feature.xml: Restrict to os=linux. diff --git a/systemtap/org.eclipse.linuxtools.callgraph-feature/build.properties b/systemtap/org.eclipse.linuxtools.callgraph-feature/build.properties index 0c6ef87303..b74af86fe4 100644 --- a/systemtap/org.eclipse.linuxtools.callgraph-feature/build.properties +++ b/systemtap/org.eclipse.linuxtools.callgraph-feature/build.properties @@ -1,3 +1,4 @@ bin.includes = feature.xml,\ feature.properties,\ - epl-v10.html + epl-v10.html,\ + license.html diff --git a/systemtap/org.eclipse.linuxtools.callgraph-feature/feature.properties b/systemtap/org.eclipse.linuxtools.callgraph-feature/feature.properties index d7b3fa5018..aa54af913a 100644 --- a/systemtap/org.eclipse.linuxtools.callgraph-feature/feature.properties +++ b/systemtap/org.eclipse.linuxtools.callgraph-feature/feature.properties @@ -11,13 +11,11 @@ featureName=C/C++ Call Graph Visualization (Incubation) featureProvider=Eclipse description=Tracks function calls in a C/C++ program as they occur. Records start and end time for each function as well as any user-specified information, and displays everything as a graph of nodes. -copyright=Copyright (c) 2009 Red Hat, Inc.\n\ -All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0\n\ -which accompanies this distribution, and is available at\n\ -http://www.eclipse.org/legal/epl-v10.html +copyright=Copyright (c) 2009, 2010 Red Hat, Inc. +licenseURL=license.html license=\ -ECLIPSE FOUNDATION SOFTWARE USER AGREEMENT\n\ -March 17, 2005\n\ +Eclipse Foundation Software User Agreement\n\ +April 14, 2010\n\ \n\ Usage Of Content\n\ \n\ @@ -25,42 +23,38 @@ THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/ OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\ USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\ AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\ -NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\ +NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\ AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\ AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\ -OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\ +OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\ TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\ OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\ BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\ \n\ Applicable Licenses\n\ \n\ -Unless otherwise indicated, all Content made available by the Eclipse Foundation\n\ -is provided to you under the terms and conditions of the Eclipse Public\n\ -License Version 1.0 ("EPL"). A copy of the EPL is provided with this\n\ -Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\ +Unless otherwise indicated, all Content made available by the\n\ +Eclipse Foundation is provided to you under the terms and conditions of\n\ +the Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is\n\ +provided with this Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\ For purposes of the EPL, "Program" will mean the Content.\n\ \n\ Content includes, but is not limited to, source code, object code,\n\ -documentation and other files maintained in the Eclipse.org CVS\n\ -repository ("Repository") in CVS modules ("Modules") and made available\n\ +documentation and other files maintained in the Eclipse Foundation source code\n\ +repository ("Repository") in software modules ("Modules") and made available\n\ as downloadable archives ("Downloads").\n\ \n\ - - Content may be structured and packaged into modules to facilitate delivering,\n\ - extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\ - plug-in fragments ("Fragments"), and features ("Features").\n\ - - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\ - in a directory named "plugins".\n\ - - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\ - Each Feature may be packaged as a sub-directory in a directory named "features".\n\ - Within a Feature, files named "feature.xml" may contain a list of the names and version\n\ - numbers of the Plug-ins and/or Fragments associated with that Feature.\n\ - - Features may also include other Features ("Included Features"). Within a Feature, files\n\ - named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\ -\n\ -Features may also include other Features ("Included Features"). Files named\n\ -"feature.xml" may contain a list of the names and version numbers of\n\ -Included Features.\n\ + - Content may be structured and packaged into modules to facilitate delivering,\n\ + extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\ + plug-in fragments ("Fragments"), and features ("Features").\n\ + - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\ + in a directory named "plugins".\n\ + - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\ + Each Feature may be packaged as a sub-directory in a directory named "features".\n\ + Within a Feature, files named "feature.xml" may contain a list of the names and version\n\ + numbers of the Plug-ins and/or Fragments associated with that Feature.\n\ + - Features may also include other Features ("Included Features"). Within a Feature, files\n\ + named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\ \n\ The terms and conditions governing Plug-ins and Fragments should be\n\ contained in files named "about.html" ("Abouts"). The terms and\n\ @@ -69,46 +63,76 @@ in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\ Licenses may be located in any directory of a Download or Module\n\ including, but not limited to the following locations:\n\ \n\ - - The top-level (root) directory\n\ - - Plug-in and Fragment directories\n\ - - Inside Plug-ins and Fragments packaged as JARs\n\ - - Sub-directories of the directory named "src" of certain Plug-ins\n\ - - Feature directories\n\ + - The top-level (root) directory\n\ + - Plug-in and Fragment directories\n\ + - Inside Plug-ins and Fragments packaged as JARs\n\ + - Sub-directories of the directory named "src" of certain Plug-ins\n\ + - Feature directories\n\ \n\ Note: if a Feature made available by the Eclipse Foundation is installed using the\n\ -Eclipse Update Manager, you must agree to a license ("Feature Update\n\ -License") during the installation process. If the Feature contains\n\ +Provisioning Technology (as defined below), you must agree to a license ("Feature \n\ +Update License") during the installation process. If the Feature contains\n\ Included Features, the Feature Update License should either provide you\n\ with the terms and conditions governing the Included Features or inform\n\ you where you can locate them. Feature Update Licenses may be found in\n\ -the "license" property of files named "feature.properties". Such Abouts,\n\ -Feature Licenses and Feature Update Licenses contain the terms and\n\ -conditions (or references to such terms and conditions) that govern your\n\ -use of the associated Content in that directory.\n\ +the "license" property of files named "feature.properties" found within a Feature.\n\ +Such Abouts, Feature Licenses, and Feature Update Licenses contain the\n\ +terms and conditions (or references to such terms and conditions) that\n\ +govern your use of the associated Content in that directory.\n\ \n\ -THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER\n\ +THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER\n\ TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\ SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\ \n\ - - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\ - - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\ - - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\ - - IBM Public License 1.0 (available at http://oss.software.ibm.com/developerworks/opensource/license10.html)\n\ - - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\ - - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\ + - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\ + - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\ + - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\ + - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\ + - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\ \n\ IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\ -TO USE OF THE CONTENT. If no About, Feature License or Feature Update License\n\ +TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License\n\ is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\ govern that particular Content.\n\ \n\ +\n\Use of Provisioning Technology\n\ +\n\ +The Eclipse Foundation makes available provisioning software, examples of which include,\n\ +but are not limited to, p2 and the Eclipse Update Manager ("Provisioning Technology") for\n\ +the purpose of allowing users to install software, documentation, information and/or\n\ +other materials (collectively "Installable Software"). This capability is provided with\n\ +the intent of allowing such users to install, extend and update Eclipse-based products.\n\ +Information about packaging Installable Software is available at\n\ +http://eclipse.org/equinox/p2/repository_packaging.html ("Specification").\n\ +\n\ +You may use Provisioning Technology to allow other parties to install Installable Software.\n\ +You shall be responsible for enabling the applicable license agreements relating to the\n\ +Installable Software to be presented to, and accepted by, the users of the Provisioning Technology\n\ +in accordance with the Specification. By using Provisioning Technology in such a manner and\n\ +making it available in accordance with the Specification, you further acknowledge your\n\ +agreement to, and the acquisition of all necessary rights to permit the following:\n\ +\n\ + 1. A series of actions may occur ("Provisioning Process") in which a user may execute\n\ + the Provisioning Technology on a machine ("Target Machine") with the intent of installing,\n\ + extending or updating the functionality of an Eclipse-based product.\n\ + 2. During the Provisioning Process, the Provisioning Technology may cause third party\n\ + Installable Software or a portion thereof to be accessed and copied to the Target Machine.\n\ + 3. Pursuant to the Specification, you will provide to the user the terms and conditions that\n\ + govern the use of the Installable Software ("Installable Software Agreement") and such\n\ + Installable Software Agreement shall be accessed from the Target Machine in accordance\n\ + with the Specification. Such Installable Software Agreement must inform the user of the\n\ + terms and conditions that govern the Installable Software and must solicit acceptance by\n\ + the end user in the manner prescribed in such Installable Software Agreement. Upon such\n\ + indication of agreement by the user, the provisioning Technology will complete installation\n\ + of the Installable Software.\n\ +\n\ Cryptography\n\ \n\ Content may contain encryption software. The country in which you are\n\ currently may have restrictions on the import, possession, and use,\n\ and/or re-export to another country, of encryption software. BEFORE\n\ using any encryption software, please check the country's laws,\n\ -regulations and policies concerning the import, possession, or use,\n\ -and re-export of encryption software, to see if this is permitted.\n\ +regulations and policies concerning the import, possession, or use, and\n\ +re-export of encryption software, to see if this is permitted.\n\ \n\ -Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.\n \ No newline at end of file +Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.\n diff --git a/systemtap/org.eclipse.linuxtools.callgraph-feature/license.html b/systemtap/org.eclipse.linuxtools.callgraph-feature/license.html new file mode 100644 index 0000000000..c184ca36a9 --- /dev/null +++ b/systemtap/org.eclipse.linuxtools.callgraph-feature/license.html @@ -0,0 +1,107 @@ + + + + + +Eclipse Foundation Software User Agreement + + + +

Eclipse Foundation Software User Agreement

+

April 14, 2010

+ +

Usage Of Content

+ +

THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS + (COLLECTIVELY "CONTENT"). USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND + CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE + OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR + NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND + CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.

+ +

Applicable Licenses

+ +

Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0 + ("EPL"). A copy of the EPL is provided with this Content and is also available at http://www.eclipse.org/legal/epl-v10.html. + For purposes of the EPL, "Program" will mean the Content.

+ +

Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code + repository ("Repository") in software modules ("Modules") and made available as downloadable archives ("Downloads").

+ +
    +
  • Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"), plug-in fragments ("Fragments"), and features ("Features").
  • +
  • Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java™ ARchive) in a directory named "plugins".
  • +
  • A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material. Each Feature may be packaged as a sub-directory in a directory named "features". Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of the Plug-ins + and/or Fragments associated with that Feature.
  • +
  • Features may also include other Features ("Included Features"). Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of Included Features.
  • +
+ +

The terms and conditions governing Plug-ins and Fragments should be contained in files named "about.html" ("Abouts"). The terms and conditions governing Features and +Included Features should be contained in files named "license.html" ("Feature Licenses"). Abouts and Feature Licenses may be located in any directory of a Download or Module +including, but not limited to the following locations:

+ +
    +
  • The top-level (root) directory
  • +
  • Plug-in and Fragment directories
  • +
  • Inside Plug-ins and Fragments packaged as JARs
  • +
  • Sub-directories of the directory named "src" of certain Plug-ins
  • +
  • Feature directories
  • +
+ +

Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license ("Feature Update License") during the +installation process. If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or +inform you where you can locate them. Feature Update Licenses may be found in the "license" property of files named "feature.properties" found within a Feature. +Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in +that directory.

+ +

THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS. SOME OF THESE +OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):

+ + + +

IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License is provided, please +contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.

+ + +

Use of Provisioning Technology

+ +

The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse + Update Manager ("Provisioning Technology") for the purpose of allowing users to install software, documentation, information and/or + other materials (collectively "Installable Software"). This capability is provided with the intent of allowing such users to + install, extend and update Eclipse-based products. Information about packaging Installable Software is available at http://eclipse.org/equinox/p2/repository_packaging.html + ("Specification").

+ +

You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the + applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology + in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the + Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:

+ +
    +
  1. A series of actions may occur ("Provisioning Process") in which a user may execute the Provisioning Technology + on a machine ("Target Machine") with the intent of installing, extending or updating the functionality of an Eclipse-based + product.
  2. +
  3. During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be + accessed and copied to the Target Machine.
  4. +
  5. Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable + Software ("Installable Software Agreement") and such Installable Software Agreement shall be accessed from the Target + Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern + the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such + indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.
  6. +
+ +

Cryptography

+ +

Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to + another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import, + possession, or use, and re-export of encryption software, to see if this is permitted.

+ +

Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.

+ + -- cgit v1.2.3 From 0b8e124bc4b3c069387711b48a5b2da7d65e81cf Mon Sep 17 00:00:00 2001 From: Andrew Overholt Date: Mon, 26 Apr 2010 15:57:32 +0000 Subject: 2010-04-26 Andrew Overholt * feature.xml: Use featureURL property instead of explicit URL. --- systemtap/org.eclipse.linuxtools.callgraph-feature/ChangeLog | 4 ++++ systemtap/org.eclipse.linuxtools.callgraph-feature/feature.xml | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) (limited to 'systemtap') diff --git a/systemtap/org.eclipse.linuxtools.callgraph-feature/ChangeLog b/systemtap/org.eclipse.linuxtools.callgraph-feature/ChangeLog index b6c4466817..f14008ff7e 100644 --- a/systemtap/org.eclipse.linuxtools.callgraph-feature/ChangeLog +++ b/systemtap/org.eclipse.linuxtools.callgraph-feature/ChangeLog @@ -1,3 +1,7 @@ +2010-04-26 Andrew Overholt + + * feature.xml: Use featureURL property instead of explicit URL. + 2010-04-26 Andrew Overholt * feature.properties: Match consistent license text (bug #306627). Update diff --git a/systemtap/org.eclipse.linuxtools.callgraph-feature/feature.xml b/systemtap/org.eclipse.linuxtools.callgraph-feature/feature.xml index 0c4550c779..d6c8e23496 100644 --- a/systemtap/org.eclipse.linuxtools.callgraph-feature/feature.xml +++ b/systemtap/org.eclipse.linuxtools.callgraph-feature/feature.xml @@ -14,7 +14,7 @@ %copyright - + %license -- cgit v1.2.3 From b95db512ce7664af4714394db229f74a85b7ae11 Mon Sep 17 00:00:00 2001 From: Andrew Overholt Date: Mon, 26 Apr 2010 16:23:18 +0000 Subject: 2010-04-26 Andrew Overholt * feature.properties: Match consistent license text (bug #306627). * license.html: New file. HTML version of SUA (bug #306627). * build.properties: Include license.html. --- .../ChangeLog | 6 ++ .../build.properties | 3 +- .../feature.properties | 88 +++++++++++------ .../license.html | 107 +++++++++++++++++++++ 4 files changed, 174 insertions(+), 30 deletions(-) create mode 100644 systemtap/org.eclipse.linuxtools.systemtap-feature/license.html (limited to 'systemtap') diff --git a/systemtap/org.eclipse.linuxtools.systemtap-feature/ChangeLog b/systemtap/org.eclipse.linuxtools.systemtap-feature/ChangeLog index 30e6d36a1e..4b209fe882 100644 --- a/systemtap/org.eclipse.linuxtools.systemtap-feature/ChangeLog +++ b/systemtap/org.eclipse.linuxtools.systemtap-feature/ChangeLog @@ -1,3 +1,9 @@ +2010-04-26 Andrew Overholt + + * feature.properties: Match consistent license text (bug #306627). + * license.html: New file. HTML version of SUA (bug #306627). + * build.properties: Include license.html. + 2010-04-14 Andrew Overholt * feature.xml: Add OS filter for Linux (won't work on other OSes). diff --git a/systemtap/org.eclipse.linuxtools.systemtap-feature/build.properties b/systemtap/org.eclipse.linuxtools.systemtap-feature/build.properties index 33c989ca2c..d96c3dc1b6 100644 --- a/systemtap/org.eclipse.linuxtools.systemtap-feature/build.properties +++ b/systemtap/org.eclipse.linuxtools.systemtap-feature/build.properties @@ -1,4 +1,5 @@ bin.includes = feature.xml,\ feature.properties,\ - epl-v10.html + epl-v10.html,\ + license.html diff --git a/systemtap/org.eclipse.linuxtools.systemtap-feature/feature.properties b/systemtap/org.eclipse.linuxtools.systemtap-feature/feature.properties index 306ff088e3..ea322bdb6b 100644 --- a/systemtap/org.eclipse.linuxtools.systemtap-feature/feature.properties +++ b/systemtap/org.eclipse.linuxtools.systemtap-feature/feature.properties @@ -15,10 +15,10 @@ Copyright (c) 2009 IBM Corporation. All rights reserved.\n\ This program and the accompanying materials are made available under the terms\n\ of the Eclipse Public License v1.0 which accompanies this distribution, and is\n\ available at http://www.eclipse.org/legal/epl-v10.html\n -licenseURL=epl-v10.html +licenseURL=license.html license=\ Eclipse Foundation Software User Agreement\n\ -March 17, 2005\n\ +April 14, 2010\n\ \n\ Usage Of Content\n\ \n\ @@ -43,21 +43,21 @@ provided with this Content and is also available at http://www.eclipse.org/legal For purposes of the EPL, "Program" will mean the Content.\n\ \n\ Content includes, but is not limited to, source code, object code,\n\ -documentation and other files maintained in the Eclipse.org CVS\n\ -repository ("Repository") in CVS modules ("Modules") and made available\n\ +documentation and other files maintained in the Eclipse Foundation source code\n\ +repository ("Repository") in software modules ("Modules") and made available\n\ as downloadable archives ("Downloads").\n\ \n\ - - Content may be structured and packaged into modules to facilitate delivering,\n\ - extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\ - plug-in fragments ("Fragments"), and features ("Features").\n\ - - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\ - in a directory named "plugins".\n\ - - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\ - Each Feature may be packaged as a sub-directory in a directory named "features".\n\ - Within a Feature, files named "feature.xml" may contain a list of the names and version\n\ - numbers of the Plug-ins and/or Fragments associated with that Feature.\n\ - - Features may also include other Features ("Included Features"). Within a Feature, files\n\ - named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\ + - Content may be structured and packaged into modules to facilitate delivering,\n\ + extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\ + plug-in fragments ("Fragments"), and features ("Features").\n\ + - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\ + in a directory named "plugins".\n\ + - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\ + Each Feature may be packaged as a sub-directory in a directory named "features".\n\ + Within a Feature, files named "feature.xml" may contain a list of the names and version\n\ + numbers of the Plug-ins and/or Fragments associated with that Feature.\n\ + - Features may also include other Features ("Included Features"). Within a Feature, files\n\ + named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\ \n\ The terms and conditions governing Plug-ins and Fragments should be\n\ contained in files named "about.html" ("Abouts"). The terms and\n\ @@ -66,15 +66,15 @@ in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\ Licenses may be located in any directory of a Download or Module\n\ including, but not limited to the following locations:\n\ \n\ - - The top-level (root) directory\n\ - - Plug-in and Fragment directories\n\ - - Inside Plug-ins and Fragments packaged as JARs\n\ - - Sub-directories of the directory named "src" of certain Plug-ins\n\ - - Feature directories\n\ + - The top-level (root) directory\n\ + - Plug-in and Fragment directories\n\ + - Inside Plug-ins and Fragments packaged as JARs\n\ + - Sub-directories of the directory named "src" of certain Plug-ins\n\ + - Feature directories\n\ \n\ Note: if a Feature made available by the Eclipse Foundation is installed using the\n\ -Eclipse Update Manager, you must agree to a license ("Feature Update\n\ -License") during the installation process. If the Feature contains\n\ +Provisioning Technology (as defined below), you must agree to a license ("Feature \n\ +Update License") during the installation process. If the Feature contains\n\ Included Features, the Feature Update License should either provide you\n\ with the terms and conditions governing the Included Features or inform\n\ you where you can locate them. Feature Update Licenses may be found in\n\ @@ -87,18 +87,48 @@ THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER\n\ TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\ SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\ \n\ - - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\ - - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\ - - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\ - - IBM Public License 1.0 (available at http://oss.software.ibm.com/developerworks/opensource/license10.html)\n\ - - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\ - - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\ + - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\ + - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\ + - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\ + - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\ + - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\ \n\ IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\ TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License\n\ is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\ govern that particular Content.\n\ \n\ +\n\Use of Provisioning Technology\n\ +\n\ +The Eclipse Foundation makes available provisioning software, examples of which include,\n\ +but are not limited to, p2 and the Eclipse Update Manager ("Provisioning Technology") for\n\ +the purpose of allowing users to install software, documentation, information and/or\n\ +other materials (collectively "Installable Software"). This capability is provided with\n\ +the intent of allowing such users to install, extend and update Eclipse-based products.\n\ +Information about packaging Installable Software is available at\n\ +http://eclipse.org/equinox/p2/repository_packaging.html ("Specification").\n\ +\n\ +You may use Provisioning Technology to allow other parties to install Installable Software.\n\ +You shall be responsible for enabling the applicable license agreements relating to the\n\ +Installable Software to be presented to, and accepted by, the users of the Provisioning Technology\n\ +in accordance with the Specification. By using Provisioning Technology in such a manner and\n\ +making it available in accordance with the Specification, you further acknowledge your\n\ +agreement to, and the acquisition of all necessary rights to permit the following:\n\ +\n\ + 1. A series of actions may occur ("Provisioning Process") in which a user may execute\n\ + the Provisioning Technology on a machine ("Target Machine") with the intent of installing,\n\ + extending or updating the functionality of an Eclipse-based product.\n\ + 2. During the Provisioning Process, the Provisioning Technology may cause third party\n\ + Installable Software or a portion thereof to be accessed and copied to the Target Machine.\n\ + 3. Pursuant to the Specification, you will provide to the user the terms and conditions that\n\ + govern the use of the Installable Software ("Installable Software Agreement") and such\n\ + Installable Software Agreement shall be accessed from the Target Machine in accordance\n\ + with the Specification. Such Installable Software Agreement must inform the user of the\n\ + terms and conditions that govern the Installable Software and must solicit acceptance by\n\ + the end user in the manner prescribed in such Installable Software Agreement. Upon such\n\ + indication of agreement by the user, the provisioning Technology will complete installation\n\ + of the Installable Software.\n\ +\n\ Cryptography\n\ \n\ Content may contain encryption software. The country in which you are\n\ @@ -108,4 +138,4 @@ using any encryption software, please check the country's laws,\n\ regulations and policies concerning the import, possession, or use, and\n\ re-export of encryption software, to see if this is permitted.\n\ \n\ -Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.\n +Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.\n diff --git a/systemtap/org.eclipse.linuxtools.systemtap-feature/license.html b/systemtap/org.eclipse.linuxtools.systemtap-feature/license.html new file mode 100644 index 0000000000..c184ca36a9 --- /dev/null +++ b/systemtap/org.eclipse.linuxtools.systemtap-feature/license.html @@ -0,0 +1,107 @@ + + + + + +Eclipse Foundation Software User Agreement + + + +

Eclipse Foundation Software User Agreement

+

April 14, 2010

+ +

Usage Of Content

+ +

THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS + (COLLECTIVELY "CONTENT"). USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND + CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE + OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR + NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND + CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.

+ +

Applicable Licenses

+ +

Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0 + ("EPL"). A copy of the EPL is provided with this Content and is also available at http://www.eclipse.org/legal/epl-v10.html. + For purposes of the EPL, "Program" will mean the Content.

+ +

Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code + repository ("Repository") in software modules ("Modules") and made available as downloadable archives ("Downloads").

+ +
    +
  • Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"), plug-in fragments ("Fragments"), and features ("Features").
  • +
  • Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java™ ARchive) in a directory named "plugins".
  • +
  • A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material. Each Feature may be packaged as a sub-directory in a directory named "features". Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of the Plug-ins + and/or Fragments associated with that Feature.
  • +
  • Features may also include other Features ("Included Features"). Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of Included Features.
  • +
+ +

The terms and conditions governing Plug-ins and Fragments should be contained in files named "about.html" ("Abouts"). The terms and conditions governing Features and +Included Features should be contained in files named "license.html" ("Feature Licenses"). Abouts and Feature Licenses may be located in any directory of a Download or Module +including, but not limited to the following locations:

+ +
    +
  • The top-level (root) directory
  • +
  • Plug-in and Fragment directories
  • +
  • Inside Plug-ins and Fragments packaged as JARs
  • +
  • Sub-directories of the directory named "src" of certain Plug-ins
  • +
  • Feature directories
  • +
+ +

Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license ("Feature Update License") during the +installation process. If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or +inform you where you can locate them. Feature Update Licenses may be found in the "license" property of files named "feature.properties" found within a Feature. +Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in +that directory.

+ +

THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS. SOME OF THESE +OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):

+ + + +

IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License is provided, please +contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.

+ + +

Use of Provisioning Technology

+ +

The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse + Update Manager ("Provisioning Technology") for the purpose of allowing users to install software, documentation, information and/or + other materials (collectively "Installable Software"). This capability is provided with the intent of allowing such users to + install, extend and update Eclipse-based products. Information about packaging Installable Software is available at http://eclipse.org/equinox/p2/repository_packaging.html + ("Specification").

+ +

You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the + applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology + in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the + Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:

+ +
    +
  1. A series of actions may occur ("Provisioning Process") in which a user may execute the Provisioning Technology + on a machine ("Target Machine") with the intent of installing, extending or updating the functionality of an Eclipse-based + product.
  2. +
  3. During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be + accessed and copied to the Target Machine.
  4. +
  5. Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable + Software ("Installable Software Agreement") and such Installable Software Agreement shall be accessed from the Target + Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern + the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such + indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.
  6. +
+ +

Cryptography

+ +

Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to + another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import, + possession, or use, and re-export of encryption software, to see if this is permitted.

+ +

Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.

+ + -- cgit v1.2.3 From b095bf9763a03c9d462b7ce45bfe1360f17c7ea7 Mon Sep 17 00:00:00 2001 From: Andrew Overholt Date: Mon, 26 Apr 2010 17:57:16 +0000 Subject: 2010-04-26 Andrew Overholt * feature.properties: Match consistent license text (bug #306627). * license.html: New file. HTML version of SUA (bug #306627). * build.properties: Include license.html. --- .../ChangeLog | 6 ++ .../build.properties | 3 +- .../feature.properties | 88 +++++++++++------ .../license.html | 107 +++++++++++++++++++++ 4 files changed, 174 insertions(+), 30 deletions(-) create mode 100644 systemtap/org.eclipse.linuxtools.systemtap.backup-feature/license.html (limited to 'systemtap') diff --git a/systemtap/org.eclipse.linuxtools.systemtap.backup-feature/ChangeLog b/systemtap/org.eclipse.linuxtools.systemtap.backup-feature/ChangeLog index d4fb337637..697f651533 100644 --- a/systemtap/org.eclipse.linuxtools.systemtap.backup-feature/ChangeLog +++ b/systemtap/org.eclipse.linuxtools.systemtap.backup-feature/ChangeLog @@ -1,3 +1,9 @@ +2010-04-26 Andrew Overholt + + * feature.properties: Match consistent license text (bug #306627). + * license.html: New file. HTML version of SUA (bug #306627). + * build.properties: Include license.html. + 2010-04-12 Andrew Overholt * feature.properties: Match consistent license text (bug #306627). diff --git a/systemtap/org.eclipse.linuxtools.systemtap.backup-feature/build.properties b/systemtap/org.eclipse.linuxtools.systemtap.backup-feature/build.properties index 0c6ef87303..b74af86fe4 100644 --- a/systemtap/org.eclipse.linuxtools.systemtap.backup-feature/build.properties +++ b/systemtap/org.eclipse.linuxtools.systemtap.backup-feature/build.properties @@ -1,3 +1,4 @@ bin.includes = feature.xml,\ feature.properties,\ - epl-v10.html + epl-v10.html,\ + license.html diff --git a/systemtap/org.eclipse.linuxtools.systemtap.backup-feature/feature.properties b/systemtap/org.eclipse.linuxtools.systemtap.backup-feature/feature.properties index 3b720e73ae..df97f03496 100644 --- a/systemtap/org.eclipse.linuxtools.systemtap.backup-feature/feature.properties +++ b/systemtap/org.eclipse.linuxtools.systemtap.backup-feature/feature.properties @@ -12,10 +12,10 @@ featureName=Systemtap script editor (Incubation) description=Plugins for maintaining and developing Systemtap scripts. provider=Eclipse copyright=Copyright 2008 Phillip Muldoon. -licenseURL=epl-v10.html +licenseURL=license.html license=\ Eclipse Foundation Software User Agreement\n\ -March 17, 2005\n\ +April 14, 2010\n\ \n\ Usage Of Content\n\ \n\ @@ -40,21 +40,21 @@ provided with this Content and is also available at http://www.eclipse.org/legal For purposes of the EPL, "Program" will mean the Content.\n\ \n\ Content includes, but is not limited to, source code, object code,\n\ -documentation and other files maintained in the Eclipse.org CVS\n\ -repository ("Repository") in CVS modules ("Modules") and made available\n\ +documentation and other files maintained in the Eclipse Foundation source code\n\ +repository ("Repository") in software modules ("Modules") and made available\n\ as downloadable archives ("Downloads").\n\ \n\ - - Content may be structured and packaged into modules to facilitate delivering,\n\ - extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\ - plug-in fragments ("Fragments"), and features ("Features").\n\ - - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\ - in a directory named "plugins".\n\ - - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\ - Each Feature may be packaged as a sub-directory in a directory named "features".\n\ - Within a Feature, files named "feature.xml" may contain a list of the names and version\n\ - numbers of the Plug-ins and/or Fragments associated with that Feature.\n\ - - Features may also include other Features ("Included Features"). Within a Feature, files\n\ - named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\ + - Content may be structured and packaged into modules to facilitate delivering,\n\ + extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\ + plug-in fragments ("Fragments"), and features ("Features").\n\ + - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\ + in a directory named "plugins".\n\ + - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\ + Each Feature may be packaged as a sub-directory in a directory named "features".\n\ + Within a Feature, files named "feature.xml" may contain a list of the names and version\n\ + numbers of the Plug-ins and/or Fragments associated with that Feature.\n\ + - Features may also include other Features ("Included Features"). Within a Feature, files\n\ + named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\ \n\ The terms and conditions governing Plug-ins and Fragments should be\n\ contained in files named "about.html" ("Abouts"). The terms and\n\ @@ -63,15 +63,15 @@ in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\ Licenses may be located in any directory of a Download or Module\n\ including, but not limited to the following locations:\n\ \n\ - - The top-level (root) directory\n\ - - Plug-in and Fragment directories\n\ - - Inside Plug-ins and Fragments packaged as JARs\n\ - - Sub-directories of the directory named "src" of certain Plug-ins\n\ - - Feature directories\n\ + - The top-level (root) directory\n\ + - Plug-in and Fragment directories\n\ + - Inside Plug-ins and Fragments packaged as JARs\n\ + - Sub-directories of the directory named "src" of certain Plug-ins\n\ + - Feature directories\n\ \n\ Note: if a Feature made available by the Eclipse Foundation is installed using the\n\ -Eclipse Update Manager, you must agree to a license ("Feature Update\n\ -License") during the installation process. If the Feature contains\n\ +Provisioning Technology (as defined below), you must agree to a license ("Feature \n\ +Update License") during the installation process. If the Feature contains\n\ Included Features, the Feature Update License should either provide you\n\ with the terms and conditions governing the Included Features or inform\n\ you where you can locate them. Feature Update Licenses may be found in\n\ @@ -84,18 +84,48 @@ THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER\n\ TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\ SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\ \n\ - - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\ - - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\ - - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\ - - IBM Public License 1.0 (available at http://oss.software.ibm.com/developerworks/opensource/license10.html)\n\ - - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\ - - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\ + - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\ + - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\ + - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\ + - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\ + - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\ \n\ IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\ TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License\n\ is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\ govern that particular Content.\n\ \n\ +\n\Use of Provisioning Technology\n\ +\n\ +The Eclipse Foundation makes available provisioning software, examples of which include,\n\ +but are not limited to, p2 and the Eclipse Update Manager ("Provisioning Technology") for\n\ +the purpose of allowing users to install software, documentation, information and/or\n\ +other materials (collectively "Installable Software"). This capability is provided with\n\ +the intent of allowing such users to install, extend and update Eclipse-based products.\n\ +Information about packaging Installable Software is available at\n\ +http://eclipse.org/equinox/p2/repository_packaging.html ("Specification").\n\ +\n\ +You may use Provisioning Technology to allow other parties to install Installable Software.\n\ +You shall be responsible for enabling the applicable license agreements relating to the\n\ +Installable Software to be presented to, and accepted by, the users of the Provisioning Technology\n\ +in accordance with the Specification. By using Provisioning Technology in such a manner and\n\ +making it available in accordance with the Specification, you further acknowledge your\n\ +agreement to, and the acquisition of all necessary rights to permit the following:\n\ +\n\ + 1. A series of actions may occur ("Provisioning Process") in which a user may execute\n\ + the Provisioning Technology on a machine ("Target Machine") with the intent of installing,\n\ + extending or updating the functionality of an Eclipse-based product.\n\ + 2. During the Provisioning Process, the Provisioning Technology may cause third party\n\ + Installable Software or a portion thereof to be accessed and copied to the Target Machine.\n\ + 3. Pursuant to the Specification, you will provide to the user the terms and conditions that\n\ + govern the use of the Installable Software ("Installable Software Agreement") and such\n\ + Installable Software Agreement shall be accessed from the Target Machine in accordance\n\ + with the Specification. Such Installable Software Agreement must inform the user of the\n\ + terms and conditions that govern the Installable Software and must solicit acceptance by\n\ + the end user in the manner prescribed in such Installable Software Agreement. Upon such\n\ + indication of agreement by the user, the provisioning Technology will complete installation\n\ + of the Installable Software.\n\ +\n\ Cryptography\n\ \n\ Content may contain encryption software. The country in which you are\n\ @@ -105,4 +135,4 @@ using any encryption software, please check the country's laws,\n\ regulations and policies concerning the import, possession, or use, and\n\ re-export of encryption software, to see if this is permitted.\n\ \n\ -Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.\n +Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.\n diff --git a/systemtap/org.eclipse.linuxtools.systemtap.backup-feature/license.html b/systemtap/org.eclipse.linuxtools.systemtap.backup-feature/license.html new file mode 100644 index 0000000000..c184ca36a9 --- /dev/null +++ b/systemtap/org.eclipse.linuxtools.systemtap.backup-feature/license.html @@ -0,0 +1,107 @@ + + + + + +Eclipse Foundation Software User Agreement + + + +

Eclipse Foundation Software User Agreement

+

April 14, 2010

+ +

Usage Of Content

+ +

THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS + (COLLECTIVELY "CONTENT"). USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND + CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE + OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR + NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND + CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.

+ +

Applicable Licenses

+ +

Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0 + ("EPL"). A copy of the EPL is provided with this Content and is also available at http://www.eclipse.org/legal/epl-v10.html. + For purposes of the EPL, "Program" will mean the Content.

+ +

Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code + repository ("Repository") in software modules ("Modules") and made available as downloadable archives ("Downloads").

+ +
    +
  • Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"), plug-in fragments ("Fragments"), and features ("Features").
  • +
  • Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java™ ARchive) in a directory named "plugins".
  • +
  • A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material. Each Feature may be packaged as a sub-directory in a directory named "features". Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of the Plug-ins + and/or Fragments associated with that Feature.
  • +
  • Features may also include other Features ("Included Features"). Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of Included Features.
  • +
+ +

The terms and conditions governing Plug-ins and Fragments should be contained in files named "about.html" ("Abouts"). The terms and conditions governing Features and +Included Features should be contained in files named "license.html" ("Feature Licenses"). Abouts and Feature Licenses may be located in any directory of a Download or Module +including, but not limited to the following locations:

+ +
    +
  • The top-level (root) directory
  • +
  • Plug-in and Fragment directories
  • +
  • Inside Plug-ins and Fragments packaged as JARs
  • +
  • Sub-directories of the directory named "src" of certain Plug-ins
  • +
  • Feature directories
  • +
+ +

Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license ("Feature Update License") during the +installation process. If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or +inform you where you can locate them. Feature Update Licenses may be found in the "license" property of files named "feature.properties" found within a Feature. +Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in +that directory.

+ +

THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS. SOME OF THESE +OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):

+ + + +

IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License is provided, please +contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.

+ + +

Use of Provisioning Technology

+ +

The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse + Update Manager ("Provisioning Technology") for the purpose of allowing users to install software, documentation, information and/or + other materials (collectively "Installable Software"). This capability is provided with the intent of allowing such users to + install, extend and update Eclipse-based products. Information about packaging Installable Software is available at http://eclipse.org/equinox/p2/repository_packaging.html + ("Specification").

+ +

You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the + applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology + in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the + Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:

+ +
    +
  1. A series of actions may occur ("Provisioning Process") in which a user may execute the Provisioning Technology + on a machine ("Target Machine") with the intent of installing, extending or updating the functionality of an Eclipse-based + product.
  2. +
  3. During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be + accessed and copied to the Target Machine.
  4. +
  5. Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable + Software ("Installable Software Agreement") and such Installable Software Agreement shall be accessed from the Target + Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern + the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such + indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.
  6. +
+ +

Cryptography

+ +

Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to + another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import, + possession, or use, and re-export of encryption software, to see if this is permitted.

+ +

Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.

+ + -- cgit v1.2.3 From 02ca0ada0c2a4c5daad480ff095ac169ff076c13 Mon Sep 17 00:00:00 2001 From: Charley Wang Date: Thu, 6 May 2010 13:51:16 +0000 Subject: Fix for 311780: Allows the CreateModuleAction dialog to close when the dialog is closed. Also changes the hotkeys for Export Script and Create Module Action from "ctrl-X" and "ctrl-Y" to "ctrl-1" and "ctrl-2" respectively. The latter two actions do not appear to conflict with any major editing shortcut keys. --- .../plugin.xml | 4 ++-- .../systemtap/ui/dashboardextension/dialogs/ScriptDetails.java | 7 +++---- 2 files changed, 5 insertions(+), 6 deletions(-) (limited to 'systemtap') diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboardextension/plugin.xml b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboardextension/plugin.xml index b7d8e6739e..171600f8e1 100644 --- a/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboardextension/plugin.xml +++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboardextension/plugin.xml @@ -25,12 +25,12 @@ commandId="org.eclipse.linuxtools.systemtap.ui.dashboardextension.commands.ExportScript" contextId="org.eclipse.ui.contexts.window" schemeId="org.eclipse.ui.defaultAcceleratorConfiguration" - sequence="M1+X"/> + sequence="M1+1"/> + sequence="M1+2"/> diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboardextension/src/org/eclipse/linuxtools/systemtap/ui/dashboardextension/dialogs/ScriptDetails.java b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboardextension/src/org/eclipse/linuxtools/systemtap/ui/dashboardextension/dialogs/ScriptDetails.java index 0bef3a1855..397f2860ac 100644 --- a/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboardextension/src/org/eclipse/linuxtools/systemtap/ui/dashboardextension/dialogs/ScriptDetails.java +++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboardextension/src/org/eclipse/linuxtools/systemtap/ui/dashboardextension/dialogs/ScriptDetails.java @@ -33,7 +33,7 @@ public class ScriptDetails extends Dialog { private Text scriptText; private Button OKButton; private Button cancelButton; - private boolean canceled = false; + private boolean canceled = true; public ScriptDetails(Shell parent) { super(parent); @@ -97,7 +97,6 @@ public class ScriptDetails extends Dialog { cancelButton.addSelectionListener(new SelectionListener() { public void widgetSelected(SelectionEvent e) { shell.dispose(); - canceled = true; } public void widgetDefaultSelected(SelectionEvent e) {} }); @@ -115,12 +114,12 @@ public class ScriptDetails extends Dialog { // Set the preferences to this new info. DashboardPlugin.getDefault().getPreferenceStore().setValue(DashboardPreferenceConstants.P_DASHBOARD_EXAMPLES_DIR, dirText.getText()); DashboardPlugin.getDefault().getPreferenceStore().setValue(DashboardPreferenceConstants.P_DASHBOARD_SCRIPT, scriptText.getText()); - + canceled = false; shell.close(); } public void widgetDefaultSelected(SelectionEvent e) {} }); - + shell.open(); Display display = parent.getDisplay(); while (!shell.isDisposed()) { -- cgit v1.2.3 From bf8d09dc0be9e5a6512d7d30f8704e87bca912ca Mon Sep 17 00:00:00 2001 From: Charley Wang Date: Thu, 6 May 2010 14:28:10 +0000 Subject: Temporarily remove keybindings for ExportScript and CreateModuleAction --- .../org.eclipse.linuxtools.systemtap.ui.dashboardextension/plugin.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'systemtap') diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboardextension/plugin.xml b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboardextension/plugin.xml index 171600f8e1..df905fad91 100644 --- a/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboardextension/plugin.xml +++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboardextension/plugin.xml @@ -19,7 +19,7 @@ categoryId="org.eclipse.linuxtools.systemtap.ui.dashboard.category.file" id="org.eclipse.linuxtools.systemtap.ui.dashboardextension.commands.CreateModuleAction"/> - - + --> - + sequence="M1+5"/> + * feature.properties: Fix provider name. --- systemtap/org.eclipse.linuxtools.callgraph-feature/ChangeLog | 4 ++++ systemtap/org.eclipse.linuxtools.callgraph-feature/feature.properties | 2 +- .../org.eclipse.linuxtools.callgraph.tests-feature/feature.properties | 2 +- systemtap/org.eclipse.linuxtools.systemtap-feature/ChangeLog | 4 ++++ systemtap/org.eclipse.linuxtools.systemtap-feature/feature.properties | 2 +- systemtap/org.eclipse.linuxtools.systemtap.backup-feature/ChangeLog | 4 ++++ .../feature.properties | 2 +- 7 files changed, 16 insertions(+), 4 deletions(-) (limited to 'systemtap') diff --git a/systemtap/org.eclipse.linuxtools.callgraph-feature/ChangeLog b/systemtap/org.eclipse.linuxtools.callgraph-feature/ChangeLog index f14008ff7e..34fc183b02 100644 --- a/systemtap/org.eclipse.linuxtools.callgraph-feature/ChangeLog +++ b/systemtap/org.eclipse.linuxtools.callgraph-feature/ChangeLog @@ -1,3 +1,7 @@ +2010-05-18 Andrew Overholt + + * feature.properties: Fix provider name. + 2010-04-26 Andrew Overholt * feature.xml: Use featureURL property instead of explicit URL. diff --git a/systemtap/org.eclipse.linuxtools.callgraph-feature/feature.properties b/systemtap/org.eclipse.linuxtools.callgraph-feature/feature.properties index aa54af913a..4823e9a6ee 100644 --- a/systemtap/org.eclipse.linuxtools.callgraph-feature/feature.properties +++ b/systemtap/org.eclipse.linuxtools.callgraph-feature/feature.properties @@ -9,7 +9,7 @@ # Red Hat, Inc. - initial API and implementation #******************************************************************************** featureName=C/C++ Call Graph Visualization (Incubation) -featureProvider=Eclipse +featureProvider=Eclipse Linux Tools description=Tracks function calls in a C/C++ program as they occur. Records start and end time for each function as well as any user-specified information, and displays everything as a graph of nodes. copyright=Copyright (c) 2009, 2010 Red Hat, Inc. licenseURL=license.html diff --git a/systemtap/org.eclipse.linuxtools.callgraph.tests-feature/feature.properties b/systemtap/org.eclipse.linuxtools.callgraph.tests-feature/feature.properties index 46593b5798..57b41ba1d6 100644 --- a/systemtap/org.eclipse.linuxtools.callgraph.tests-feature/feature.properties +++ b/systemtap/org.eclipse.linuxtools.callgraph.tests-feature/feature.properties @@ -10,7 +10,7 @@ #******************************************************************************** featureName=Callgraph Tests (Incubation) description=Tests for local integration of SystemTap on Eclipse -featureProvider=Eclipse +featureProvider=Eclipse Linux Tools copyright=Copyright 2009 Red Hat, Inc. licenseURL=epl-v10.html license=\ diff --git a/systemtap/org.eclipse.linuxtools.systemtap-feature/ChangeLog b/systemtap/org.eclipse.linuxtools.systemtap-feature/ChangeLog index 4b209fe882..28c7af2634 100644 --- a/systemtap/org.eclipse.linuxtools.systemtap-feature/ChangeLog +++ b/systemtap/org.eclipse.linuxtools.systemtap-feature/ChangeLog @@ -1,3 +1,7 @@ +2010-05-18 Andrew Overholt + + * feature.properties: Fix provider name. + 2010-04-26 Andrew Overholt * feature.properties: Match consistent license text (bug #306627). diff --git a/systemtap/org.eclipse.linuxtools.systemtap-feature/feature.properties b/systemtap/org.eclipse.linuxtools.systemtap-feature/feature.properties index ea322bdb6b..264ffea1da 100644 --- a/systemtap/org.eclipse.linuxtools.systemtap-feature/feature.properties +++ b/systemtap/org.eclipse.linuxtools.systemtap-feature/feature.properties @@ -8,7 +8,7 @@ #******************************************************************************** featureName=systemtapgui description=SystemTap IDE and Visualization Tools (Incubation) -featureProvider=Eclipse +featureProvider=Eclipse Linux Tools copyright=\ Copyright (c) 2009 IBM Corporation. All rights reserved.\n\ \n\ diff --git a/systemtap/org.eclipse.linuxtools.systemtap.backup-feature/ChangeLog b/systemtap/org.eclipse.linuxtools.systemtap.backup-feature/ChangeLog index 697f651533..539017cb05 100644 --- a/systemtap/org.eclipse.linuxtools.systemtap.backup-feature/ChangeLog +++ b/systemtap/org.eclipse.linuxtools.systemtap.backup-feature/ChangeLog @@ -1,3 +1,7 @@ +2010-05-18 Andrew Overholt + + * feature.properties: Fix provider name. + 2010-04-26 Andrew Overholt * feature.properties: Match consistent license text (bug #306627). diff --git a/systemtap/org.eclipse.linuxtools.systemtap.backup-feature/feature.properties b/systemtap/org.eclipse.linuxtools.systemtap.backup-feature/feature.properties index df97f03496..48eb5e9bbf 100644 --- a/systemtap/org.eclipse.linuxtools.systemtap.backup-feature/feature.properties +++ b/systemtap/org.eclipse.linuxtools.systemtap.backup-feature/feature.properties @@ -10,7 +10,7 @@ #******************************************************************************** featureName=Systemtap script editor (Incubation) description=Plugins for maintaining and developing Systemtap scripts. -provider=Eclipse +provider=Eclipse Linux Tools copyright=Copyright 2008 Phillip Muldoon. licenseURL=license.html license=\ -- cgit v1.2.3 From df9afaa0d8754a4e4b2794ee77b5c419dad996c5 Mon Sep 17 00:00:00 2001 From: Andrew Overholt Date: Tue, 18 May 2010 15:55:14 +0000 Subject: 2009-12-22 Roland Grunberg * META-INF/MANIFEST.MF: Make necessary changes to switch from JUnit 3 to JUnit 4. --- systemtap/org.eclipse.linuxtools.callgraph.launch.tests/ChangeLog | 4 ++++ .../META-INF/MANIFEST.MF | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) (limited to 'systemtap') diff --git a/systemtap/org.eclipse.linuxtools.callgraph.launch.tests/ChangeLog b/systemtap/org.eclipse.linuxtools.callgraph.launch.tests/ChangeLog index 1ee9db69f4..e467693530 100644 --- a/systemtap/org.eclipse.linuxtools.callgraph.launch.tests/ChangeLog +++ b/systemtap/org.eclipse.linuxtools.callgraph.launch.tests/ChangeLog @@ -3,6 +3,10 @@ * src/org/eclipse/linuxtools/callgraph/launch/tests/SystemTapErrorHandlerTest.java (testUprobesError): Update message to reflect new error message. +2009-12-22 Roland Grunberg + + * META-INF/MANIFEST.MF: Make necessary changes to switch from JUnit 3 to JUnit 4. + 2009-12-16 rgrunber * src/org/eclipse/linuxtools/callgraph/launch/tests/SystemTapErrorHandlerTest.java: diff --git a/systemtap/org.eclipse.linuxtools.callgraph.launch.tests/META-INF/MANIFEST.MF b/systemtap/org.eclipse.linuxtools.callgraph.launch.tests/META-INF/MANIFEST.MF index ccf6227d77..d02e29639f 100644 --- a/systemtap/org.eclipse.linuxtools.callgraph.launch.tests/META-INF/MANIFEST.MF +++ b/systemtap/org.eclipse.linuxtools.callgraph.launch.tests/META-INF/MANIFEST.MF @@ -7,7 +7,7 @@ Bundle-Activator: org.eclipse.linuxtools.callgraph.launch.tests.Activator Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime, org.eclipse.debug.ui;bundle-version="3.4.1", - org.junit;bundle-version="[0.0.0,4.0.0)" + org.junit;bundle-version="4.7.0" Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Import-Package: org.eclipse.cdt.core.model, -- cgit v1.2.3 From 537b9690aa713fa43081a0dec83f2ef5d7b683b9 Mon Sep 17 00:00:00 2001 From: Charley Wang Date: Tue, 18 May 2010 19:24:24 +0000 Subject: Patch for 306241 -- do not set visibility for Create/Export script actionsets to True --- .../org.eclipse.linuxtools.systemtap.ui.dashboardextension/plugin.xml | 2 -- 1 file changed, 2 deletions(-) (limited to 'systemtap') diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboardextension/plugin.xml b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboardextension/plugin.xml index 8a6065c701..549a7e3a85 100644 --- a/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboardextension/plugin.xml +++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboardextension/plugin.xml @@ -36,7 +36,6 @@ point="org.eclipse.ui.actionSets"> + + + + + + + + -- cgit v1.2.3 From 7a1be2a7b38d7ec2ecfc05b080725e231b8ec480 Mon Sep 17 00:00:00 2001 From: Andrew Overholt Date: Tue, 1 Jun 2010 14:15:55 +0000 Subject: NEW - bug 314868: Create category for SystemTap views https://bugs.eclipse.org/bugs/show_bug.cgi?id=314868 --- .../plugin.xml | 33 ++++++++++++---------- 1 file changed, 18 insertions(+), 15 deletions(-) (limited to 'systemtap') diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/plugin.xml b/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/plugin.xml index b2744310b7..bd3afafc54 100644 --- a/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/plugin.xml +++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/plugin.xml @@ -13,23 +13,26 @@ + allowMultiple="true" + category="org.eclipse.linuxtools.systemtap.ui" + class="org.eclipse.linuxtools.systemtap.ui.ide.views.FunctionBrowserView" + icon="icons/views/func_obj.gif" + id="org.eclipse.linuxtools.systemtap.ui.ide.views.FunctionBrowserView" + name="%view.function.name"/> + allowMultiple="true" + category="org.eclipse.linuxtools.systemtap.ui" + class="org.eclipse.linuxtools.systemtap.ui.ide.views.KernelBrowserView" + icon="icons/views/kernel_obj.gif" + id="org.eclipse.linuxtools.systemtap.ui.ide.views.KernelBrowserView" + name="%view.kernel.name"/> + allowMultiple="true" + category="org.eclipse.linuxtools.systemtap.ui" + class="org.eclipse.linuxtools.systemtap.ui.ide.views.ProbeAliasBrowserView" + icon="icons/views/probe_obj.gif" + id="org.eclipse.linuxtools.systemtap.ui.ide.views.ProbeAliasBrowserView" + name="%view.probe.name"/> + allowMultiple="false" + category="org.eclipse.linuxtools.systemtap.ui" + class="org.eclipse.linuxtools.systemtap.ui.consolelog.views.ErrorView" + icon="icons/views/error_obj.gif" + id="org.eclipse.linuxtools.systemtap.ui.consolelog.views.ErrorView" + name="%view.error.name"/> -- cgit v1.2.3 From fa05a8628602367a040364f4e4eba9202237e922 Mon Sep 17 00:00:00 2001 From: Andrew Overholt Date: Tue, 1 Jun 2010 14:16:00 +0000 Subject: NEW - bug 314868: Create category for SystemTap views https://bugs.eclipse.org/bugs/show_bug.cgi?id=314868 --- .../plugin.xml | 34 ++++++++++++---------- .../plugin.xml | 11 +++---- 2 files changed, 25 insertions(+), 20 deletions(-) (limited to 'systemtap') diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/plugin.xml b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/plugin.xml index 4c6f0ece4c..fbebdbaba0 100644 --- a/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/plugin.xml +++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/plugin.xml @@ -13,28 +13,32 @@ + allowMultiple="false" + category="org.eclipse.linuxtools.systemtap.ui" + class="org.eclipse.linuxtools.systemtap.ui.dashboard.views.DashboardModuleBrowserView" + icon="icons/views/mod_obj.gif" + id="org.eclipse.linuxtools.systemtap.ui.dashboard.views.DashboardModuleBrowserView" + name="%view.module.name"> + allowMultiple="false" + category="org.eclipse.linuxtools.systemtap.ui" + class="org.eclipse.linuxtools.systemtap.ui.dashboard.views.ActiveModuleBrowserView" + icon="icons/views/active_mod_obj.gif" + id="org.eclipse.linuxtools.systemtap.ui.dashboard.views.ActiveModuleBrowserView" + name="%view.activeModule.name"> + allowMultiple="false" + category="org.eclipse.linuxtools.systemtap.ui" + class="org.eclipse.linuxtools.systemtap.ui.dashboard.views.DashboardView" + icon="icons/views/dashboard_obj.gif" + id="org.eclipse.linuxtools.systemtap.ui.dashboard.views.DashboardView" + name="%view.dashboard.name"> + allowMultiple="false" + category="org.eclipse.linuxtools.systemtap.ui" + class="org.eclipse.linuxtools.systemtap.ui.graphing.views.GraphSelectorView" + icon="icons/views/selector_obj.gif" + id="org.eclipse.linuxtools.systemtap.ui.graphing.views.GraphSelectorView" + name="%view.graphSelector.name"> -- cgit v1.2.3 From e43ece40728fdaa30b1038a4729d95a5095c3d9f Mon Sep 17 00:00:00 2001 From: Roland Grunberg Date: Tue, 1 Jun 2010 15:15:19 +0000 Subject: 2010-06-01 Roland Grunberg * src/org/eclipse/linuxtools/callgraph/launch/messages.properties: Externalize string. * src/org/eclipse/linuxtools/callgraph/launch/SystemTapLaunchConfigurationDelegate.java' (finishLaunch): Display error message pop-up when stap may not be on the system path or installed. --- .../ChangeLog | 7 ++++ .../SystemTapLaunchConfigurationDelegate.java | 46 +++++++++++++--------- .../callgraph/launch/messages.properties | 11 +----- 3 files changed, 36 insertions(+), 28 deletions(-) (limited to 'systemtap') diff --git a/systemtap/org.eclipse.linuxtools.callgraph.launch/ChangeLog b/systemtap/org.eclipse.linuxtools.callgraph.launch/ChangeLog index 4986af1528..075b772783 100644 --- a/systemtap/org.eclipse.linuxtools.callgraph.launch/ChangeLog +++ b/systemtap/org.eclipse.linuxtools.callgraph.launch/ChangeLog @@ -1,3 +1,10 @@ +2010-06-01 Roland Grunberg + + * src/org/eclipse/linuxtools/callgraph/launch/messages.properties: Externalize string. + * src/org/eclipse/linuxtools/callgraph/launch/SystemTapLaunchConfigurationDelegate.java' + (finishLaunch): Display error message pop-up when stap may not be on the system path + or installed. + 2010-04-13 Roland Grunberg * src/org/eclipse/linuxtools/callgraph/launch/SystemTapLaunchConfigurationDelegate.java: diff --git a/systemtap/org.eclipse.linuxtools.callgraph.launch/src/org/eclipse/linuxtools/callgraph/launch/SystemTapLaunchConfigurationDelegate.java b/systemtap/org.eclipse.linuxtools.callgraph.launch/src/org/eclipse/linuxtools/callgraph/launch/SystemTapLaunchConfigurationDelegate.java index d8df555d3e..c96e54285a 100644 --- a/systemtap/org.eclipse.linuxtools.callgraph.launch/src/org/eclipse/linuxtools/callgraph/launch/SystemTapLaunchConfigurationDelegate.java +++ b/systemtap/org.eclipse.linuxtools.callgraph.launch/src/org/eclipse/linuxtools/callgraph/launch/SystemTapLaunchConfigurationDelegate.java @@ -265,26 +265,36 @@ public class SystemTapLaunchConfigurationDelegate extends s.close(); parser.setKillButtonEnabled(false); - if (process.getExitValue() != 0) { + if (process.getExitValue() != 0) { parser.cancelJob(); - SystemTapErrorHandler errorHandler = new SystemTapErrorHandler(); - - //Prepare stap information - errorHandler.appendToLog(config.getName() + Messages.getString("SystemTapLaunchConfigurationDelegate.stap_command") + cmd+ PluginConstants.NEW_LINE + PluginConstants.NEW_LINE);//$NON-NLS-1$ - - //Handle error from TEMP_ERROR_OUTPUT - errorHandler.handle(monitor, new FileReader(TEMP_ERROR_OUTPUT)); //$NON-NLS-1$ - if ((monitor != null && monitor.isCanceled())) - return; - - errorHandler.finishHandling(monitor, scriptPath); - if (errorHandler.isErrorRecognized()) { - SystemTapUIErrorMessages errorDialog = new SystemTapUIErrorMessages - (Messages.getString("SystemTapLaunchConfigurationDelegate.CallGraphGenericError"), //$NON-NLS-1$ - Messages.getString("SystemTapLaunchConfigurationDelegate.CallGraphGenericError"), //$NON-NLS-1$ - errorHandler.getErrorMessage()); - + //exit code for command not found + if (process.getExitValue() == 127){ + SystemTapUIErrorMessages errorDialog = new SystemTapUIErrorMessages( + Messages.getString("SystemTapLaunchConfigurationDelegate.CallGraphGenericError"), //$NON-NLS-1$ + Messages.getString("SystemTapLaunchConfigurationDelegate.CallGraphGenericError"), //$NON-NLS-1$ + Messages.getString("SystemTapLaunchConfigurationDelegate.stapNotFound")); //$NON-NLS-1$ + errorDialog.schedule(); + }else{ + SystemTapErrorHandler errorHandler = new SystemTapErrorHandler(); + + //Prepare stap information + errorHandler.appendToLog(config.getName() + Messages.getString("SystemTapLaunchConfigurationDelegate.stap_command") + cmd+ PluginConstants.NEW_LINE + PluginConstants.NEW_LINE);//$NON-NLS-1$ + + //Handle error from TEMP_ERROR_OUTPUT + errorHandler.handle(monitor, new FileReader(TEMP_ERROR_OUTPUT)); //$NON-NLS-1$ + if ((monitor != null && monitor.isCanceled())) + return; + + errorHandler.finishHandling(monitor, scriptPath); + if (errorHandler.isErrorRecognized()) { + SystemTapUIErrorMessages errorDialog = new SystemTapUIErrorMessages( + Messages.getString("SystemTapLaunchConfigurationDelegate.CallGraphGenericError"), //$NON-NLS-1$ + Messages.getString("SystemTapLaunchConfigurationDelegate.CallGraphGenericError"), //$NON-NLS-1$ + errorHandler.getErrorMessage()); + + errorDialog.schedule(); + } } return; } diff --git a/systemtap/org.eclipse.linuxtools.callgraph.launch/src/org/eclipse/linuxtools/callgraph/launch/messages.properties b/systemtap/org.eclipse.linuxtools.callgraph.launch/src/org/eclipse/linuxtools/callgraph/launch/messages.properties index 17855f2b17..72e1ce360f 100644 --- a/systemtap/org.eclipse.linuxtools.callgraph.launch/src/org/eclipse/linuxtools/callgraph/launch/messages.properties +++ b/systemtap/org.eclipse.linuxtools.callgraph.launch/src/org/eclipse/linuxtools/callgraph/launch/messages.properties @@ -1,13 +1,3 @@ -############################################################################### -# Copyright (c) 2009 Red Hat, Inc. -# 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: -# Red Hat - initial API and implementation -############################################################################### LaunchStapGraph.ScriptGenErr=Error generating script LaunchStapGraph.ScriptGenErrMsg=The path to the temporary script could not be opened. LaunchWizard.WelcomeWizard=Welcome to SystemTap Wizard @@ -39,6 +29,7 @@ SystemTapLaunchConfigurationDelegate.Relaunch10=Configuration name: SystemTapLaunchConfigurationDelegate.Relaunch8=No binary commands specified. To specify commands, SystemTapLaunchConfigurationDelegate.Relaunch9=check under the Binary Arguments tab for this SystemTapLaunchConfigurationDelegate.stap_command=\ stap command: \n +SystemTapLaunchConfigurationDelegate.stapNotFound=The SystemTap command 'stap' could not be executed. Please make sure SystemTap is installed and that 'stap' is on the system path. SystemTapLaunchShortcut.Invalid=invalid SystemTapLaunchShortcut.NoFiles=No files found. SystemTapLaunchShortcut.SelectFiles=Select files to probe -- cgit v1.2.3 From 843926586136d78037e273ee15850d8ee8648949 Mon Sep 17 00:00:00 2001 From: Roland Grunberg Date: Tue, 1 Jun 2010 20:00:25 +0000 Subject: 2010-06-01 Roland Grunberg * errors.prop: Modify error message for uprobes to list both /usr/share/ and /usr/local/share in the make step for standard SystemTap installs, and local installations. --- systemtap/org.eclipse.linuxtools.callgraph.core/ChangeLog | 6 ++++++ systemtap/org.eclipse.linuxtools.callgraph.core/errors.prop | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) (limited to 'systemtap') diff --git a/systemtap/org.eclipse.linuxtools.callgraph.core/ChangeLog b/systemtap/org.eclipse.linuxtools.callgraph.core/ChangeLog index e1de72d6d1..de7c7db268 100644 --- a/systemtap/org.eclipse.linuxtools.callgraph.core/ChangeLog +++ b/systemtap/org.eclipse.linuxtools.callgraph.core/ChangeLog @@ -1,3 +1,9 @@ +2010-06-01 Roland Grunberg + + * errors.prop: Modify error message for uprobes to list both + /usr/share/ and /usr/local/share in the make step for standard + SystemTap installs, and local installations. + 2010-04-13 Roland Grunberg * src/org/eclipse/linuxtools/callgraph/core/SystemTapTextParser.java: diff --git a/systemtap/org.eclipse.linuxtools.callgraph.core/errors.prop b/systemtap/org.eclipse.linuxtools.callgraph.core/errors.prop index 84644cf7e6..f2acee1a36 100644 --- a/systemtap/org.eclipse.linuxtools.callgraph.core/errors.prop +++ b/systemtap/org.eclipse.linuxtools.callgraph.core/errors.prop @@ -10,5 +10,5 @@ .*stapdev.*stapusr.*=Please add yourself to the 'stapdev' or 'stapusr' group in order to run stap. .*Error inserting module.*File exists=A previous run of systemtap did not finish execution properly. In commandline, try ps aux | grep stap, kill any running stap processes and try again. .*line 0: syntax error near unexpected token.*=Your workspace name may contain opening and closing brackets -- please switch to a workspace that does not use brackets and try again. -.*SystemTap's version of uprobes is out of date.*=SystemTap's version of uprobes is out of date. As root, please run "make -C /usr/local/share/systemtap/runtime/uprobes". -.*Error inserting module.*Invalid module format.*=SystemTap's version of uprobes is out of date. As root, please run "make -C /usr/local/share/systemtap/runtime/uprobes". \ No newline at end of file +.*SystemTap's version of uprobes is out of date.*=SystemTap's version of uprobes is out of date. If this is a standard SystemTap install, please run as root "make -C /usr/share/systemtap/runtime/uprobes". If SystemTap was built from source, please run as root "make -C /usr/local/share/systemtap/runtime/uprobes". +.*Error inserting module.*Invalid module format.*=SystemTap's version of uprobes is out of date. If this is a standard SystemTap install, please run as root "make -C /usr/share/systemtap/runtime/uprobes". If SystemTap was built from source, please run as root "make -C /usr/local/share/systemtap/runtime/uprobes". \ No newline at end of file -- cgit v1.2.3 From 9f4e0ec1187f44667eda6ee113a044eda863e77b Mon Sep 17 00:00:00 2001 From: Roland Grunberg Date: Wed, 2 Jun 2010 14:59:26 +0000 Subject: 2010-06-02 Roland Grunberg * plugin.properties: Externalize some strings in the Manifest. * build.properties: See above * META-INF/MANIFEST.MF: See above * plugin.xml: See above --- .../org.eclipse.linuxtools.callgraph.core/ChangeLog | 7 +++++++ .../META-INF/MANIFEST.MF | 5 +++-- .../build.properties | 4 ++-- .../plugin.properties | 7 +++++++ .../org.eclipse.linuxtools.callgraph.core/plugin.xml | 8 ++++---- .../org.eclipse.linuxtools.callgraph.launch/ChangeLog | 7 +++++++ .../META-INF/MANIFEST.MF | 4 ++-- .../build.properties | 3 +-- .../plugin.properties | 16 +++++----------- .../org.eclipse.linuxtools.callgraph.launch/plugin.xml | 3 +-- systemtap/org.eclipse.linuxtools.callgraph/ChangeLog | 7 +++++++ .../META-INF/MANIFEST.MF | 5 +++-- .../org.eclipse.linuxtools.callgraph/build.properties | 3 ++- .../org.eclipse.linuxtools.callgraph/plugin.properties | 6 ++++++ systemtap/org.eclipse.linuxtools.callgraph/plugin.xml | 6 +++--- 15 files changed, 60 insertions(+), 31 deletions(-) create mode 100644 systemtap/org.eclipse.linuxtools.callgraph.core/plugin.properties create mode 100644 systemtap/org.eclipse.linuxtools.callgraph/plugin.properties (limited to 'systemtap') diff --git a/systemtap/org.eclipse.linuxtools.callgraph.core/ChangeLog b/systemtap/org.eclipse.linuxtools.callgraph.core/ChangeLog index de7c7db268..8fa121bee1 100644 --- a/systemtap/org.eclipse.linuxtools.callgraph.core/ChangeLog +++ b/systemtap/org.eclipse.linuxtools.callgraph.core/ChangeLog @@ -1,3 +1,10 @@ +2010-06-02 Roland Grunberg + + * plugin.properties: Externalize some strings in the Manifest. + * build.properties: See above + * META-INF/MANIFEST.MF: See above + * plugin.xml: See above + 2010-06-01 Roland Grunberg * errors.prop: Modify error message for uprobes to list both diff --git a/systemtap/org.eclipse.linuxtools.callgraph.core/META-INF/MANIFEST.MF b/systemtap/org.eclipse.linuxtools.callgraph.core/META-INF/MANIFEST.MF index c3bf8607d2..ffb4c474b9 100644 --- a/systemtap/org.eclipse.linuxtools.callgraph.core/META-INF/MANIFEST.MF +++ b/systemtap/org.eclipse.linuxtools.callgraph.core/META-INF/MANIFEST.MF @@ -1,6 +1,6 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 -Bundle-Name: Callgraph Core (Incubation) +Bundle-Name: %Bundle-Name Bundle-SymbolicName: org.eclipse.linuxtools.callgraph.core;singleton:=true Bundle-Version: 0.0.1.qualifier Bundle-Activator: org.eclipse.linuxtools.callgraph.core.CallgraphCorePlugin @@ -15,4 +15,5 @@ Import-Package: org.eclipse.cdt.core.model, org.eclipse.linuxtools.profiling.ui, org.eclipse.ui, org.eclipse.ui.console -Bundle-Vendor: Eclipse +Bundle-Vendor: %Bundle-Vendor +Bundle-Localization: plugin diff --git a/systemtap/org.eclipse.linuxtools.callgraph.core/build.properties b/systemtap/org.eclipse.linuxtools.callgraph.core/build.properties index d2ed9ca5e0..6db76ad2a2 100644 --- a/systemtap/org.eclipse.linuxtools.callgraph.core/build.properties +++ b/systemtap/org.eclipse.linuxtools.callgraph.core/build.properties @@ -15,11 +15,11 @@ bin.includes = META-INF/,\ install.sh,\ systemtap.png,\ parse_function_partial.stp,\ - bin/,\ systemtapbanner.png,\ plugin.xml,\ icons/,\ - errors.prop + errors.prop,\ + plugin.properties \ No newline at end of file diff --git a/systemtap/org.eclipse.linuxtools.callgraph.core/plugin.properties b/systemtap/org.eclipse.linuxtools.callgraph.core/plugin.properties new file mode 100644 index 0000000000..0c48e5e101 --- /dev/null +++ b/systemtap/org.eclipse.linuxtools.callgraph.core/plugin.properties @@ -0,0 +1,7 @@ +#Properties file for org.eclipse.linuxtools.callgraph.core +Bundle-Vendor=Eclipse Linux Tools +Bundle-Name=Callgraph Core (Incubation) +systemtaptextviewname=SystemTapTextView +view.name=SystemTap Text View +systemtapsleepingthreadparser=SleepingThreadParser +systemtapparserextensionpoint=SystemTapParserPoint \ No newline at end of file diff --git a/systemtap/org.eclipse.linuxtools.callgraph.core/plugin.xml b/systemtap/org.eclipse.linuxtools.callgraph.core/plugin.xml index 2aa2064666..3d9e0c9bf0 100644 --- a/systemtap/org.eclipse.linuxtools.callgraph.core/plugin.xml +++ b/systemtap/org.eclipse.linuxtools.callgraph.core/plugin.xml @@ -1,17 +1,17 @@ - + @@ -20,7 +20,7 @@ + + * build.properties: Externalize some strings in the Manifest. + * META-INF/MANIFEST.MF: See above + * plugin.properties: See above + * plugin.xml: See above + 2010-06-01 Roland Grunberg * src/org/eclipse/linuxtools/callgraph/launch/messages.properties: Externalize string. diff --git a/systemtap/org.eclipse.linuxtools.callgraph.launch/META-INF/MANIFEST.MF b/systemtap/org.eclipse.linuxtools.callgraph.launch/META-INF/MANIFEST.MF index 8a1d13015b..eacedce7f3 100644 --- a/systemtap/org.eclipse.linuxtools.callgraph.launch/META-INF/MANIFEST.MF +++ b/systemtap/org.eclipse.linuxtools.callgraph.launch/META-INF/MANIFEST.MF @@ -1,6 +1,6 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 -Bundle-Name: Callgraph Launch (Incubation) +Bundle-Name: %Bundle-Name Bundle-SymbolicName: org.eclipse.linuxtools.callgraph.launch;singleton:=true Bundle-Version: 0.0.1.qualifier Bundle-Activator: org.eclipse.linuxtools.callgraph.launch.CallgraphLaunchPlugin @@ -26,4 +26,4 @@ Import-Package: org.eclipse.cdt.core.model, org.eclipse.ui.views.navigator Bundle-Localization: plugin Export-Package: org.eclipse.linuxtools.callgraph.launch -Bundle-Vendor: Eclipse +Bundle-Vendor: %Bundle-Vendor diff --git a/systemtap/org.eclipse.linuxtools.callgraph.launch/build.properties b/systemtap/org.eclipse.linuxtools.callgraph.launch/build.properties index bbba056b40..5e6d23b2e1 100644 --- a/systemtap/org.eclipse.linuxtools.callgraph.launch/build.properties +++ b/systemtap/org.eclipse.linuxtools.callgraph.launch/build.properties @@ -14,5 +14,4 @@ bin.includes = plugin.xml,\ META-INF/,\ plugin.properties,\ .,\ - icons/,\ - bin/ + icons/ diff --git a/systemtap/org.eclipse.linuxtools.callgraph.launch/plugin.properties b/systemtap/org.eclipse.linuxtools.callgraph.launch/plugin.properties index 06458bf8f8..b90890d310 100644 --- a/systemtap/org.eclipse.linuxtools.callgraph.launch/plugin.properties +++ b/systemtap/org.eclipse.linuxtools.callgraph.launch/plugin.properties @@ -1,12 +1,6 @@ -############################################################################### -# Copyright (c) 2009 Red Hat, Inc. -# 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: -# Red Hat - initial API and implementation -############################################################################### +#Properties file for org.eclipse.linuxtools.callgraph.launch +Bundle-Vendor=Eclipse Linux Tools +Bundle-Name=Callgraph Launch (Incubation) launchConfigurationType.name.0 = Profile with SystemTap -launchConfigurationTabGroup.description.0 = Launch a custom SystemTap Script \ No newline at end of file +launchConfigurationTabGroup.description.0 = Launch a custom SystemTap Script +launch.name=Function callgraph \ No newline at end of file diff --git a/systemtap/org.eclipse.linuxtools.callgraph.launch/plugin.xml b/systemtap/org.eclipse.linuxtools.callgraph.launch/plugin.xml index 85199c6e74..df5cbd90e0 100644 --- a/systemtap/org.eclipse.linuxtools.callgraph.launch/plugin.xml +++ b/systemtap/org.eclipse.linuxtools.callgraph.launch/plugin.xml @@ -26,7 +26,6 @@ - name = "SystemTap Control Tab" diff --git a/systemtap/org.eclipse.linuxtools.callgraph/ChangeLog b/systemtap/org.eclipse.linuxtools.callgraph/ChangeLog index 866b77104c..127eb8ac52 100644 --- a/systemtap/org.eclipse.linuxtools.callgraph/ChangeLog +++ b/systemtap/org.eclipse.linuxtools.callgraph/ChangeLog @@ -1,3 +1,10 @@ +2010-06-02 Roland Grunberg + + * plugin.properties: Externalize some strings in the Manifest. + * build.properties: See above + * META-INF/MANIFEST.MF: See above + * plugin.xml: See above + 2010-03-22 Roland Grunberg * src/org/eclipse/linuxtools/callgraph/graphlisteners/StapGraphMouseListener.java (controlDoubleClick): diff --git a/systemtap/org.eclipse.linuxtools.callgraph/META-INF/MANIFEST.MF b/systemtap/org.eclipse.linuxtools.callgraph/META-INF/MANIFEST.MF index d8f333c709..ad4e5eebe9 100644 --- a/systemtap/org.eclipse.linuxtools.callgraph/META-INF/MANIFEST.MF +++ b/systemtap/org.eclipse.linuxtools.callgraph/META-INF/MANIFEST.MF @@ -1,6 +1,6 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 -Bundle-Name: Callgraph Graphing (Incubation) +Bundle-Name: %Bundle-Name Bundle-SymbolicName: org.eclipse.linuxtools.callgraph;singleton:=true Bundle-Version: 0.0.1.qualifier Bundle-Activator: org.eclipse.linuxtools.callgraph.CallgraphPlugin @@ -19,4 +19,5 @@ Import-Package: org.eclipse.cdt.core.model, org.eclipse.zest.core.widgets, org.eclipse.zest.layouts, org.eclipse.zest.layouts.algorithms -Bundle-Vendor: Eclipse +Bundle-Vendor: %Bundle-Vendor +Bundle-Localization: plugin diff --git a/systemtap/org.eclipse.linuxtools.callgraph/build.properties b/systemtap/org.eclipse.linuxtools.callgraph/build.properties index 2fe877d1f8..bfa5881dc0 100644 --- a/systemtap/org.eclipse.linuxtools.callgraph/build.properties +++ b/systemtap/org.eclipse.linuxtools.callgraph/build.properties @@ -13,4 +13,5 @@ output.. = bin/ bin.includes = plugin.xml,\ META-INF/,\ .,\ - icons/ + icons/,\ + plugin.properties diff --git a/systemtap/org.eclipse.linuxtools.callgraph/plugin.properties b/systemtap/org.eclipse.linuxtools.callgraph/plugin.properties new file mode 100644 index 0000000000..d9ce3f34c2 --- /dev/null +++ b/systemtap/org.eclipse.linuxtools.callgraph/plugin.properties @@ -0,0 +1,6 @@ +#Properties file for org.eclipse.linuxtools.callgraph +Bundle-Vendor = Eclipse Linux Tools +Bundle-Name = Callgraph Graphing (Incubation) +extension.name = Callgraph View +view.name = Call Graph +extension.name.0 = GraphParser \ No newline at end of file diff --git a/systemtap/org.eclipse.linuxtools.callgraph/plugin.xml b/systemtap/org.eclipse.linuxtools.callgraph/plugin.xml index 259bcac109..6208254ab9 100644 --- a/systemtap/org.eclipse.linuxtools.callgraph/plugin.xml +++ b/systemtap/org.eclipse.linuxtools.callgraph/plugin.xml @@ -17,14 +17,14 @@ @@ -84,7 +84,7 @@ --> * src/org/eclipse/linuxtools/systemtap/ui/dashboard/structures/DashboardModuleLocator.java (getModuleLocations): Fix BZ #314873 * src/org/eclipse/linuxtools/systemtap/ui/dashboard/structures/DashboardModuleTreeBuilder.java (scanNextLevel): Fix BZ #314873 --- systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/ChangeLog | 7 +++++++ .../systemtap/ui/dashboard/structures/DashboardModuleLocator.java | 7 +++++-- .../ui/dashboard/structures/DashboardModuleTreeBuilder.java | 3 +++ 3 files changed, 15 insertions(+), 2 deletions(-) (limited to 'systemtap') diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/ChangeLog b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/ChangeLog index 77f5859675..352863ae37 100644 --- a/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/ChangeLog +++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/ChangeLog @@ -1,3 +1,10 @@ +2010-06-02 Roland Grunberg + + * src/org/eclipse/linuxtools/systemtap/ui/dashboard/structures/DashboardModuleLocator.java + (getModuleLocations): Fix BZ #314873 + * src/org/eclipse/linuxtools/systemtap/ui/dashboard/structures/DashboardModuleTreeBuilder.java + (scanNextLevel): Fix BZ #314873 + 2010-02-11 Roland Grunberg * src/org/eclipse/linuxtools/systemtap/ui/dashboard/internal/DashboardCloseMonitor.java: diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/src/org/eclipse/linuxtools/systemtap/ui/dashboard/structures/DashboardModuleLocator.java b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/src/org/eclipse/linuxtools/systemtap/ui/dashboard/structures/DashboardModuleLocator.java index f5d362b838..c7600b0eaf 100644 --- a/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/src/org/eclipse/linuxtools/systemtap/ui/dashboard/structures/DashboardModuleLocator.java +++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/src/org/eclipse/linuxtools/systemtap/ui/dashboard/structures/DashboardModuleLocator.java @@ -80,8 +80,11 @@ public final class DashboardModuleLocator { allFolders[0] = moduleLocation; } else { allFolders[0] = System.getProperty("osgi.splashLocation"); - allFolders[0] = allFolders[0].substring(0, allFolders[0].indexOf("systemtapgui")); - allFolders[0] += "dashboard/modules/"; + int stapguiLoc = allFolders[0].indexOf("systemtapgui"); + if (stapguiLoc != -1) { + allFolders[0] = allFolders[0].substring(0, stapguiLoc); + allFolders[0] += "dashboard/modules/"; + } } allFolders[1] = SystemTapGUISettings.settingsFolder.getAbsolutePath(); diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/src/org/eclipse/linuxtools/systemtap/ui/dashboard/structures/DashboardModuleTreeBuilder.java b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/src/org/eclipse/linuxtools/systemtap/ui/dashboard/structures/DashboardModuleTreeBuilder.java index 35fa225542..7f37d27435 100644 --- a/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/src/org/eclipse/linuxtools/systemtap/ui/dashboard/structures/DashboardModuleTreeBuilder.java +++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/src/org/eclipse/linuxtools/systemtap/ui/dashboard/structures/DashboardModuleTreeBuilder.java @@ -57,6 +57,9 @@ public class DashboardModuleTreeBuilder { */ private void scanNextLevel(File f) { File[] fs = f.listFiles(new DashboardModuleFileFilter()); + if (fs == null){ + return; + } DashboardMetaData dmd; DashboardModule dm; -- cgit v1.2.3 From 4dcafffaec677b4e238471e689d1322d61f7d35a Mon Sep 17 00:00:00 2001 From: Roland Grunberg Date: Wed, 2 Jun 2010 16:30:29 +0000 Subject: 2010-06-02 Roland Grunberg * plugin.xml: Fix BZ #315223. Identical ActionSet in GraphicalRun --- .../ChangeLog | 4 ++++ .../plugin.xml | 18 ------------------ 2 files changed, 4 insertions(+), 18 deletions(-) (limited to 'systemtap') diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.graphing/ChangeLog b/systemtap/org.eclipse.linuxtools.systemtap.ui.graphing/ChangeLog index 50728690be..69d958f110 100644 --- a/systemtap/org.eclipse.linuxtools.systemtap.ui.graphing/ChangeLog +++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.graphing/ChangeLog @@ -1,3 +1,7 @@ +2010-06-02 Roland Grunberg + + * plugin.xml: Fix BZ #315223. Identical ActionSet in GraphicalRun + 2010-01-29 Anithra P Janakiraman * src/org/eclipse/linuxtools/systemtap/ui/graphing/actions/ModifyParsingAction.java: Removed. diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.graphing/plugin.xml b/systemtap/org.eclipse.linuxtools.systemtap.ui.graphing/plugin.xml index 079fc71439..5f285ccd88 100644 --- a/systemtap/org.eclipse.linuxtools.systemtap.ui.graphing/plugin.xml +++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.graphing/plugin.xml @@ -134,23 +134,6 @@ style="push" state="false"/> - - - - - -- cgit v1.2.3 From 70d516bb1aadca3b5a37d102e28938a4e19d6393 Mon Sep 17 00:00:00 2001 From: Roland Grunberg Date: Wed, 2 Jun 2010 17:52:39 +0000 Subject: 2010-06-02 Roland Grunberg * plugin.xml: Switch "Modify Parsing Expression" to M1+M3+F6 [Ctrl+Shift+F6] to avoid collision with printing. --- systemtap/org.eclipse.linuxtools.systemtap.ui.graphicalrun/ChangeLog | 5 +++++ .../org.eclipse.linuxtools.systemtap.ui.graphicalrun/plugin.xml | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) (limited to 'systemtap') diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.graphicalrun/ChangeLog b/systemtap/org.eclipse.linuxtools.systemtap.ui.graphicalrun/ChangeLog index 4e1f2d1213..5b87632ab9 100644 --- a/systemtap/org.eclipse.linuxtools.systemtap.ui.graphicalrun/ChangeLog +++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.graphicalrun/ChangeLog @@ -1,3 +1,8 @@ +2010-06-02 Roland Grunberg + + * plugin.xml: Switch "Modify Parsing Expression" to M1+M3+F6 [Ctrl+Shift+F6] to avoid + collision with printing. + 2010-01-29 Anithra P Janakiraman * META-INF/MANIFEST.MF: Changed Bundle-version diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.graphicalrun/plugin.xml b/systemtap/org.eclipse.linuxtools.systemtap.ui.graphicalrun/plugin.xml index 01cd39da09..596183d9d0 100644 --- a/systemtap/org.eclipse.linuxtools.systemtap.ui.graphicalrun/plugin.xml +++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.graphicalrun/plugin.xml @@ -35,7 +35,7 @@ commandId="org.eclipse.linuxtools.systemtap.ui.graphicalrun.commands.ModifyParsing" contextId="org.eclipse.ui.contexts.window" schemeId="org.eclipse.ui.defaultAcceleratorConfiguration" - sequence="M1+P"/> + sequence="M1+M3+F6"/> bz 30629 --- systemtap/org.eclipse.linuxtools.systemtap.ui.editor/ChangeLog | 5 +++++ .../linuxtools/systemtap/ui/editor/actions/file/OpenFileAction.java | 3 +++ 2 files changed, 8 insertions(+) (limited to 'systemtap') diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.editor/ChangeLog b/systemtap/org.eclipse.linuxtools.systemtap.ui.editor/ChangeLog index 699f023b89..791071a7fb 100644 --- a/systemtap/org.eclipse.linuxtools.systemtap.ui.editor/ChangeLog +++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.editor/ChangeLog @@ -1,3 +1,8 @@ +2010-06-04 Anithra P Janakiraman + + bz 30629 + * src/org/eclipse/linuxtools/systemtap/ui/editor/actions/file/OpenFileAction.java (run): + 2010-02-04 Anithra P Janakiraman * META-INF/MANIFEST.MF: removed version dependency for org.eclipse.ui bundle diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.editor/src/org/eclipse/linuxtools/systemtap/ui/editor/actions/file/OpenFileAction.java b/systemtap/org.eclipse.linuxtools.systemtap.ui.editor/src/org/eclipse/linuxtools/systemtap/ui/editor/actions/file/OpenFileAction.java index 929113a25f..7a5d21b628 100644 --- a/systemtap/org.eclipse.linuxtools.systemtap.ui.editor/src/org/eclipse/linuxtools/systemtap/ui/editor/actions/file/OpenFileAction.java +++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.editor/src/org/eclipse/linuxtools/systemtap/ui/editor/actions/file/OpenFileAction.java @@ -31,6 +31,7 @@ import org.eclipse.ui.IEditorRegistry; import org.eclipse.ui.IWorkbench; import org.eclipse.ui.IWorkbenchPage; import org.eclipse.ui.PartInitException; +import org.eclipse.ui.PlatformUI; @@ -48,6 +49,8 @@ public class OpenFileAction extends EditorAction { * Opens the editor input. */ public void run() { + if (window == null) + window = PlatformUI.getWorkbench().getActiveWorkbenchWindow(); File file = queryFile(); if (file != null) { IEditorInput input= createEditorInput(file); -- cgit v1.2.3 From 7a0001e20e6c5c64e900db35b324ab6e52b8f5fd Mon Sep 17 00:00:00 2001 From: Andrew Overholt Date: Fri, 4 Jun 2010 21:43:09 +0000 Subject: ASSIGNED - bug 282039: Externalize bundleName and bundleProvider in plugin/feature.properties https://bugs.eclipse.org/bugs/show_bug.cgi?id=282039 --- systemtap/org.eclipse.linuxtools.systemtap.ui.consolelog/ChangeLog | 7 +++++++ .../META-INF/MANIFEST.MF | 4 ++-- .../plugin.properties | 2 ++ systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/ChangeLog | 7 +++++++ .../META-INF/MANIFEST.MF | 4 ++-- .../plugin.properties | 3 +++ .../ChangeLog | 7 +++++++ .../META-INF/MANIFEST.MF | 4 ++-- .../plugin.properties | 3 +++ systemtap/org.eclipse.linuxtools.systemtap.ui.editor/ChangeLog | 7 +++++++ .../META-INF/MANIFEST.MF | 4 ++-- .../org.eclipse.linuxtools.systemtap.ui.editor/plugin.properties | 3 ++- .../org.eclipse.linuxtools.systemtap.ui.graphicalrun/ChangeLog | 7 +++++++ .../META-INF/MANIFEST.MF | 4 ++-- .../plugin.properties | 3 +++ systemtap/org.eclipse.linuxtools.systemtap.ui.graphing/ChangeLog | 7 +++++++ .../META-INF/MANIFEST.MF | 4 ++-- .../org.eclipse.linuxtools.systemtap.ui.graphing/plugin.properties | 3 +++ .../ChangeLog | 7 +++++++ .../META-INF/MANIFEST.MF | 5 +++-- .../build.properties | 3 ++- .../plugin.properties | 2 ++ .../org.eclipse.linuxtools.systemtap.ui.graphingapi.ui/ChangeLog | 7 +++++++ .../META-INF/MANIFEST.MF | 4 ++-- .../plugin.properties | 3 +++ systemtap/org.eclipse.linuxtools.systemtap.ui.ide/ChangeLog | 7 +++++++ .../org.eclipse.linuxtools.systemtap.ui.ide/META-INF/MANIFEST.MF | 4 ++-- .../org.eclipse.linuxtools.systemtap.ui.ide/plugin.properties | 2 ++ systemtap/org.eclipse.linuxtools.systemtap.ui.logging/ChangeLog | 7 +++++++ .../META-INF/MANIFEST.MF | 4 ++-- .../org.eclipse.linuxtools.systemtap.ui.logging/plugin.properties | 2 ++ systemtap/org.eclipse.linuxtools.systemtap.ui.structures/ChangeLog | 7 +++++++ .../META-INF/MANIFEST.MF | 4 ++-- .../plugin.properties | 2 ++ .../org.eclipse.linuxtools.systemtap.ui.systemtapgui/ChangeLog | 7 +++++++ .../META-INF/MANIFEST.MF | 4 ++-- .../plugin.properties | 2 ++ 37 files changed, 140 insertions(+), 26 deletions(-) create mode 100644 systemtap/org.eclipse.linuxtools.systemtap.ui.graphingapi.nonui/plugin.properties (limited to 'systemtap') diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.consolelog/ChangeLog b/systemtap/org.eclipse.linuxtools.systemtap.ui.consolelog/ChangeLog index 5c3b411ea2..1b38004fe8 100644 --- a/systemtap/org.eclipse.linuxtools.systemtap.ui.consolelog/ChangeLog +++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.consolelog/ChangeLog @@ -1,3 +1,10 @@ +2010-06-04 Andrew Overholt + + Bug #282039 + + * plugin.properties: Externalize bundle name and provider. + * plugin.xml: Likewise. + 2010-03-11 Anithra P Janakiraman * src/org/eclipse/linuxtools/systemtap/ui/consolelog/actions/ConsoleAction.java (buildEnablementChecks): Fix for BZ #304208 diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.consolelog/META-INF/MANIFEST.MF b/systemtap/org.eclipse.linuxtools.systemtap.ui.consolelog/META-INF/MANIFEST.MF index fd32e5d8e0..ea046f6b33 100644 --- a/systemtap/org.eclipse.linuxtools.systemtap.ui.consolelog/META-INF/MANIFEST.MF +++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.consolelog/META-INF/MANIFEST.MF @@ -1,10 +1,10 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 -Bundle-Name: SystemTap ConsoleLog Plug-in (Incubation) +Bundle-Name: %bundleName Bundle-SymbolicName: org.eclipse.linuxtools.systemtap.ui.consolelog;singleton:=true Bundle-Version: 0.3.0.qualifier Bundle-Activator: org.eclipse.linuxtools.systemtap.ui.consolelog.internal.ConsoleLogPlugin -Bundle-Vendor: Eclipse +Bundle-Vendor: %bundleProvider Bundle-Localization: plugin Export-Package: org.eclipse.linuxtools.systemtap.ui.consolelog, org.eclipse.linuxtools.systemtap.ui.consolelog.actions, diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.consolelog/plugin.properties b/systemtap/org.eclipse.linuxtools.systemtap.ui.consolelog/plugin.properties index afd8b0297e..788888b682 100644 --- a/systemtap/org.eclipse.linuxtools.systemtap.ui.consolelog/plugin.properties +++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.consolelog/plugin.properties @@ -1,3 +1,5 @@ +bundleName=SystemTap ConsoleLog Plug-in (Incubation) +bundleProvider=Eclipse Linux Tools view.error.name=Error Log action.saveLog.name=Save &Log diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/ChangeLog b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/ChangeLog index 352863ae37..d89c27fe71 100644 --- a/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/ChangeLog +++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/ChangeLog @@ -5,6 +5,13 @@ * src/org/eclipse/linuxtools/systemtap/ui/dashboard/structures/DashboardModuleTreeBuilder.java (scanNextLevel): Fix BZ #314873 +2010-06-04 Andrew Overholt + + Bug #282039 + + * plugin.properties: Externalize bundle name and provider. + * plugin.xml: Likewise. + 2010-02-11 Roland Grunberg * src/org/eclipse/linuxtools/systemtap/ui/dashboard/internal/DashboardCloseMonitor.java: diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/META-INF/MANIFEST.MF b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/META-INF/MANIFEST.MF index 8c773ab1e4..e14dff3d8a 100644 --- a/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/META-INF/MANIFEST.MF +++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/META-INF/MANIFEST.MF @@ -1,10 +1,9 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 -Bundle-Name: SystemTap Dashboard (Incubation) Bundle-SymbolicName: org.eclipse.linuxtools.systemtap.ui.dashboard; singleton:=true Bundle-Version: 0.3.0.qualifier Bundle-Activator: org.eclipse.linuxtools.systemtap.ui.dashboard.internal.DashboardPlugin -Bundle-Vendor: Eclipse +Bundle-Vendor: %bundleProvider Bundle-Localization: plugin Export-Package: org.eclipse.linuxtools.systemtap.ui.dashboard, org.eclipse.linuxtools.systemtap.ui.dashboard.internal, @@ -24,3 +23,4 @@ Import-Package: org.eclipse.linuxtools.systemtap.ui.graphicalrun.structures, org.eclipse.linuxtools.systemtap.ui.ide.structures Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: J2SE-1.5 +Bundle-Name: %bundleName diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/plugin.properties b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/plugin.properties index 8638567f04..eb41018a23 100644 --- a/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/plugin.properties +++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/plugin.properties @@ -1,3 +1,6 @@ +bundleName=SystemTap Dashboard (Incubation) +bundleProvider=Eclipse Linux Tools + perspective.dashboard.name=SystemTap Dashboard view.module.name=Modules diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboardextension/ChangeLog b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboardextension/ChangeLog index 2f0fb66692..0f9134b748 100644 --- a/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboardextension/ChangeLog +++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboardextension/ChangeLog @@ -1,3 +1,10 @@ +2010-06-04 Andrew Overholt + + Bug #282039 + + * plugin.properties: Externalize bundle name and provider. + * plugin.xml: Likewise. + 2010-02-04 Anithra P Janakiraman * META-INF/MANIFEST.MF: removed version dependency for org.eclipse.ui bundle diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboardextension/META-INF/MANIFEST.MF b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboardextension/META-INF/MANIFEST.MF index 5622bb308f..dc89497b93 100644 --- a/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboardextension/META-INF/MANIFEST.MF +++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboardextension/META-INF/MANIFEST.MF @@ -1,10 +1,10 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 -Bundle-Name: DashboardExtension Plug-in (Incubation) +Bundle-Name: %bundleName Bundle-SymbolicName: org.eclipse.linuxtools.systemtap.ui.dashboardextension; singleton:=true Bundle-Version: 0.3.0.qualifier Bundle-Activator: org.eclipse.linuxtools.systemtap.ui.dashboardextension.internal.DashboardExtensionPlugin -Bundle-Vendor: Eclipse +Bundle-Vendor: %bundleProvider Bundle-Localization: plugin Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime, diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboardextension/plugin.properties b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboardextension/plugin.properties index bdc6f14513..6011411d6d 100644 --- a/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboardextension/plugin.properties +++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboardextension/plugin.properties @@ -1,3 +1,6 @@ +bundleName=SystemTap Dashboard Extension Plug-in (Incubation) +bundleProvider=Eclipse Linux Tools + command.exportScript.name=&Export Script... command.exportScript.desc=Export Script to the Dashboard diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.editor/ChangeLog b/systemtap/org.eclipse.linuxtools.systemtap.ui.editor/ChangeLog index 791071a7fb..174b7f48db 100644 --- a/systemtap/org.eclipse.linuxtools.systemtap.ui.editor/ChangeLog +++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.editor/ChangeLog @@ -3,6 +3,13 @@ bz 30629 * src/org/eclipse/linuxtools/systemtap/ui/editor/actions/file/OpenFileAction.java (run): +2010-06-04 Andrew Overholt + + Bug #282039 + + * plugin.properties: Externalize bundle name and provider. + * plugin.xml: Likewise. + 2010-02-04 Anithra P Janakiraman * META-INF/MANIFEST.MF: removed version dependency for org.eclipse.ui bundle diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.editor/META-INF/MANIFEST.MF b/systemtap/org.eclipse.linuxtools.systemtap.ui.editor/META-INF/MANIFEST.MF index 07f9cdbfac..98a4c1b9b2 100644 --- a/systemtap/org.eclipse.linuxtools.systemtap.ui.editor/META-INF/MANIFEST.MF +++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.editor/META-INF/MANIFEST.MF @@ -1,10 +1,10 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 -Bundle-Name: SystemTap Script Editor (Incubation) +Bundle-Name: %bundleName Bundle-SymbolicName: org.eclipse.linuxtools.systemtap.ui.editor;singleton:=true Bundle-Version: 0.3.0.qualifier Bundle-Activator: org.eclipse.linuxtools.systemtap.ui.editor.internal.EditorPlugin -Bundle-Vendor: Eclipse +Bundle-Vendor: %bundleProvider Bundle-Localization: plugin Export-Package: org.eclipse.linuxtools.systemtap.ui.editor, org.eclipse.linuxtools.systemtap.ui.editor.actions.file diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.editor/plugin.properties b/systemtap/org.eclipse.linuxtools.systemtap.ui.editor/plugin.properties index e0f6e1371b..6f1c578522 100644 --- a/systemtap/org.eclipse.linuxtools.systemtap.ui.editor/plugin.properties +++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.editor/plugin.properties @@ -1,4 +1,5 @@ - +bundleName=SystemTap Script Editor (Incubation) +bundleProvider=Eclipse Linux Tools category.file.name=File category.file.desc=File diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.graphicalrun/ChangeLog b/systemtap/org.eclipse.linuxtools.systemtap.ui.graphicalrun/ChangeLog index 5b87632ab9..7649f7ffce 100644 --- a/systemtap/org.eclipse.linuxtools.systemtap.ui.graphicalrun/ChangeLog +++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.graphicalrun/ChangeLog @@ -3,6 +3,13 @@ * plugin.xml: Switch "Modify Parsing Expression" to M1+M3+F6 [Ctrl+Shift+F6] to avoid collision with printing. +2010-06-04 Andrew Overholt + + Bug #282039 + + * plugin.properties: Externalize bundle name and provider. + * plugin.xml: Likewise. + 2010-01-29 Anithra P Janakiraman * META-INF/MANIFEST.MF: Changed Bundle-version diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.graphicalrun/META-INF/MANIFEST.MF b/systemtap/org.eclipse.linuxtools.systemtap.ui.graphicalrun/META-INF/MANIFEST.MF index fca0690f5d..3837dea252 100644 --- a/systemtap/org.eclipse.linuxtools.systemtap.ui.graphicalrun/META-INF/MANIFEST.MF +++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.graphicalrun/META-INF/MANIFEST.MF @@ -1,10 +1,10 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 -Bundle-Name: GraphicalRun Plug-in (Incubation) +Bundle-Name: %bundleName Bundle-SymbolicName: org.eclipse.linuxtools.systemtap.ui.graphicalrun; singleton:=true Bundle-Version: 0.3.0.qualifier Bundle-Activator: org.eclipse.linuxtools.systemtap.ui.graphicalrun.internal.GraphicalRunPlugin -Bundle-Vendor: Eclipse +Bundle-Vendor: %bundleProvider Bundle-Localization: plugin Export-Package: org.eclipse.linuxtools.systemtap.ui.graphicalrun.structures Require-Bundle: org.eclipse.ui, diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.graphicalrun/plugin.properties b/systemtap/org.eclipse.linuxtools.systemtap.ui.graphicalrun/plugin.properties index c044a09879..22796f523e 100644 --- a/systemtap/org.eclipse.linuxtools.systemtap.ui.graphicalrun/plugin.properties +++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.graphicalrun/plugin.properties @@ -1,3 +1,6 @@ +bundleName=GraphicalRun Plug-in (Incubation) +bundleProvider=Eclipse Linux Tools + command.runChart.name=Run w/C&hart command.runChart.desc=Run the Script w/Chart command.modifyParsing.name=Modify &Parsing Expression diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.graphing/ChangeLog b/systemtap/org.eclipse.linuxtools.systemtap.ui.graphing/ChangeLog index 69d958f110..708363cae7 100644 --- a/systemtap/org.eclipse.linuxtools.systemtap.ui.graphing/ChangeLog +++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.graphing/ChangeLog @@ -2,6 +2,13 @@ * plugin.xml: Fix BZ #315223. Identical ActionSet in GraphicalRun +2010-06-04 Andrew Overholt + + Bug #282039 + + * plugin.properties: Externalize bundle name and provider. + * plugin.xml: Likewise. + 2010-01-29 Anithra P Janakiraman * src/org/eclipse/linuxtools/systemtap/ui/graphing/actions/ModifyParsingAction.java: Removed. diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.graphing/META-INF/MANIFEST.MF b/systemtap/org.eclipse.linuxtools.systemtap.ui.graphing/META-INF/MANIFEST.MF index 5558af61bc..efe4b1b549 100644 --- a/systemtap/org.eclipse.linuxtools.systemtap.ui.graphing/META-INF/MANIFEST.MF +++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.graphing/META-INF/MANIFEST.MF @@ -1,10 +1,10 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 -Bundle-Name: SystemTap Graphing Plug-In (Incubation) +Bundle-Name: %bundleName Bundle-SymbolicName: org.eclipse.linuxtools.systemtap.ui.graphing;singleton:=true Bundle-Version: 0.3.0.qualifier Bundle-Activator: org.eclipse.linuxtools.systemtap.ui.graphing.internal.GraphingPlugin -Bundle-Vendor: Eclipse +Bundle-Vendor: %bundleProvider Bundle-Localization: plugin Export-Package: org.eclipse.linuxtools.systemtap.ui.graphing, org.eclipse.linuxtools.systemtap.ui.graphing.structures, diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.graphing/plugin.properties b/systemtap/org.eclipse.linuxtools.systemtap.ui.graphing/plugin.properties index f6ebcebd85..d4ebcc5837 100644 --- a/systemtap/org.eclipse.linuxtools.systemtap.ui.graphing/plugin.properties +++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.graphing/plugin.properties @@ -1,3 +1,6 @@ +bundleName=SystemTap Graphing Plug-In (Incubation) +bundleProvider=Eclipse Linux Tools + perspective.graphing.name=SystemTap Graphing view.graphSelector.name=Graph Selector diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.graphingapi.nonui/ChangeLog b/systemtap/org.eclipse.linuxtools.systemtap.ui.graphingapi.nonui/ChangeLog index 1406fbd132..7f290b0cd8 100644 --- a/systemtap/org.eclipse.linuxtools.systemtap.ui.graphingapi.nonui/ChangeLog +++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.graphingapi.nonui/ChangeLog @@ -1,3 +1,10 @@ +2010-06-04 Andrew Overholt + + Bug #282039 + + * plugin.properties: Externalize bundle name and provider. + * plugin.xml: Likewise. + 2010-01-29 Anithra P Janakiraman * src/org/eclipse/linuxtools/systemtap/ui/graphingapi/nonui/structures/ChartStreamDaemon2.java: Removed. diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.graphingapi.nonui/META-INF/MANIFEST.MF b/systemtap/org.eclipse.linuxtools.systemtap.ui.graphingapi.nonui/META-INF/MANIFEST.MF index 79bfa253e2..7d31259d5f 100644 --- a/systemtap/org.eclipse.linuxtools.systemtap.ui.graphingapi.nonui/META-INF/MANIFEST.MF +++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.graphingapi.nonui/META-INF/MANIFEST.MF @@ -1,10 +1,11 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 -Bundle-Name: SystemTap Graphing API (non-UI) (Incubation) +Bundle-Name: %bundleName Bundle-SymbolicName: org.eclipse.linuxtools.systemtap.ui.graphingapi.nonui;singleton:=true Bundle-Version: 0.3.0.qualifier Bundle-Activator: org.eclipse.linuxtools.systemtap.ui.graphingapi.nonui.internal.GraphingAPINonUIPlugin -Bundle-Vendor: Eclipse +Bundle-Localization: plugin +Bundle-Vendor: %bundleProvider Export-Package: org.eclipse.linuxtools.systemtap.ui.graphingapi.nonui, org.eclipse.linuxtools.systemtap.ui.graphingapi.nonui.adapters, org.eclipse.linuxtools.systemtap.ui.graphingapi.nonui.aggregates, diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.graphingapi.nonui/build.properties b/systemtap/org.eclipse.linuxtools.systemtap.ui.graphingapi.nonui/build.properties index 98def4deb0..cabb1f7cb0 100644 --- a/systemtap/org.eclipse.linuxtools.systemtap.ui.graphingapi.nonui/build.properties +++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.graphingapi.nonui/build.properties @@ -2,4 +2,5 @@ source.. = src/ output.. = bin/ bin.includes = META-INF/,\ .,\ - src/ + src/,\ + plugin.properties diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.graphingapi.nonui/plugin.properties b/systemtap/org.eclipse.linuxtools.systemtap.ui.graphingapi.nonui/plugin.properties new file mode 100644 index 0000000000..4afcbae30e --- /dev/null +++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.graphingapi.nonui/plugin.properties @@ -0,0 +1,2 @@ +bundleName=SystemTap Graphing API (non-UI) (Incubation) +bundleProvider=Eclipse Linux Tools \ No newline at end of file diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.graphingapi.ui/ChangeLog b/systemtap/org.eclipse.linuxtools.systemtap.ui.graphingapi.ui/ChangeLog index 7fdecc15eb..cf759baa80 100644 --- a/systemtap/org.eclipse.linuxtools.systemtap.ui.graphingapi.ui/ChangeLog +++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.graphingapi.ui/ChangeLog @@ -1,3 +1,10 @@ +2010-06-04 Andrew Overholt + + Bug #282039 + + * plugin.properties: Externalize bundle name and provider. + * plugin.xml: Likewise. + 2010-01-29 Anithra P Janakiraman * src/org/eclipse/linuxtools/systemtap/ui/graphingapi/ui/chart/widget/ChartCanvas.java: New file. diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.graphingapi.ui/META-INF/MANIFEST.MF b/systemtap/org.eclipse.linuxtools.systemtap.ui.graphingapi.ui/META-INF/MANIFEST.MF index 36e2dc0ec1..fa48951fed 100644 --- a/systemtap/org.eclipse.linuxtools.systemtap.ui.graphingapi.ui/META-INF/MANIFEST.MF +++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.graphingapi.ui/META-INF/MANIFEST.MF @@ -1,10 +1,10 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 -Bundle-Name: SystemTap Graphing API (UI) (Incubation) +Bundle-Name: %bundleName Bundle-SymbolicName: org.eclipse.linuxtools.systemtap.ui.graphingapi.ui;singleton:=true Bundle-Version: 0.3.0.qualifier Bundle-Activator: org.eclipse.linuxtools.systemtap.ui.graphingapi.ui.internal.GraphingAPIUIPlugin -Bundle-Vendor: Eclipse +Bundle-Vendor: %bundleProvider Bundle-Localization: plugin Export-Package: org.eclipse.linuxtools.systemtap.ui.graphingapi.ui.chart.widget, diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.graphingapi.ui/plugin.properties b/systemtap/org.eclipse.linuxtools.systemtap.ui.graphingapi.ui/plugin.properties index 1c7f6fbc11..984a4b701f 100644 --- a/systemtap/org.eclipse.linuxtools.systemtap.ui.graphingapi.ui/plugin.properties +++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.graphingapi.ui/plugin.properties @@ -1,3 +1,6 @@ +bundleName=SystemTap Graphing API (UI) (Incubation) +bundleProvider=Eclipse Linux Tools + preference.graphing.name=GraphingAPI preference.dataTable.name=Data Table preference.graph.name=Graph diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/ChangeLog b/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/ChangeLog index 37e17d5837..0f844eb517 100644 --- a/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/ChangeLog +++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/ChangeLog @@ -1,3 +1,10 @@ +2010-06-04 Andrew Overholt + + Bug #282039 + + * plugin.properties: Externalize bundle name and provider. + * plugin.xml: Likewise. + 2010-03-15 Anithra P Janakiraman * src/org/eclipse/linuxtools/systemtap/ui/ide/actions/RunScriptAction.java (getFilePath): Bz 304206 diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/META-INF/MANIFEST.MF b/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/META-INF/MANIFEST.MF index 7ad3e7674e..a9026472a3 100644 --- a/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/META-INF/MANIFEST.MF +++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/META-INF/MANIFEST.MF @@ -1,10 +1,10 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 -Bundle-Name: SystemTap IDE Plug-in (Incubation) +Bundle-Name: %bundleName Bundle-SymbolicName: org.eclipse.linuxtools.systemtap.ui.ide;singleton:=true Bundle-Version: 0.3.0.qualifier Bundle-Activator: org.eclipse.linuxtools.systemtap.ui.ide.internal.IDEPlugin -Bundle-Vendor: Eclipse +Bundle-Vendor: %bundleProvider Bundle-Localization: plugin Export-Package: org.eclipse.linuxtools.systemtap.ui.ide, org.eclipse.linuxtools.systemtap.ui.ide.actions, diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/plugin.properties b/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/plugin.properties index 155df86936..ed1b2f8250 100644 --- a/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/plugin.properties +++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/plugin.properties @@ -1,3 +1,5 @@ +bundleName=SystemTap IDE Plug-in (Incubation) +bundleProvider=Eclipse Linux Tools perspective.ide.name=SystemTap IDE view.function.name=Function diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.logging/ChangeLog b/systemtap/org.eclipse.linuxtools.systemtap.ui.logging/ChangeLog index cc51809370..10f0cd6622 100644 --- a/systemtap/org.eclipse.linuxtools.systemtap.ui.logging/ChangeLog +++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.logging/ChangeLog @@ -1,3 +1,10 @@ +2010-06-04 Andrew Overholt + + Bug #282039 + + * plugin.properties: Externalize bundle name and provider. + * plugin.xml: Likewise. + 2009-11-16 Andrew Overholt * META-INF/MANIFEST.MF: Fix bundle name. diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.logging/META-INF/MANIFEST.MF b/systemtap/org.eclipse.linuxtools.systemtap.ui.logging/META-INF/MANIFEST.MF index 9c59f5ab38..3c3b79585d 100644 --- a/systemtap/org.eclipse.linuxtools.systemtap.ui.logging/META-INF/MANIFEST.MF +++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.logging/META-INF/MANIFEST.MF @@ -1,10 +1,10 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 -Bundle-Name: SystemTap Logging Functionality (Incubation) +Bundle-Name: %bundleName Bundle-SymbolicName: org.eclipse.linuxtools.systemtap.ui.logging;singleton:=true Bundle-Version: 0.3.0.qualifier Bundle-Activator: org.eclipse.linuxtools.systemtap.ui.logging.internal.LoggingPlugin -Bundle-Vendor: Eclipse +Bundle-Vendor: %bundleProvider Bundle-Localization: plugin Export-Package: org.eclipse.linuxtools.systemtap.ui.logging Require-Bundle: org.eclipse.ui, diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.logging/plugin.properties b/systemtap/org.eclipse.linuxtools.systemtap.ui.logging/plugin.properties index e2fbef23bf..7be2eeecc3 100644 --- a/systemtap/org.eclipse.linuxtools.systemtap.ui.logging/plugin.properties +++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.logging/plugin.properties @@ -1 +1,3 @@ +bundleName=SystemTap Logging Functionality (Incubation) +bundleProvider=Eclipse Linux Tools preference.logging.name=Logging \ No newline at end of file diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.structures/ChangeLog b/systemtap/org.eclipse.linuxtools.systemtap.ui.structures/ChangeLog index 8aa19eaf64..59f420102a 100644 --- a/systemtap/org.eclipse.linuxtools.systemtap.ui.structures/ChangeLog +++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.structures/ChangeLog @@ -1,3 +1,10 @@ +2010-06-04 Andrew Overholt + + Bug #282039 + + * plugin.properties: Externalize bundle name and provider. + * plugin.xml: Likewise. + 2009-11-16 Andrew Overholt * META-INF/MANIFEST.MF: Fix bundle name. diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.structures/META-INF/MANIFEST.MF b/systemtap/org.eclipse.linuxtools.systemtap.ui.structures/META-INF/MANIFEST.MF index fed0534e11..cb82e3c955 100644 --- a/systemtap/org.eclipse.linuxtools.systemtap.ui.structures/META-INF/MANIFEST.MF +++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.structures/META-INF/MANIFEST.MF @@ -1,10 +1,10 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 -Bundle-Name: SystemTap Structures Plug-in (Incubation) +Bundle-Name: %bundleName Bundle-SymbolicName: org.eclipse.linuxtools.systemtap.ui.structures;singleton:=true Bundle-Version: 0.3.0.qualifier Bundle-Activator: org.eclipse.linuxtools.systemtap.ui.structures.internal.StructuresPlugin -Bundle-Vendor: Eclipse +Bundle-Vendor: %bundleProvider Bundle-ActivationPolicy: lazy Export-Package: org.eclipse.linuxtools.systemtap.ui.structures, org.eclipse.linuxtools.systemtap.ui.structures.listeners, diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.structures/plugin.properties b/systemtap/org.eclipse.linuxtools.systemtap.ui.structures/plugin.properties index 34ac531867..83996413b8 100644 --- a/systemtap/org.eclipse.linuxtools.systemtap.ui.structures/plugin.properties +++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.structures/plugin.properties @@ -1 +1,3 @@ +bundleName=SystemTap Structures Plug-in (Incubation) +bundleProvider=Eclipse Linux Tools category.name = SystemTap \ No newline at end of file diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.systemtapgui/ChangeLog b/systemtap/org.eclipse.linuxtools.systemtap.ui.systemtapgui/ChangeLog index 9ab891126f..2d05226db2 100644 --- a/systemtap/org.eclipse.linuxtools.systemtap.ui.systemtapgui/ChangeLog +++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.systemtapgui/ChangeLog @@ -1,3 +1,10 @@ +2010-06-04 Andrew Overholt + + Bug #282039 + + * plugin.properties: Externalize bundle name and provider. + * plugin.xml: Likewise. + 2009-11-16 Andrew Overholt * META-INF/MANIFEST.MF: Fix Bundle-Name. diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.systemtapgui/META-INF/MANIFEST.MF b/systemtap/org.eclipse.linuxtools.systemtap.ui.systemtapgui/META-INF/MANIFEST.MF index 8f7200fcb3..327cb8cdb1 100644 --- a/systemtap/org.eclipse.linuxtools.systemtap.ui.systemtapgui/META-INF/MANIFEST.MF +++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.systemtapgui/META-INF/MANIFEST.MF @@ -1,10 +1,10 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 -Bundle-Name: SystemTapGUI Plug-in (Incubation) +Bundle-Name: %bundleName Bundle-SymbolicName: org.eclipse.linuxtools.systemtap.ui.systemtapgui;singleton:=true Bundle-Version: 0.3.0.qualifier Bundle-Activator: org.eclipse.linuxtools.systemtap.ui.systemtapgui.internal.SystemTapGUIPlugin -Bundle-Vendor: Eclipse +Bundle-Vendor: %bundleProvider Bundle-Localization: plugin Export-Package: org.eclipse.linuxtools.systemtap.ui.systemtapgui, org.eclipse.linuxtools.systemtap.ui.systemtapgui.preferences diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.systemtapgui/plugin.properties b/systemtap/org.eclipse.linuxtools.systemtap.ui.systemtapgui/plugin.properties index c1fb95d0d4..ecdc907d9a 100644 --- a/systemtap/org.eclipse.linuxtools.systemtap.ui.systemtapgui/plugin.properties +++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.systemtapgui/plugin.properties @@ -1,3 +1,5 @@ +bundleName=SystemTapGUI Plug-in (Incubation) +bundleProvider=Eclipse Linux Tools about.text=System Tap GUI\n\n\ Version 1.0.rc1\n\n\ Build ID:\n\n\ -- cgit v1.2.3 From 38d552e9fdbc13ab721a00de252c5e7c4b84b1fe Mon Sep 17 00:00:00 2001 From: Anithra P Janakiraman Date: Sat, 5 Jun 2010 12:04:41 +0000 Subject: 2010-06-05 Anithra P Janakiraman Bug #315650 --- .../linuxtools/systemtap/ui/ide/internal/localization.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'systemtap') diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/src/org/eclipse/linuxtools/systemtap/ui/ide/internal/localization.properties b/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/src/org/eclipse/linuxtools/systemtap/ui/ide/internal/localization.properties index 56146d7aa1..45f557ec59 100644 --- a/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/src/org/eclipse/linuxtools/systemtap/ui/ide/internal/localization.properties +++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/src/org/eclipse/linuxtools/systemtap/ui/ide/internal/localization.properties @@ -58,7 +58,7 @@ CodeAssistPreferencePage.Overwrite=&Overwrite CodeAssistPreferencePage.ActivationDelay=Activation &Delay (requires restart): CodeAssistPreferencePage.ActivationTrigger=Activation &Trigger: -StapPreferencePage.StapPreferenceDescription=Empty page for now. Thinking of what to add. +StapPreferencePage.StapPreferenceDescription= EditorPreferencePage.EditorPreferenceDescription=This is for basic properties of the editors. EditorPreferencePage.BackgroundColor=&Editor Background Color: -- cgit v1.2.3 From 3472007a364e270308482f329bf202573612d62c Mon Sep 17 00:00:00 2001 From: Anithra P Janakiraman Date: Sat, 5 Jun 2010 12:05:04 +0000 Subject: 2010-06-05 Anithra P Janakiraman Bug #315650 --- systemtap/org.eclipse.linuxtools.systemtap.ui.ide/ChangeLog | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'systemtap') diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/ChangeLog b/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/ChangeLog index 0f844eb517..1aa7b6d047 100644 --- a/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/ChangeLog +++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/ChangeLog @@ -1,3 +1,9 @@ +2010-06-05 Anithra P Janakiraman + + * src/org/eclipse/linuxtools/systemtap/ui/ide/internal/localization.properties: + + Bug #315650 + 2010-06-04 Andrew Overholt Bug #282039 -- cgit v1.2.3 From 356a794f4c51ac8c6ae9f9e930b567d1eaccdc64 Mon Sep 17 00:00:00 2001 From: Anithra P Janakiraman Date: Sat, 5 Jun 2010 12:34:49 +0000 Subject: 2010-06-05 Anithra P Janakiraman Bug #315843 --- systemtap/org.eclipse.linuxtools.systemtap.ui.consolelog/ChangeLog | 6 ++++++ .../plugin.properties | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) (limited to 'systemtap') diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.consolelog/ChangeLog b/systemtap/org.eclipse.linuxtools.systemtap.ui.consolelog/ChangeLog index 1b38004fe8..441f92c0cd 100644 --- a/systemtap/org.eclipse.linuxtools.systemtap.ui.consolelog/ChangeLog +++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.consolelog/ChangeLog @@ -1,3 +1,9 @@ +2010-06-05 Anithra P Janakiraman + + Bug #315843 + + * plugin.properties: + 2010-06-04 Andrew Overholt Bug #282039 diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.consolelog/plugin.properties b/systemtap/org.eclipse.linuxtools.systemtap.ui.consolelog/plugin.properties index 788888b682..bc64491b07 100644 --- a/systemtap/org.eclipse.linuxtools.systemtap.ui.consolelog/plugin.properties +++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.consolelog/plugin.properties @@ -5,4 +5,4 @@ view.error.name=Error Log action.saveLog.name=Save &Log action.saveLog.desc=Save console log to file -preference.consoleLog.name=RemoteServer \ No newline at end of file +preference.consoleLog.name=Remote Server \ No newline at end of file -- cgit v1.2.3 From 84e682afbe43771161f6340187fdabd052836ab2 Mon Sep 17 00:00:00 2001 From: Andrew Overholt Date: Mon, 7 Jun 2010 13:56:00 +0000 Subject: NEW - bug 315143: Put GraphingAPI preference in SystemTap category https://bugs.eclipse.org/bugs/show_bug.cgi?id=315143 --- .../org.eclipse.linuxtools.systemtap.ui.graphingapi.ui/plugin.xml | 7 ++++--- systemtap/org.eclipse.linuxtools.systemtap.ui.logging/plugin.xml | 7 ++++--- 2 files changed, 8 insertions(+), 6 deletions(-) (limited to 'systemtap') diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.graphingapi.ui/plugin.xml b/systemtap/org.eclipse.linuxtools.systemtap.ui.graphingapi.ui/plugin.xml index 10c8211584..ae405e66c7 100644 --- a/systemtap/org.eclipse.linuxtools.systemtap.ui.graphingapi.ui/plugin.xml +++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.graphingapi.ui/plugin.xml @@ -4,9 +4,10 @@ + category="com.qualityeclipse.systemtap.prefs.view" + class="org.eclipse.linuxtools.systemtap.ui.graphingapi.ui.preferences.GraphingAPIPreferencePage" + id="com.qualityeclipse.generic.prefs.graphingapi" + name="%preference.graphing.name"/> + category="com.qualityeclipse.systemtap.prefs.view" + class="org.eclipse.linuxtools.systemtap.ui.logging.preferences.LoggingPreferencePage" + id="com.qualityeclipse.generic.prefs.logging" + name="%preference.logging.name"/> -- cgit v1.2.3 From 848961f12235f32caafe2339bc841b8ee386eb2b Mon Sep 17 00:00:00 2001 From: Anithra P Janakiraman Date: Mon, 7 Jun 2010 15:33:43 +0000 Subject: 2010-06-05 Anithra P Janakiraman Bug #315225 --- .../org.eclipse.linuxtools.systemtap.ui.ide/ChangeLog | 6 ++++++ .../org.eclipse.linuxtools.systemtap.ui.ide/plugin.xml | 15 --------------- 2 files changed, 6 insertions(+), 15 deletions(-) (limited to 'systemtap') diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/ChangeLog b/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/ChangeLog index 1aa7b6d047..20fbbb0f9a 100644 --- a/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/ChangeLog +++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/ChangeLog @@ -1,3 +1,9 @@ +2010-06-07 Anithra P Janakiraman + + * plugin.xml: Removing RunwithChart action + + Bug #315225 + 2010-06-05 Anithra P Janakiraman * src/org/eclipse/linuxtools/systemtap/ui/ide/internal/localization.properties: diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/plugin.xml b/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/plugin.xml index bd3afafc54..e5c21a7a19 100644 --- a/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/plugin.xml +++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/plugin.xml @@ -149,11 +149,6 @@ description="%command.run.desc" categoryId="org.eclipse.linuxtools.systemtap.ui.ide.category.run" id="org.eclipse.linuxtools.systemtap.ui.ide.commands.RunScript"/> - - Bug #315440 --- systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/ChangeLog | 7 +++++++ systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/plugin.xml | 7 +++---- .../ChangeLog | 6 ++++++ .../plugin.xml | 2 -- .../org.eclipse.linuxtools.systemtap.ui.graphicalrun/ChangeLog | 7 +++++++ .../org.eclipse.linuxtools.systemtap.ui.graphicalrun/plugin.xml | 1 - 6 files changed, 23 insertions(+), 7 deletions(-) (limited to 'systemtap') diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/ChangeLog b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/ChangeLog index d89c27fe71..7ff8c967fa 100644 --- a/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/ChangeLog +++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/ChangeLog @@ -1,3 +1,10 @@ +2010-06-07 Anithra P Janakiraman + + * plugin.xml: Removing invalid Menu Extensions + + Bug #315440 + + 2010-06-02 Roland Grunberg * src/org/eclipse/linuxtools/systemtap/ui/dashboard/structures/DashboardModuleLocator.java diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/plugin.xml b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/plugin.xml index fbebdbaba0..afb57f6195 100644 --- a/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/plugin.xml +++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/plugin.xml @@ -105,7 +105,6 @@ id="org.eclipse.linuxtools.systemtap.ui.dashboard.actions.ImportModuleAction" icon="icons/actions/import_wiz.gif" toolbarPath="org.eclipse.ui.workbench.file/open.ext" - menubarPath="file2/new.ext" class="org.eclipse.linuxtools.systemtap.ui.dashboard.actions.ImportModuleLocationAction" definitionId="org.eclipse.linuxtools.systemtap.ui.dashboard.commands.ImportModuleAction" style="push" @@ -133,9 +132,9 @@ definitionId="org.eclipse.linuxtools.systemtap.ui.dashboard.commands.StopModuleAction" icon="icons/actions/stop_script.gif" id="org.eclipse.linuxtools.systemtap.ui.dashboard.actions.StopModuleAction" + menubarPath="org.eclipse.ui.run/runGroup" state="false" style="push" - menubarPath="launch/wbStart" toolbarPath="org.eclipse.ui.workbench.file/build.group"> diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboardextension/ChangeLog b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboardextension/ChangeLog index 0f9134b748..b1297fee86 100644 --- a/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboardextension/ChangeLog +++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboardextension/ChangeLog @@ -1,3 +1,9 @@ +2010-06-07 Anithra P Janakiraman + + * plugin.xml: Removing invalid Menu Extensions + + Bug #315440 + 2010-06-04 Andrew Overholt Bug #282039 diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboardextension/plugin.xml b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboardextension/plugin.xml index 549a7e3a85..f95219e6c8 100644 --- a/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboardextension/plugin.xml +++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboardextension/plugin.xml @@ -43,7 +43,6 @@ id="org.eclipse.linuxtools.systemtap.ui.dashboardextension.actions.ExportScript" icon="icons/actions/export_wiz.gif" toolbarPath="org.eclipse.ui.workbench.file/export.ext" - menubarPath="file2/export.ext" class="org.eclipse.linuxtools.systemtap.ui.dashboardextension.actions.ExportScriptAction" definitionId="org.eclipse.linuxtools.systemtap.ui.dashboardextension.commands.ExportScript" style="push" @@ -61,7 +60,6 @@ id="org.eclipse.linuxtools.systemtap.ui.dashboardextension.actions.CreateModuleAction" icon="icons/actions/mod_obj.gif" toolbarPath="org.eclipse.ui.workbench.file/export.ext" - menubarPath="file2/export.ext" class="org.eclipse.linuxtools.systemtap.ui.dashboardextension.actions.CreateModuleAction" definitionId="org.eclipse.linuxtools.systemtap.ui.dashboardextension.commands.CreateModuleAction" style="push" diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.graphicalrun/ChangeLog b/systemtap/org.eclipse.linuxtools.systemtap.ui.graphicalrun/ChangeLog index 7649f7ffce..199e567564 100644 --- a/systemtap/org.eclipse.linuxtools.systemtap.ui.graphicalrun/ChangeLog +++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.graphicalrun/ChangeLog @@ -1,3 +1,10 @@ +2010-06-07 Anithra P Janakiraman + + * plugin.xml: Removing invalid Menu Extensions + + Bug #315440 + + 2010-06-02 Roland Grunberg * plugin.xml: Switch "Modify Parsing Expression" to M1+M3+F6 [Ctrl+Shift+F6] to avoid diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.graphicalrun/plugin.xml b/systemtap/org.eclipse.linuxtools.systemtap.ui.graphicalrun/plugin.xml index 596183d9d0..703ecbcb9a 100644 --- a/systemtap/org.eclipse.linuxtools.systemtap.ui.graphicalrun/plugin.xml +++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.graphicalrun/plugin.xml @@ -50,7 +50,6 @@ id="org.eclipse.linuxtools.systemtap.ui.graphicalrun.actions.RunScriptChartAction" icon="icons/actions/run_chart.gif" toolbarPath="org.eclipse.ui.workbench.file/build.ext" - menubarPath="launch/build.ext" class="org.eclipse.linuxtools.systemtap.ui.graphicalrun.actions.RunScriptChartAction" definitionId="org.eclipse.linuxtools.systemtap.ui.graphicalrun.commands.RunScriptChart" style="push" -- cgit v1.2.3 From 511d8c92aad7f5160929911017a4b1f72fc364ba Mon Sep 17 00:00:00 2001 From: Anithra P Janakiraman Date: Tue, 8 Jun 2010 14:33:45 +0000 Subject: 2010-06-08 Anithra P Janakiraman Bug #315224 --- systemtap/org.eclipse.linuxtools.systemtap.ui.consolelog/ChangeLog | 6 ++++++ .../systemtap/ui/consolelog/actions/StopScriptAction.java | 7 +++++++ 2 files changed, 13 insertions(+) (limited to 'systemtap') diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.consolelog/ChangeLog b/systemtap/org.eclipse.linuxtools.systemtap.ui.consolelog/ChangeLog index 441f92c0cd..1e7b0d2eac 100644 --- a/systemtap/org.eclipse.linuxtools.systemtap.ui.consolelog/ChangeLog +++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.consolelog/ChangeLog @@ -1,3 +1,9 @@ +2010-06-08 Anithra P Janakiraman + + * src/org/eclipse/linuxtools/systemtap/ui/consolelog/actions/StopScriptAction.java (selectionChanged): + + Bug #315224 + 2010-06-05 Anithra P Janakiraman Bug #315843 diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.consolelog/src/org/eclipse/linuxtools/systemtap/ui/consolelog/actions/StopScriptAction.java b/systemtap/org.eclipse.linuxtools.systemtap.ui.consolelog/src/org/eclipse/linuxtools/systemtap/ui/consolelog/actions/StopScriptAction.java index 8ce232d084..9a8c59fbb0 100644 --- a/systemtap/org.eclipse.linuxtools.systemtap.ui.consolelog/src/org/eclipse/linuxtools/systemtap/ui/consolelog/actions/StopScriptAction.java +++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.consolelog/src/org/eclipse/linuxtools/systemtap/ui/consolelog/actions/StopScriptAction.java @@ -11,6 +11,8 @@ package org.eclipse.linuxtools.systemtap.ui.consolelog.actions; +import org.eclipse.jface.action.IAction; +import org.eclipse.jface.viewers.ISelection; import org.eclipse.linuxtools.systemtap.ui.consolelog.structures.ScriptConsole; import org.eclipse.ui.PlatformUI; import org.eclipse.ui.console.ConsolePlugin; @@ -43,6 +45,11 @@ public class StopScriptAction extends ConsoleAction { }); } + public void selectionChanged(IAction a, ISelection s) { + a.setEnabled(anyRunning()); + } + + /** * This method will stop the i'th ScriptConsole if it is running. * @param i The index value of the console that will be stopped. -- cgit v1.2.3 From 38d763cd22f04af803f1be43a9c60b5b6a316fb6 Mon Sep 17 00:00:00 2001 From: Anithra P Janakiraman Date: Tue, 8 Jun 2010 14:55:42 +0000 Subject: 2010-06-08 Anithra P Janakiraman Bug #315988 --- systemtap/org.eclipse.linuxtools.systemtap.ui.ide/ChangeLog | 6 ++++++ .../org/eclipse/linuxtools/systemtap/ui/ide/views/BrowserView.java | 5 +++++ 2 files changed, 11 insertions(+) (limited to 'systemtap') diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/ChangeLog b/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/ChangeLog index 20fbbb0f9a..a0db796b21 100644 --- a/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/ChangeLog +++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/ChangeLog @@ -1,3 +1,9 @@ +2010-06-08 Anithra P Janakiraman + + * src/org/eclipse/linuxtools/systemtap/ui/ide/views/BrowserView.java (ViewUpdater.handleUpdateEvent): + + Bug #315988 + 2010-06-07 Anithra P Janakiraman * plugin.xml: Removing RunwithChart action diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/src/org/eclipse/linuxtools/systemtap/ui/ide/views/BrowserView.java b/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/src/org/eclipse/linuxtools/systemtap/ui/ide/views/BrowserView.java index 4d27c13b14..e3c083a791 100644 --- a/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/src/org/eclipse/linuxtools/systemtap/ui/ide/views/BrowserView.java +++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/src/org/eclipse/linuxtools/systemtap/ui/ide/views/BrowserView.java @@ -157,11 +157,16 @@ public abstract class BrowserView extends ViewPart { protected class ViewUpdater implements IUpdateListener { public void handleUpdateEvent() { + try { viewer.getControl().getDisplay().asyncExec(new Runnable() { public void run() { refresh(); } }); + }catch(Exception e) + { + //TO FIX: BUG 315988 + } } } } \ No newline at end of file -- cgit v1.2.3 From 6a923b76f3bcf03ce5e8a7b4b331c11028c05318 Mon Sep 17 00:00:00 2001 From: Anithra P Janakiraman Date: Tue, 8 Jun 2010 15:12:11 +0000 Subject: 2010-06-08 Anithra P Janakiraman Bug #304206 --- systemtap/org.eclipse.linuxtools.systemtap.ui.ide/ChangeLog | 2 ++ .../linuxtools/systemtap/ui/ide/actions/RunScriptAction.java | 7 +++++-- 2 files changed, 7 insertions(+), 2 deletions(-) (limited to 'systemtap') diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/ChangeLog b/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/ChangeLog index a0db796b21..ace189b69b 100644 --- a/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/ChangeLog +++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/ChangeLog @@ -1,8 +1,10 @@ 2010-06-08 Anithra P Janakiraman + * src/org/eclipse/linuxtools/systemtap/ui/ide/actions/RunScriptAction.java (getFilePath): * src/org/eclipse/linuxtools/systemtap/ui/ide/views/BrowserView.java (ViewUpdater.handleUpdateEvent): Bug #315988 + Bug #304206 2010-06-07 Anithra P Janakiraman diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/src/org/eclipse/linuxtools/systemtap/ui/ide/actions/RunScriptAction.java b/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/src/org/eclipse/linuxtools/systemtap/ui/ide/actions/RunScriptAction.java index dad3e2d8ed..21044bb52f 100644 --- a/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/src/org/eclipse/linuxtools/systemtap/ui/ide/actions/RunScriptAction.java +++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/src/org/eclipse/linuxtools/systemtap/ui/ide/actions/RunScriptAction.java @@ -115,8 +115,11 @@ public class RunScriptAction extends Action implements IWorkbenchWindowActionDel */ protected String getFilePath() { IEditorPart ed = fWindow.getActivePage().getActiveEditor(); - return ResourceUtil.getFile(ed.getEditorInput()).getLocation().toString(); - //return ((PathEditorInput)ed.getEditorInput()).getPath().toString(); + if(ed.getEditorInput() instanceof PathEditorInput) + return ((PathEditorInput)ed.getEditorInput()).getPath().toString(); + else + return ResourceUtil.getFile(ed.getEditorInput()).getLocation().toString(); + } /** -- cgit v1.2.3 From 5ae1baaa4604ffe9e1e5e452ecbfb7101ae24da1 Mon Sep 17 00:00:00 2001 From: Roland Grunberg Date: Tue, 8 Jun 2010 17:51:22 +0000 Subject: 2010-06-08 Roland Grunberg Bug #315303 * plugin.properties: Change format for plugin.properties to avoid parsing issues. --- .../org.eclipse.linuxtools.systemtap.ui.systemtapgui/ChangeLog | 7 +++++++ .../plugin.properties | 4 +--- 2 files changed, 8 insertions(+), 3 deletions(-) (limited to 'systemtap') diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.systemtapgui/ChangeLog b/systemtap/org.eclipse.linuxtools.systemtap.ui.systemtapgui/ChangeLog index 2d05226db2..0769791b78 100644 --- a/systemtap/org.eclipse.linuxtools.systemtap.ui.systemtapgui/ChangeLog +++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.systemtapgui/ChangeLog @@ -1,3 +1,10 @@ +2010-06-08 Roland Grunberg + + Bug #315303 + + * plugin.properties: Change format for plugin.properties + to avoid parsing issues. + 2010-06-04 Andrew Overholt Bug #282039 diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.systemtapgui/plugin.properties b/systemtap/org.eclipse.linuxtools.systemtap.ui.systemtapgui/plugin.properties index ecdc907d9a..b68e22c7ca 100644 --- a/systemtap/org.eclipse.linuxtools.systemtap.ui.systemtapgui/plugin.properties +++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.systemtapgui/plugin.properties @@ -5,8 +5,6 @@ Version 1.0.rc1\n\n\ Build ID:\n\n\ Copywrite: At some point we will\n\ have a real copywrite info here.\n\n\ -Buit on the Eclipse framework.\ - - +Built on the Eclipse framework. preference.systemTap.name=SystemTap preference.envVars.name=Environment Variables \ No newline at end of file -- cgit v1.2.3 From a47d8162ec968acd13b14226a581f398fcf093ed Mon Sep 17 00:00:00 2001 From: Charley Wang Date: Wed, 9 Jun 2010 14:21:06 +0000 Subject: Bug 308376 -- avoid passing null listeners into StreamGobbler --- .../linuxtools/systemtap/ui/consolelog/structures/ScriptConsole.java | 3 ++- .../linuxtools/systemtap/ui/structures/runnable/StreamGobbler.java | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'systemtap') diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.consolelog/src/org/eclipse/linuxtools/systemtap/ui/consolelog/structures/ScriptConsole.java b/systemtap/org.eclipse.linuxtools.systemtap.ui.consolelog/src/org/eclipse/linuxtools/systemtap/ui/consolelog/structures/ScriptConsole.java index 1b02e93c7e..3270af12ba 100644 --- a/systemtap/org.eclipse.linuxtools.systemtap.ui.consolelog/src/org/eclipse/linuxtools/systemtap/ui/consolelog/structures/ScriptConsole.java +++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.consolelog/src/org/eclipse/linuxtools/systemtap/ui/consolelog/structures/ScriptConsole.java @@ -162,7 +162,8 @@ public class ScriptConsole extends MessageConsole { if (errorParser != null) createErrorDaemon(errorParser); cmd = new LoggedCommand2(command, envVars, prompt, 100,this.getName()); - cmd.addErrorStreamListener(errorDaemon); + if (errorDaemon != null) + cmd.addErrorStreamListener(errorDaemon); cmd.addInputStreamListener(consoleDaemon); cmd.start(); activate(); diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.structures/src/org/eclipse/linuxtools/systemtap/ui/structures/runnable/StreamGobbler.java b/systemtap/org.eclipse.linuxtools.systemtap.ui.structures/src/org/eclipse/linuxtools/systemtap/ui/structures/runnable/StreamGobbler.java index 91a9034588..2776bb8df1 100644 --- a/systemtap/org.eclipse.linuxtools.systemtap.ui.structures/src/org/eclipse/linuxtools/systemtap/ui/structures/runnable/StreamGobbler.java +++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.structures/src/org/eclipse/linuxtools/systemtap/ui/structures/runnable/StreamGobbler.java @@ -163,7 +163,7 @@ public class StreamGobbler implements Runnable { */ public void addDataListener(IGobblerListener l) { - if(!listeners.contains(l)) + if(l != null && !listeners.contains(l)) { listeners.add(l); -- cgit v1.2.3 From f8b1b168ecbe64552b6d3c2d74d1e73d082de184 Mon Sep 17 00:00:00 2001 From: Charley Wang Date: Wed, 9 Jun 2010 14:30:34 +0000 Subject: Fix for 316140 -- cancel New File dialog without throwing an NPE --- .../systemtap/ui/editor/actions/file/OpenFileAction.java | 10 ++++++++++ .../systemtap/ui/ide/actions/hidden/FunctionBrowserAction.java | 5 ++++- 2 files changed, 14 insertions(+), 1 deletion(-) (limited to 'systemtap') diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.editor/src/org/eclipse/linuxtools/systemtap/ui/editor/actions/file/OpenFileAction.java b/systemtap/org.eclipse.linuxtools.systemtap.ui.editor/src/org/eclipse/linuxtools/systemtap/ui/editor/actions/file/OpenFileAction.java index 7a5d21b628..3be1d56e2c 100644 --- a/systemtap/org.eclipse.linuxtools.systemtap.ui.editor/src/org/eclipse/linuxtools/systemtap/ui/editor/actions/file/OpenFileAction.java +++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.editor/src/org/eclipse/linuxtools/systemtap/ui/editor/actions/file/OpenFileAction.java @@ -36,9 +36,13 @@ import org.eclipse.ui.PlatformUI; public class OpenFileAction extends EditorAction { + + private boolean successful; + public OpenFileAction() { super(); setEnabled(true); + successful = false; } public void run(IAction act) { @@ -49,6 +53,7 @@ public class OpenFileAction extends EditorAction { * Opens the editor input. */ public void run() { + successful = false; if (window == null) window = PlatformUI.getWorkbench().getActiveWorkbenchWindow(); File file = queryFile(); @@ -59,6 +64,7 @@ public class OpenFileAction extends EditorAction { try { page.openEditor(input, editorId); RecentFileLog.updateRecentFiles(file); + successful = true; } catch (PartInitException e) {} } else if (file != null) { String msg = MessageFormat.format(Localization.getString("OpenFileAction.FileIsNull"), (Object [])(new String[] {file.getName()})); @@ -104,4 +110,8 @@ public class OpenFileAction extends EditorAction { PathEditorInput input= new PathEditorInput(location); return input; } + + public boolean isSuccessful() { + return successful; + } } diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/src/org/eclipse/linuxtools/systemtap/ui/ide/actions/hidden/FunctionBrowserAction.java b/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/src/org/eclipse/linuxtools/systemtap/ui/ide/actions/hidden/FunctionBrowserAction.java index 7f7adbe0c8..2970f2544a 100644 --- a/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/src/org/eclipse/linuxtools/systemtap/ui/ide/actions/hidden/FunctionBrowserAction.java +++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/src/org/eclipse/linuxtools/systemtap/ui/ide/actions/hidden/FunctionBrowserAction.java @@ -115,7 +115,10 @@ public class FunctionBrowserAction extends Action implements IWorkbenchAction, I NewFileAction action = new NewFileAction(); //action.init(page.getWorkbenchWindow()); action.run(); - ed = page.getWorkbenchWindow().getActivePage().getActiveEditor(); + if (action.isSuccessful()) + ed = page.getWorkbenchWindow().getActivePage().getActiveEditor(); + else + return; } input = ed.getEditorInput(); //System.out.println("Node " + t.toString() + "claims to be clickable"); -- cgit v1.2.3 From d5e879dbec743f80224e22027a3e704b45bba4a6 Mon Sep 17 00:00:00 2001 From: Andrew Overholt Date: Mon, 14 Jun 2010 20:19:22 +0000 Subject: build.properties: Add about.html to binary build. --- systemtap/org.eclipse.linuxtools.callgraph/build.properties | 1 + 1 file changed, 1 insertion(+) (limited to 'systemtap') diff --git a/systemtap/org.eclipse.linuxtools.callgraph/build.properties b/systemtap/org.eclipse.linuxtools.callgraph/build.properties index bfa5881dc0..5edbf80b97 100644 --- a/systemtap/org.eclipse.linuxtools.callgraph/build.properties +++ b/systemtap/org.eclipse.linuxtools.callgraph/build.properties @@ -14,4 +14,5 @@ bin.includes = plugin.xml,\ META-INF/,\ .,\ icons/,\ + about.html,\ plugin.properties -- cgit v1.2.3 From 9a3151c28b7874adcb744afd0d5293ae60f3b23e Mon Sep 17 00:00:00 2001 From: Andrew Overholt Date: Mon, 14 Jun 2010 20:19:24 +0000 Subject: build.properties: Add about.html to binary build. --- systemtap/org.eclipse.linuxtools.callgraph.core/build.properties | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'systemtap') diff --git a/systemtap/org.eclipse.linuxtools.callgraph.core/build.properties b/systemtap/org.eclipse.linuxtools.callgraph.core/build.properties index 6db76ad2a2..b55ab26674 100644 --- a/systemtap/org.eclipse.linuxtools.callgraph.core/build.properties +++ b/systemtap/org.eclipse.linuxtools.callgraph.core/build.properties @@ -17,9 +17,10 @@ bin.includes = META-INF/,\ parse_function_partial.stp,\ systemtapbanner.png,\ plugin.xml,\ + about.html,\ icons/,\ errors.prop,\ plugin.properties - \ No newline at end of file + -- cgit v1.2.3 From 3392863e32cacca1a3e51fcaff96d3159cabc1c2 Mon Sep 17 00:00:00 2001 From: Andrew Overholt Date: Mon, 14 Jun 2010 20:19:26 +0000 Subject: build.properties: Add about.html to binary build. --- systemtap/org.eclipse.linuxtools.callgraph.launch/build.properties | 1 + 1 file changed, 1 insertion(+) (limited to 'systemtap') diff --git a/systemtap/org.eclipse.linuxtools.callgraph.launch/build.properties b/systemtap/org.eclipse.linuxtools.callgraph.launch/build.properties index 5e6d23b2e1..1ef19a8878 100644 --- a/systemtap/org.eclipse.linuxtools.callgraph.launch/build.properties +++ b/systemtap/org.eclipse.linuxtools.callgraph.launch/build.properties @@ -14,4 +14,5 @@ bin.includes = plugin.xml,\ META-INF/,\ plugin.properties,\ .,\ + about.html,\ icons/ -- cgit v1.2.3 From 8a7dbf6ef503b4b9d00119f8ed66c4027eb3ed38 Mon Sep 17 00:00:00 2001 From: Andrew Overholt Date: Mon, 14 Jun 2010 20:20:06 +0000 Subject: build.properties: Add about.html to binary build. --- .../org.eclipse.linuxtools.systemtap.ui.consolelog/build.properties | 1 + 1 file changed, 1 insertion(+) (limited to 'systemtap') diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.consolelog/build.properties b/systemtap/org.eclipse.linuxtools.systemtap.ui.consolelog/build.properties index fc993cec49..886d967ba5 100644 --- a/systemtap/org.eclipse.linuxtools.systemtap.ui.consolelog/build.properties +++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.consolelog/build.properties @@ -5,5 +5,6 @@ bin.includes = plugin.xml,\ .,\ icons/,\ plugin.properties,\ + about.html,\ .classpath src.includes = .classpath -- cgit v1.2.3 From 836270c48462c75bbe4abee7312a86eb3ff0a837 Mon Sep 17 00:00:00 2001 From: Andrew Overholt Date: Mon, 14 Jun 2010 20:20:08 +0000 Subject: build.properties: Add about.html to binary build. --- systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/build.properties | 1 + 1 file changed, 1 insertion(+) (limited to 'systemtap') diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/build.properties b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/build.properties index f7e08a69e6..791be512f3 100644 --- a/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/build.properties +++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/build.properties @@ -7,4 +7,5 @@ bin.includes = plugin.xml,\ documentation/,\ toc.xml,\ modules/,\ + about.html,\ plugin.properties -- cgit v1.2.3 From 16dade80e600faf7a343d3cddb62288862fd2d06 Mon Sep 17 00:00:00 2001 From: Andrew Overholt Date: Mon, 14 Jun 2010 20:20:11 +0000 Subject: build.properties: Add about.html to binary build. --- .../build.properties | 1 + 1 file changed, 1 insertion(+) (limited to 'systemtap') diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboardextension/build.properties b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboardextension/build.properties index c88359b87e..b418be782e 100644 --- a/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboardextension/build.properties +++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboardextension/build.properties @@ -4,4 +4,5 @@ bin.includes = plugin.xml,\ META-INF/,\ .,\ icons/,\ + about.html,\ plugin.properties -- cgit v1.2.3 From 660f181cbb3cc9042d778d7e80c5d7d84ee966b2 Mon Sep 17 00:00:00 2001 From: Andrew Overholt Date: Mon, 14 Jun 2010 20:20:12 +0000 Subject: build.properties: Add about.html to binary build. --- systemtap/org.eclipse.linuxtools.systemtap.ui.editor/build.properties | 1 + 1 file changed, 1 insertion(+) (limited to 'systemtap') diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.editor/build.properties b/systemtap/org.eclipse.linuxtools.systemtap.ui.editor/build.properties index 370b6c6896..4a9177f64d 100644 --- a/systemtap/org.eclipse.linuxtools.systemtap.ui.editor/build.properties +++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.editor/build.properties @@ -4,4 +4,5 @@ bin.includes = plugin.xml,\ META-INF/,\ icons/,\ .,\ + about.html,\ plugin.properties -- cgit v1.2.3 From b19196f2b51380a59fa56c4c5a95b43feedc0549 Mon Sep 17 00:00:00 2001 From: Andrew Overholt Date: Mon, 14 Jun 2010 20:20:15 +0000 Subject: build.properties: Add about.html to binary build. --- .../org.eclipse.linuxtools.systemtap.ui.graphicalrun/build.properties | 1 + 1 file changed, 1 insertion(+) (limited to 'systemtap') diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.graphicalrun/build.properties b/systemtap/org.eclipse.linuxtools.systemtap.ui.graphicalrun/build.properties index c88359b87e..b418be782e 100644 --- a/systemtap/org.eclipse.linuxtools.systemtap.ui.graphicalrun/build.properties +++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.graphicalrun/build.properties @@ -4,4 +4,5 @@ bin.includes = plugin.xml,\ META-INF/,\ .,\ icons/,\ + about.html,\ plugin.properties -- cgit v1.2.3 From 54884fd31e1a291cb8dd7368c73757907ca7af82 Mon Sep 17 00:00:00 2001 From: Andrew Overholt Date: Mon, 14 Jun 2010 20:20:17 +0000 Subject: build.properties: Add about.html to binary build. --- systemtap/org.eclipse.linuxtools.systemtap.ui.graphing/build.properties | 1 + 1 file changed, 1 insertion(+) (limited to 'systemtap') diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.graphing/build.properties b/systemtap/org.eclipse.linuxtools.systemtap.ui.graphing/build.properties index 0137899eba..d153f12289 100644 --- a/systemtap/org.eclipse.linuxtools.systemtap.ui.graphing/build.properties +++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.graphing/build.properties @@ -6,4 +6,5 @@ bin.includes = plugin.xml,\ icons/,\ documentation/,\ toc.xml,\ + about.html,\ plugin.properties -- cgit v1.2.3 From 161f4e88f3baf725a396e57a6052b4337ce7b8ad Mon Sep 17 00:00:00 2001 From: Andrew Overholt Date: Mon, 14 Jun 2010 20:20:19 +0000 Subject: build.properties: Add about.html to binary build. --- .../build.properties | 1 + 1 file changed, 1 insertion(+) (limited to 'systemtap') diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.graphingapi.nonui/build.properties b/systemtap/org.eclipse.linuxtools.systemtap.ui.graphingapi.nonui/build.properties index cabb1f7cb0..eaa54463cd 100644 --- a/systemtap/org.eclipse.linuxtools.systemtap.ui.graphingapi.nonui/build.properties +++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.graphingapi.nonui/build.properties @@ -3,4 +3,5 @@ output.. = bin/ bin.includes = META-INF/,\ .,\ src/,\ + about.html,\ plugin.properties -- cgit v1.2.3 From 2e7d14d5a4106cc389c9f734a5a2d72fcf3acd99 Mon Sep 17 00:00:00 2001 From: Andrew Overholt Date: Mon, 14 Jun 2010 20:20:21 +0000 Subject: build.properties: Add about.html to binary build. --- .../org.eclipse.linuxtools.systemtap.ui.graphingapi.ui/build.properties | 1 + 1 file changed, 1 insertion(+) (limited to 'systemtap') diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.graphingapi.ui/build.properties b/systemtap/org.eclipse.linuxtools.systemtap.ui.graphingapi.ui/build.properties index c88359b87e..b418be782e 100644 --- a/systemtap/org.eclipse.linuxtools.systemtap.ui.graphingapi.ui/build.properties +++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.graphingapi.ui/build.properties @@ -4,4 +4,5 @@ bin.includes = plugin.xml,\ META-INF/,\ .,\ icons/,\ + about.html,\ plugin.properties -- cgit v1.2.3 From a1e55691cf6402c8340c76fb3d4fde1063960846 Mon Sep 17 00:00:00 2001 From: Andrew Overholt Date: Mon, 14 Jun 2010 20:20:24 +0000 Subject: build.properties: Add about.html to binary build. --- systemtap/org.eclipse.linuxtools.systemtap.ui.ide/build.properties | 1 + 1 file changed, 1 insertion(+) (limited to 'systemtap') diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/build.properties b/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/build.properties index e3fe0187cf..c5e3e730de 100644 --- a/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/build.properties +++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/build.properties @@ -6,4 +6,5 @@ bin.includes = plugin.xml,\ icons/,\ toc.xml,\ documentation/,\ + about.html,\ plugin.properties -- cgit v1.2.3 From f91c49c6d9f9c96e9d38221d4f5d29e046d8bdef Mon Sep 17 00:00:00 2001 From: Andrew Overholt Date: Mon, 14 Jun 2010 20:20:27 +0000 Subject: build.properties: Add about.html to binary build. --- systemtap/org.eclipse.linuxtools.systemtap.ui.logging/build.properties | 1 + 1 file changed, 1 insertion(+) (limited to 'systemtap') diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.logging/build.properties b/systemtap/org.eclipse.linuxtools.systemtap.ui.logging/build.properties index 7b17480348..544a57867c 100644 --- a/systemtap/org.eclipse.linuxtools.systemtap.ui.logging/build.properties +++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.logging/build.properties @@ -3,4 +3,5 @@ output.. = bin/ bin.includes = plugin.xml,\ META-INF/,\ .,\ + about.html,\ plugin.properties -- cgit v1.2.3 From 50a4fef5a09c035fb7c446d8725a5a8ddf1cdda0 Mon Sep 17 00:00:00 2001 From: Andrew Overholt Date: Mon, 14 Jun 2010 20:20:30 +0000 Subject: build.properties: Add about.html to binary build. --- .../org.eclipse.linuxtools.systemtap.ui.structures/build.properties | 1 + 1 file changed, 1 insertion(+) (limited to 'systemtap') diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.structures/build.properties b/systemtap/org.eclipse.linuxtools.systemtap.ui.structures/build.properties index cfdce0248f..3297579ee3 100644 --- a/systemtap/org.eclipse.linuxtools.systemtap.ui.structures/build.properties +++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.structures/build.properties @@ -4,4 +4,5 @@ bin.includes = META-INF/,\ .,\ src/,\ plugin.xml,\ + about.html,\ plugin.properties -- cgit v1.2.3 From 0d07f8b39c98ec523d2d37348f469278b22f8a40 Mon Sep 17 00:00:00 2001 From: Andrew Overholt Date: Tue, 15 Jun 2010 03:29:13 +0000 Subject: Add missing about.html --- .../org.eclipse.linuxtools.callgraph/about.html | 26 ++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 systemtap/org.eclipse.linuxtools.callgraph/about.html (limited to 'systemtap') diff --git a/systemtap/org.eclipse.linuxtools.callgraph/about.html b/systemtap/org.eclipse.linuxtools.callgraph/about.html new file mode 100644 index 0000000000..23506a4bae --- /dev/null +++ b/systemtap/org.eclipse.linuxtools.callgraph/about.html @@ -0,0 +1,26 @@ + + + + + +About + +

About This Content

+ +

June 5, 2006

+

License

+ +

The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise +indicated below, the Content is provided to you under the terms and conditions of the +Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available +at http://www.eclipse.org/legal/epl-v10.html. +For purposes of the EPL, "Program" will mean the Content.

+ +

If you did not receive this Content directly from the Eclipse Foundation, the Content is +being redistributed by another party ("Redistributor") and different terms and conditions may +apply to your use of any object code in the Content. Check the Redistributor's license that was +provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise +indicated below, the terms and conditions of the EPL still apply to any source code in the Content +and such source code may be obtained at http://www.eclipse.org.

+ + \ No newline at end of file -- cgit v1.2.3 From 52df2f72682a8836052393ef85d31991b5b8ae75 Mon Sep 17 00:00:00 2001 From: Andrew Overholt Date: Tue, 15 Jun 2010 03:29:15 +0000 Subject: Add missing about.html --- .../about.html | 26 ++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 systemtap/org.eclipse.linuxtools.callgraph.core/about.html (limited to 'systemtap') diff --git a/systemtap/org.eclipse.linuxtools.callgraph.core/about.html b/systemtap/org.eclipse.linuxtools.callgraph.core/about.html new file mode 100644 index 0000000000..23506a4bae --- /dev/null +++ b/systemtap/org.eclipse.linuxtools.callgraph.core/about.html @@ -0,0 +1,26 @@ + + + + + +About + +

About This Content

+ +

June 5, 2006

+

License

+ +

The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise +indicated below, the Content is provided to you under the terms and conditions of the +Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available +at http://www.eclipse.org/legal/epl-v10.html. +For purposes of the EPL, "Program" will mean the Content.

+ +

If you did not receive this Content directly from the Eclipse Foundation, the Content is +being redistributed by another party ("Redistributor") and different terms and conditions may +apply to your use of any object code in the Content. Check the Redistributor's license that was +provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise +indicated below, the terms and conditions of the EPL still apply to any source code in the Content +and such source code may be obtained at http://www.eclipse.org.

+ + \ No newline at end of file -- cgit v1.2.3 From 1492cebef6342e2195aa30c5c07859cb2ee7eac2 Mon Sep 17 00:00:00 2001 From: Andrew Overholt Date: Tue, 15 Jun 2010 03:29:17 +0000 Subject: Add missing about.html --- .../about.html | 26 ++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 systemtap/org.eclipse.linuxtools.callgraph.launch/about.html (limited to 'systemtap') diff --git a/systemtap/org.eclipse.linuxtools.callgraph.launch/about.html b/systemtap/org.eclipse.linuxtools.callgraph.launch/about.html new file mode 100644 index 0000000000..23506a4bae --- /dev/null +++ b/systemtap/org.eclipse.linuxtools.callgraph.launch/about.html @@ -0,0 +1,26 @@ + + + + + +About + +

About This Content

+ +

June 5, 2006

+

License

+ +

The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise +indicated below, the Content is provided to you under the terms and conditions of the +Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available +at http://www.eclipse.org/legal/epl-v10.html. +For purposes of the EPL, "Program" will mean the Content.

+ +

If you did not receive this Content directly from the Eclipse Foundation, the Content is +being redistributed by another party ("Redistributor") and different terms and conditions may +apply to your use of any object code in the Content. Check the Redistributor's license that was +provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise +indicated below, the terms and conditions of the EPL still apply to any source code in the Content +and such source code may be obtained at http://www.eclipse.org.

+ + \ No newline at end of file -- cgit v1.2.3 From 926b6c6740dc686937635c3c32cafbd64b194c31 Mon Sep 17 00:00:00 2001 From: Andrew Overholt Date: Tue, 15 Jun 2010 03:29:40 +0000 Subject: Add missing about.html --- .../about.html | 26 ++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 systemtap/org.eclipse.linuxtools.systemtap.ui.consolelog/about.html (limited to 'systemtap') diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.consolelog/about.html b/systemtap/org.eclipse.linuxtools.systemtap.ui.consolelog/about.html new file mode 100644 index 0000000000..23506a4bae --- /dev/null +++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.consolelog/about.html @@ -0,0 +1,26 @@ + + + + + +About + +

About This Content

+ +

June 5, 2006

+

License

+ +

The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise +indicated below, the Content is provided to you under the terms and conditions of the +Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available +at http://www.eclipse.org/legal/epl-v10.html. +For purposes of the EPL, "Program" will mean the Content.

+ +

If you did not receive this Content directly from the Eclipse Foundation, the Content is +being redistributed by another party ("Redistributor") and different terms and conditions may +apply to your use of any object code in the Content. Check the Redistributor's license that was +provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise +indicated below, the terms and conditions of the EPL still apply to any source code in the Content +and such source code may be obtained at http://www.eclipse.org.

+ + \ No newline at end of file -- cgit v1.2.3 From a99cfbe187a7e5e7ee74be76c9c5947e6309b97b Mon Sep 17 00:00:00 2001 From: Andrew Overholt Date: Tue, 15 Jun 2010 03:29:43 +0000 Subject: Add missing about.html --- .../about.html | 26 ++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/about.html (limited to 'systemtap') diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/about.html b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/about.html new file mode 100644 index 0000000000..23506a4bae --- /dev/null +++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/about.html @@ -0,0 +1,26 @@ + + + + + +About + +

About This Content

+ +

June 5, 2006

+

License

+ +

The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise +indicated below, the Content is provided to you under the terms and conditions of the +Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available +at http://www.eclipse.org/legal/epl-v10.html. +For purposes of the EPL, "Program" will mean the Content.

+ +

If you did not receive this Content directly from the Eclipse Foundation, the Content is +being redistributed by another party ("Redistributor") and different terms and conditions may +apply to your use of any object code in the Content. Check the Redistributor's license that was +provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise +indicated below, the terms and conditions of the EPL still apply to any source code in the Content +and such source code may be obtained at http://www.eclipse.org.

+ + \ No newline at end of file -- cgit v1.2.3 From 5122d40185a0ec8a4ae62d75d10f2490f67044d8 Mon Sep 17 00:00:00 2001 From: Andrew Overholt Date: Tue, 15 Jun 2010 03:29:44 +0000 Subject: Add missing about.html --- .../about.html | 26 ++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 systemtap/org.eclipse.linuxtools.systemtap.ui.dashboardextension/about.html (limited to 'systemtap') diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboardextension/about.html b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboardextension/about.html new file mode 100644 index 0000000000..23506a4bae --- /dev/null +++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboardextension/about.html @@ -0,0 +1,26 @@ + + + + + +About + +

About This Content

+ +

June 5, 2006

+

License

+ +

The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise +indicated below, the Content is provided to you under the terms and conditions of the +Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available +at http://www.eclipse.org/legal/epl-v10.html. +For purposes of the EPL, "Program" will mean the Content.

+ +

If you did not receive this Content directly from the Eclipse Foundation, the Content is +being redistributed by another party ("Redistributor") and different terms and conditions may +apply to your use of any object code in the Content. Check the Redistributor's license that was +provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise +indicated below, the terms and conditions of the EPL still apply to any source code in the Content +and such source code may be obtained at http://www.eclipse.org.

+ + \ No newline at end of file -- cgit v1.2.3 From fda4ff3dca13a938190c534b64e8daa1337bf1b8 Mon Sep 17 00:00:00 2001 From: Andrew Overholt Date: Tue, 15 Jun 2010 03:29:46 +0000 Subject: Add missing about.html --- .../about.html | 26 ++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 systemtap/org.eclipse.linuxtools.systemtap.ui.editor/about.html (limited to 'systemtap') diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.editor/about.html b/systemtap/org.eclipse.linuxtools.systemtap.ui.editor/about.html new file mode 100644 index 0000000000..23506a4bae --- /dev/null +++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.editor/about.html @@ -0,0 +1,26 @@ + + + + + +About + +

About This Content

+ +

June 5, 2006

+

License

+ +

The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise +indicated below, the Content is provided to you under the terms and conditions of the +Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available +at http://www.eclipse.org/legal/epl-v10.html. +For purposes of the EPL, "Program" will mean the Content.

+ +

If you did not receive this Content directly from the Eclipse Foundation, the Content is +being redistributed by another party ("Redistributor") and different terms and conditions may +apply to your use of any object code in the Content. Check the Redistributor's license that was +provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise +indicated below, the terms and conditions of the EPL still apply to any source code in the Content +and such source code may be obtained at http://www.eclipse.org.

+ + \ No newline at end of file -- cgit v1.2.3 From 719e03a62ca5771650cc838553a4f4b205642371 Mon Sep 17 00:00:00 2001 From: Andrew Overholt Date: Tue, 15 Jun 2010 03:29:49 +0000 Subject: Add missing about.html --- .../about.html | 26 ++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 systemtap/org.eclipse.linuxtools.systemtap.ui.graphicalrun/about.html (limited to 'systemtap') diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.graphicalrun/about.html b/systemtap/org.eclipse.linuxtools.systemtap.ui.graphicalrun/about.html new file mode 100644 index 0000000000..23506a4bae --- /dev/null +++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.graphicalrun/about.html @@ -0,0 +1,26 @@ + + + + + +About + +

About This Content

+ +

June 5, 2006

+

License

+ +

The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise +indicated below, the Content is provided to you under the terms and conditions of the +Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available +at http://www.eclipse.org/legal/epl-v10.html. +For purposes of the EPL, "Program" will mean the Content.

+ +

If you did not receive this Content directly from the Eclipse Foundation, the Content is +being redistributed by another party ("Redistributor") and different terms and conditions may +apply to your use of any object code in the Content. Check the Redistributor's license that was +provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise +indicated below, the terms and conditions of the EPL still apply to any source code in the Content +and such source code may be obtained at http://www.eclipse.org.

+ + \ No newline at end of file -- cgit v1.2.3 From 42878f02570c0668228603cfbc9cf13372d3747d Mon Sep 17 00:00:00 2001 From: Andrew Overholt Date: Tue, 15 Jun 2010 03:29:50 +0000 Subject: Add missing about.html --- .../about.html | 26 ++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 systemtap/org.eclipse.linuxtools.systemtap.ui.graphing/about.html (limited to 'systemtap') diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.graphing/about.html b/systemtap/org.eclipse.linuxtools.systemtap.ui.graphing/about.html new file mode 100644 index 0000000000..23506a4bae --- /dev/null +++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.graphing/about.html @@ -0,0 +1,26 @@ + + + + + +About + +

About This Content

+ +

June 5, 2006

+

License

+ +

The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise +indicated below, the Content is provided to you under the terms and conditions of the +Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available +at http://www.eclipse.org/legal/epl-v10.html. +For purposes of the EPL, "Program" will mean the Content.

+ +

If you did not receive this Content directly from the Eclipse Foundation, the Content is +being redistributed by another party ("Redistributor") and different terms and conditions may +apply to your use of any object code in the Content. Check the Redistributor's license that was +provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise +indicated below, the terms and conditions of the EPL still apply to any source code in the Content +and such source code may be obtained at http://www.eclipse.org.

+ + \ No newline at end of file -- cgit v1.2.3 From acd5355c5704f6903f5b09da844f2646b88b829f Mon Sep 17 00:00:00 2001 From: Andrew Overholt Date: Tue, 15 Jun 2010 03:29:52 +0000 Subject: Add missing about.html --- .../about.html | 26 ++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 systemtap/org.eclipse.linuxtools.systemtap.ui.graphingapi.nonui/about.html (limited to 'systemtap') diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.graphingapi.nonui/about.html b/systemtap/org.eclipse.linuxtools.systemtap.ui.graphingapi.nonui/about.html new file mode 100644 index 0000000000..23506a4bae --- /dev/null +++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.graphingapi.nonui/about.html @@ -0,0 +1,26 @@ + + + + + +About + +

About This Content

+ +

June 5, 2006

+

License

+ +

The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise +indicated below, the Content is provided to you under the terms and conditions of the +Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available +at http://www.eclipse.org/legal/epl-v10.html. +For purposes of the EPL, "Program" will mean the Content.

+ +

If you did not receive this Content directly from the Eclipse Foundation, the Content is +being redistributed by another party ("Redistributor") and different terms and conditions may +apply to your use of any object code in the Content. Check the Redistributor's license that was +provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise +indicated below, the terms and conditions of the EPL still apply to any source code in the Content +and such source code may be obtained at http://www.eclipse.org.

+ + \ No newline at end of file -- cgit v1.2.3 From ddcfd2922701f14a914c064a65e0b97c8710507c Mon Sep 17 00:00:00 2001 From: Andrew Overholt Date: Tue, 15 Jun 2010 03:29:55 +0000 Subject: Add missing about.html --- .../about.html | 26 ++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 systemtap/org.eclipse.linuxtools.systemtap.ui.graphingapi.ui/about.html (limited to 'systemtap') diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.graphingapi.ui/about.html b/systemtap/org.eclipse.linuxtools.systemtap.ui.graphingapi.ui/about.html new file mode 100644 index 0000000000..23506a4bae --- /dev/null +++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.graphingapi.ui/about.html @@ -0,0 +1,26 @@ + + + + + +About + +

About This Content

+ +

June 5, 2006

+

License

+ +

The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise +indicated below, the Content is provided to you under the terms and conditions of the +Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available +at http://www.eclipse.org/legal/epl-v10.html. +For purposes of the EPL, "Program" will mean the Content.

+ +

If you did not receive this Content directly from the Eclipse Foundation, the Content is +being redistributed by another party ("Redistributor") and different terms and conditions may +apply to your use of any object code in the Content. Check the Redistributor's license that was +provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise +indicated below, the terms and conditions of the EPL still apply to any source code in the Content +and such source code may be obtained at http://www.eclipse.org.

+ + \ No newline at end of file -- cgit v1.2.3 From 22ff9757e99ffa9aaddc63cd7b706c9cb903406a Mon Sep 17 00:00:00 2001 From: Andrew Overholt Date: Tue, 15 Jun 2010 03:29:56 +0000 Subject: Add missing about.html --- .../about.html | 26 ++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 systemtap/org.eclipse.linuxtools.systemtap.ui.ide/about.html (limited to 'systemtap') diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/about.html b/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/about.html new file mode 100644 index 0000000000..23506a4bae --- /dev/null +++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/about.html @@ -0,0 +1,26 @@ + + + + + +About + +

About This Content

+ +

June 5, 2006

+

License

+ +

The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise +indicated below, the Content is provided to you under the terms and conditions of the +Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available +at http://www.eclipse.org/legal/epl-v10.html. +For purposes of the EPL, "Program" will mean the Content.

+ +

If you did not receive this Content directly from the Eclipse Foundation, the Content is +being redistributed by another party ("Redistributor") and different terms and conditions may +apply to your use of any object code in the Content. Check the Redistributor's license that was +provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise +indicated below, the terms and conditions of the EPL still apply to any source code in the Content +and such source code may be obtained at http://www.eclipse.org.

+ + \ No newline at end of file -- cgit v1.2.3 From deabdb8a72998e547e65ecac337a853190701fe2 Mon Sep 17 00:00:00 2001 From: Andrew Overholt Date: Tue, 15 Jun 2010 03:29:58 +0000 Subject: Add missing about.html --- .../about.html | 26 ++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 systemtap/org.eclipse.linuxtools.systemtap.ui.logging/about.html (limited to 'systemtap') diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.logging/about.html b/systemtap/org.eclipse.linuxtools.systemtap.ui.logging/about.html new file mode 100644 index 0000000000..23506a4bae --- /dev/null +++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.logging/about.html @@ -0,0 +1,26 @@ + + + + + +About + +

About This Content

+ +

June 5, 2006

+

License

+ +

The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise +indicated below, the Content is provided to you under the terms and conditions of the +Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available +at http://www.eclipse.org/legal/epl-v10.html. +For purposes of the EPL, "Program" will mean the Content.

+ +

If you did not receive this Content directly from the Eclipse Foundation, the Content is +being redistributed by another party ("Redistributor") and different terms and conditions may +apply to your use of any object code in the Content. Check the Redistributor's license that was +provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise +indicated below, the terms and conditions of the EPL still apply to any source code in the Content +and such source code may be obtained at http://www.eclipse.org.

+ + \ No newline at end of file -- cgit v1.2.3 From 8bcb0d2e35af80ea3515292bcf52ce9a3941d0b0 Mon Sep 17 00:00:00 2001 From: Andrew Overholt Date: Tue, 15 Jun 2010 03:30:01 +0000 Subject: Add missing about.html --- .../about.html | 26 ++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 systemtap/org.eclipse.linuxtools.systemtap.ui.structures/about.html (limited to 'systemtap') diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.structures/about.html b/systemtap/org.eclipse.linuxtools.systemtap.ui.structures/about.html new file mode 100644 index 0000000000..23506a4bae --- /dev/null +++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.structures/about.html @@ -0,0 +1,26 @@ + + + + + +About + +

About This Content

+ +

June 5, 2006

+

License

+ +

The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise +indicated below, the Content is provided to you under the terms and conditions of the +Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available +at http://www.eclipse.org/legal/epl-v10.html. +For purposes of the EPL, "Program" will mean the Content.

+ +

If you did not receive this Content directly from the Eclipse Foundation, the Content is +being redistributed by another party ("Redistributor") and different terms and conditions may +apply to your use of any object code in the Content. Check the Redistributor's license that was +provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise +indicated below, the terms and conditions of the EPL still apply to any source code in the Content +and such source code may be obtained at http://www.eclipse.org.

+ + \ No newline at end of file -- cgit v1.2.3 From 8536c537b59e78130c1e2cf6de96dc2da3f54388 Mon Sep 17 00:00:00 2001 From: Andrew Overholt Date: Tue, 15 Jun 2010 04:33:51 +0000 Subject: Use proper about.html --- .../about.html | 39 ++++++++++++---------- 1 file changed, 22 insertions(+), 17 deletions(-) (limited to 'systemtap') diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.systemtapgui/about.html b/systemtap/org.eclipse.linuxtools.systemtap.ui.systemtapgui/about.html index 5d6dee8192..c258ef55d8 100644 --- a/systemtap/org.eclipse.linuxtools.systemtap.ui.systemtapgui/about.html +++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.systemtapgui/about.html @@ -1,23 +1,28 @@ - + + -About Systemtap GUI + +About + + +

About This Content

+ +

June 5, 2006

+

License

- -
- +

The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise +indicated below, the Content is provided to you under the terms and conditions of the +Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available +at http://www.eclipse.org/legal/epl-v10.html. +For purposes of the EPL, "Program" will mean the Content.

-
- Copyright © 2006 IBM ®. All rights reserved. +

If you did not receive this Content directly from the Eclipse Foundation, the Content is +being redistributed by another party ("Redistributor") and different terms and conditions may +apply to your use of any object code in the Content. Check the Redistributor's license that was +provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise +indicated below, the terms and conditions of the EPL still apply to any source code in the Content +and such source code may be obtained at http://www.eclipse.org.

-

- Systemtap - -

- Contact: Systemtap GUI developers - - -

- This offering is powered by Eclipse technology and includes Eclipse plug-ins that can be installed and used with other Eclipse (3.1)-based offerings. -
\ No newline at end of file -- cgit v1.2.3