This commit was manufactured by cvs2svn to create tag 'v120'.
Sprout from master 2001-06-07 16:11:29 UTC DJ Houghton <dj> 'Updated build.properties file.'
Cherrypick from master 2001-05-31 19:22:37 UTC bfarn <bfarn> 'Code Cleanup':
update/org.eclipse.update/Eclipse Update/org/eclipse/update/internal/core/UpdateManager.java
update/org.eclipse.update/Eclipse Update/org/eclipse/update/internal/ui/JarVerifier.java
Delete:
update/org.eclipse.update.examples/.classpath
update/org.eclipse.update.examples/.cvsignore
update/org.eclipse.update.examples/.vcm_meta
update/org.eclipse.update.examples/Eclipse Update Examples/org/eclipse/update/examples/ExamplesPlugin.java
update/org.eclipse.update.examples/Eclipse Update Examples/org/eclipse/update/examples/ExamplesPluginResources.properties
update/org.eclipse.update.examples/Eclipse Update Examples/org/eclipse/update/examples/SampleAction.java
update/org.eclipse.update.examples/build.properties
update/org.eclipse.update.examples/doc/example.html
update/org.eclipse.update.examples/doc/hglegal.htm
update/org.eclipse.update.examples/doc/ngibmcpy.gif
update/org.eclipse.update.examples/install/components/install.index
update/org.eclipse.update.examples/install/components/org.eclipse.update.examples.component_1.0.0/install.xml
update/org.eclipse.update.examples/install/components/org.eclipse.update.examples.component_1.0.0/org.eclipse.update.examples.component_1.0.0.jar
update/org.eclipse.update.examples/plugin.xml
update/org.eclipse.update.examples/plugin.xml.readmediff --git a/update/org.eclipse.update.examples/.classpath b/update/org.eclipse.update.examples/.classpath
deleted file mode 100644
index c4e8ac2..0000000
--- a/update/org.eclipse.update.examples/.classpath
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="EXAMPLES Plugin"/>
- <classpathentry kind="var"
- path="ECLIPSE_HOME/plugins/org.eclipse.core.runtime/runtime.jar" sourcepath="ECLIPSE_HOME/plugins/org.eclipse.core.runtime/runtimesrc.zip"/>
- <classpathentry kind="var"
- path="ECLIPSE_HOME/plugins/org.apache.xerces/xerces.jar" sourcepath="ECLIPSE_HOME/plugins/org.apache.xerces/xercessrc.zip"/>
- <classpathentry kind="var"
- path="ECLIPSE_HOME/plugins/org.eclipse.core.resources/resources.jar" sourcepath="ECLIPSE_HOME/plugins/org.eclipse.core.resources/resourcessrc.zip"/>
- <classpathentry kind="var"
- path="ECLIPSE_HOME/plugins/org.eclipse.ui/workbench.jar" sourcepath="ECLIPSE_HOME/plugins/org.eclipse.ui/workbenchsrc.zip"/>
- <classpathentry kind="var"
- path="ECLIPSE_HOME/plugins/org.eclipse.help/help.jar" sourcepath="ECLIPSE_HOME/plugins/org.eclipse.help/helpsrc.zip"/>
- <classpathentry kind="var"
- path="ECLIPSE_HOME/plugins/org.eclipse.swt/swt.jar" sourcepath="ECLIPSE_HOME/plugins/org.eclipse.swt/swtsrc.zip"/>
- <classpathentry kind="var"
- path="ECLIPSE_HOME/plugins/org.eclipse.core.boot/boot.jar" sourcepath="ECLIPSE_HOME/plugins/org.eclipse.core.boot/bootsrc.zip"/>
- <classpathentry kind="var" path="JRE_LIB" rootpath="JRE_SRCROOT" sourcepath="JRE_SRC"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/update/org.eclipse.update.examples/.cvsignore b/update/org.eclipse.update.examples/.cvsignore
deleted file mode 100644
index 0121573..0000000
--- a/update/org.eclipse.update.examples/.cvsignore
+++ /dev/null
@@ -1,4 +0,0 @@
-bin
-build.xml
-examples.jar
-examples.jar.bin.log
\ No newline at end of file
diff --git a/update/org.eclipse.update.examples/.vcm_meta b/update/org.eclipse.update.examples/.vcm_meta
deleted file mode 100644
index 0c9e8d8..0000000
--- a/update/org.eclipse.update.examples/.vcm_meta
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project-description>
- <nature id="org.eclipse.jdt.core.javanature"/>
- <nature id="org.eclipse.pde.PluginNature"/>
- <builder name="org.eclipse.jdt.core.javabuilder">
- </builder>
- <builder name="org.eclipse.pde.ManifestBuilder">
- </builder>
- <builder name="org.eclipse.pde.SchemaBuilder">
- </builder>
-</project-description>
diff --git a/update/org.eclipse.update.examples/Eclipse Update Examples/org/eclipse/update/examples/ExamplesPlugin.java b/update/org.eclipse.update.examples/Eclipse Update Examples/org/eclipse/update/examples/ExamplesPlugin.java
deleted file mode 100644
index 1fc494d..0000000
--- a/update/org.eclipse.update.examples/Eclipse Update Examples/org/eclipse/update/examples/ExamplesPlugin.java
+++ /dev/null
@@ -1,67 +0,0 @@
-package org.eclipse.update.examples;
-/*
- * (c) Copyright IBM Corp. 2000, 2001.
- * All Rights Reserved.
- */
-
-import org.eclipse.ui.plugin.*;
-import org.eclipse.core.runtime.*;
-import org.eclipse.core.resources.*;
-import java.util.*;
-
-/**
- * The main plugin class to be used in the desktop.
- */
-public class ExamplesPlugin extends AbstractUIPlugin {
- //The shared instance.
- private static ExamplesPlugin plugin;
- //Resource bundle.
- private ResourceBundle resourceBundle;
-
- /**
- * The constructor.
- */
- public ExamplesPlugin(IPluginDescriptor descriptor) {
- super(descriptor);
- plugin = this;
- try {
- resourceBundle= ResourceBundle.getBundle("org.eclipse.update.examples.ExamplesPluginResources");
- } catch (MissingResourceException x) {
- resourceBundle = null;
- }
- }
-
- /**
- * Returns the shared instance.
- */
- public static ExamplesPlugin getDefault() {
- return plugin;
- }
-
- /**
- * Returns the workspace instance.
- */
- public static IWorkspace getWorkspace() {
- return ResourcesPlugin.getWorkspace();
- }
-
- /**
- * Returns the string from the plugin's resource bundle,
- * or 'key' if not found.
- */
- public static String getResourceString(String key) {
- ResourceBundle bundle= ExamplesPlugin.getDefault().getResourceBundle();
- try {
- return bundle.getString(key);
- } catch (MissingResourceException e) {
- return key;
- }
- }
-
- /**
- * Returns the plugin's resource bundle,
- */
- public ResourceBundle getResourceBundle() {
- return resourceBundle;
- }
-}
diff --git a/update/org.eclipse.update.examples/Eclipse Update Examples/org/eclipse/update/examples/ExamplesPluginResources.properties b/update/org.eclipse.update.examples/Eclipse Update Examples/org/eclipse/update/examples/ExamplesPluginResources.properties
deleted file mode 100644
index 43de06a..0000000
--- a/update/org.eclipse.update.examples/Eclipse Update Examples/org/eclipse/update/examples/ExamplesPluginResources.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-title = Sample Action
-msg = Hello from Sample Action
\ No newline at end of file
diff --git a/update/org.eclipse.update.examples/Eclipse Update Examples/org/eclipse/update/examples/SampleAction.java b/update/org.eclipse.update.examples/Eclipse Update Examples/org/eclipse/update/examples/SampleAction.java
deleted file mode 100644
index 76da884..0000000
--- a/update/org.eclipse.update.examples/Eclipse Update Examples/org/eclipse/update/examples/SampleAction.java
+++ /dev/null
@@ -1,50 +0,0 @@
-package org.eclipse.update.examples;
-/*
- * (c) Copyright IBM Corp. 2000, 2001.
- * All Rights Reserved.
- */
-
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.IWorkbenchWindowActionDelegate;
-import org.eclipse.swt.widgets.MessageBox;
-
-/**
- * @see IWorkbenchWindowActionDelegate
- */
-public class SampleAction implements IWorkbenchWindowActionDelegate {
- /**
- * The constructor.
- */
- public SampleAction() {
- }
-
- /**
- * @see IWorkbenchWindowActionDelegate#run
- */
- public void run(IAction arg0) {
- MessageBox messageBox = new MessageBox(null);
- messageBox.setText(ExamplesPlugin.getResourceString("title"));
- messageBox.setMessage(ExamplesPlugin.getResourceString("msg"));
- messageBox.open();
- }
-
- /**
- * @see IWorkbenchWindowActionDelegate#selectionChanged
- */
- public void selectionChanged(IAction arg0, ISelection arg1) {
- }
-
- /**
- * @see IWorkbenchWindowActionDelegate#dispose
- */
- public void dispose() {
- }
-
- /**
- * @see IWorkbenchWindowActionDelegate#init
- */
- public void init(IWorkbenchWindow arg0) {
- }
-}
diff --git a/update/org.eclipse.update.examples/build.properties b/update/org.eclipse.update.examples/build.properties
deleted file mode 100644
index e94183d..0000000
--- a/update/org.eclipse.update.examples/build.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-build.includes=build.properties,plugin.xml.readme,install,doc
-build.vaj.Eclipse\ Update\ Examples=Eclipse Update Examples
-
-source.examples.jar=Eclipse Update Examples
-bin.includes=*.jar,plugin.xml
diff --git a/update/org.eclipse.update.examples/doc/example.html b/update/org.eclipse.update.examples/doc/example.html
deleted file mode 100644
index febc327..0000000
--- a/update/org.eclipse.update.examples/doc/example.html
+++ /dev/null
@@ -1,76 +0,0 @@
-<!doctype html public "-//w3c//dtd html 4.0 transitional//en">
-<html>
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
- <meta name="Author" content="home">
- <meta name="GENERATOR" content="Mozilla/4.5 [en] (WinNT; U) [Netscape]">
- <title>Update Example</title>
-</head>
-<body>
-
-<h1>
-Eclipse Update Example</h1>
-This example illustrates the structure required on an HTTP server for downloading
-Eclipse components. The example consists of a simple plugin that adds a
-menu and an action to the workbench. The plug-in has been packaged as a
-component jar using the Plug-in Development tools in the Eclipse workbench
-(PDE). Note, that the base plug-in directory for <tt>org.eclipse.update.examples</tt>
-does not contain the <tt>plugin.xml</tt> file. Consequently the base plugin
-does not contribute anything to the workbench. The base plugin contains
-an <tt>install</tt> directory that is used in the following steps.
-<h3>
-Running the example</h3>
-To run the example, you'll need to have an HTTP server available (eg. Apache
-server). Copy the entire <b><tt>install</tt></b> directory from the example
-plug-in into the HTTP server document tree (eg. <tt>htdocs</tt> directory
-for Apache server). Make sure the server is running.
-<p>Start the Eclipse workbench. Select <b>Help</b>, then <b>Software Updates</b>,
-then <b>Add...</b>
-<br>On the location page enter the URL of your server (eg. http://my.server/
-... fill in your actual server URL here). The URL needs to reflect
-any additional server path elements leading to the <tt>install</tt> directory
-you copied. For example, if you copied the <tt>install</tt> directory into
-htdocs/examples (so the path is htdocs/examples/install), you would enter
-the URL as http://my.server/examples.
-<br>Press <b>Add</b> and <b>Next></b>. You should be presented with a list
-containing installable components. The provided example contains a single
-component called <b>Update Example</b>. Select it and complete the installation.You'll
-need to restart the workbench to activate the changes.
-<p>Once restarted, you'll be able to add the example action set to your
-perspectives. Select <b>Perspective</b>, <b>Customize...</b> and then expand
-<b>Other</b>.
-Select <b>Sample Action Set</b> (this is an action set implemented by this
-example plug-in that you just downloaded and installed). A new menu labeled
-Sample Menu should appear in the workbench with a new action. The new component
-and its plug-in is now installed and activated.
-<h3>
-Examining the <tt>install</tt> directory</h3>
-The install directory is the output of building a component jar using the
-PDE Component Project setup (with one extra file added). It contains the
-following:
-<p><tt>install/</tt>
-<br><tt> components/</tt>
-<br><tt> install.index</tt>
-<br><tt> org.eclipse.update.examples.component_1.0.0/</tt>
-<br><tt>
-install.xml</tt>
-<br><tt>
-orq.eclipse.update.examples.component_1.0.0.jar</tt>
-<p>The above directory structure is required to exist on the server. There
-is a common <tt>install</tt> root. There is also a common <tt>components</tt>
-subdirectory. It contains a subdirectory for each component available for
-download (in the example case just one, <tt>org.eclipse.update.examples.component_1.0.0</tt>).
-The file <tt>install.index</tt> was manually created (not generated by
-PDE). It is a simple directory index of component directories (one line
-per directory). This allows the update client to discover which component
-directories actually exist on the server.
-<p>The actual component as created by PDE is contained in the <tt>orq.eclipse.update.examples.component_1.0.0.jar.
-</tt>Its <tt>install.xml</tt> file that describes the component is also
-exposed to allow the update support to find out about the component without
-the need to actually download the jar.
-<p>Please refer to PDE documentation for details of creating component
-jars. Select <b>Help</b>, then <b>Help Contents</b> and <b>PDE ISV Guide</b>
-(from the drop box).
-<p><a href="hglegal.htm"><img SRC="ngibmcpy.gif" ALT="Copyright IBM Corp. 2000, 2001." BORDER=0 height=12 width=195></a>
-</body>
-</html>
diff --git a/update/org.eclipse.update.examples/doc/hglegal.htm b/update/org.eclipse.update.examples/doc/hglegal.htm
deleted file mode 100644
index b071dbd..0000000
--- a/update/org.eclipse.update.examples/doc/hglegal.htm
+++ /dev/null
@@ -1,14 +0,0 @@
-<!doctype html public "-//w3c//dtd html 4.0 transitional//en">
-<html>
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
- <meta name="GENERATOR" content="Mozilla/4.73 [en] (Win98; U) [Netscape]">
- <title>Legal Notices</title>
-</head>
-<body>
-
-<h3>
-<a NAME="Notices"></a>Notices</h3>
-(c) Copyright IBM Corp. 2000, 2001. All Rights Reserved.
-</body>
-</html>
diff --git a/update/org.eclipse.update.examples/doc/ngibmcpy.gif b/update/org.eclipse.update.examples/doc/ngibmcpy.gif
deleted file mode 100644
index 360f8e9..0000000
--- a/update/org.eclipse.update.examples/doc/ngibmcpy.gif
+++ /dev/null
Binary files differ
diff --git a/update/org.eclipse.update.examples/install/components/install.index b/update/org.eclipse.update.examples/install/components/install.index
deleted file mode 100644
index 73b8cfc..0000000
--- a/update/org.eclipse.update.examples/install/components/install.index
+++ /dev/null
@@ -1 +0,0 @@
-org.eclipse.update.examples.component_1.0.0
diff --git a/update/org.eclipse.update.examples/install/components/org.eclipse.update.examples.component_1.0.0/install.xml b/update/org.eclipse.update.examples/install/components/org.eclipse.update.examples.component_1.0.0/install.xml
deleted file mode 100644
index e2ef7e4..0000000
--- a/update/org.eclipse.update.examples/install/components/org.eclipse.update.examples.component_1.0.0/install.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- File written by PDE 1.0 -->
-<component
- id="org.eclipse.update.examples.component"
- label="Update Example Component"
- version="1.0.0"
- provider-name="">
-
- <description>
- This is an example component.
- </description>
-
- <url>
- <update label="Examples update site" url="http://update.server/directory"/>
- </url>
-
- <plugin
- id="org.eclipse.update.examples"
- label="Examples Plugin"
- version="1.0.0">
- </plugin>
-
-</component>
diff --git a/update/org.eclipse.update.examples/install/components/org.eclipse.update.examples.component_1.0.0/org.eclipse.update.examples.component_1.0.0.jar b/update/org.eclipse.update.examples/install/components/org.eclipse.update.examples.component_1.0.0/org.eclipse.update.examples.component_1.0.0.jar
deleted file mode 100644
index 6775356..0000000
--- a/update/org.eclipse.update.examples/install/components/org.eclipse.update.examples.component_1.0.0/org.eclipse.update.examples.component_1.0.0.jar
+++ /dev/null
Binary files differ
diff --git a/update/org.eclipse.update.examples/plugin.xml b/update/org.eclipse.update.examples/plugin.xml
deleted file mode 100644
index 06c4a72..0000000
--- a/update/org.eclipse.update.examples/plugin.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- File written by PDE 1.0 -->
-<plugin
- id="org.eclipse.update.examples"
- name="Update Example Plugin"
- version="1.0.0"
- class="org.eclipse.update.examples.ExamplesPlugin">
-<requires>
- <import plugin="org.eclipse.core.runtime"/>
- <import plugin="org.eclipse.core.resources"/>
- <import plugin="org.eclipse.ui"/>
-</requires>
-
-<runtime>
- <library name="examples.jar"/>
-</runtime>
-
-<extension
- point="org.eclipse.ui.actionSets">
- <actionSet
- label="Sample Action Set"
- id="org.eclipse.update.examples.actionSet1">
- <menu
- label="Sample Menu"
- id="sampleMenu">
- <separator
- name="sampleGroup">
- </separator>
- </menu>
- <action
- label="&Sample Action"
- class="org.eclipse.update.examples.SampleAction"
- menubarPath="sampleMenu/sampleGroup"
- id="org.eclipse.update.examples.action1">
- </action>
- </actionSet>
-</extension>
-</plugin>
diff --git a/update/org.eclipse.update.examples/plugin.xml.readme b/update/org.eclipse.update.examples/plugin.xml.readme
deleted file mode 100644
index 2876c98..0000000
--- a/update/org.eclipse.update.examples/plugin.xml.readme
+++ /dev/null
@@ -1 +0,0 @@
-This example plugin intentionally does not contain plugin.xml file
\ No newline at end of file
diff --git a/update/org.eclipse.update/Eclipse Update/org/eclipse/update/internal/core/UpdateManager.java b/update/org.eclipse.update/Eclipse Update/org/eclipse/update/internal/core/UpdateManager.java
index e456884..f09e124 100644
--- a/update/org.eclipse.update/Eclipse Update/org/eclipse/update/internal/core/UpdateManager.java
+++ b/update/org.eclipse.update/Eclipse Update/org/eclipse/update/internal/core/UpdateManager.java
@@ -122,8 +122,8 @@
*/
public UMSessionManagerSession createSession(IInstallable[] descriptors, boolean bVerifyJars) throws UpdateManagerException {
- // FOR NOW DO NOT DO JAR VERIFICATION
- //-----------------------------------
+ // WARNING! TEMPORARY OVERRIDE - DO NOT DO JAR VERIFICATION
+ //---------------------------------------------------------
bVerifyJars = false;
// Create a new update session
diff --git a/update/org.eclipse.update/Eclipse Update/org/eclipse/update/internal/ui/JarVerifier.java b/update/org.eclipse.update/Eclipse Update/org/eclipse/update/internal/ui/JarVerifier.java
index dda11d7..00c1ea7 100644
--- a/update/org.eclipse.update/Eclipse Update/org/eclipse/update/internal/ui/JarVerifier.java
+++ b/update/org.eclipse.update/Eclipse Update/org/eclipse/update/internal/ui/JarVerifier.java
Binary files differ
