Bug 266859 FeatureParser should be split in two. One for the folder/jar and one for the feature manifest

3 files changed, 290 insertions, 301 deletions

diff --git a/bundles/org.eclipse.equinox.p2.publisher/src/org/eclipse/equinox/internal/p2/publisher/eclipse/FeatureManifestParser.java b/bundles/org.eclipse.equinox.p2.publisher/src/org/eclipse/equinox/internal/p2/publisher/eclipse/FeatureManifestParser.java
new file mode 100644
index 000000000..4aef269e2
--- /dev/null
+++ b/bundles/org.eclipse.equinox.p2.publisher/src/org/eclipse/equinox/internal/p2/publisher/eclipse/FeatureManifestParser.java
@@ -0,0 +1,267 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2009 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
+ *     Cloudsmith Inc - split into FeatureParser and FeatureManifestParser
+ *******************************************************************************/
+package org.eclipse.equinox.internal.p2.publisher.eclipse;
+
+import java.io.*;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.List;
+import javax.xml.parsers.*;
+import org.eclipse.equinox.p2.publisher.eclipse.Feature;
+import org.eclipse.equinox.p2.publisher.eclipse.FeatureEntry;
+import org.eclipse.osgi.util.NLS;
+import org.xml.sax.*;
+import org.xml.sax.helpers.DefaultHandler;
+
+/**
+ * Parses a feature manifest from a provided stream.
+ */
+public class FeatureManifestParser extends DefaultHandler {
+
+	private final static SAXParserFactory parserFactory = SAXParserFactory.newInstance();
+	private SAXParser parser;
+	protected Feature result;
+	private URL url;
+	private StringBuffer characters = null;
+
+	private List messageKeys = null;
+
+	public FeatureManifestParser() {
+		this(true);
+	}
+
+	public FeatureManifestParser(boolean createParser) {
+		super();
+		if (!createParser)
+			return;
+		try {
+			parserFactory.setNamespaceAware(true);
+			this.parser = parserFactory.newSAXParser();
+		} catch (ParserConfigurationException e) {
+			System.out.println(e);
+		} catch (SAXException e) {
+			System.out.println(e);
+		}
+	}
+
+	public void characters(char[] ch, int start, int length) {
+		if (characters == null)
+			return;
+		characters.append(ch, start, length);
+	}
+
+	protected Feature createFeature(String id, String version) {
+		return new Feature(id, version);
+	}
+
+	public void endElement(String uri, String localName, String qName) {
+		if (characters == null)
+			return;
+		if ("description".equals(localName)) { //$NON-NLS-1$
+			result.setDescription(localize(characters.toString().trim()));
+		} else if ("license".equals(localName)) { //$NON-NLS-1$
+			result.setLicense(localize(characters.toString().trim()));
+		} else if ("copyright".equals(localName)) { //$NON-NLS-1$
+			result.setCopyright(localize(characters.toString().trim()));
+		}
+		characters = null;
+	}
+
+	public Feature getResult() {
+		return result;
+	}
+
+	private String localize(String value) {
+		if (value != null && value.startsWith("%")) { //$NON-NLS-1$
+			String key = value.substring(1);
+			messageKeys.add(key);
+		}
+		return value;
+	}
+
+	/**
+	 * Parse the given input stream and return a feature object
+	 * or null.
+	 */
+	public Feature parse(InputStream in) {
+		messageKeys = new ArrayList();
+		result = null;
+		try {
+			parser.parse(new InputSource(in), this);
+		} catch (SAXException e) {
+			e.printStackTrace();
+		} catch (IOException e) {
+			e.printStackTrace();
+		}
+		return result;
+	}
+
+	public List getMessageKeys() {
+		return messageKeys;
+	}
+
+	private void processCopyright(Attributes attributes) {
+		result.setCopyrightURL(attributes.getValue("url")); //$NON-NLS-1$
+		characters = new StringBuffer();
+	}
+
+	private void processDescription(Attributes attributes) {
+		result.setDescriptionURL(attributes.getValue("url")); //$NON-NLS-1$
+		characters = new StringBuffer();
+	}
+
+	private void processDiscoverySite(Attributes attributes) {
+		//ignore discovery sites of type 'web'
+		if ("web".equals(attributes.getValue("type"))) //$NON-NLS-1$ //$NON-NLS-2$
+			return;
+		result.addDiscoverySite(attributes.getValue("label"), attributes.getValue("url")); //$NON-NLS-1$ //$NON-NLS-2$
+	}
+
+	protected void processFeature(Attributes attributes) {
+		String id = attributes.getValue("id"); //$NON-NLS-1$
+		String ver = attributes.getValue("version"); //$NON-NLS-1$
+
+		if (id == null || id.trim().equals("") //$NON-NLS-1$
+				|| ver == null || ver.trim().equals("")) { //$NON-NLS-1$
+			//			System.out.println(NLS.bind(Messages.FeatureParser_IdOrVersionInvalid, (new String[] { id, ver})));
+		} else {
+			result = createFeature(id, ver);
+
+			String os = attributes.getValue("os"); //$NON-NLS-1$
+			String ws = attributes.getValue("ws"); //$NON-NLS-1$
+			String nl = attributes.getValue("nl"); //$NON-NLS-1$
+			String arch = attributes.getValue("arch"); //$NON-NLS-1$
+			result.setEnvironment(os, ws, arch, nl);
+
+			result.setApplication(attributes.getValue("application")); //$NON-NLS-1$
+			result.setPlugin(attributes.getValue("plugin")); //$NON-NLS-1$
+			result.setExclusive(Boolean.valueOf(attributes.getValue("exclusive")).booleanValue()); //$NON-NLS-1$
+			result.setPrimary(Boolean.valueOf(attributes.getValue("primary")).booleanValue()); //$NON-NLS-1$
+			result.setColocationAffinity(attributes.getValue("colocation-affinity")); //$NON-NLS-1$
+
+			//TODO rootURLs
+			if (url != null && "file".equals(url.getProtocol())) { //$NON-NLS-1$
+				File f = new File(url.getFile().replace('/', File.separatorChar));
+				result.setURL("features" + "/" + f.getParentFile().getName() + "/");// + f.getName()); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+			} else {
+				// externalized URLs might be in relative form, ensure they are absolute				
+				//				feature.setURL(Utils.makeAbsolute(Utils.getInstallURL(), url).toExternalForm());
+			}
+
+			result.setProviderName(localize(attributes.getValue("provider-name"))); //$NON-NLS-1$
+			result.setLabel(localize(attributes.getValue("label"))); //$NON-NLS-1$
+			result.setImage(attributes.getValue("image")); //$NON-NLS-1$
+
+			//			Utils.debug("End process DefaultFeature tag: id:" +id + " ver:" +ver + " url:" + feature.getURL()); 	 //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+		}
+	}
+
+	private void processImport(Attributes attributes) {
+		String id = attributes.getValue("feature"); //$NON-NLS-1$
+		FeatureEntry entry = null;
+		if (id != null) {
+			if ("true".equalsIgnoreCase(attributes.getValue("patch"))) { //$NON-NLS-1$ //$NON-NLS-2$
+				entry = FeatureEntry.createRequires(id, attributes.getValue("version"), "perfect", attributes.getValue("filter"), false); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				entry.setPatch(true);
+			} else {
+				entry = FeatureEntry.createRequires(id, attributes.getValue("version"), attributes.getValue("match"), attributes.getValue("filter"), false); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+			}
+		} else {
+			id = attributes.getValue("plugin"); //$NON-NLS-1$
+			entry = FeatureEntry.createRequires(id, attributes.getValue("version"), attributes.getValue("match"), attributes.getValue("filter"), true); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+		}
+		result.addEntry(entry);
+	}
+
+	private void processIncludes(Attributes attributes) {
+		FeatureEntry entry = new FeatureEntry(attributes.getValue("id"), attributes.getValue("version"), false); //$NON-NLS-1$ //$NON-NLS-2$
+		String flag = attributes.getValue("optional"); //$NON-NLS-1$
+		if (flag != null)
+			entry.setOptional(Boolean.valueOf(flag).booleanValue());
+		setEnvironment(attributes, entry);
+		result.addEntry(entry);
+	}
+
+	private void processInstallHandler(Attributes attributes) {
+		result.setInstallHandler(attributes.getValue("handler")); //$NON-NLS-1$
+		result.setInstallHandlerLibrary(attributes.getValue("library")); //$NON-NLS-1$
+		result.setInstallHandlerURL(attributes.getValue("url")); //$NON-NLS-1$
+	}
+
+	private void processLicense(Attributes attributes) {
+		result.setLicenseURL(attributes.getValue("url")); //$NON-NLS-1$
+		characters = new StringBuffer();
+	}
+
+	private void processPlugin(Attributes attributes) {
+		String id = attributes.getValue("id"); //$NON-NLS-1$
+		String version = attributes.getValue("version"); //$NON-NLS-1$
+
+		if (id == null || id.trim().equals("") || version == null || version.trim().equals("")) { //$NON-NLS-1$ //$NON-NLS-2$
+			System.out.println(NLS.bind("FeatureParser#processPlugin, ID {0} or version {1} invalid", (new String[] {id, version}))); //$NON-NLS-1$
+		} else {
+			FeatureEntry plugin = new FeatureEntry(id, version, true);
+			setEnvironment(attributes, plugin);
+			String unpack = attributes.getValue("unpack"); //$NON-NLS-1$
+			if (unpack != null)
+				plugin.setUnpack(Boolean.valueOf(unpack).booleanValue());
+			String fragment = attributes.getValue("fragment"); //$NON-NLS-1$
+			if (fragment != null)
+				plugin.setFragment(Boolean.valueOf(fragment).booleanValue());
+			String filter = attributes.getValue("filter"); //$NON-NLS-1$
+			if (filter != null)
+				plugin.setFilter(filter);
+			result.addEntry(plugin);
+
+			//			Utils.debug("End process DefaultFeature tag: id:" + id + " ver:" + ver + " url:" + feature.getURL()); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+		}
+	}
+
+	private void processUpdateSite(Attributes attributes) {
+		result.setUpdateSiteLabel(attributes.getValue("label")); //$NON-NLS-1$
+		result.setUpdateSiteURL(attributes.getValue("url")); //$NON-NLS-1$
+	}
+
+	private void setEnvironment(Attributes attributes, FeatureEntry entry) {
+		String os = attributes.getValue("os"); //$NON-NLS-1$
+		String ws = attributes.getValue("ws"); //$NON-NLS-1$
+		String nl = attributes.getValue("nl"); //$NON-NLS-1$
+		String arch = attributes.getValue("arch"); //$NON-NLS-1$
+		entry.setEnvironment(os, ws, arch, nl);
+	}
+
+	public void startElement(String uri, String localName, String qName, Attributes attributes) {
+		//		Utils.debug("Start Element: uri:" + uri + " local Name:" + localName + " qName:" + qName); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+		if ("plugin".equals(localName)) { //$NON-NLS-1$
+			processPlugin(attributes);
+		} else if ("description".equals(localName)) { //$NON-NLS-1$
+			processDescription(attributes);
+		} else if ("license".equals(localName)) { //$NON-NLS-1$
+			processLicense(attributes);
+		} else if ("copyright".equals(localName)) { //$NON-NLS-1$
+			processCopyright(attributes);
+		} else if ("feature".equals(localName)) { //$NON-NLS-1$
+			processFeature(attributes);
+		} else if ("import".equals(localName)) { //$NON-NLS-1$
+			processImport(attributes);
+		} else if ("includes".equals(localName)) { //$NON-NLS-1$
+			processIncludes(attributes);
+		} else if ("install-handler".equals(localName)) { //$NON-NLS-1$
+			processInstallHandler(attributes);
+		} else if ("update".equals(localName)) { //$NON-NLS-1$
+			processUpdateSite(attributes);
+		} else if ("discovery".equals(localName)) { //$NON-NLS-1$
+			processDiscoverySite(attributes);
+		}
+	}
+
+}
diff --git a/bundles/org.eclipse.equinox.p2.publisher/src/org/eclipse/equinox/internal/p2/publisher/eclipse/FeatureParser.java b/bundles/org.eclipse.equinox.p2.publisher/src/org/eclipse/equinox/internal/p2/publisher/eclipse/FeatureParser.java
index 1cba2c175..47a802066 100644
--- a/bundles/org.eclipse.equinox.p2.publisher/src/org/eclipse/equinox/internal/p2/publisher/eclipse/FeatureParser.java
+++ b/bundles/org.eclipse.equinox.p2.publisher/src/org/eclipse/equinox/internal/p2/publisher/eclipse/FeatureParser.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2008 IBM Corporation and others.
+ * Copyright (c) 2000, 2009 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
@@ -7,132 +7,29 @@
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
+ *     Cloudsmith Inc - split into FeatureParser and FeatureManifestParser
  *******************************************************************************/
 package org.eclipse.equinox.internal.p2.publisher.eclipse;
 
 import java.io.*;
-import java.net.URL;
-import java.util.*;
+import java.util.List;
 import java.util.jar.JarEntry;
 import java.util.jar.JarFile;
-import javax.xml.parsers.*;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
 import org.eclipse.equinox.internal.p2.core.helpers.LogHelper;
 import org.eclipse.equinox.internal.p2.publisher.Activator;
 import org.eclipse.equinox.p2.publisher.eclipse.Feature;
-import org.eclipse.equinox.p2.publisher.eclipse.FeatureEntry;
 import org.eclipse.equinox.spi.p2.publisher.LocalizationHelper;
-import org.eclipse.osgi.util.NLS;
-import org.xml.sax.*;
 import org.xml.sax.helpers.DefaultHandler;
 
 /**
- * Default feature parser.
- * Parses the feature manifest file as defined by the platform.
- * 
- * @since 3.0
+ * The publisher feature parser. This class parses a feature either in jar or folder
+ * form. Feature localization data (feature.properties) is also processed here.
  */
 public class FeatureParser extends DefaultHandler {
 
-	private final static SAXParserFactory parserFactory = SAXParserFactory.newInstance();
-	private SAXParser parser;
-	protected Feature result;
-	private URL url;
-	private StringBuffer characters = null;
-
-	private Properties messages = null;
-	private List messageKeys = null;
-
-	public FeatureParser() {
-		this(true);
-	}
-
-	public FeatureParser(boolean createParser) {
-		super();
-		if (!createParser)
-			return;
-		try {
-			parserFactory.setNamespaceAware(true);
-			this.parser = parserFactory.newSAXParser();
-		} catch (ParserConfigurationException e) {
-			System.out.println(e);
-		} catch (SAXException e) {
-			System.out.println(e);
-		}
-	}
-
-	public void characters(char[] ch, int start, int length) throws SAXException {
-		if (characters == null)
-			return;
-		characters.append(ch, start, length);
-	}
-
-	protected Feature createFeature(String id, String version) {
-		return new Feature(id, version);
-	}
-
-	public void endElement(String uri, String localName, String qName) throws SAXException {
-		if (characters == null)
-			return;
-		if ("description".equals(localName)) { //$NON-NLS-1$
-			result.setDescription(localize(characters.toString().trim()));
-		} else if ("license".equals(localName)) { //$NON-NLS-1$
-			result.setLicense(localize(characters.toString().trim()));
-		} else if ("copyright".equals(localName)) { //$NON-NLS-1$
-			result.setCopyright(localize(characters.toString().trim()));
-		}
-		characters = null;
-	}
-
-	public Feature getResult() {
-		return result;
-	}
-
-	private void loadProperties(File directory, Properties properties) {
-		//skip directories that don't contain a feature.properties file
-		File file = new File(directory, "feature.properties"); //$NON-NLS-1$
-		if (!file.exists())
-			return;
-		try {
-			InputStream input = new BufferedInputStream(new FileInputStream(file));
-			try {
-				properties.load(input);
-			} finally {
-				if (input != null)
-					input.close();
-			}
-		} catch (IOException e) {
-			e.printStackTrace();
-		}
-	}
-
-	private void loadProperties(JarFile jar, Properties properties) {
-		JarEntry entry = jar.getJarEntry("feature.properties"); //$NON-NLS-1$
-		if (entry == null)
-			return;
-		try {
-			InputStream input = new BufferedInputStream(jar.getInputStream(entry));
-			try {
-				properties.load(input);
-			} finally {
-				if (input != null)
-					input.close();
-			}
-		} catch (IOException e) {
-			e.printStackTrace();
-		}
-	}
-
-	private String localize(String value) {
-		if (messages == null || value == null)
-			return value;
-		if (!value.startsWith("%")) //$NON-NLS-1$
-			return value;
-		String key = value.substring(1);
-		messageKeys.add(key);
-		return value;
-	}
+	private FeatureManifestParser parser = new FeatureManifestParser();
 
 	/**
 	 * Parses the specified location and constructs a feature. The given location 
@@ -146,35 +43,40 @@ public class FeatureParser extends DefaultHandler {
 			return null;
 
 		Feature feature = null;
-		Properties properties = new Properties();
-
 		if (location.isDirectory()) {
 			//skip directories that don't contain a feature.xml file
 			File file = new File(location, "feature.xml"); //$NON-NLS-1$
-			if (!file.exists())
-				return null;
-			loadProperties(location, properties);
+			InputStream input = null;
 			try {
-				InputStream input = new BufferedInputStream(new FileInputStream(file));
-				feature = parse(input, properties);
+				input = new BufferedInputStream(new FileInputStream(file));
+				feature = parser.parse(input);
 				if (feature != null) {
+					List messageKeys = parser.getMessageKeys();
 					String[] keyStrings = (String[]) messageKeys.toArray(new String[messageKeys.size()]);
 					feature.setLocalizations(LocalizationHelper.getDirPropertyLocalizations(location, "feature", null, keyStrings)); //$NON-NLS-1$
 				}
 			} catch (FileNotFoundException e) {
-				e.printStackTrace();
+				return null;
+			} finally {
+				if (input != null)
+					try {
+						input.close();
+					} catch (IOException e) {
+						//
+					}
 			}
 		} else if (location.getName().endsWith(".jar")) { //$NON-NLS-1$
 			JarFile jar = null;
 			try {
 				jar = new JarFile(location);
-				loadProperties(jar, properties);
 				JarEntry entry = jar.getJarEntry("feature.xml"); //$NON-NLS-1$
 				if (entry == null)
 					return null;
+
 				InputStream input = new BufferedInputStream(jar.getInputStream(entry));
-				feature = parse(input, properties);
+				feature = parser.parse(input);
 				if (feature != null) {
+					List messageKeys = parser.getMessageKeys();
 					String[] keyStrings = (String[]) messageKeys.toArray(new String[messageKeys.size()]);
 					feature.setLocalizations(LocalizationHelper.getJarPropertyLocalizations(location, "feature", null, keyStrings)); //$NON-NLS-1$
 				}
@@ -193,184 +95,4 @@ public class FeatureParser extends DefaultHandler {
 		}
 		return feature;
 	}
-
-	/**
-	 * Parse the given input stream and return a feature object
-	 * or null. This method closes the input stream.
-	 */
-	public Feature parse(InputStream in, Properties messages) {
-		this.messages = messages;
-		this.messageKeys = new ArrayList(messages.size());
-		result = null;
-		try {
-			parser.parse(new InputSource(in), this);
-		} catch (SAXException e) {
-			e.printStackTrace();
-		} catch (IOException e) {
-			e.printStackTrace();
-		} finally {
-			try {
-				in.close();
-			} catch (IOException e1) {
-				//					Utils.log(e1.getLocalizedMessage());
-			}
-		}
-		return result;
-	}
-
-	private void processCopyright(Attributes attributes) {
-		result.setCopyrightURL(attributes.getValue("url")); //$NON-NLS-1$
-		characters = new StringBuffer();
-	}
-
-	private void processDescription(Attributes attributes) {
-		result.setDescriptionURL(attributes.getValue("url")); //$NON-NLS-1$
-		characters = new StringBuffer();
-	}
-
-	private void processDiscoverySite(Attributes attributes) {
-		//ignore discovery sites of type 'web'
-		if ("web".equals(attributes.getValue("type"))) //$NON-NLS-1$ //$NON-NLS-2$
-			return;
-		result.addDiscoverySite(attributes.getValue("label"), attributes.getValue("url")); //$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	protected void processFeature(Attributes attributes) {
-		String id = attributes.getValue("id"); //$NON-NLS-1$
-		String ver = attributes.getValue("version"); //$NON-NLS-1$
-
-		if (id == null || id.trim().equals("") //$NON-NLS-1$
-				|| ver == null || ver.trim().equals("")) { //$NON-NLS-1$
-			//			System.out.println(NLS.bind(Messages.FeatureParser_IdOrVersionInvalid, (new String[] { id, ver})));
-		} else {
-			result = createFeature(id, ver);
-
-			String os = attributes.getValue("os"); //$NON-NLS-1$
-			String ws = attributes.getValue("ws"); //$NON-NLS-1$
-			String nl = attributes.getValue("nl"); //$NON-NLS-1$
-			String arch = attributes.getValue("arch"); //$NON-NLS-1$
-			result.setEnvironment(os, ws, arch, nl);
-
-			result.setApplication(attributes.getValue("application")); //$NON-NLS-1$
-			result.setPlugin(attributes.getValue("plugin")); //$NON-NLS-1$
-			result.setExclusive(Boolean.valueOf(attributes.getValue("exclusive")).booleanValue()); //$NON-NLS-1$
-			result.setPrimary(Boolean.valueOf(attributes.getValue("primary")).booleanValue()); //$NON-NLS-1$
-			result.setColocationAffinity(attributes.getValue("colocation-affinity")); //$NON-NLS-1$
-
-			//TODO rootURLs
-			if (url != null && "file".equals(url.getProtocol())) { //$NON-NLS-1$
-				File f = new File(url.getFile().replace('/', File.separatorChar));
-				result.setURL("features" + "/" + f.getParentFile().getName() + "/");// + f.getName()); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-			} else {
-				// externalized URLs might be in relative form, ensure they are absolute				
-				//				feature.setURL(Utils.makeAbsolute(Utils.getInstallURL(), url).toExternalForm());
-			}
-
-			result.setProviderName(localize(attributes.getValue("provider-name"))); //$NON-NLS-1$
-			result.setLabel(localize(attributes.getValue("label"))); //$NON-NLS-1$
-			result.setImage(attributes.getValue("image")); //$NON-NLS-1$
-
-			//			Utils.debug("End process DefaultFeature tag: id:" +id + " ver:" +ver + " url:" + feature.getURL()); 	 //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-		}
-	}
-
-	private void processImport(Attributes attributes) {
-		String id = attributes.getValue("feature"); //$NON-NLS-1$
-		FeatureEntry entry = null;
-		if (id != null) {
-			if ("true".equalsIgnoreCase(attributes.getValue("patch"))) { //$NON-NLS-1$ //$NON-NLS-2$
-				entry = FeatureEntry.createRequires(id, attributes.getValue("version"), "perfect", attributes.getValue("filter"), false); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-				entry.setPatch(true);
-			} else {
-				entry = FeatureEntry.createRequires(id, attributes.getValue("version"), attributes.getValue("match"), attributes.getValue("filter"), false); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-			}
-		} else {
-			id = attributes.getValue("plugin"); //$NON-NLS-1$
-			entry = FeatureEntry.createRequires(id, attributes.getValue("version"), attributes.getValue("match"), attributes.getValue("filter"), true); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-		}
-		result.addEntry(entry);
-	}
-
-	private void processIncludes(Attributes attributes) {
-		FeatureEntry entry = new FeatureEntry(attributes.getValue("id"), attributes.getValue("version"), false); //$NON-NLS-1$ //$NON-NLS-2$
-		String flag = attributes.getValue("optional"); //$NON-NLS-1$
-		if (flag != null)
-			entry.setOptional(Boolean.valueOf(flag).booleanValue());
-		setEnvironment(attributes, entry);
-		result.addEntry(entry);
-	}
-
-	private void processInstallHandler(Attributes attributes) {
-		result.setInstallHandler(attributes.getValue("handler")); //$NON-NLS-1$
-		result.setInstallHandlerLibrary(attributes.getValue("library")); //$NON-NLS-1$
-		result.setInstallHandlerURL(attributes.getValue("url")); //$NON-NLS-1$
-	}
-
-	private void processLicense(Attributes attributes) {
-		result.setLicenseURL(attributes.getValue("url")); //$NON-NLS-1$
-		characters = new StringBuffer();
-	}
-
-	private void processPlugin(Attributes attributes) {
-		String id = attributes.getValue("id"); //$NON-NLS-1$
-		String version = attributes.getValue("version"); //$NON-NLS-1$
-
-		if (id == null || id.trim().equals("") || version == null || version.trim().equals("")) { //$NON-NLS-1$ //$NON-NLS-2$
-			System.out.println(NLS.bind("FeatureParser#processPlugin, ID {0} or version {1} invalid", (new String[] {id, version}))); //$NON-NLS-1$
-		} else {
-			FeatureEntry plugin = new FeatureEntry(id, version, true);
-			setEnvironment(attributes, plugin);
-			String unpack = attributes.getValue("unpack"); //$NON-NLS-1$
-			if (unpack != null)
-				plugin.setUnpack(Boolean.valueOf(unpack).booleanValue());
-			String fragment = attributes.getValue("fragment"); //$NON-NLS-1$
-			if (fragment != null)
-				plugin.setFragment(Boolean.valueOf(fragment).booleanValue());
-			String filter = attributes.getValue("filter"); //$NON-NLS-1$
-			if (filter != null)
-				plugin.setFilter(filter);
-			result.addEntry(plugin);
-
-			//			Utils.debug("End process DefaultFeature tag: id:" + id + " ver:" + ver + " url:" + feature.getURL()); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-		}
-	}
-
-	private void processUpdateSite(Attributes attributes) {
-		result.setUpdateSiteLabel(attributes.getValue("label")); //$NON-NLS-1$
-		result.setUpdateSiteURL(attributes.getValue("url")); //$NON-NLS-1$
-	}
-
-	private void setEnvironment(Attributes attributes, FeatureEntry entry) {
-		String os = attributes.getValue("os"); //$NON-NLS-1$
-		String ws = attributes.getValue("ws"); //$NON-NLS-1$
-		String nl = attributes.getValue("nl"); //$NON-NLS-1$
-		String arch = attributes.getValue("arch"); //$NON-NLS-1$
-		entry.setEnvironment(os, ws, arch, nl);
-	}
-
-	public void startElement(String uri, String localName, String qName, Attributes attributes) throws SAXException {
-		//		Utils.debug("Start Element: uri:" + uri + " local Name:" + localName + " qName:" + qName); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-		if ("plugin".equals(localName)) { //$NON-NLS-1$
-			processPlugin(attributes);
-		} else if ("description".equals(localName)) { //$NON-NLS-1$
-			processDescription(attributes);
-		} else if ("license".equals(localName)) { //$NON-NLS-1$
-			processLicense(attributes);
-		} else if ("copyright".equals(localName)) { //$NON-NLS-1$
-			processCopyright(attributes);
-		} else if ("feature".equals(localName)) { //$NON-NLS-1$
-			processFeature(attributes);
-		} else if ("import".equals(localName)) { //$NON-NLS-1$
-			processImport(attributes);
-		} else if ("includes".equals(localName)) { //$NON-NLS-1$
-			processIncludes(attributes);
-		} else if ("install-handler".equals(localName)) { //$NON-NLS-1$
-			processInstallHandler(attributes);
-		} else if ("update".equals(localName)) { //$NON-NLS-1$
-			processUpdateSite(attributes);
-		} else if ("discovery".equals(localName)) { //$NON-NLS-1$
-			processDiscoverySite(attributes);
-		}
-	}
-
 }
diff --git a/bundles/org.eclipse.equinox.p2.updatesite/src/org/eclipse/equinox/internal/p2/updatesite/DigestParser.java b/bundles/org.eclipse.equinox.p2.updatesite/src/org/eclipse/equinox/internal/p2/updatesite/DigestParser.java
index 1cd510648..aec557a6a 100644
--- a/bundles/org.eclipse.equinox.p2.updatesite/src/org/eclipse/equinox/internal/p2/updatesite/DigestParser.java
+++ b/bundles/org.eclipse.equinox.p2.updatesite/src/org/eclipse/equinox/internal/p2/updatesite/DigestParser.java
@@ -19,7 +19,7 @@ import javax.xml.parsers.*;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
 import org.eclipse.equinox.internal.p2.core.helpers.LogHelper;
-import org.eclipse.equinox.internal.p2.publisher.eclipse.FeatureParser;
+import org.eclipse.equinox.internal.p2.publisher.eclipse.FeatureManifestParser;
 import org.eclipse.equinox.p2.publisher.eclipse.Feature;
 import org.eclipse.osgi.util.NLS;
 import org.xml.sax.*;
@@ -36,7 +36,7 @@ public class DigestParser extends DefaultHandler {
 	private final static SAXParserFactory parserFactory = SAXParserFactory.newInstance();
 	private SAXParser parser;
 	private final List features = new ArrayList();
-	private final FeatureParser featureHandler = new FeatureParser(false);
+	private final FeatureManifestParser featureHandler = new FeatureManifestParser(false);
 
 	public DigestParser() {
 		super();