[SCM] eclipse-wtp packaging branch, master, updated. upstream/3.4.0_rc4-25-g5989a74

Jakub Adam jakub.adam at ktknet.cz
Tue Sep 18 18:19:24 UTC 2012


The following commit has been merged in the master branch:
commit 62ac034ff4839714de7cc743bd535f05d95e4672
Author: Jakub Adam <jakub.adam at ktknet.cz>
Date:   Mon Sep 17 18:04:35 2012 +0200

    Remove unnecessary perfmsr-stub-to-root-folder.patch

diff --git a/debian/patches/perfmsr-stub-to-root-folder.patch b/debian/patches/perfmsr-stub-to-root-folder.patch
deleted file mode 100644
index 1936afb..0000000
--- a/debian/patches/perfmsr-stub-to-root-folder.patch
+++ /dev/null
@@ -1,983 +0,0 @@
-From: Jakub Adam <jakub.adam at ktknet.cz>
-Date: Fri, 18 Nov 2011 23:27:24 +0100
-Subject: perfmsr-stub-to-root-folder
-
-Moved org.eclipse.perfmsr.core.stub to root folder,
-jh_setupenvironment would not work correctly otherwise
----
- org.eclipse.jem.util/build.properties              |    2 +-
- .../org.eclipse.perfmsr.core.stub/.classpath       |    7 -
- .../org.eclipse.perfmsr.core.stub/.project         |   28 ---
- .../PERFMSR.README.txt                             |   14 --
- .../org.eclipse.perfmsr.core.stub/about.html       |   32 ----
- .../org.eclipse.perfmsr.core.stub/build.properties |   14 --
- .../org.eclipse.perfmsr.core.stub/perfmsr.jardesc  |   14 --
- .../plugin.properties                              |   12 --
- .../org.eclipse.perfmsr.core.stub/plugin.xml       |   17 --
- .../eclipse/perfmsr/core/IPerformanceMonitor.java  |  195 --------------------
- .../eclipse/perfmsr/core/PerfMsrCorePlugin.java    |   31 ---
- .../src/org/eclipse/perfmsr/core/Upload.java       |   27 ---
- org.eclipse.perfmsr.core.stub/.classpath           |    7 +
- org.eclipse.perfmsr.core.stub/.project             |   28 +++
- org.eclipse.perfmsr.core.stub/PERFMSR.README.txt   |   14 ++
- org.eclipse.perfmsr.core.stub/about.html           |   32 ++++
- org.eclipse.perfmsr.core.stub/build.properties     |   14 ++
- org.eclipse.perfmsr.core.stub/perfmsr.jardesc      |   14 ++
- org.eclipse.perfmsr.core.stub/plugin.properties    |   12 ++
- org.eclipse.perfmsr.core.stub/plugin.xml           |   17 ++
- .../eclipse/perfmsr/core/IPerformanceMonitor.java  |  195 ++++++++++++++++++++
- .../eclipse/perfmsr/core/PerfMsrCorePlugin.java    |   31 +++
- .../src/org/eclipse/perfmsr/core/Upload.java       |   27 +++
- 23 files changed, 392 insertions(+), 392 deletions(-)
- delete mode 100755 org.eclipse.jem.util/org.eclipse.perfmsr.core.stub/.classpath
- delete mode 100755 org.eclipse.jem.util/org.eclipse.perfmsr.core.stub/.project
- delete mode 100755 org.eclipse.jem.util/org.eclipse.perfmsr.core.stub/PERFMSR.README.txt
- delete mode 100755 org.eclipse.jem.util/org.eclipse.perfmsr.core.stub/about.html
- delete mode 100755 org.eclipse.jem.util/org.eclipse.perfmsr.core.stub/build.properties
- delete mode 100755 org.eclipse.jem.util/org.eclipse.perfmsr.core.stub/perfmsr.jardesc
- delete mode 100755 org.eclipse.jem.util/org.eclipse.perfmsr.core.stub/plugin.properties
- delete mode 100755 org.eclipse.jem.util/org.eclipse.perfmsr.core.stub/plugin.xml
- delete mode 100755 org.eclipse.jem.util/org.eclipse.perfmsr.core.stub/src/org/eclipse/perfmsr/core/IPerformanceMonitor.java
- delete mode 100755 org.eclipse.jem.util/org.eclipse.perfmsr.core.stub/src/org/eclipse/perfmsr/core/PerfMsrCorePlugin.java
- delete mode 100755 org.eclipse.jem.util/org.eclipse.perfmsr.core.stub/src/org/eclipse/perfmsr/core/Upload.java
- create mode 100755 org.eclipse.perfmsr.core.stub/.classpath
- create mode 100755 org.eclipse.perfmsr.core.stub/.project
- create mode 100755 org.eclipse.perfmsr.core.stub/PERFMSR.README.txt
- create mode 100755 org.eclipse.perfmsr.core.stub/about.html
- create mode 100755 org.eclipse.perfmsr.core.stub/build.properties
- create mode 100755 org.eclipse.perfmsr.core.stub/perfmsr.jardesc
- create mode 100755 org.eclipse.perfmsr.core.stub/plugin.properties
- create mode 100755 org.eclipse.perfmsr.core.stub/plugin.xml
- create mode 100755 org.eclipse.perfmsr.core.stub/src/org/eclipse/perfmsr/core/IPerformanceMonitor.java
- create mode 100755 org.eclipse.perfmsr.core.stub/src/org/eclipse/perfmsr/core/PerfMsrCorePlugin.java
- create mode 100755 org.eclipse.perfmsr.core.stub/src/org/eclipse/perfmsr/core/Upload.java
-
-diff --git a/org.eclipse.jem.util/build.properties b/org.eclipse.jem.util/build.properties
-index aa0d851..4e8ecf0 100755
---- a/org.eclipse.jem.util/build.properties
-+++ b/org.eclipse.jem.util/build.properties
-@@ -21,4 +21,4 @@ source.. = jemutil/,\
-            property_files/,\
-            jemutil-nonworkbnech/
- jars.compile.order = .
--extra.. = ./org.eclipse.perfmsr.core.stub/perfmsr.jar
-+extra.. = ../org.eclipse.perfmsr.core.stub/perfmsr.jar
-diff --git a/org.eclipse.jem.util/org.eclipse.perfmsr.core.stub/.classpath b/org.eclipse.jem.util/org.eclipse.perfmsr.core.stub/.classpath
-deleted file mode 100755
-index 065ac06..0000000
---- a/org.eclipse.jem.util/org.eclipse.perfmsr.core.stub/.classpath
-+++ /dev/null
-@@ -1,7 +0,0 @@
--<?xml version="1.0" encoding="UTF-8"?>
--<classpath>
--	<classpathentry kind="src" path="src"/>
--	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
--	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
--	<classpathentry kind="output" path="bin"/>
--</classpath>
-diff --git a/org.eclipse.jem.util/org.eclipse.perfmsr.core.stub/.project b/org.eclipse.jem.util/org.eclipse.perfmsr.core.stub/.project
-deleted file mode 100755
-index 5e29c82..0000000
---- a/org.eclipse.jem.util/org.eclipse.perfmsr.core.stub/.project
-+++ /dev/null
-@@ -1,28 +0,0 @@
--<?xml version="1.0" encoding="UTF-8"?>
--<projectDescription>
--	<name>org.eclipse.perfmsr.core</name>
--	<comment></comment>
--	<projects>
--	</projects>
--	<buildSpec>
--		<buildCommand>
--			<name>org.eclipse.jdt.core.javabuilder</name>
--			<arguments>
--			</arguments>
--		</buildCommand>
--		<buildCommand>
--			<name>org.eclipse.pde.ManifestBuilder</name>
--			<arguments>
--			</arguments>
--		</buildCommand>
--		<buildCommand>
--			<name>org.eclipse.pde.SchemaBuilder</name>
--			<arguments>
--			</arguments>
--		</buildCommand>
--	</buildSpec>
--	<natures>
--		<nature>org.eclipse.pde.PluginNature</nature>
--		<nature>org.eclipse.jdt.core.javanature</nature>
--	</natures>
--</projectDescription>
-diff --git a/org.eclipse.jem.util/org.eclipse.perfmsr.core.stub/PERFMSR.README.txt b/org.eclipse.jem.util/org.eclipse.perfmsr.core.stub/PERFMSR.README.txt
-deleted file mode 100755
-index 3186a36..0000000
---- a/org.eclipse.jem.util/org.eclipse.perfmsr.core.stub/PERFMSR.README.txt
-+++ /dev/null
-@@ -1,14 +0,0 @@
--This is a stub plugin for perfmsr. It is here just so that org.eclipse.jem.util can compile.
--
--It should not be an open project during normal usage. Whenever any of the files in this project
--are changed, "perfmsr.jardesc" should be used to create the new changed appropriate jar. Do this by:
--
--1) Select perfmsr.jardesc
--2) On popup menu select "Create JAR"
--3) Hit "Finish"
--4) Commit all changes to CVS.
--5) Go to org.eclipse.jem.util project, select the org.eclipse.perfmsr.core.stub folder
--   and select Replace->Latest from HEAD. This will cause your just committed changes
--   from step 4 to be put into org.eclipse.jem.util and will be picked up for that
--   plugin to compile against.
--6) Either close or delete the org.eclipse.perfmsr.core.stuf project from the workspace.
-\ No newline at end of file
-diff --git a/org.eclipse.jem.util/org.eclipse.perfmsr.core.stub/about.html b/org.eclipse.jem.util/org.eclipse.perfmsr.core.stub/about.html
-deleted file mode 100755
-index f9f238e..0000000
---- a/org.eclipse.jem.util/org.eclipse.perfmsr.core.stub/about.html
-+++ /dev/null
-@@ -1,32 +0,0 @@
--<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
--<html>
--<head>
--<title>About</title>
--<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
--</head>
--<body lang="EN-US">
--<h2>About This Content</h2>
-- 
--<p>30th March, 2004</p>	
--<h3>License</h3>
--<p>Eclipse.org 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 <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
--For purposes of the EPL, "Program" will mean the Content.</p>
--
--<h3>Contributions</h3>
--
--<p>If this Content is licensed to you under the terms and conditions of the EPL, any Contributions, as defined in the EPL, uploaded, submitted, or otherwise
--made available to Eclipse.org, members of Eclipse.org and/or the host of Eclipse.org web site, by you that relate to such
--Content are provided under the terms and conditions of the EPL and can be made available to others under the terms of the EPL.</p>
--
--<p>If this Content is licensed to you under license terms and conditions other than the EPL ("Other License"), any modifications, enhancements and/or
--other code and/or documentation ("Modifications") uploaded, submitted, or otherwise made available to Eclipse.org, members of Eclipse.org and/or the
--host of Eclipse.org, by you that relate to such Content are provided under terms and conditions of the Other License and can be made available
--to others under the terms of the Other License.  In addition, with regard to Modifications for which you are the copyright holder, you are also
--providing the Modifications under the terms and conditions of the EPL and such Modifications can be made available to others under the terms of
--the EPL.</p>
--
--<p><b>Version:</b> v20040624a
--
--</body>
--</html>
-\ No newline at end of file
-diff --git a/org.eclipse.jem.util/org.eclipse.perfmsr.core.stub/build.properties b/org.eclipse.jem.util/org.eclipse.perfmsr.core.stub/build.properties
-deleted file mode 100755
-index 3a4db57..0000000
---- a/org.eclipse.jem.util/org.eclipse.perfmsr.core.stub/build.properties
-+++ /dev/null
-@@ -1,14 +0,0 @@
--###############################################################################
--# Copyright (c) 2003, 2005 IBM Corporation and others.
--# All rights reserved. This program and the accompanying materials
--# are made available under the terms of the Eclipse Public License v1.0
--# which accompanies this distribution, and is available at
--# http://www.eclipse.org/legal/epl-v10.html
--# 
--# Contributors:
--#     IBM Corporation - initial API and implementation
--###############################################################################
--bin.includes = plugin.xml,\
--               plugin.properties,\
--               *.jar
--source.perfmsr.jar = src/
-diff --git a/org.eclipse.jem.util/org.eclipse.perfmsr.core.stub/perfmsr.jardesc b/org.eclipse.jem.util/org.eclipse.perfmsr.core.stub/perfmsr.jardesc
-deleted file mode 100755
-index d48e223..0000000
---- a/org.eclipse.jem.util/org.eclipse.perfmsr.core.stub/perfmsr.jardesc
-+++ /dev/null
-@@ -1,14 +0,0 @@
--<?xml version="1.0" encoding="UTF-8"?>
--<jardesc>
--    <jar path="org.eclipse.perfmsr.core.stub/perfmsr.jar"/>
--    <options buildIfNeeded="true" compress="true" descriptionLocation="/org.eclipse.perfmsr.core.stub/perfmsr.jardesc" exportErrors="true" exportWarnings="true" overwrite="false" saveDescription="true" useSourceFolders="false"/>
--    <manifest generateManifest="true" manifestLocation="/VEScrapProject/MANIFEST.mf" manifestVersion="1.0" reuseManifest="false" saveManifest="false" usesManifest="true">
--        <sealing sealJar="false">
--            <packagesToSeal/>
--            <packagesToUnSeal/>
--        </sealing>
--    </manifest>
--    <selectedElements exportClassFiles="true" exportJavaFiles="true" exportOutputFolder="false">
--        <javaElement handleIdentifier="=org.eclipse.perfmsr.core.stub/src"/>
--    </selectedElements>
--</jardesc>
-diff --git a/org.eclipse.jem.util/org.eclipse.perfmsr.core.stub/plugin.properties b/org.eclipse.jem.util/org.eclipse.perfmsr.core.stub/plugin.properties
-deleted file mode 100755
-index 5720eeb..0000000
---- a/org.eclipse.jem.util/org.eclipse.perfmsr.core.stub/plugin.properties
-+++ /dev/null
-@@ -1,12 +0,0 @@
--###############################################################################
--# Copyright (c) 2003, 2005 IBM Corporation and others.
--# All rights reserved. This program and the accompanying materials
--# are made available under the terms of the Eclipse Public License v1.0
--# which accompanies this distribution, and is available at
--# http://www.eclipse.org/legal/epl-v10.html
--# 
--# Contributors:
--#     IBM Corporation - initial API and implementation
--###############################################################################
--Plugin.name=Performance Monitor
--
-diff --git a/org.eclipse.jem.util/org.eclipse.perfmsr.core.stub/plugin.xml b/org.eclipse.jem.util/org.eclipse.perfmsr.core.stub/plugin.xml
-deleted file mode 100755
-index 596926d..0000000
---- a/org.eclipse.jem.util/org.eclipse.perfmsr.core.stub/plugin.xml
-+++ /dev/null
-@@ -1,17 +0,0 @@
--<?xml version="1.0" encoding="UTF-8"?>
--<?eclipse version="3.0"?>
--<plugin
--   id="org.eclipse.perfmsr.core"
--   name="%Plugin.name"
--   version="3.0.0"
--   provider-name="Eclipse.org"
--   class="org.eclipse.perfmsr.core.PerfMsrCorePlugin">
--
--   <runtime>
--      <library name="perfmsr.jar"><export name="*"/></library>
--   </runtime>
--   
--   <requires>
--      <import plugin="org.eclipse.core.runtime"/>
--   </requires>
--</plugin>
-diff --git a/org.eclipse.jem.util/org.eclipse.perfmsr.core.stub/src/org/eclipse/perfmsr/core/IPerformanceMonitor.java b/org.eclipse.jem.util/org.eclipse.perfmsr.core.stub/src/org/eclipse/perfmsr/core/IPerformanceMonitor.java
-deleted file mode 100755
-index bd992c7..0000000
---- a/org.eclipse.jem.util/org.eclipse.perfmsr.core.stub/src/org/eclipse/perfmsr/core/IPerformanceMonitor.java
-+++ /dev/null
-@@ -1,195 +0,0 @@
--/*******************************************************************************
-- * Copyright (c) 2003, 2005 IBM Corporation and others.
-- * All rights reserved. This program and the accompanying materials
-- * are made available under the terms of the Eclipse Public License v1.0
-- * which accompanies this distribution, and is available at
-- * http://www.eclipse.org/legal/epl-v10.html
-- * 
-- * Contributors:
-- *     IBM Corporation - initial API and implementation
-- *******************************************************************************/
--package org.eclipse.perfmsr.core;
--
--/**
-- * Take snapshots of the various performance counters.
-- * ************* This is just a stub of the real interface to get org.eclipse.jem.util 
-- *               to compile. It is not usable by itself. ****************************
-- */
--public interface IPerformanceMonitor
--{
--	/**
--	 * These constants control how much information is gathered for a particular snapshot.
--	 * They are or'ed together and passed into the snapshot method.  
--	 */
--	interface Types
--	{
--		/** 
--		 * 1 - Write out the performance counters from the operating system. These
--		 * include working set, peak working set, elapsed time, user time, and 
--		 * kernel time.
--		 */
--		int OperatingSystemCounters		= 1;
--		
--		/**
--		 * 2 - Write out the global performance info. This includes things like the total
--		 * committed memory for the entire system.
--		 * 
--		 * This function depends on the GetPerformanceInfo() function being available in
--		 * the Windows psapi.dll. This is available in XP but is usually not available
--		 * in Win/2000. If it is not available then this function throws an UnsupportedOperationException.
--		 */
--		int GlobalSystemCounters		= 2;
--		
--		/**
--		 * 4 - Write out the size of the Java Heap.
--		 */
--		int JavaHeapSize				= 4;
--
--		/**
--		 * 8 - Write out how much of the Java heap is being used. This calls the 
--		 * garbage collector so it may skew timing results.
--		 */
--		int JavaHeapUsed				= 8;
--		
--		/**
--		 * 16 - The plugin startup and size information.
--		 */
--		int PluginInfo					= 16;
--		
--		/** 0xffff - Everything. */
--		int All							= 0xffff;	
--	}
--	
--	/**
--	 * Add some more "extra" variations. 
--	 * 
--	 * The variations that are in effect are made up of these extra variations plus any variations
--	 * that may have been set with the setVar() method.
--	 * 
--	 * @param varList a comma separated list of variations
--	 */
--	public void addVarAppend(String varList);
--	
--	/**
--	 * Set the driver name. 
--	 * 
--	 * @param driver a label that identifies the driver that is being tested. If it is a WSAD
--	 * driver, this will usually be set by the extension.
--	 */
--	public void setDriver(String driver);
--	
--	/**
--	 * Set the location of the performance measurement file, that is the place where
--	 * the measurements are stored.
--	 * 
--	 * @param logFile the file name of where the log should be written. Usually this is fully qualified
--	 * path name. For example "x:\logs\timer.xml".
--	 */
--	public void setLogFile(String logFile);
--	
--	/**
--	 * Set the performance monitor to be on or off. If it is off then most of the other 
--	 * operations will no-op.
--	 * 
--	 * The default is for the performance monitor to be off unless it's special environment variable is set. 
--	 * When called from the UI, the UI should call this to make sure that it is on.
--	 */
--	public void setIsOn(boolean isOn);
--	
--	/**
--	 * Sets the test case number for this measurement run.
--	 *  
--	 * @param testd test case identifier
--	 */
--	public void setTestd(int testd);
--	
--	/**
--	 * Sets the test case name. If will cause a new test case to be created if it does not already exist.
--	 * 
--	 * @param testName a simple (short) test case name. In the case of JUnit test cases, it would usually 
--	 * be the JUnit name.
--	 */
--	public void setTestName(String testName);
--	
--	/**
--	 * Set the variations that are in effect.
--	 * 
--	 * @param var a comma delimited string of variation numbers
--	 */
--	public void setVar(String var);
--	
--	/**
--	 * Set the upload host
--	 * 
--	 * @param host DNS name of the upload host
--	 */
--	public void setUploadHost(String host);
--	
--	/**
--	 * Set the upload port
--	 * 
--	 * @param port upload port
--	 */
--	public void setUploadPort(int port);
--	
--	/**
--	 * Set the upload userid
--	 * 
--	 * @param userid
--	 */
--	public void setUploadUserid(String userid);
--	
--	/**
--	 * Take a snapshot of some default performance measurements.
--	 * 
--	 * @param step this identifies the step that the snapshot is for
--	 */
--	void snapshot(int step);
--	
--	/**
--	 * Take a snapshot of the selected performance measurements.
--	 * 
--	 * @param step this identifies the step that the snapshot is for
--	 * 
--	 * @param types This controls which measurements are selected. It is an or'd together
--	 * list of the IPerformanceMonitor.Types constants.
--	 * 
--	 * @see IPerformanceMonitor.Types 
--	 */
--	void snapshot(int step, int types);
--	
--	/**
--	 * Write the comment to the performance measurement file.
--	 * 
--	 * @param comment
--	 */
--	void writeComment(String comment);
--	
--	/**
--	 * Upload the results to the server. This causes the file to be
--	 * closed, and the monitor to be placed into the finished state.
--	 * 
--	 * This method can only be called if the uploadhost, uploadport and uploaduserid
--	 * have been configured before hand.
--	 * 
--	 * @param description an optional description (it can be null)
--	 * 
--	 * @return some status information
--	 */
--	public Upload.Status upload(String description);
--//	
--//	/**
--//	 * Upload the results to the server. This causes the file to be
--//	 * closed, and the monitor to be placed into the finished state.
--//	 * 
--//	 * @param host the host name that the file is being sent to
--//	 * @param port the port on the host
--//	 * @param userid the userid that is doing the upload
--//	 * @param description an optional description (it can be null)
--//	 * 
--//	 * @return some status information
--//	 */
--//	Upload.Status upload(String host, int port, String userid, String description);
--
--
--}
-diff --git a/org.eclipse.jem.util/org.eclipse.perfmsr.core.stub/src/org/eclipse/perfmsr/core/PerfMsrCorePlugin.java b/org.eclipse.jem.util/org.eclipse.perfmsr.core.stub/src/org/eclipse/perfmsr/core/PerfMsrCorePlugin.java
-deleted file mode 100755
-index 655ba2a..0000000
---- a/org.eclipse.jem.util/org.eclipse.perfmsr.core.stub/src/org/eclipse/perfmsr/core/PerfMsrCorePlugin.java
-+++ /dev/null
-@@ -1,31 +0,0 @@
--/*******************************************************************************
-- * Copyright (c) 2005 IBM Corporation and others.
-- * All rights reserved. This program and the accompanying materials 
-- * are made available under the terms of the Eclipse Public License v1.0
-- * which accompanies this distribution, and is available at
-- * http://www.eclipse.org/legal/epl-v10.html
-- * 
-- * Contributors:
-- *     IBM Corporation - initial API and implementation
-- *******************************************************************************/
--/*
--
--
-- */
--package org.eclipse.perfmsr.core;
--
--import org.eclipse.core.runtime.Plugin;
-- 
--
--/**
-- * ************* This is just a stub of the real class to get org.eclipse.jem.util 
-- *               to compile. It is not usable by itself. ****************************
-- * @since 1.0.0
-- */
--public class PerfMsrCorePlugin extends Plugin {
--	
--	public static IPerformanceMonitor getPerformanceMonitor(boolean bool) {
--		return null;
--	}
--
--}
-diff --git a/org.eclipse.jem.util/org.eclipse.perfmsr.core.stub/src/org/eclipse/perfmsr/core/Upload.java b/org.eclipse.jem.util/org.eclipse.perfmsr.core.stub/src/org/eclipse/perfmsr/core/Upload.java
-deleted file mode 100755
-index 65fa677..0000000
---- a/org.eclipse.jem.util/org.eclipse.perfmsr.core.stub/src/org/eclipse/perfmsr/core/Upload.java
-+++ /dev/null
-@@ -1,27 +0,0 @@
--/*******************************************************************************
-- * Copyright (c) 2005 IBM Corporation and others.
-- * All rights reserved. This program and the accompanying materials 
-- * are made available under the terms of the Eclipse Public License v1.0
-- * which accompanies this distribution, and is available at
-- * http://www.eclipse.org/legal/epl-v10.html
-- * 
-- * Contributors:
-- *     IBM Corporation - initial API and implementation
-- *******************************************************************************/
--/*
--
--
-- */
--package org.eclipse.perfmsr.core;
-- 
--
--/**
-- * Upload.
-- * ************* This is just a stub of the real interface to get org.eclipse.jem.util 
-- *               to compile. It is not usable by itself. ****************************
-- */
--public interface Upload {
--	public static class Status {
--		public boolean success;
--	}
--}
-diff --git a/org.eclipse.perfmsr.core.stub/.classpath b/org.eclipse.perfmsr.core.stub/.classpath
-new file mode 100755
-index 0000000..065ac06
---- /dev/null
-+++ b/org.eclipse.perfmsr.core.stub/.classpath
-@@ -0,0 +1,7 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<classpath>
-+	<classpathentry kind="src" path="src"/>
-+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-+	<classpathentry kind="output" path="bin"/>
-+</classpath>
-diff --git a/org.eclipse.perfmsr.core.stub/.project b/org.eclipse.perfmsr.core.stub/.project
-new file mode 100755
-index 0000000..5e29c82
---- /dev/null
-+++ b/org.eclipse.perfmsr.core.stub/.project
-@@ -0,0 +1,28 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<projectDescription>
-+	<name>org.eclipse.perfmsr.core</name>
-+	<comment></comment>
-+	<projects>
-+	</projects>
-+	<buildSpec>
-+		<buildCommand>
-+			<name>org.eclipse.jdt.core.javabuilder</name>
-+			<arguments>
-+			</arguments>
-+		</buildCommand>
-+		<buildCommand>
-+			<name>org.eclipse.pde.ManifestBuilder</name>
-+			<arguments>
-+			</arguments>
-+		</buildCommand>
-+		<buildCommand>
-+			<name>org.eclipse.pde.SchemaBuilder</name>
-+			<arguments>
-+			</arguments>
-+		</buildCommand>
-+	</buildSpec>
-+	<natures>
-+		<nature>org.eclipse.pde.PluginNature</nature>
-+		<nature>org.eclipse.jdt.core.javanature</nature>
-+	</natures>
-+</projectDescription>
-diff --git a/org.eclipse.perfmsr.core.stub/PERFMSR.README.txt b/org.eclipse.perfmsr.core.stub/PERFMSR.README.txt
-new file mode 100755
-index 0000000..3186a36
---- /dev/null
-+++ b/org.eclipse.perfmsr.core.stub/PERFMSR.README.txt
-@@ -0,0 +1,14 @@
-+This is a stub plugin for perfmsr. It is here just so that org.eclipse.jem.util can compile.
-+
-+It should not be an open project during normal usage. Whenever any of the files in this project
-+are changed, "perfmsr.jardesc" should be used to create the new changed appropriate jar. Do this by:
-+
-+1) Select perfmsr.jardesc
-+2) On popup menu select "Create JAR"
-+3) Hit "Finish"
-+4) Commit all changes to CVS.
-+5) Go to org.eclipse.jem.util project, select the org.eclipse.perfmsr.core.stub folder
-+   and select Replace->Latest from HEAD. This will cause your just committed changes
-+   from step 4 to be put into org.eclipse.jem.util and will be picked up for that
-+   plugin to compile against.
-+6) Either close or delete the org.eclipse.perfmsr.core.stuf project from the workspace.
-\ No newline at end of file
-diff --git a/org.eclipse.perfmsr.core.stub/about.html b/org.eclipse.perfmsr.core.stub/about.html
-new file mode 100755
-index 0000000..f9f238e
---- /dev/null
-+++ b/org.eclipse.perfmsr.core.stub/about.html
-@@ -0,0 +1,32 @@
-+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-+<html>
-+<head>
-+<title>About</title>
-+<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-+</head>
-+<body lang="EN-US">
-+<h2>About This Content</h2>
-+ 
-+<p>30th March, 2004</p>	
-+<h3>License</h3>
-+<p>Eclipse.org 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 <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-+For purposes of the EPL, "Program" will mean the Content.</p>
-+
-+<h3>Contributions</h3>
-+
-+<p>If this Content is licensed to you under the terms and conditions of the EPL, any Contributions, as defined in the EPL, uploaded, submitted, or otherwise
-+made available to Eclipse.org, members of Eclipse.org and/or the host of Eclipse.org web site, by you that relate to such
-+Content are provided under the terms and conditions of the EPL and can be made available to others under the terms of the EPL.</p>
-+
-+<p>If this Content is licensed to you under license terms and conditions other than the EPL ("Other License"), any modifications, enhancements and/or
-+other code and/or documentation ("Modifications") uploaded, submitted, or otherwise made available to Eclipse.org, members of Eclipse.org and/or the
-+host of Eclipse.org, by you that relate to such Content are provided under terms and conditions of the Other License and can be made available
-+to others under the terms of the Other License.  In addition, with regard to Modifications for which you are the copyright holder, you are also
-+providing the Modifications under the terms and conditions of the EPL and such Modifications can be made available to others under the terms of
-+the EPL.</p>
-+
-+<p><b>Version:</b> v20040624a
-+
-+</body>
-+</html>
-\ No newline at end of file
-diff --git a/org.eclipse.perfmsr.core.stub/build.properties b/org.eclipse.perfmsr.core.stub/build.properties
-new file mode 100755
-index 0000000..3a4db57
---- /dev/null
-+++ b/org.eclipse.perfmsr.core.stub/build.properties
-@@ -0,0 +1,14 @@
-+###############################################################################
-+# Copyright (c) 2003, 2005 IBM Corporation and others.
-+# All rights reserved. This program and the accompanying materials
-+# are made available under the terms of the Eclipse Public License v1.0
-+# which accompanies this distribution, and is available at
-+# http://www.eclipse.org/legal/epl-v10.html
-+# 
-+# Contributors:
-+#     IBM Corporation - initial API and implementation
-+###############################################################################
-+bin.includes = plugin.xml,\
-+               plugin.properties,\
-+               *.jar
-+source.perfmsr.jar = src/
-diff --git a/org.eclipse.perfmsr.core.stub/perfmsr.jardesc b/org.eclipse.perfmsr.core.stub/perfmsr.jardesc
-new file mode 100755
-index 0000000..d48e223
---- /dev/null
-+++ b/org.eclipse.perfmsr.core.stub/perfmsr.jardesc
-@@ -0,0 +1,14 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<jardesc>
-+    <jar path="org.eclipse.perfmsr.core.stub/perfmsr.jar"/>
-+    <options buildIfNeeded="true" compress="true" descriptionLocation="/org.eclipse.perfmsr.core.stub/perfmsr.jardesc" exportErrors="true" exportWarnings="true" overwrite="false" saveDescription="true" useSourceFolders="false"/>
-+    <manifest generateManifest="true" manifestLocation="/VEScrapProject/MANIFEST.mf" manifestVersion="1.0" reuseManifest="false" saveManifest="false" usesManifest="true">
-+        <sealing sealJar="false">
-+            <packagesToSeal/>
-+            <packagesToUnSeal/>
-+        </sealing>
-+    </manifest>
-+    <selectedElements exportClassFiles="true" exportJavaFiles="true" exportOutputFolder="false">
-+        <javaElement handleIdentifier="=org.eclipse.perfmsr.core.stub/src"/>
-+    </selectedElements>
-+</jardesc>
-diff --git a/org.eclipse.perfmsr.core.stub/plugin.properties b/org.eclipse.perfmsr.core.stub/plugin.properties
-new file mode 100755
-index 0000000..5720eeb
---- /dev/null
-+++ b/org.eclipse.perfmsr.core.stub/plugin.properties
-@@ -0,0 +1,12 @@
-+###############################################################################
-+# Copyright (c) 2003, 2005 IBM Corporation and others.
-+# All rights reserved. This program and the accompanying materials
-+# are made available under the terms of the Eclipse Public License v1.0
-+# which accompanies this distribution, and is available at
-+# http://www.eclipse.org/legal/epl-v10.html
-+# 
-+# Contributors:
-+#     IBM Corporation - initial API and implementation
-+###############################################################################
-+Plugin.name=Performance Monitor
-+
-diff --git a/org.eclipse.perfmsr.core.stub/plugin.xml b/org.eclipse.perfmsr.core.stub/plugin.xml
-new file mode 100755
-index 0000000..596926d
---- /dev/null
-+++ b/org.eclipse.perfmsr.core.stub/plugin.xml
-@@ -0,0 +1,17 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<?eclipse version="3.0"?>
-+<plugin
-+   id="org.eclipse.perfmsr.core"
-+   name="%Plugin.name"
-+   version="3.0.0"
-+   provider-name="Eclipse.org"
-+   class="org.eclipse.perfmsr.core.PerfMsrCorePlugin">
-+
-+   <runtime>
-+      <library name="perfmsr.jar"><export name="*"/></library>
-+   </runtime>
-+   
-+   <requires>
-+      <import plugin="org.eclipse.core.runtime"/>
-+   </requires>
-+</plugin>
-diff --git a/org.eclipse.perfmsr.core.stub/src/org/eclipse/perfmsr/core/IPerformanceMonitor.java b/org.eclipse.perfmsr.core.stub/src/org/eclipse/perfmsr/core/IPerformanceMonitor.java
-new file mode 100755
-index 0000000..bd992c7
---- /dev/null
-+++ b/org.eclipse.perfmsr.core.stub/src/org/eclipse/perfmsr/core/IPerformanceMonitor.java
-@@ -0,0 +1,195 @@
-+/*******************************************************************************
-+ * Copyright (c) 2003, 2005 IBM Corporation and others.
-+ * All rights reserved. This program and the accompanying materials
-+ * are made available under the terms of the Eclipse Public License v1.0
-+ * which accompanies this distribution, and is available at
-+ * http://www.eclipse.org/legal/epl-v10.html
-+ * 
-+ * Contributors:
-+ *     IBM Corporation - initial API and implementation
-+ *******************************************************************************/
-+package org.eclipse.perfmsr.core;
-+
-+/**
-+ * Take snapshots of the various performance counters.
-+ * ************* This is just a stub of the real interface to get org.eclipse.jem.util 
-+ *               to compile. It is not usable by itself. ****************************
-+ */
-+public interface IPerformanceMonitor
-+{
-+	/**
-+	 * These constants control how much information is gathered for a particular snapshot.
-+	 * They are or'ed together and passed into the snapshot method.  
-+	 */
-+	interface Types
-+	{
-+		/** 
-+		 * 1 - Write out the performance counters from the operating system. These
-+		 * include working set, peak working set, elapsed time, user time, and 
-+		 * kernel time.
-+		 */
-+		int OperatingSystemCounters		= 1;
-+		
-+		/**
-+		 * 2 - Write out the global performance info. This includes things like the total
-+		 * committed memory for the entire system.
-+		 * 
-+		 * This function depends on the GetPerformanceInfo() function being available in
-+		 * the Windows psapi.dll. This is available in XP but is usually not available
-+		 * in Win/2000. If it is not available then this function throws an UnsupportedOperationException.
-+		 */
-+		int GlobalSystemCounters		= 2;
-+		
-+		/**
-+		 * 4 - Write out the size of the Java Heap.
-+		 */
-+		int JavaHeapSize				= 4;
-+
-+		/**
-+		 * 8 - Write out how much of the Java heap is being used. This calls the 
-+		 * garbage collector so it may skew timing results.
-+		 */
-+		int JavaHeapUsed				= 8;
-+		
-+		/**
-+		 * 16 - The plugin startup and size information.
-+		 */
-+		int PluginInfo					= 16;
-+		
-+		/** 0xffff - Everything. */
-+		int All							= 0xffff;	
-+	}
-+	
-+	/**
-+	 * Add some more "extra" variations. 
-+	 * 
-+	 * The variations that are in effect are made up of these extra variations plus any variations
-+	 * that may have been set with the setVar() method.
-+	 * 
-+	 * @param varList a comma separated list of variations
-+	 */
-+	public void addVarAppend(String varList);
-+	
-+	/**
-+	 * Set the driver name. 
-+	 * 
-+	 * @param driver a label that identifies the driver that is being tested. If it is a WSAD
-+	 * driver, this will usually be set by the extension.
-+	 */
-+	public void setDriver(String driver);
-+	
-+	/**
-+	 * Set the location of the performance measurement file, that is the place where
-+	 * the measurements are stored.
-+	 * 
-+	 * @param logFile the file name of where the log should be written. Usually this is fully qualified
-+	 * path name. For example "x:\logs\timer.xml".
-+	 */
-+	public void setLogFile(String logFile);
-+	
-+	/**
-+	 * Set the performance monitor to be on or off. If it is off then most of the other 
-+	 * operations will no-op.
-+	 * 
-+	 * The default is for the performance monitor to be off unless it's special environment variable is set. 
-+	 * When called from the UI, the UI should call this to make sure that it is on.
-+	 */
-+	public void setIsOn(boolean isOn);
-+	
-+	/**
-+	 * Sets the test case number for this measurement run.
-+	 *  
-+	 * @param testd test case identifier
-+	 */
-+	public void setTestd(int testd);
-+	
-+	/**
-+	 * Sets the test case name. If will cause a new test case to be created if it does not already exist.
-+	 * 
-+	 * @param testName a simple (short) test case name. In the case of JUnit test cases, it would usually 
-+	 * be the JUnit name.
-+	 */
-+	public void setTestName(String testName);
-+	
-+	/**
-+	 * Set the variations that are in effect.
-+	 * 
-+	 * @param var a comma delimited string of variation numbers
-+	 */
-+	public void setVar(String var);
-+	
-+	/**
-+	 * Set the upload host
-+	 * 
-+	 * @param host DNS name of the upload host
-+	 */
-+	public void setUploadHost(String host);
-+	
-+	/**
-+	 * Set the upload port
-+	 * 
-+	 * @param port upload port
-+	 */
-+	public void setUploadPort(int port);
-+	
-+	/**
-+	 * Set the upload userid
-+	 * 
-+	 * @param userid
-+	 */
-+	public void setUploadUserid(String userid);
-+	
-+	/**
-+	 * Take a snapshot of some default performance measurements.
-+	 * 
-+	 * @param step this identifies the step that the snapshot is for
-+	 */
-+	void snapshot(int step);
-+	
-+	/**
-+	 * Take a snapshot of the selected performance measurements.
-+	 * 
-+	 * @param step this identifies the step that the snapshot is for
-+	 * 
-+	 * @param types This controls which measurements are selected. It is an or'd together
-+	 * list of the IPerformanceMonitor.Types constants.
-+	 * 
-+	 * @see IPerformanceMonitor.Types 
-+	 */
-+	void snapshot(int step, int types);
-+	
-+	/**
-+	 * Write the comment to the performance measurement file.
-+	 * 
-+	 * @param comment
-+	 */
-+	void writeComment(String comment);
-+	
-+	/**
-+	 * Upload the results to the server. This causes the file to be
-+	 * closed, and the monitor to be placed into the finished state.
-+	 * 
-+	 * This method can only be called if the uploadhost, uploadport and uploaduserid
-+	 * have been configured before hand.
-+	 * 
-+	 * @param description an optional description (it can be null)
-+	 * 
-+	 * @return some status information
-+	 */
-+	public Upload.Status upload(String description);
-+//	
-+//	/**
-+//	 * Upload the results to the server. This causes the file to be
-+//	 * closed, and the monitor to be placed into the finished state.
-+//	 * 
-+//	 * @param host the host name that the file is being sent to
-+//	 * @param port the port on the host
-+//	 * @param userid the userid that is doing the upload
-+//	 * @param description an optional description (it can be null)
-+//	 * 
-+//	 * @return some status information
-+//	 */
-+//	Upload.Status upload(String host, int port, String userid, String description);
-+
-+
-+}
-diff --git a/org.eclipse.perfmsr.core.stub/src/org/eclipse/perfmsr/core/PerfMsrCorePlugin.java b/org.eclipse.perfmsr.core.stub/src/org/eclipse/perfmsr/core/PerfMsrCorePlugin.java
-new file mode 100755
-index 0000000..655ba2a
---- /dev/null
-+++ b/org.eclipse.perfmsr.core.stub/src/org/eclipse/perfmsr/core/PerfMsrCorePlugin.java
-@@ -0,0 +1,31 @@
-+/*******************************************************************************
-+ * Copyright (c) 2005 IBM Corporation and others.
-+ * All rights reserved. This program and the accompanying materials 
-+ * are made available under the terms of the Eclipse Public License v1.0
-+ * which accompanies this distribution, and is available at
-+ * http://www.eclipse.org/legal/epl-v10.html
-+ * 
-+ * Contributors:
-+ *     IBM Corporation - initial API and implementation
-+ *******************************************************************************/
-+/*
-+
-+
-+ */
-+package org.eclipse.perfmsr.core;
-+
-+import org.eclipse.core.runtime.Plugin;
-+ 
-+
-+/**
-+ * ************* This is just a stub of the real class to get org.eclipse.jem.util 
-+ *               to compile. It is not usable by itself. ****************************
-+ * @since 1.0.0
-+ */
-+public class PerfMsrCorePlugin extends Plugin {
-+	
-+	public static IPerformanceMonitor getPerformanceMonitor(boolean bool) {
-+		return null;
-+	}
-+
-+}
-diff --git a/org.eclipse.perfmsr.core.stub/src/org/eclipse/perfmsr/core/Upload.java b/org.eclipse.perfmsr.core.stub/src/org/eclipse/perfmsr/core/Upload.java
-new file mode 100755
-index 0000000..65fa677
---- /dev/null
-+++ b/org.eclipse.perfmsr.core.stub/src/org/eclipse/perfmsr/core/Upload.java
-@@ -0,0 +1,27 @@
-+/*******************************************************************************
-+ * Copyright (c) 2005 IBM Corporation and others.
-+ * All rights reserved. This program and the accompanying materials 
-+ * are made available under the terms of the Eclipse Public License v1.0
-+ * which accompanies this distribution, and is available at
-+ * http://www.eclipse.org/legal/epl-v10.html
-+ * 
-+ * Contributors:
-+ *     IBM Corporation - initial API and implementation
-+ *******************************************************************************/
-+/*
-+
-+
-+ */
-+package org.eclipse.perfmsr.core;
-+ 
-+
-+/**
-+ * Upload.
-+ * ************* This is just a stub of the real interface to get org.eclipse.jem.util 
-+ *               to compile. It is not usable by itself. ****************************
-+ */
-+public interface Upload {
-+	public static class Status {
-+		public boolean success;
-+	}
-+}
--- 
diff --git a/debian/patches/series b/debian/patches/series
index 68dd6f4..356af9e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,4 @@
 debian-custom-build.patch
-perfmsr-stub-to-root-folder.patch
 xerces-2.0.11-compatibility-fix.patch
 wsdl4j-1.6.2-compatibility-fix.patch
 regenerate-xpath2-parser.patch

-- 
eclipse-wtp packaging



More information about the pkg-java-commits mailing list