This commit was manufactured by cvs2svn to create tag 'v200907030310'.
diff --git a/bundles/org.eclipse.wst.xml.xpath.core/.classpath b/bundles/org.eclipse.wst.xml.xpath.core/.classpath
deleted file mode 100644
index 46df406..0000000
--- a/bundles/org.eclipse.wst.xml.xpath.core/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-  <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/bundles/org.eclipse.wst.xml.xpath.core/.project b/bundles/org.eclipse.wst.xml.xpath.core/.project
deleted file mode 100644
index 0b90c1f..0000000
--- a/bundles/org.eclipse.wst.xml.xpath.core/.project
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.wst.xml.xpath.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>
-		<buildCommand>
-			<name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
-	</natures>
-</projectDescription>
diff --git a/bundles/org.eclipse.wst.xml.xpath.core/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.wst.xml.xpath.core/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 44db239..0000000
--- a/bundles/org.eclipse.wst.xml.xpath.core/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,7 +0,0 @@
-#Tue Apr 22 15:22:05 GMT-05:00 2008
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5
diff --git a/bundles/org.eclipse.wst.xml.xpath.core/META-INF/MANIFEST.MF b/bundles/org.eclipse.wst.xml.xpath.core/META-INF/MANIFEST.MF
deleted file mode 100644
index 6ce3af6..0000000
--- a/bundles/org.eclipse.wst.xml.xpath.core/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,19 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.wst.xml.xpath.core; singleton:=true
-Bundle-Version: 1.0.0.qualifier
-Bundle-ClassPath: .
-Bundle-Vendor: %providerName
-Bundle-Localization: plugin
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Export-Package: org.eclipse.wst.xml.xpath.core;uses:="org.osgi.framework,org.eclipse.core.runtime",
- org.eclipse.wst.xml.xpath.core.util;
-  uses:="org.apache.xml.utils,
-   org.w3c.dom.traversal,
-   org.apache.xpath.objects,
-   org.w3c.dom,
-   org.apache.xpath.compiler"
-Require-Bundle: org.eclipse.core.runtime.compatibility;bundle-version="[3.2.0,4.0.0)",
- org.apache.xalan;bundle-version="[2.7.1,2.8.0)",
- org.eclipse.wst.xml.xpath2.processor;bundle-version="[1.0.0,2.0.0)"
diff --git a/bundles/org.eclipse.wst.xml.xpath.core/about.html b/bundles/org.eclipse.wst.xml.xpath.core/about.html
deleted file mode 100644
index 2199df3..0000000
--- a/bundles/org.eclipse.wst.xml.xpath.core/about.html
+++ /dev/null
@@ -1,34 +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">
-
-<H3>About This Content</H3>
-
-<P>June, 2008</P>
-
-<H3>License</H3>
-
-<P>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
-<A href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</A>. 
-For purposes of the EPL, "Program" will mean the Content.</P>
-
-<P>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
-<A href="http://www.eclipse.org/">http://www.eclipse.org/</A>.</P>
-
-</BODY>
-</HTML>
diff --git a/bundles/org.eclipse.wst.xml.xpath.core/build.properties b/bundles/org.eclipse.wst.xml.xpath.core/build.properties
deleted file mode 100644
index 5c3c31f..0000000
--- a/bundles/org.eclipse.wst.xml.xpath.core/build.properties
+++ /dev/null
@@ -1,23 +0,0 @@
-#  Copyright (c) 2008 Standards for Technology in Automotive Retail 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:
-#      David Carver - initial API and implementation
-#
-# $Id: build.properties,v 1.7 2008/10/18 03:27:13 david_williams Exp $
-
-bin.includes = .,\
-               META-INF/,\
-               plugin.properties,\
-               bin/,\
-               about.html
-jars.compile.order = .
-source.. = src/
-output.. = bin/
-src.includes = src/,\
-               META-INF/,\
-               build.properties,\
-               plugin.properties,\
diff --git a/bundles/org.eclipse.wst.xml.xpath.core/plugin.properties b/bundles/org.eclipse.wst.xml.xpath.core/plugin.properties
deleted file mode 100644
index 6e29267..0000000
--- a/bundles/org.eclipse.wst.xml.xpath.core/plugin.properties
+++ /dev/null
@@ -1,25 +0,0 @@
-#  Copyright (c) 2008 Standards for Technology in Automotive Retail 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:
-#      David Carver - initial API and implementation
-#
-# $Id: plugin.properties,v 1.3 2009/04/24 03:33:53 dacarver Exp $
-
-# ====================================================================
-# To code developer:
-#   Do NOT change the properties between this line and the
-#   "%%% END OF TRANSLATED PROPERTIES %%%" line.
-#   Make a new property name, append to the end of the file and change
-#   the code to use the new property.
-# ====================================================================
-
-# ====================================================================
-# %%% END OF TRANSLATED PROPERTIES %%%
-# ====================================================================
-
-pluginName = XPath Core
-providerName = Eclipse.org
diff --git a/bundles/org.eclipse.wst.xml.xpath.core/src/org/eclipse/wst/xml/xpath/core/XPathCorePlugin.java b/bundles/org.eclipse.wst.xml.xpath.core/src/org/eclipse/wst/xml/xpath/core/XPathCorePlugin.java
deleted file mode 100644
index a9341da..0000000
--- a/bundles/org.eclipse.wst.xml.xpath.core/src/org/eclipse/wst/xml/xpath/core/XPathCorePlugin.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Standards for Technology in Automotive Retail 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:
- *     David Carver (STAR) - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.xml.xpath.core;
-
-import org.eclipse.core.runtime.Plugin;
-import org.osgi.framework.BundleContext;
-
-/**
- * The activator class controls the plug-in life cycle
- */
-public class XPathCorePlugin extends Plugin {
-
-	// The plug-in ID
-	public static final String PLUGIN_ID = "org.eclipse.wst.xml.xpath.core";
-
-	// The shared instance
-	private static XPathCorePlugin plugin;
-	
-	/**
-	 * The constructor
-	 */
-	public XPathCorePlugin() {
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.core.runtime.Plugins#start(org.osgi.framework.BundleContext)
-	 */
-	@Override
-	public void start(BundleContext context) throws Exception {
-		super.start(context);
-		plugin = this;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.core.runtime.Plugin#stop(org.osgi.framework.BundleContext)
-	 */
-	@Override
-	public void stop(BundleContext context) throws Exception {
-		plugin = null;
-		super.stop(context);
-	}
-
-	/**
-	 * Returns the shared instance
-	 *
-	 * @return the shared instance
-	 */
-	public static XPathCorePlugin getDefault() {
-		return plugin;
-	}
-
-}
diff --git a/bundles/org.eclipse.wst.xml.xpath.core/src/org/eclipse/wst/xml/xpath/core/util/XPath20Helper.java b/bundles/org.eclipse.wst.xml.xpath.core/src/org/eclipse/wst/xml/xpath/core/util/XPath20Helper.java
deleted file mode 100644
index e099816..0000000
--- a/bundles/org.eclipse.wst.xml.xpath.core/src/org/eclipse/wst/xml/xpath/core/util/XPath20Helper.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Standards for Technology in Automotive Retail 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:
- *     David Carver (STAR) - bug 226245 - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xml.xpath.core.util;
-
-import javax.xml.xpath.XPathExpressionException;
-
-import org.eclipse.wst.xml.xpath2.processor.JFlexCupParser;
-import org.eclipse.wst.xml.xpath2.processor.XPathParser;
-import org.eclipse.wst.xml.xpath2.processor.XPathParserException;
-
-/**
- * @since 1.0
- */
-public class XPath20Helper {
-
-	public XPath20Helper() {
-	}
-	
-	public static void compile(String xpathExp) throws XPathExpressionException {
-		try {
-			XPathParser xpathParser = new JFlexCupParser();
-			xpathParser.parse(xpathExp);
-		} catch (XPathParserException ex) {
-			throw new XPathExpressionException(ex.getMessage());
-		}
-	}
-
-}
diff --git a/bundles/org.eclipse.wst.xml.xpath.core/src/org/eclipse/wst/xml/xpath/core/util/XSLTXPathHelper.java b/bundles/org.eclipse.wst.xml.xpath.core/src/org/eclipse/wst/xml/xpath/core/util/XSLTXPathHelper.java
deleted file mode 100644
index 4da3a15..0000000
--- a/bundles/org.eclipse.wst.xml.xpath.core/src/org/eclipse/wst/xml/xpath/core/util/XSLTXPathHelper.java
+++ /dev/null
@@ -1,370 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Standards for Technology in Automotive Retail 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:
- *     David Carver (STAR) - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.xml.xpath.core.util;
-
-import javax.xml.transform.TransformerException;
-import javax.xml.xpath.XPathExpressionException;
-
-import org.apache.xml.utils.PrefixResolver;
-import org.apache.xml.utils.PrefixResolverDefault;
-import org.apache.xpath.XPath;
-import org.apache.xpath.XPathContext;
-import org.apache.xpath.compiler.FunctionTable;
-import org.apache.xpath.objects.XObject;
-import org.w3c.dom.Attr;
-import org.w3c.dom.Document;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import org.w3c.dom.traversal.NodeIterator;
-
-public class XSLTXPathHelper {
-	
-
-	/**
-	 * Use an XPath string to select a single node. XPath namespace prefixes are
-	 * resolved from the context node, which may not be what you want (see the
-	 * next method).
-	 * 
-	 * @param contextNode
-	 *            The node to start searching from.
-	 * @param str
-	 *            A valid XPath string.
-	 * @return The first node found that matches the XPath, or null.
-	 * 
-	 * @throws TransformerException
-	 */
-	public static Node selectSingleNode(Node contextNode, String str)
-			throws TransformerException {
-		return selectSingleNode(contextNode, str, contextNode);
-	}
-
-	/**
-	 * Use an XPath string to select a single node. XPath namespace prefixes are
-	 * resolved from the namespaceNode.
-	 * 
-	 * @param contextNode
-	 *            The node to start searching from.
-	 * @param str
-	 *            A valid XPath string.
-	 * @param namespaceNode
-	 *            The node from which prefixes in the XPath will be resolved to
-	 *            namespaces.
-	 * @return The first node found that matches the XPath, or null.
-	 * 
-	 * @throws TransformerException
-	 */
-	public static Node selectSingleNode(Node contextNode, String str,
-			Node namespaceNode) throws TransformerException {
-
-		// Have the XObject return its result as a NodeSetDTM.
-		NodeIterator nl = selectNodeIterator(contextNode, str, namespaceNode);
-
-		// Return the first node, or null
-		return nl.nextNode();
-	}
-
-	/**
-	 * Use an XPath string to select a nodelist. XPath namespace prefixes are
-	 * resolved from the contextNode.
-	 * 
-	 * @param contextNode
-	 *            The node to start searching from.
-	 * @param str
-	 *            A valid XPath string.
-	 * @return A NodeIterator, should never be null.
-	 * 
-	 * @throws TransformerException
-	 */
-	public static NodeIterator selectNodeIterator(Node contextNode, String str)
-			throws TransformerException {
-		return selectNodeIterator(contextNode, str, contextNode);
-	}
-
-	/**
-	 * Use an XPath string to select a nodelist. XPath namespace prefixes are
-	 * resolved from the namespaceNode.
-	 * 
-	 * @param contextNode
-	 *            The node to start searching from.
-	 * @param str
-	 *            A valid XPath string.
-	 * @param namespaceNode
-	 *            The node from which prefixes in the XPath will be resolved to
-	 *            namespaces.
-	 * @return A NodeIterator, should never be null.
-	 * 
-	 * @throws TransformerException
-	 */
-	public static NodeIterator selectNodeIterator(Node contextNode, String str,
-			Node namespaceNode) throws TransformerException {
-
-		// Execute the XPath, and have it return the result
-		XObject list = eval(contextNode, str, namespaceNode);
-
-		// Have the XObject return its result as a NodeSetDTM.
-		return list.nodeset();
-	}
-
-	/**
-	 * Use an XPath string to select a nodelist. XPath namespace prefixes are
-	 * resolved from the contextNode.
-	 * 
-	 * @param contextNode
-	 *            The node to start searching from.
-	 * @param str
-	 *            A valid XPath string.
-	 * @return A NodeIterator, should never be null.
-	 * 
-	 * @throws TransformerException
-	 */
-	public static NodeList selectNodeList(Node contextNode, String str)
-			throws TransformerException {
-		return selectNodeList(contextNode, str, contextNode);
-	}
-
-	/**
-	 * Use an XPath string to select a nodelist. XPath namespace prefixes are
-	 * resolved from the namespaceNode.
-	 * 
-	 * @param contextNode
-	 *            The node to start searching from.
-	 * @param str
-	 *            A valid XPath string.
-	 * @param namespaceNode
-	 *            The node from which prefixes in the XPath will be resolved to
-	 *            namespaces.
-	 * @return A NodeIterator, should never be null.
-	 * 
-	 * @throws TransformerException
-	 */
-	public static NodeList selectNodeList(Node contextNode, String str,
-			Node namespaceNode) throws TransformerException {
-
-		// Execute the XPath, and have it return the result
-		XObject list = eval(contextNode, str, namespaceNode);
-
-		// Return a NodeList.
-		return list.nodelist();
-	}
-
-	/**
-	 * Evaluate XPath string to an XObject. Using this method, XPath namespace
-	 * prefixes will be resolved from the namespaceNode.
-	 * 
-	 * @param contextNode
-	 *            The node to start searching from.
-	 * @param str
-	 *            A valid XPath string.
-	 * @return An XObject, which can be used to obtain a string, number,
-	 *         nodelist, etc, should never be null.
-	 * @see org.apache.xpath.objects.XObject
-	 * @see org.apache.xpath.objects.XNull
-	 * @see org.apache.xpath.objects.XBoolean
-	 * @see org.apache.xpath.objects.XNumber
-	 * @see org.apache.xpath.objects.XString
-	 * @see org.apache.xpath.objects.XRTreeFrag
-	 * 
-	 * @throws TransformerException
-	 */
-	public static XObject eval(Node contextNode, String str)
-			throws TransformerException {
-		return eval(contextNode, str, contextNode);
-	}
-
-	/**
-	 * Evaluate XPath string to an XObject. XPath namespace prefixes are
-	 * resolved from the namespaceNode. The implementation of this is a little
-	 * slow, since it creates a number of objects each time it is called. This
-	 * could be optimized to keep the same objects around, but then
-	 * thread-safety issues would arise.
-	 * 
-	 * @param contextNode
-	 *            The node to start searching from.
-	 * @param str
-	 *            A valid XPath string.
-	 * @param namespaceNode
-	 *            The node from which prefixes in the XPath will be resolved to
-	 *            namespaces.
-	 * @return An XObject, which can be used to obtain a string, number,
-	 *         nodelist, etc, should never be null.
-	 * @see org.apache.xpath.objects.XObject
-	 * @see org.apache.xpath.objects.XNull
-	 * @see org.apache.xpath.objects.XBoolean
-	 * @see org.apache.xpath.objects.XNumber
-	 * @see org.apache.xpath.objects.XString
-	 * @see org.apache.xpath.objects.XRTreeFrag
-	 * 
-	 * @throws TransformerException
-	 * 
-	 */
-	public static XObject eval(Node contextNode, String str, Node namespaceNode)
-			throws TransformerException {
-
-		// Since we don't have a XML Parser involved here, install some default
-		// support
-		// for things like namespaces, etc.
-		// (Changed from: XPathContext xpathSupport = new XPathContext();
-		// because XPathContext is weak in a number of areas... perhaps
-		// XPathContext should be done away with.)
-		XPathContext xpathSupport = new XPathContext();
-		
-
-		// Create an object to resolve namespace prefixes.
-		// XPath namespaces are resolved from the input context node's document
-		// element
-		// if it is a root node, or else the current context node (for lack of a
-		// better
-		// resolution space, given the simplicity of this sample code).
-		PrefixResolverDefault prefixResolver = new PrefixResolverDefault(
-				(namespaceNode.getNodeType() == Node.DOCUMENT_NODE) ? ((Document) namespaceNode)
-						.getDocumentElement()
-						: namespaceNode);
-
-		// Create the XPath object.
-		XPath xpath = new XPath(str, null, prefixResolver, XPath.SELECT, null, getFunctionTable());
-
-		// Execute the XPath, and have it return the result
-		// return xpath.execute(xpathSupport, contextNode, prefixResolver);
-		int ctxtNode = xpathSupport.getDTMHandleFromNode(contextNode);
-
-		return xpath.execute(xpathSupport, ctxtNode, prefixResolver);
-	}
-
-	/**
-	 * Evaluate XPath string to an XObject. XPath namespace prefixes are
-	 * resolved from the namespaceNode. The implementation of this is a little
-	 * slow, since it creates a number of objects each time it is called. This
-	 * could be optimized to keep the same objects around, but then
-	 * thread-safety issues would arise.
-	 * 
-	 * @param contextNode
-	 *            The node to start searching from.
-	 * @param str
-	 *            A valid XPath string.
-	 * @param prefixResolver
-	 *            Will be called if the parser encounters namespace prefixes, to
-	 *            resolve the prefixes to URLs.
-	 * @return An XObject, which can be used to obtain a string, number,
-	 *         nodelist, etc, should never be null.
-	 * @see org.apache.xpath.objects.XObject
-	 * @see org.apache.xpath.objects.XNull
-	 * @see org.apache.xpath.objects.XBoolean
-	 * @see org.apache.xpath.objects.XNumber
-	 * @see org.apache.xpath.objects.XString
-	 * @see org.apache.xpath.objects.XRTreeFrag
-	 * 
-	 * @throws TransformerException
-	 */
-	public static XObject eval(Node contextNode, String str,
-			PrefixResolver prefixResolver) throws TransformerException {
-
-		// Since we don't have a XML Parser involved here, install some default
-		// support
-		// for things like namespaces, etc.
-		// (Changed from: XPathContext xpathSupport = new XPathContext();
-		// because XPathContext is weak in a number of areas... perhaps
-		// XPathContext should be done away with.)
-		// Create the XPath object.
-		XPath xpath = new XPath(str, null, prefixResolver, XPath.SELECT, null, getFunctionTable());
-
-		// Execute the XPath, and have it return the result
-		XPathContext xpathSupport = new XPathContext();
-		int ctxtNode = xpathSupport.getDTMHandleFromNode(contextNode);
-
-		return xpath.execute(xpathSupport, ctxtNode, prefixResolver);
-	}
-	
-	public static void compile(String expression) throws XPathExpressionException {
-        try {
-            @SuppressWarnings("unused")
-			org.apache.xpath.XPath xpath = new XPath (expression, null,
-                    null, org.apache.xpath.XPath.SELECT, null, getFunctionTable());
-        } catch ( javax.xml.transform.TransformerException te ) {
-            throw new XPathExpressionException ( te ) ;
-        }
-		
-	}
-	
-	protected static FunctionTable getFunctionTable() {
-		FunctionTable functionTable = new FunctionTable();
-		functionTable.installFunction("key", org.apache.xalan.templates.FuncKey.class);
-		functionTable.installFunction("format-number", org.apache.xalan.templates.FuncFormatNumb.class);
-		functionTable.installFunction("document", org.apache.xalan.templates.FuncDocument.class);
-		functionTable.installFunction("element-available", org.apache.xpath.functions.FuncExtElementAvailable.class);
-		functionTable.installFunction("function-available", org.apache.xpath.functions.FuncExtFunctionAvailable.class);
-		functionTable.installFunction("current", org.apache.xpath.functions.FuncCurrent.class);
-		functionTable.installFunction("unparsed-entity-string", org.apache.xpath.functions.FuncUnparsedEntityURI.class);
-		functionTable.installFunction("generate-id", org.apache.xpath.functions.FuncGenerateId.class);
-		functionTable.installFunction("system-property", org.apache.xpath.functions.FuncSystemProperty.class);
-		return functionTable;
-	}
-	
-	/**
-	 * Returns a XPath expression given a DOM Node.
-	 * 
-	 * @param node The DOM Node to create the XPath expression.
-	 * @since 1.0
-	 */
-	public static String calculateXPathToNode(Node node)
-	{
-		StringBuffer sb = new StringBuffer();
-		while (node != null)
-		{
-			switch (node.getNodeType())
-			{
-				case Node.ATTRIBUTE_NODE:
-					sb.insert(0, node.getNodeName());
-					sb.insert(0, "/@"); //$NON-NLS-1$
-					node = ((Attr)node).getOwnerElement();
-					break;
-				case Node.ELEMENT_NODE:
-					Node sibling = node;
-					int position = 1;
-					while ((sibling = sibling.getPreviousSibling()) != null)
-					{
-						if (sibling.getNodeType() == Node.ELEMENT_NODE && sibling.getNodeName().equals(node.getNodeName()))
-						{
-							++position;
-						}
-					}
-					if (position > 1)
-						sb.insert(0, "[" + position + "]"); //$NON-NLS-1$ //$NON-NLS-2$
-					else
-					{
-						sibling = node;
-						boolean following = false;
-						while ((sibling = sibling.getNextSibling()) != null)
-						{
-							if (sibling.getNodeType() == Node.ELEMENT_NODE && sibling.getNodeName().equals(node.getNodeName()))
-							{
-								following = true;
-								break;
-							}
-						}
-						if (following)
-						{
-							sb.insert(0, "[1]"); //$NON-NLS-1$
-						}
-					}
-					sb.insert(0, node.getNodeName());
-					sb.insert(0, "/"); //$NON-NLS-1$
-					node = node.getParentNode();
-					break;
-				default:
-					node = node.getParentNode();
-			}
-		}
-		return sb.toString();
-	}
-	
-
-}
diff --git a/bundles/org.eclipse.wst.xml.xpath.ui/.classpath b/bundles/org.eclipse.wst.xml.xpath.ui/.classpath
deleted file mode 100644
index 814235d..0000000
--- a/bundles/org.eclipse.wst.xml.xpath.ui/.classpath
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="src" path="src-xpath"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/bundles/org.eclipse.wst.xml.xpath.ui/.project b/bundles/org.eclipse.wst.xml.xpath.ui/.project
deleted file mode 100644
index 467a17e..0000000
--- a/bundles/org.eclipse.wst.xml.xpath.ui/.project
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.wst.xml.xpath.ui</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>
-		<buildCommand>
-			<name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
-	</natures>
-</projectDescription>
diff --git a/bundles/org.eclipse.wst.xml.xpath.ui/.settings/org.eclipse.core.resources.prefs b/bundles/org.eclipse.wst.xml.xpath.ui/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index afa5c91..0000000
--- a/bundles/org.eclipse.wst.xml.xpath.ui/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Tue Apr 04 03:36:32 EDT 2006
-eclipse.preferences.version=1
-encoding/<project>=ISO-8859-1
diff --git a/bundles/org.eclipse.wst.xml.xpath.ui/.settings/org.eclipse.core.runtime.prefs b/bundles/org.eclipse.wst.xml.xpath.ui/.settings/org.eclipse.core.runtime.prefs
deleted file mode 100644
index 7ec5750..0000000
--- a/bundles/org.eclipse.wst.xml.xpath.ui/.settings/org.eclipse.core.runtime.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Mon Apr 17 01:48:39 EDT 2006
-eclipse.preferences.version=1
-line.separator=\r\n
diff --git a/bundles/org.eclipse.wst.xml.xpath.ui/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.wst.xml.xpath.ui/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index e5b7578..0000000
--- a/bundles/org.eclipse.wst.xml.xpath.ui/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,74 +0,0 @@
-#Tue Feb 10 05:36:40 GMT 2009
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning
-org.eclipse.jdt.core.compiler.problem.deadCode=warning
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
-org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
-org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled
-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=ignore
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
-org.eclipse.jdt.core.compiler.problem.nullReference=warning
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
-org.eclipse.jdt.core.compiler.problem.rawTypeReference=ignore
-org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore
-org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=ignore
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=warning
-org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
-org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.5
diff --git a/bundles/org.eclipse.wst.xml.xpath.ui/.settings/org.eclipse.jdt.ui.prefs b/bundles/org.eclipse.wst.xml.xpath.ui/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index 702bfe9..0000000
--- a/bundles/org.eclipse.wst.xml.xpath.ui/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,50 +0,0 @@
-#Sun Sep 09 21:59:08 CEST 2007
-cleanup.add_default_serial_version_id=true
-cleanup.add_generated_serial_version_id=false
-cleanup.add_missing_annotations=false
-cleanup.add_missing_deprecated_annotations=true
-cleanup.add_missing_nls_tags=false
-cleanup.add_missing_override_annotations=true
-cleanup.add_serial_version_id=true
-cleanup.always_use_blocks=true
-cleanup.always_use_parentheses_in_expressions=true
-cleanup.always_use_this_for_non_static_field_access=false
-cleanup.always_use_this_for_non_static_method_access=false
-cleanup.convert_to_enhanced_for_loop=false
-cleanup.format_comment=true
-cleanup.format_javadoc=true
-cleanup.format_multi_line_comment=true
-cleanup.format_single_line_comment=true
-cleanup.format_source_code=true
-cleanup.make_local_variable_final=true
-cleanup.make_parameters_final=false
-cleanup.make_private_fields_final=true
-cleanup.make_variable_declarations_final=false
-cleanup.never_use_blocks=false
-cleanup.never_use_parentheses_in_expressions=false
-cleanup.organize_imports=true
-cleanup.qualify_static_field_accesses_with_declaring_class=false
-cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
-cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
-cleanup.qualify_static_member_accesses_with_declaring_class=true
-cleanup.qualify_static_method_accesses_with_declaring_class=false
-cleanup.remove_private_constructors=true
-cleanup.remove_unnecessary_casts=true
-cleanup.remove_unnecessary_nls_tags=true
-cleanup.remove_unused_imports=true
-cleanup.remove_unused_local_variables=false
-cleanup.remove_unused_private_fields=true
-cleanup.remove_unused_private_members=true
-cleanup.remove_unused_private_methods=true
-cleanup.remove_unused_private_types=true
-cleanup.use_blocks=true
-cleanup.use_blocks_only_for_return_and_throw=false
-cleanup.use_parentheses_in_expressions=true
-cleanup.use_this_for_non_static_field_access=false
-cleanup.use_this_for_non_static_field_access_only_if_necessary=true
-cleanup.use_this_for_non_static_method_access=false
-cleanup.use_this_for_non_static_method_access_only_if_necessary=true
-cleanup_profile=_SSE Team Styles
-cleanup_settings_version=2
-eclipse.preferences.version=1
-org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8"?>\r\n<templates/>
diff --git a/bundles/org.eclipse.wst.xml.xpath.ui/.settings/org.eclipse.ltk.core.refactoring.prefs b/bundles/org.eclipse.wst.xml.xpath.ui/.settings/org.eclipse.ltk.core.refactoring.prefs
deleted file mode 100644
index c59368c..0000000
--- a/bundles/org.eclipse.wst.xml.xpath.ui/.settings/org.eclipse.ltk.core.refactoring.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Tue Apr 04 03:36:32 EDT 2006
-eclipse.preferences.version=1
-org.eclipse.ltk.core.refactoring.enable.project.refactoring.history=false
diff --git a/bundles/org.eclipse.wst.xml.xpath.ui/.settings/org.eclipse.pde.prefs b/bundles/org.eclipse.wst.xml.xpath.ui/.settings/org.eclipse.pde.prefs
deleted file mode 100644
index 58a5113..0000000
--- a/bundles/org.eclipse.wst.xml.xpath.ui/.settings/org.eclipse.pde.prefs
+++ /dev/null
@@ -1,26 +0,0 @@
-#Thu May 08 14:32:18 GMT-05:00 2008
-compilers.f.unresolved-features=1
-compilers.f.unresolved-plugins=1
-compilers.incompatible-environment=0
-compilers.p.build=0
-compilers.p.deprecated=1
-compilers.p.discouraged-class=1
-compilers.p.illegal-att-value=0
-compilers.p.internal=1
-compilers.p.missing-bundle-classpath-entries=1
-compilers.p.missing-packages=2
-compilers.p.no-required-att=0
-compilers.p.not-externalized-att=1
-compilers.p.unknown-attribute=0
-compilers.p.unknown-class=0
-compilers.p.unknown-element=0
-compilers.p.unknown-identifier=1
-compilers.p.unknown-resource=0
-compilers.p.unresolved-ex-points=0
-compilers.p.unresolved-import=0
-compilers.p.unused-element-or-attribute=0
-compilers.s.create-docs=false
-compilers.s.doc-folder=doc
-compilers.s.open-tags=1
-compilers.use-project=true
-eclipse.preferences.version=1
diff --git a/bundles/org.eclipse.wst.xml.xpath.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.wst.xml.xpath.ui/META-INF/MANIFEST.MF
deleted file mode 100644
index 73a8ec8..0000000
--- a/bundles/org.eclipse.wst.xml.xpath.ui/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,28 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.eclipse.wst.xml.xpath.ui;singleton:=true
-Bundle-Version: 1.0.0.qualifier
-Bundle-Activator: org.eclipse.wst.xml.xpath.ui.internal.XPathUIPlugin
-Bundle-Localization: plugin
-Bundle-Vendor: %providerName
-Bundle-Name: %pluginName
-Require-Bundle: org.eclipse.ui;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.jface.text;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.wst.sse.core;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.ui.views;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.wst.sse.ui;bundle-version="[1.0.101,1.2.0)",
- org.eclipse.wst.xml.core;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.wst.xml.ui;bundle-version="[1.0.101,1.2.0)",
- org.eclipse.wst.common.uriresolver;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.ui.workbench.texteditor;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.ui.forms;bundle-version="[3.3.100,4.0.0)",
- org.eclipse.wst.xml.xpath.core;bundle-version="[1.0.0,2.0.0)"
-Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Export-Package: org.eclipse.wst.xml.xpath.ui.internal;x-friends:="org.eclipse.wst.xsl.*",
- org.eclipse.wst.xml.xpath.ui.internal.contentassist;x-friends:="org.eclipse.wst.xsl.*",
- org.eclipse.wst.xml.xpath.ui.internal.preferences;x-friends:="org.eclipse.wst.xsl.*",
- org.eclipse.wst.xml.xpath.ui.internal.templates;x-friends:="org.eclipse.wst.xsl.*",
- org.eclipse.wst.xml.xpath.ui.internal.util;x-friends:="org.eclipse.wst.xsl.*",
- org.eclipse.wst.xml.xpath.ui.internal.views;x-friends:="org.eclipse.wst.xsl.*"
diff --git a/bundles/org.eclipse.wst.xml.xpath.ui/about.html b/bundles/org.eclipse.wst.xml.xpath.ui/about.html
deleted file mode 100644
index 2199df3..0000000
--- a/bundles/org.eclipse.wst.xml.xpath.ui/about.html
+++ /dev/null
@@ -1,34 +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">
-
-<H3>About This Content</H3>
-
-<P>June, 2008</P>
-
-<H3>License</H3>
-
-<P>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
-<A href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</A>. 
-For purposes of the EPL, "Program" will mean the Content.</P>
-
-<P>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
-<A href="http://www.eclipse.org/">http://www.eclipse.org/</A>.</P>
-
-</BODY>
-</HTML>
diff --git a/bundles/org.eclipse.wst.xml.xpath.ui/build.properties b/bundles/org.eclipse.wst.xml.xpath.ui/build.properties
deleted file mode 100644
index 2149ff1..0000000
--- a/bundles/org.eclipse.wst.xml.xpath.ui/build.properties
+++ /dev/null
@@ -1,10 +0,0 @@
-source.. = src-xpath/,\
-           src/
-output.. = bin/
-bin.includes = plugin.xml,\
-               META-INF/,\
-               .,\
-               icons/,\
-               plugin.properties,\
-               templates/,\
-               about.html
diff --git a/bundles/org.eclipse.wst.xml.xpath.ui/icons/full/ancestor.gif b/bundles/org.eclipse.wst.xml.xpath.ui/icons/full/ancestor.gif
deleted file mode 100644
index 697db80..0000000
--- a/bundles/org.eclipse.wst.xml.xpath.ui/icons/full/ancestor.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.xml.xpath.ui/icons/full/directional.gif b/bundles/org.eclipse.wst.xml.xpath.ui/icons/full/directional.gif
deleted file mode 100644
index d51ad18..0000000
--- a/bundles/org.eclipse.wst.xml.xpath.ui/icons/full/directional.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.xml.xpath.ui/icons/full/dlcl16/collapseall.gif b/bundles/org.eclipse.wst.xml.xpath.ui/icons/full/dlcl16/collapseall.gif
deleted file mode 100644
index 7dc0de5..0000000
--- a/bundles/org.eclipse.wst.xml.xpath.ui/icons/full/dlcl16/collapseall.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.xml.xpath.ui/icons/full/dlcl16/synced.gif b/bundles/org.eclipse.wst.xml.xpath.ui/icons/full/dlcl16/synced.gif
deleted file mode 100644
index 4b9e567..0000000
--- a/bundles/org.eclipse.wst.xml.xpath.ui/icons/full/dlcl16/synced.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.xml.xpath.ui/icons/full/elcl16/collapseall.gif b/bundles/org.eclipse.wst.xml.xpath.ui/icons/full/elcl16/collapseall.gif
deleted file mode 100644
index a2d80a9..0000000
--- a/bundles/org.eclipse.wst.xml.xpath.ui/icons/full/elcl16/collapseall.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.xml.xpath.ui/icons/full/elcl16/synced.gif b/bundles/org.eclipse.wst.xml.xpath.ui/icons/full/elcl16/synced.gif
deleted file mode 100644
index 05cefef..0000000
--- a/bundles/org.eclipse.wst.xml.xpath.ui/icons/full/elcl16/synced.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.xml.xpath.ui/icons/full/family.gif b/bundles/org.eclipse.wst.xml.xpath.ui/icons/full/family.gif
deleted file mode 100644
index e917f3e..0000000
--- a/bundles/org.eclipse.wst.xml.xpath.ui/icons/full/family.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.xml.xpath.ui/icons/full/function.gif b/bundles/org.eclipse.wst.xml.xpath.ui/icons/full/function.gif
deleted file mode 100644
index a81fd68..0000000
--- a/bundles/org.eclipse.wst.xml.xpath.ui/icons/full/function.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.xml.xpath.ui/icons/full/operation.gif b/bundles/org.eclipse.wst.xml.xpath.ui/icons/full/operation.gif
deleted file mode 100644
index b55d9e3..0000000
--- a/bundles/org.eclipse.wst.xml.xpath.ui/icons/full/operation.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.xml.xpath.ui/icons/full/variable.gif b/bundles/org.eclipse.wst.xml.xpath.ui/icons/full/variable.gif
deleted file mode 100644
index f6d83cb..0000000
--- a/bundles/org.eclipse.wst.xml.xpath.ui/icons/full/variable.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.xml.xpath.ui/icons/full/xpath.gif b/bundles/org.eclipse.wst.xml.xpath.ui/icons/full/xpath.gif
deleted file mode 100644
index a53ef58..0000000
--- a/bundles/org.eclipse.wst.xml.xpath.ui/icons/full/xpath.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.xml.xpath.ui/icons/refresh.gif b/bundles/org.eclipse.wst.xml.xpath.ui/icons/refresh.gif
deleted file mode 100644
index e383147..0000000
--- a/bundles/org.eclipse.wst.xml.xpath.ui/icons/refresh.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.xml.xpath.ui/icons/run.gif b/bundles/org.eclipse.wst.xml.xpath.ui/icons/run.gif
deleted file mode 100644
index 57f4102..0000000
--- a/bundles/org.eclipse.wst.xml.xpath.ui/icons/run.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.xml.xpath.ui/plugin.properties b/bundles/org.eclipse.wst.xml.xpath.ui/plugin.properties
deleted file mode 100644
index d2d889d..0000000
--- a/bundles/org.eclipse.wst.xml.xpath.ui/plugin.properties
+++ /dev/null
@@ -1,25 +0,0 @@
-###############################################################################
-# Copyright (c) 2005-2007 Orangevolt (www.orangevolt.com)
-# 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:
-#     Orangevolt (www.orangevolt.com) - XSLT support
-#     Jesper Steen Moller - refactored Orangevolt XSLT support into WST
-#     
-###############################################################################
-
-providerName=Eclipse.org
-pluginName=XPath UI
-xmlCategoryName=XML
-xpathViewName=XPath
-contextType.axis = axis
-contextType.exslt = exslt
-contextType.xpath = xpath
-contextType.xpath2o = xpath 2.0
-contextType.operator = operator
-contextType.custom = custom
-pageNameXpath = XPath
-pagenameXPathTemplates = XPath Templates
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.xml.xpath.ui/plugin.xml b/bundles/org.eclipse.wst.xml.xpath.ui/plugin.xml
deleted file mode 100644
index bb52e9d..0000000
--- a/bundles/org.eclipse.wst.xml.xpath.ui/plugin.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin>
-
-   <extension
-         point="org.eclipse.ui.views">
-      <category      
-            name="%xmlCategoryName"
-            id="org.eclipse.wst.xml"/>
-    <view
-          category="org.eclipse.wst.xml"
-          class="org.eclipse.wst.xml.xpath.ui.internal.views.XPathView"
-          icon="$nl$/icons/full/xpath.gif"
-          id="org.eclipse.wst.xml.views.XPathView"
-          name="%xpathViewName"/>
- </extension>
-
- <!-- Addition to the XML perspective -->
- <extension point="org.eclipse.ui.perspectiveExtensions">
-	<perspectiveExtension targetID="org.eclipse.wst.xml.ui.perspective">
-		<!-- ProjectExplorer on the left, XPath on the "bottom left" -->
-		<view id="org.eclipse.wst.xml.views.XPathView" relative="org.eclipse.ui.navigator.ProjectExplorer" relationship="bottom" ratio="0.55" />
-		<viewShortcut id="org.eclipse.wst.xml.views.XPathView"/>
-	</perspectiveExtension>
- </extension>
-
-   	<!-- XPath templates -->
-	<extension point="org.eclipse.ui.editors.templates">
-		<contextType
-			class="org.eclipse.wst.xml.ui.internal.templates.TemplateContextTypeXML"
-			id="xpath_axis" name="%contextType.axis">
-		</contextType>
-		<contextType
-			class="org.eclipse.wst.xml.ui.internal.templates.TemplateContextTypeXML"
-			id="exslt_function" name="%contextType.exslt">
-		</contextType>
-		<contextType
-			class="org.eclipse.wst.xml.ui.internal.templates.TemplateContextTypeXML"
-			id="xsl_xpath" name="%contextType.xpath">
-		</contextType>
-		<contextType
-			class="org.eclipse.wst.xml.ui.internal.templates.TemplateContextTypeXML"
-			id="xpath_2" name="%contextType.xpath2o">
-		</contextType>
-		<contextType
-			class="org.eclipse.wst.xml.ui.internal.templates.TemplateContextTypeXML"
-			id="xpath_operator" name="%contextType.operator">
-		</contextType>
-		<contextType
-			class="org.eclipse.wst.xml.ui.internal.templates.TemplateContextTypeXML"
-			id="extension_function" name="%contextType.custom">
-		</contextType>
-		<include file="templates/xpath_templates.xml"/>
-		<include file="templates/xpath_operator_templates.xml"/>
-		<include file="templates/xpath_axis_templates.xml"/>
-	</extension>
-   
-	<extension point="org.eclipse.ui.preferencePages">
-	  <page
-	        category="org.eclipse.wst.xml.ui.preferences.xml"
-	        class="org.eclipse.wst.xml.xpath.ui.internal.preferences.XPathPrefencePage"
-	        id="org.eclipse.wst.xml.xpath.ui.XPathPreferencePage"
-	        name="%pageNameXpath">
-	  </page>
-		<page category="org.eclipse.wst.xml.xpath.ui.XPathPreferencePage"
-			class="org.eclipse.wst.xml.xpath.ui.internal.preferences.XPathTemplatePreferencePage"
-			id="org.eclipse.wst.xsl.ui.XPath" 
-			name="%pagenameXPathTemplates">
-		</page>	
-	</extension>
-	   
-</plugin>
diff --git a/bundles/org.eclipse.wst.xml.xpath.ui/src-xpath/org/eclipse/wst/xml/xpath/ui/views/DOMNodeLabelProvider.java b/bundles/org.eclipse.wst.xml.xpath.ui/src-xpath/org/eclipse/wst/xml/xpath/ui/views/DOMNodeLabelProvider.java
deleted file mode 100644
index c872a64..0000000
--- a/bundles/org.eclipse.wst.xml.xpath.ui/src-xpath/org/eclipse/wst/xml/xpath/ui/views/DOMNodeLabelProvider.java
+++ /dev/null
@@ -1,114 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005-2007 Orangevolt (www.orangevolt.com)
- * 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:
- *     Orangevolt (www.orangevolt.com) - XSLT support
- *     Jesper Steen Moller - refactored Orangevolt XSLT support into WST
- *     
- *******************************************************************************/
-package org.eclipse.wst.xml.xpath.ui.views;
-
-import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.wst.xml.ui.internal.editor.XMLEditorPluginImageHelper;
-import org.eclipse.wst.xml.ui.internal.editor.XMLEditorPluginImages;
-import org.w3c.dom.Attr;
-import org.w3c.dom.CDATASection;
-import org.w3c.dom.Comment;
-import org.w3c.dom.Document;
-import org.w3c.dom.DocumentType;
-import org.w3c.dom.Element;
-import org.w3c.dom.Entity;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.ProcessingInstruction;
-import org.w3c.dom.Text;
-
-public class DOMNodeLabelProvider extends LabelProvider {
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jface.viewers.LabelProvider#getText(java.lang.Object)
-	 */
-	public String getText(Object element) {
-		if (element instanceof Document) {
-			return element.toString();
-		} else if (element instanceof Element) {
-			StringBuffer sb = new StringBuffer(((Element) element).getTagName());
-
-			NamedNodeMap attrs = ((Element) element).getAttributes();
-			if (attrs.getLength() > 0) {
-				sb.append("("); //$NON-NLS-1$
-				for (int i = 0; i < attrs.getLength(); i++) {
-					Attr attr = (Attr) attrs.item(i);
-					sb.append('@').append(attr.getName())
-							.append("=\"").append(attr.getValue()).append('\"'); //$NON-NLS-1$
-					if (i < attrs.getLength() - 1) {
-						sb.append(' ');
-					}
-				}
-				sb.append(")"); //$NON-NLS-1$
-			}
-			return sb.toString();
-		} else if (element instanceof Comment) {
-			return element.toString();
-		} else if (element instanceof Attr) {
-			Attr attr = (Attr) element;
-
-			return "@" + attr.getName() + "=\"" + attr.getValue() + "\""; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-		} else if (element instanceof CDATASection) {
-			return element.toString();
-		} else if (element instanceof Entity) {
-			return element.toString();
-		} else if (element instanceof ProcessingInstruction) {
-			return element.toString();
-		} else if (element instanceof DocumentType) {
-			return element.toString();
-		} else if (element instanceof Text) {
-			return ((Text) element).getData();
-		} else {
-			return element.toString();
-		}
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jface.viewers.LabelProvider#getImage(java.lang.Object)
-	 */
-	public Image getImage(Object element) {
-		if (element instanceof Document) {
-			return XMLEditorPluginImageHelper.getInstance().getImage(
-					XMLEditorPluginImages.IMG_OBJ_TAG_GENERIC);
-		} else if (element instanceof Element) {
-			return XMLEditorPluginImageHelper.getInstance().getImage(
-					XMLEditorPluginImages.IMG_OBJ_ELEMENT);
-		} else if (element instanceof Comment) {
-			return XMLEditorPluginImageHelper.getInstance().getImage(
-					XMLEditorPluginImages.IMG_OBJ_COMMENT);
-		} else if (element instanceof CDATASection) {
-			return XMLEditorPluginImageHelper.getInstance().getImage(
-					XMLEditorPluginImages.IMG_OBJ_CDATASECTION);
-		} else if (element instanceof Entity) {
-			return XMLEditorPluginImageHelper.getInstance().getImage(
-					XMLEditorPluginImages.IMG_OBJ_ENTITY);
-		} else if (element instanceof ProcessingInstruction) {
-			return XMLEditorPluginImageHelper.getInstance().getImage(
-					XMLEditorPluginImages.IMG_OBJ_PROCESSINGINSTRUCTION);
-		} else if (element instanceof DocumentType) {
-			return XMLEditorPluginImageHelper.getInstance().getImage(
-					XMLEditorPluginImages.IMG_OBJ_DOCTYPE);
-		} else if (element instanceof Attr) {
-			return XMLEditorPluginImageHelper.getInstance().getImage(
-					XMLEditorPluginImages.IMG_OBJ_ATTRIBUTE);
-		} else if (element instanceof Text) {
-			return XMLEditorPluginImageHelper.getInstance().getImage(
-					XMLEditorPluginImages.IMG_OBJ_TXTEXT);
-		} else {
-			return super.getImage(element);
-		}
-	}
-}
diff --git a/bundles/org.eclipse.wst.xml.xpath.ui/src-xpath/org/eclipse/wst/xml/xpath/ui/views/DOMTreeContentProvider.java b/bundles/org.eclipse.wst.xml.xpath.ui/src-xpath/org/eclipse/wst/xml/xpath/ui/views/DOMTreeContentProvider.java
deleted file mode 100644
index f0181c8..0000000
--- a/bundles/org.eclipse.wst.xml.xpath.ui/src-xpath/org/eclipse/wst/xml/xpath/ui/views/DOMTreeContentProvider.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005-2007 Orangevolt (www.orangevolt.com)
- * 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:
- *     Orangevolt (www.orangevolt.com) - XSLT support
- *     Jesper Steen Moller - refactored Orangevolt XSLT support into WST
- *     
- *******************************************************************************/
-package org.eclipse.wst.xml.xpath.ui.views;
-
-import org.eclipse.jface.viewers.ITreeContentProvider;
-import org.eclipse.jface.viewers.Viewer;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
-public class DOMTreeContentProvider implements ITreeContentProvider {
-	Node node = null;
-
-	static final Object[] NOTHING = new Object[0];
-
-	private Object[] nodeList2Array(NodeList nl) {
-		Object[] oa = new Object[nl.getLength()];
-		for (int i = 0; i < nl.getLength(); i++) {
-			oa[i] = nl.item(i);
-		}
-
-		return oa;
-	}
-
-	public Object[] getChildren(Object parentElement) {
-		return parentElement == null ? NOTHING
-				: nodeList2Array(((Node) parentElement).getChildNodes());
-	}
-
-	public Object getParent(Object element) {
-		return ((Node) element).getParentNode();
-	}
-
-	public boolean hasChildren(Object element) {
-		return ((Node) element).hasChildNodes();
-	}
-
-	public Object[] getElements(Object inputElement) {
-		return getChildren(inputElement);
-	}
-
-	public void dispose() {
-	}
-
-	public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
-		if (newInput instanceof Element) {
-			node = (Element) newInput;
-		} else if (newInput instanceof Document) {
-			node = ((Document) newInput).getDocumentElement();
-		}
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.xml.xpath.ui/src-xpath/org/eclipse/wst/xml/xpath/ui/views/DOMViewerFilter.java b/bundles/org.eclipse.wst.xml.xpath.ui/src-xpath/org/eclipse/wst/xml/xpath/ui/views/DOMViewerFilter.java
deleted file mode 100644
index 2a26a54..0000000
--- a/bundles/org.eclipse.wst.xml.xpath.ui/src-xpath/org/eclipse/wst/xml/xpath/ui/views/DOMViewerFilter.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005-2007 Orangevolt (www.orangevolt.com)
- * 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:
- *     Orangevolt (www.orangevolt.com) - XSLT support
- *     Jesper Steen Moller - refactored Orangevolt XSLT support into WST
- *     
- *******************************************************************************/
-package org.eclipse.wst.xml.xpath.ui.views;
-
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.viewers.ViewerFilter;
-import org.w3c.dom.Text;
-
-public class DOMViewerFilter extends ViewerFilter {
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.jface.viewers.ViewerFilter#select(org.eclipse.jface.viewers
-	 * .Viewer, java.lang.Object, java.lang.Object)
-	 */
-	public boolean select(Viewer viewer, Object parentElement, Object element) {
-		return !((element instanceof Text) && ((((Text) element).getData())
-				.trim().length() == 0));
-	}
-}
diff --git a/bundles/org.eclipse.wst.xml.xpath.ui/src-xpath/org/eclipse/wst/xml/xpath/ui/views/EditNamespacePrefixDialog.java b/bundles/org.eclipse.wst.xml.xpath.ui/src-xpath/org/eclipse/wst/xml/xpath/ui/views/EditNamespacePrefixDialog.java
deleted file mode 100644
index 06143f9..0000000
--- a/bundles/org.eclipse.wst.xml.xpath.ui/src-xpath/org/eclipse/wst/xml/xpath/ui/views/EditNamespacePrefixDialog.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006, 2007 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 (adapted from EditSchemaInfoDialog):
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     Jesper Steen Moller - Extracted for use in XPath Navigator view
- *     
- *******************************************************************************/
-package org.eclipse.wst.xml.xpath.ui.views;
-
-import java.util.List;
-
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.wst.xml.core.internal.contentmodel.util.NamespaceInfo;
-import org.eclipse.wst.xml.ui.internal.dialogs.NamespaceInfoErrorHelper;
-import org.eclipse.wst.xml.ui.internal.dialogs.UpdateListener;
-import org.eclipse.wst.xml.ui.internal.nsedit.CommonEditNamespacesDialog;
-import org.eclipse.wst.xml.xpath.ui.internal.Messages;
-
-public class EditNamespacePrefixDialog extends Dialog implements UpdateListener {
-	// protected NamespaceInfoTable namespaceInfoTable;
-	protected Label errorMessageLabel;
-	protected List<NamespaceInfo> namespaceInfoList;
-	protected IPath resourceLocation;
-
-	public EditNamespacePrefixDialog(Shell parentShell, IPath resourceLocation) {
-		super(parentShell);
-		setShellStyle(getShellStyle() | SWT.RESIZE);
-		this.resourceLocation = resourceLocation;
-	}
-
-	protected void createButtonsForButtonBar(Composite parent) {
-		createButton(parent, IDialogConstants.OK_ID, IDialogConstants.OK_LABEL,
-				true);
-		createButton(parent, IDialogConstants.CANCEL_ID,
-				IDialogConstants.CANCEL_LABEL, false);
-	}
-
-	protected Control createDialogArea(Composite parent) {
-		Composite dialogArea = (Composite) super.createDialogArea(parent);
-		// PlatformUI.getWorkbench().getHelpSystem().setHelp(dialogArea,
-		// XMLCommonUIContextIds.XCUI_SCHEMA_INFO_DIALOG);
-
-		CommonEditNamespacesDialog editNamespacesControl = new CommonEditNamespacesDialog(
-				dialogArea, resourceLocation,
-				Messages.XPathNavigator_Namespace_Prefixes, false, true);
-		editNamespacesControl.setNamespaceInfoList(namespaceInfoList);
-
-		editNamespacesControl.updateErrorMessage(namespaceInfoList);
-
-		getShell().setText(Messages.XPathNavigator_Namespace_Prefixes);
-		return dialogArea;
-	}
-
-	protected Control getDialogArea(Composite parent) {
-		return super.createDialogArea(parent);
-	}
-
-	public List<NamespaceInfo> getNamespaceInfoList() {
-		return namespaceInfoList;
-	}
-
-	public void setNamespaceInfoList(List<NamespaceInfo> list) {
-		namespaceInfoList = list;
-	}
-
-	public void updateErrorMessage(List<NamespaceInfo> namespaceInfoList) {
-		NamespaceInfoErrorHelper helper = new NamespaceInfoErrorHelper();
-		String errorMessage = helper.computeErrorMessage(namespaceInfoList,
-				null);
-		errorMessageLabel.setText(errorMessage != null ? errorMessage : ""); //$NON-NLS-1$
-	}
-
-	@SuppressWarnings("unchecked")
-	public void updateOccured(Object object, Object arg) {
-		updateErrorMessage((List<NamespaceInfo>) arg);
-	}
-}
diff --git a/bundles/org.eclipse.wst.xml.xpath.ui/src-xpath/org/eclipse/wst/xml/xpath/ui/views/XPathNavigator.java b/bundles/org.eclipse.wst.xml.xpath.ui/src-xpath/org/eclipse/wst/xml/xpath/ui/views/XPathNavigator.java
deleted file mode 100644
index 4324e58..0000000
--- a/bundles/org.eclipse.wst.xml.xpath.ui/src-xpath/org/eclipse/wst/xml/xpath/ui/views/XPathNavigator.java
+++ /dev/null
@@ -1,793 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005-2007 Orangevolt (www.orangevolt.com)
- * 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:
- *     Orangevolt (www.orangevolt.com) - XSLT support
- *     Jesper Steen Moller - refactored Orangevolt XSLT support into WST
- *     
- *******************************************************************************/
-package org.eclipse.wst.xml.xpath.ui.views;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.WeakHashMap;
-
-import javax.xml.namespace.NamespaceContext;
-import javax.xml.xpath.XPath;
-import javax.xml.xpath.XPathConstants;
-import javax.xml.xpath.XPathExpression;
-import javax.xml.xpath.XPathExpressionException;
-import javax.xml.xpath.XPathFactory;
-
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.action.IMenuListener;
-import org.eclipse.jface.action.IMenuManager;
-import org.eclipse.jface.action.IToolBarManager;
-import org.eclipse.jface.action.MenuManager;
-import org.eclipse.jface.action.Separator;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.text.BadLocationException;
-import org.eclipse.jface.viewers.ComboViewer;
-import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.IStructuredContentProvider;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.TreeViewer;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.CTabFolder;
-import org.eclipse.swt.custom.CTabItem;
-import org.eclipse.swt.custom.StyleRange;
-import org.eclipse.swt.custom.StyledText;
-import org.eclipse.swt.events.KeyEvent;
-import org.eclipse.swt.events.KeyListener;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Group;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Menu;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.IActionBars;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IEditorReference;
-import org.eclipse.ui.IMemento;
-import org.eclipse.ui.IPathEditorInput;
-import org.eclipse.ui.IViewSite;
-import org.eclipse.ui.IWorkbenchActionConstants;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.part.ViewPart;
-import org.eclipse.wst.sse.ui.internal.provisional.extensions.ISourceEditingTextTools;
-import org.eclipse.wst.xml.core.internal.contentmodel.util.NamespaceInfo;
-import org.eclipse.wst.xml.core.internal.contentmodel.util.NamespaceTable;
-import org.eclipse.wst.xml.core.internal.document.DocumentImpl;
-import org.eclipse.wst.xml.core.internal.document.ElementImpl;
-import org.eclipse.wst.xml.ui.internal.provisional.IDOMSourceEditingTextTools;
-import org.eclipse.wst.xml.xpath.ui.internal.Messages;
-import org.eclipse.wst.xml.xpath.ui.internal.XPathUIPlugin;
-import org.w3c.dom.Attr;
-import org.w3c.dom.CDATASection;
-import org.w3c.dom.Comment;
-import org.w3c.dom.Document;
-import org.w3c.dom.DocumentFragment;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import org.w3c.dom.ProcessingInstruction;
-
-/**
- * 
- */
-public class XPathNavigator extends ViewPart {
-	class XPathAction extends Action {
-		public void run() {
-			String expr = xpath.getText().trim();
-			if (expr.length() == 0) {
-				xpath.setFocus();
-				return;
-			}
-
-			if (documents.getSelection().isEmpty()) {
-				MessageDialog.openInformation(getSite().getShell(),
-						Messages.XPathNavigator_XPath_Navigator,
-						Messages.XPathNavigator_Select_source_first);
-				documents.getCombo().setFocus();
-				return;
-			}
-
-			Element contextElement = getQueryContext();
-			if (contextElement == null) {
-				return;
-			}
-
-			try {
-				text.setText(""); //$NON-NLS-1$
-				viewer.setInput(null);
-
-				XPath newXPath = XPathFactory.newInstance().newXPath();
-
-				final List<NamespaceInfo> namespaces = createNamespaceInfo(getSelectedDocument());
-				if (namespaces != null) {
-
-					newXPath.setNamespaceContext(new NamespaceContext() {
-
-						public String getNamespaceURI(String prefix) {
-							for (NamespaceInfo ni : namespaces) {
-								if (prefix.equals(ni.prefix)) {
-									return ni.uri;
-								}
-							}
-							return null;
-						}
-
-						public String getPrefix(String uri) {
-							// Should be same as getPrefixes(uri).get(0)
-							for (NamespaceInfo ni : namespaces) {
-								if (uri.equals(ni.uri)) {
-									return ni.prefix;
-								}
-							}
-							return null;
-						}
-
-						public Iterator<String> getPrefixes(String uri) {
-							List<String> prefixes = new LinkedList<String>();
-							for (NamespaceInfo ni : namespaces) {
-								if (uri.equals(ni.uri)) {
-									prefixes.add(ni.prefix);
-								}
-							}
-							return prefixes.iterator();
-						}
-					});
-				}
-				XPathExpression xpExp = newXPath.compile(expr);
-
-				NodeList nl = null;
-				String stringResult = null;
-
-				// IMHO, this is really poor API design in javax.xpath.
-				// We prefer the nodeset, but if there's a string instead, we
-				// want that. It shouldn't be that hard!
-				try {
-					nl = (NodeList) xpExp.evaluate(contextElement,
-							XPathConstants.NODESET);
-				} catch (XPathExpressionException xee) {
-					stringResult = xpExp.evaluate(contextElement); // Implicit
-																	// XPathConstants.STRING
-				}
-				Document document = (Document) contextElement
-						.getOwnerDocument().cloneNode(false);
-				Element root = document.createElement("xpath-result"); //$NON-NLS-1$
-				document.appendChild(root);
-
-				boolean odd = false;
-
-				StringBuffer sb = new StringBuffer();
-
-				if (nl != null) {
-					for (int i = 0; i < nl.getLength(); ++i) {
-						Node node = nl.item(i);
-
-						root.appendChild(document.importNode(node, true));
-						switch (node.getNodeType()) {
-						case org.w3c.dom.Node.ATTRIBUTE_NODE: {
-							Attr attr = (Attr) node;
-							sb
-									.append("#attribute :: ").append(attr.getName()).append("=\"").append(attr.getValue()).append('"'); //$NON-NLS-1$ //$NON-NLS-2$
-
-							break;
-						}
-						case org.w3c.dom.Node.CDATA_SECTION_NODE: {
-							CDATASection cdata = (CDATASection) node;
-							sb.append("#cdata :: ").append(cdata.toString()); //$NON-NLS-1$
-							break;
-						}
-						case org.w3c.dom.Node.COMMENT_NODE: {
-							Comment comment = (Comment) node;
-							sb
-									.append("#comment :: ").append(comment.toString()); //$NON-NLS-1$
-
-							break;
-						}
-						case org.w3c.dom.Node.DOCUMENT_FRAGMENT_NODE: {
-							DocumentFragment fragment = (DocumentFragment) node;
-							sb
-									.append("#fragment :: ").append(fragment.toString()); //$NON-NLS-1$
-							break;
-						}
-						case org.w3c.dom.Node.DOCUMENT_NODE: {
-							Document doc = (Document) node;
-							sb.append("#document :: "); //$NON-NLS-1$
-							sb.append(((DocumentImpl) doc).getSource());
-							break;
-						}
-						case org.w3c.dom.Node.ELEMENT_NODE: {
-							Element element = (Element) node;
-							sb.append("#element :: "); //$NON-NLS-1$
-							sb.append(((ElementImpl) element).getSource());
-							break;
-						}
-						case org.w3c.dom.Node.PROCESSING_INSTRUCTION_NODE: {
-							ProcessingInstruction pi = (ProcessingInstruction) node;
-
-							sb.append("#pi :: ").append(pi.toString()); //$NON-NLS-1$
-
-							break;
-						}
-						case org.w3c.dom.Node.TEXT_NODE: {
-							org.w3c.dom.Text text = (org.w3c.dom.Text) node;
-							sb.append("#text :: ").append(text.getNodeValue()); //$NON-NLS-1$
-
-							break;
-						}
-						default: {
-							sb
-									.append("#unknown :: ").append(node.getNodeType()).append(node.toString()); //$NON-NLS-1$
-						}
-						}
-
-						sb.append("\r\n"); //$NON-NLS-1$
-
-						text.append(sb.toString());
-
-						StyleRange sr = new StyleRange();
-						sr.foreground = Display.getDefault().getSystemColor(
-								odd ? SWT.COLOR_BLACK : SWT.COLOR_DARK_BLUE);
-						sr.start = text.getText().length() - sb.length();
-						sr.length = sb.length();
-						text.setStyleRange(sr);
-
-						odd = !odd;
-						sb.setLength(0);
-					}
-				} else if (stringResult != null) {
-					text.setText(stringResult);
-					resultTabs.setSelection(1);
-				} else {
-					text.setText(""); //$NON-NLS-1$
-				}
-
-				text.setCaretOffset(0);
-
-				viewer.setInput(document.getDocumentElement());
-				viewer.refresh();
-				viewer.expandToLevel(3);
-
-				// scroll top element into visible area
-				if (viewer.getTree().getItems().length > 0) {
-					viewer.getTree().showItem(viewer.getTree().getItems()[0]);
-				}
-			} catch (XPathExpressionException pex) {
-				MessageDialog.openError(getSite().getShell(),
-						Messages.XPathNavigator_XPath_Navigator,
-						Messages.XPathNavigator_XPath_Eval_Failed
-								+ pex.getCause().getMessage());
-				XPathUIPlugin.log(pex);
-			} catch (Exception ex) {
-				MessageDialog.openError(getSite().getShell(),
-						Messages.XPathNavigator_XPath_Navigator,
-						Messages.XPathNavigator_XPath_Eval_Failed
-								+ ex.getMessage());
-				XPathUIPlugin.log(ex);
-			}
-		}
-	}
-
-	class RefreshAction extends Action {
-		public void run() {
-			update();
-		}
-	}
-
-	class ShowInSourceAction extends Action {
-		public void run() {
-			// try
-			// {
-			// NodeImpl nodeImpl =
-			// (NodeImpl)((IStructuredSelection)viewer.getSelection()).getFirstElement();
-			//
-			// int start = nodeImpl.getStartOffset();
-			// int end = nodeImpl.getEndOffset();
-			// IStructuredSelection selection =
-			// (IStructuredSelection)documents.getSelection();
-			// IEditorReference editorReference =
-			// (IEditorReference)selection.getFirstElement();
-			// XMLMultiPageEditorPart structuredTextEditor =
-			// (XMLMultiPageEditorPart)editorReference.getEditor( true);
-			// structuredTextEditor.selectAndReveal( start, end-start);
-			// }
-			// catch( Exception ex)
-			// {
-			// MessageDialog.openError( getSite().getShell(),
-			// XPathUIMessages.XPathNavigator_XPath_Navigator,
-			// XPathUIMessages.XPathNavigator_XPath_Show_In_Source_Failed +
-			// ex.getMessage());
-			//                 XPathViewPlugin.getDefault().log( "XPath Navigator : Show in source failed.", ex); //$NON-NLS-1$
-			// }
-		}
-	}
-
-	private TreeViewer viewer;
-	private StyledText text;
-	private CTabFolder resultTabs;
-
-	private XPathAction query;
-
-	private RefreshAction refresh;
-
-	private ShowInSourceAction showInSource;
-
-	private Text xpath;
-
-	private ComboViewer documents;
-
-	private Button queryByContext, queryByDocument, namespaceButton;
-
-	protected IMemento memento;
-
-	protected WeakHashMap<Document, List<NamespaceInfo>> namespaceInfo = new WeakHashMap<Document, List<NamespaceInfo>>();
-
-	/**
-	 * This is a callback that will allow us to create the viewer and initialize
-	 * it.
-	 */
-	public void createPartControl(Composite parent) {
-		Composite comp = new Composite(parent, SWT.NONE);
-
-		GridLayout gridLayout = new GridLayout();
-		gridLayout.verticalSpacing = 0;
-		gridLayout.marginHeight = 0;
-		gridLayout.marginTop = 5;
-		gridLayout.marginWidth = 0;
-		comp.setLayout(gridLayout);
-
-		Label label = new Label(comp, SWT.NONE);
-		label.setText(Messages.XPathNavigator_XML_Source_Document);
-		GridData data = new GridData();
-		data.horizontalAlignment = GridData.FILL;
-		data.horizontalIndent = gridLayout.horizontalSpacing / 2;
-		label.setLayoutData(data);
-
-		documents = new ComboViewer(comp, SWT.READ_ONLY);
-		data = new GridData();
-		data.horizontalAlignment = GridData.FILL;
-		data.grabExcessHorizontalSpace = true;
-		data.horizontalAlignment = GridData.FILL;
-		data.verticalIndent = gridLayout.marginTop;
-		data.verticalAlignment = GridData.VERTICAL_ALIGN_BEGINNING;
-		documents.getCombo().setLayoutData(data);
-		documents.setUseHashlookup(true);
-		documents.setContentProvider(new XMLEditorsContentProvider());
-		documents.setLabelProvider(new EditorReferenceLabelProvider());
-		documents.setInput(Boolean.TRUE);
-
-		Group queryGroup = new Group(comp, SWT.SHADOW_NONE);
-		queryGroup.setText(Messages.XPathNavigator_Context);
-		data = new GridData();
-		data.horizontalAlignment = GridData.FILL;
-		data.grabExcessHorizontalSpace = true;
-		data.verticalIndent = gridLayout.marginTop;
-		data.verticalAlignment = GridData.VERTICAL_ALIGN_BEGINNING;
-		queryGroup.setLayoutData(data);
-		GridLayout _gridLayout = new GridLayout();
-		_gridLayout.numColumns = 3;
-		queryGroup.setLayout(_gridLayout);
-
-		queryByContext = new Button(queryGroup, SWT.RADIO);
-		queryByContext.setText(Messages.XPathNavigator_Selection);
-
-		queryByDocument = new Button(queryGroup, SWT.RADIO);
-		queryByDocument.setText(Messages.XPathNavigator_Document);
-		queryByDocument.setSelection(true);
-
-		namespaceButton = new Button(queryGroup, SWT.PUSH);
-		namespaceButton.setText(Messages.XPathNavigator_Namespaces);
-		namespaceButton.setToolTipText(Messages.XPathNavigator_Namespaces_Tip);
-		namespaceButton.addSelectionListener(new SelectionAdapter() {
-			@Override
-			public void widgetSelected(SelectionEvent e) {
-				Document selectedDocument = getSelectedDocument();
-
-				if (selectedDocument != null) {
-					List<NamespaceInfo> info = createNamespaceInfo(selectedDocument);
-
-					IStructuredSelection selection = (IStructuredSelection) documents
-							.getSelection();
-					IEditorReference editorReference = (IEditorReference) selection
-							.getFirstElement();
-					IPathEditorInput editorInput = (IPathEditorInput) editorReference
-							.getEditor(true).getEditorInput();
-
-					EditNamespacePrefixDialog dlg = new EditNamespacePrefixDialog(
-							XPathNavigator.this.getSite().getShell(),
-							editorInput.getPath());
-					dlg.setNamespaceInfoList(info);
-					if (SWT.OK == dlg.open()) {
-						// Apply changes
-					}
-				}
-			}
-		});
-
-		label = new Label(comp, SWT.NONE);
-		label.setText(Messages.XPathNavigator_Expression);
-		data = new GridData();
-		data.horizontalAlignment = GridData.FILL;
-		data.horizontalIndent = gridLayout.horizontalSpacing;
-		data.grabExcessHorizontalSpace = true;
-		data.horizontalIndent = gridLayout.horizontalSpacing / 2;
-		label.setLayoutData(data);
-
-		xpath = new Text(comp, SWT.BORDER);
-		data = new GridData();
-		data.horizontalAlignment = GridData.FILL;
-		data.grabExcessHorizontalSpace = true;
-		data.verticalIndent = gridLayout.marginTop;
-		data.verticalAlignment = GridData.VERTICAL_ALIGN_BEGINNING;
-		xpath.setLayoutData(data);
-		xpath.addKeyListener(new KeyListener() {
-			/*
-			 * (non-Javadoc)
-			 * 
-			 * @see
-			 * org.eclipse.swt.events.KeyListener#keyReleased(org.eclipse.swt
-			 * .events.KeyEvent)
-			 */
-			public void keyReleased(KeyEvent e) {
-				if (e.keyCode == '\r') {
-					query.run();
-				}
-			}
-
-			/*
-			 * (non-Javadoc)
-			 * 
-			 * @see
-			 * org.eclipse.swt.events.KeyListener#keyPressed(org.eclipse.swt
-			 * .events.KeyEvent)
-			 */
-			public void keyPressed(KeyEvent e) {
-			}
-		});
-
-		resultTabs = new CTabFolder(comp, SWT.BOTTOM);
-		data = new GridData();
-		data.verticalIndent = gridLayout.marginTop;
-		data.verticalAlignment = GridData.VERTICAL_ALIGN_BEGINNING;
-		data.horizontalAlignment = GridData.FILL;
-		data.verticalAlignment = GridData.FILL;
-		data.grabExcessHorizontalSpace = true;
-		data.grabExcessVerticalSpace = true;
-		resultTabs.setLayoutData(data);
-
-		viewer = new TreeViewer(resultTabs, SWT.H_SCROLL | SWT.V_SCROLL);
-		viewer.setLabelProvider(new DOMNodeLabelProvider());
-		viewer.setContentProvider(new DOMTreeContentProvider());
-		viewer.addFilter(new DOMViewerFilter());
-		viewer.addSelectionChangedListener(new ISelectionChangedListener() {
-			/*
-			 * (non-Javadoc)
-			 * 
-			 * @see
-			 * org.eclipse.jface.viewers.ISelectionChangedListener#selectionChanged
-			 * (org.eclipse.jface.viewers.SelectionChangedEvent)
-			 */
-			public void selectionChanged(SelectionChangedEvent event) {
-				showInSource.setEnabled(!event.getSelection().isEmpty());
-			}
-		});
-		CTabItem item = new CTabItem(resultTabs, SWT.NULL);
-		item.setText(Messages.XPathNavigator_DOM_Tree);
-		item.setControl(viewer.getControl());
-
-		resultTabs.setSelection(item);
-
-		text = new StyledText(resultTabs, SWT.MULTI | SWT.H_SCROLL
-				| SWT.V_SCROLL);
-		Color white = text.getBackground();
-		text.setEditable(false);
-		text.setBackground(white);
-		item = new CTabItem(resultTabs, SWT.NULL);
-		item.setText(Messages.XPathNavigator_Text);
-		item.setControl(text);
-
-		makeActions();
-		hookContextMenu();
-		contributeToActionBars();
-
-		if (memento != null) {
-			restoreState();
-			memento = null;
-		}
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ui.part.ViewPart#init(org.eclipse.ui.IViewSite,
-	 * org.eclipse.ui.IMemento)
-	 */
-	public void init(IViewSite site, IMemento memento) throws PartInitException {
-		super.init(site, memento);
-		this.memento = memento;
-	}
-
-	public static final String MEMENTO_XPATHNAVIGATOR_SECTION = "xpath-navigator-view"; //$NON-NLS-1$
-
-	public static final String MEMENTO_QUERYCONTEXT_KEY = "query-context"; //$NON-NLS-1$
-	public static final String MEMENTO_QUERYCONTEXT_DOCUMENT = "document"; //$NON-NLS-1$
-	public static final String MEMENTO_QUERYCONTEXT_SELECTION = "selection"; //$NON-NLS-1$
-
-	public static final String MEMENTO_XPATHQUERY_KEY = "xpath-query"; //$NON-NLS-1$
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ui.part.ViewPart#saveState(org.eclipse.ui.IMemento)
-	 */
-	public void saveState(IMemento memento) {
-		IMemento settings = memento.createChild(MEMENTO_XPATHNAVIGATOR_SECTION);
-		// System.out.println( "queryByDocument.getSelection()=" +
-		// queryByDocument.getSelection());
-		settings.putString(MEMENTO_QUERYCONTEXT_KEY, queryByDocument
-				.getSelection() ? MEMENTO_QUERYCONTEXT_DOCUMENT
-				: MEMENTO_QUERYCONTEXT_SELECTION);
-		settings.putString(MEMENTO_XPATHQUERY_KEY, xpath.getText());
-		super.saveState(memento);
-	}
-
-	/**
-     * 
-     */
-	protected void restoreState() {
-		IMemento settings = memento.getChild(MEMENTO_XPATHNAVIGATOR_SECTION);
-		if (settings != null) {
-			String queryContext = settings.getString(MEMENTO_QUERYCONTEXT_KEY);
-			if (MEMENTO_QUERYCONTEXT_DOCUMENT.equals(queryContext)) {
-				queryByDocument.setSelection(true);
-				queryByContext.setSelection(false);
-			} else {
-				queryByDocument.setSelection(false);
-				queryByContext.setSelection(true);
-			}
-
-			xpath.setText(settings.getString(MEMENTO_XPATHQUERY_KEY));
-		}
-	}
-
-	private void hookContextMenu() {
-		MenuManager menuMgr = new MenuManager("#PopupMenu"); //$NON-NLS-1$
-		menuMgr.setRemoveAllWhenShown(true);
-		menuMgr.addMenuListener(new IMenuListener() {
-			public void menuAboutToShow(IMenuManager manager) {
-				XPathNavigator.this.fillContextMenu(manager);
-			}
-		});
-		Menu menu = menuMgr.createContextMenu(viewer.getControl());
-		viewer.getControl().setMenu(menu);
-		getSite().registerContextMenu(menuMgr, viewer);
-	}
-
-	private void contributeToActionBars() {
-		IActionBars bars = getViewSite().getActionBars();
-		fillLocalPullDown(bars.getMenuManager());
-		fillLocalToolBar(bars.getToolBarManager());
-	}
-
-	private void fillLocalPullDown(IMenuManager manager) {
-		manager.add(query);
-		manager.add(refresh);
-	}
-
-	private void fillContextMenu(IMenuManager manager) {
-		manager.add(query);
-		manager.add(refresh);
-		manager.add(new Separator());
-		manager.add(showInSource);
-		manager.add(new Separator(IWorkbenchActionConstants.MB_ADDITIONS));
-	}
-
-	private void fillLocalToolBar(IToolBarManager manager) {
-		manager.add(query);
-		manager.add(refresh);
-	}
-
-	private void makeActions() {
-		query = new XPathAction();
-		query.setText(Messages.XPathNavigator_Run_XPath_Query);
-		query.setToolTipText(Messages.XPathNavigator_Run_on_selected);
-		query.setImageDescriptor(XPathUIPlugin.getDefault().getImageRegistry()
-				.getDescriptor("run")); //$NON-NLS-1$
-
-		refresh = new RefreshAction();
-		refresh.setText(Messages.XPathNavigator_Refresh_Source_Docs);
-		refresh.setToolTipText(Messages.XPathNavigator_Refresh_Source_Docs_Tip);
-		refresh.setImageDescriptor(XPathUIPlugin.getDefault()
-				.getImageRegistry().getDescriptor("refresh")); //$NON-NLS-1$
-
-		showInSource = new ShowInSourceAction();
-		showInSource.setText(Messages.XPathNavigator_Show_In_Source);
-		showInSource.setToolTipText(Messages.XPathNavigator_Show_In_Source_Tip);
-	}
-
-	protected Document getSelectedDocument() {
-		IStructuredSelection selection = (IStructuredSelection) documents
-				.getSelection();
-		IEditorReference editorReference = (IEditorReference) selection
-				.getFirstElement();
-
-		return (Document) editorReference.getEditor(true).getAdapter(
-				Document.class);
-	}
-
-	protected Element getQueryContext() {
-		IStructuredSelection selection = (IStructuredSelection) documents
-				.getSelection();
-		IEditorReference editorReference = (IEditorReference) selection
-				.getFirstElement();
-
-		IEditorPart structuredTextEditor = editorReference.getEditor(true);
-
-		if (queryByContext.getSelection()) {
-			ISourceEditingTextTools sett = (ISourceEditingTextTools) structuredTextEditor
-					.getAdapter(ISourceEditingTextTools.class);
-			if (sett instanceof IDOMSourceEditingTextTools) {
-				IDOMSourceEditingTextTools idsett = (IDOMSourceEditingTextTools) sett;
-				Node n = null;
-				try {
-					n = idsett.getNode(idsett.getCaretOffset());
-				} catch (BadLocationException e) {
-					MessageDialog.openInformation(getSite().getShell(),
-							Messages.XPathNavigator_XPath_Navigator,
-							Messages.XPathNavigator_Node_could_not_be_selected);
-				}
-
-				// Go upwards to an element
-				while ((n != null)
-						&& !((n instanceof Element) || (n instanceof Document))) {
-					n = n.getParentNode();
-				}
-
-				if (n instanceof Document) {
-					n = ((Document) n).getDocumentElement();
-				}
-
-				if (n == null) {
-					MessageDialog.openInformation(getSite().getShell(),
-							Messages.XPathNavigator_XPath_Navigator,
-							Messages.XPathNavigator_Nothing_selected);
-					structuredTextEditor.setFocus();
-					return null;
-				}
-				return (Element) n;
-			}
-		}
-		return ((Document) structuredTextEditor.getAdapter(Document.class))
-				.getDocumentElement();
-	}
-
-	/**
-	 * Passing the focus request to the viewer's control.
-	 */
-	public void setFocus() {
-		xpath.setFocus();
-	}
-
-	public void update() {
-		ISelection selection = documents.getSelection();
-
-		// dummy call to force refresh viewer
-		documents.setInput(documents.getInput() == Boolean.FALSE ? Boolean.TRUE
-				: Boolean.FALSE);
-
-		documents.setSelection(selection);
-	}
-
-	@SuppressWarnings("unchecked")
-	private List<NamespaceInfo> createNamespaceInfo(Document document) {
-		List<NamespaceInfo> info = namespaceInfo.get(document);
-		if (info == null) {
-			info = new ArrayList<NamespaceInfo>();
-			NamespaceTable namespaceTable = new NamespaceTable(document);
-			namespaceTable.visitElement(document.getDocumentElement());
-			Collection<?> namespaces = namespaceTable
-					.getNamespaceInfoCollection();
-			info.addAll((Collection<NamespaceInfo>) namespaces);
-			namespaceInfo.put(document, info);
-		}
-		return info;
-	}
-
-	static class XMLEditorsContentProvider implements
-			IStructuredContentProvider {
-		public Object[] getElements(Object inputElement) {
-			ArrayList<IEditorReference> editorReferences = new ArrayList<IEditorReference>();
-
-			IWorkbenchWindow[] windows = PlatformUI.getWorkbench()
-					.getWorkbenchWindows();
-
-			for (int i = 0; i < windows.length; i++) {
-				IWorkbenchWindow window = windows[i];
-
-				IWorkbenchPage[] pages = window.getPages();
-				for (int j = 0; j < pages.length; j++) {
-					IWorkbenchPage page = pages[j];
-					IEditorReference[] editors = page.getEditorReferences();
-
-					editorReferences.addAll(Arrays.asList(editors));
-				}
-			}
-			ArrayList<IEditorReference> aClone = new ArrayList<IEditorReference>();
-			aClone.addAll(editorReferences);
-
-			for (IEditorReference ref : aClone) {
-				if (!(ref.getEditor(false) instanceof IEditorPart)) {
-					editorReferences.remove(ref);
-				}
-			}
-
-			return editorReferences.toArray();
-		}
-
-		public void dispose() {
-		}
-
-		public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
-			// System.out.println( "inputChanged");
-		}
-	}
-
-	static class EditorReferenceLabelProvider extends LabelProvider {
-		/**
-		 * A string used to indicate that an editor is dirty
-		 */
-		public static char DIRTY_INDICATOR = '*';
-
-		/**
-		 * @see ILabelProvider#getImage(Object)
-		 */
-		public Image getImage(Object element) {
-			if (element instanceof IEditorReference) {
-				return ((IEditorReference) element).getTitleImage();
-			}
-			return super.getImage(element);
-		}
-
-		/**
-		 * @see ILabelProvider#getText(Object)
-		 */
-		public String getText(Object element) {
-			if (element instanceof IEditorReference) {
-				IEditorReference reference = ((IEditorReference) element);
-				StringBuffer buffer = new StringBuffer();
-				if (reference.isDirty()) {
-					buffer.append(DIRTY_INDICATOR);
-				}
-				buffer.append(reference.getTitle());
-				return buffer.toString();
-			}
-			return super.getText(element);
-		}
-	}
-}
diff --git a/bundles/org.eclipse.wst.xml.xpath.ui/src/org/eclipse/wst/xml/xpath/ui/internal/Messages.java b/bundles/org.eclipse.wst.xml.xpath.ui/src/org/eclipse/wst/xml/xpath/ui/internal/Messages.java
deleted file mode 100644
index 4f3788d..0000000
--- a/bundles/org.eclipse.wst.xml.xpath.ui/src/org/eclipse/wst/xml/xpath/ui/internal/Messages.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Standards for Technology in Automotive Retail 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:
- *     David Carver - initial API based off wst.xml.ui.CustomTemplateProposal
- *     Doug Satchwell - refactored to internal package
- *******************************************************************************/
-package org.eclipse.wst.xml.xpath.ui.internal;
-
-import org.eclipse.osgi.util.NLS;
-
-/**
- * @since 1.0
- */
-public class Messages extends NLS {
-	private static final String BUNDLE_NAME = "org.eclipse.wst.xml.xpath.ui.internal.messages"; //$NON-NLS-1$
-	public static String XPathComputer_0;
-	public static String XPathComputer_5;
-	public static String XPathView_0;
-	public static String XPathView_1;
-	public static String XPathView_2;
-	public static String XPathView_8;
-	public static String XPathViewActions_0;
-	public static String XPathViewActions_1;
-	public static String XPathPrefencePage_0;
-
-	public static String XPathNavigator_XPath_Navigator;
-	public static String XPathNavigator_Select_source_first;
-	public static String XPathNavigator_XPath_Eval_Failed;
-	public static String XPathNavigator_XML_Source_Document;
-	public static String XPathNavigator_Context;
-	public static String XPathNavigator_Selection;
-	public static String XPathNavigator_Document;
-	public static String XPathNavigator_Expression;
-	public static String XPathNavigator_DOM_Tree;
-	public static String XPathNavigator_Text;
-	public static String XPathNavigator_Run_XPath_Query;
-	public static String XPathNavigator_Run_on_selected;
-	public static String XPathNavigator_Refresh_Source_Docs;
-	public static String XPathNavigator_Refresh_Source_Docs_Tip;
-	public static String XPathNavigator_Show_In_Source;
-	public static String XPathNavigator_Show_In_Source_Tip;
-	public static String XPathNavigator_Node_could_not_be_selected;
-	public static String XPathNavigator_Nothing_selected;
-	public static String XPathNavigator_XPath_Show_In_Source_Failed;
-	public static String XPathNavigator_Namespaces;
-	public static String XPathNavigator_Namespaces_Tip;
-	public static String XPathNavigator_Namespace_Prefixes;
-
-	static {
-		// initialize resource bundle
-		NLS.initializeMessages(BUNDLE_NAME, Messages.class);
-	}
-
-	private Messages() {
-	}
-}
diff --git a/bundles/org.eclipse.wst.xml.xpath.ui/src/org/eclipse/wst/xml/xpath/ui/internal/XPathUIPlugin.java b/bundles/org.eclipse.wst.xml.xpath.ui/src/org/eclipse/wst/xml/xpath/ui/internal/XPathUIPlugin.java
deleted file mode 100644
index 90fb5db..0000000
--- a/bundles/org.eclipse.wst.xml.xpath.ui/src/org/eclipse/wst/xml/xpath/ui/internal/XPathUIPlugin.java
+++ /dev/null
@@ -1,131 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Chase Technology Ltd - http://www.chasetechnology.co.uk
- * 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:
- *     Doug Satchwell (Chase Technology Ltd) - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xml.xpath.ui.internal;
-
-import java.io.IOException;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jface.text.templates.ContextTypeRegistry;
-import org.eclipse.jface.text.templates.persistence.TemplateStore;
-import org.eclipse.ui.editors.text.templates.ContributionContextTypeRegistry;
-import org.eclipse.ui.editors.text.templates.ContributionTemplateStore;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.osgi.framework.BundleContext;
-
-/**
- * The activator class controls the plug-in life cycle
- */
-public class XPathUIPlugin extends AbstractUIPlugin {
-
-	// The plug-in ID
-	public static final String PLUGIN_ID = "org.eclipse.wst.xml.xpath.ui";
-
-	// The shared instance
-	private static XPathUIPlugin plugin;
-
-	/**
-	 * The template store for xpath.
-	 */
-	private TemplateStore fXPathTemplateStore;
-
-	/**
-	 * The template context type registry for xpath.
-	 */
-	private ContributionContextTypeRegistry fXPathContextTypeRegistry;
-
-	/**
-	 * The constructor
-	 */
-	public XPathUIPlugin() {
-		super();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.core.runtime.Plugins#start(org.osgi.framework.BundleContext)
-	 */
-	public void start(BundleContext context) throws Exception {
-		super.start(context);
-		plugin = this;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.core.runtime.Plugin#stop(org.osgi.framework.BundleContext)
-	 */
-	public void stop(BundleContext context) throws Exception {
-		plugin = null;
-		super.stop(context);
-	}
-
-	/**
-	 * Returns the shared instance
-	 * 
-	 * @return the shared instance
-	 */
-	public static XPathUIPlugin getDefault() {
-		return plugin;
-	}
-
-	public static void log(Exception e) {
-		getDefault().getLog().log(
-				new Status(IStatus.ERROR, PLUGIN_ID, 0, "", e)); //$NON-NLS-1$
-	}
-
-	public static void log(CoreException e) {
-		getDefault().getLog().log(e.getStatus());
-	}
-
-	/**
-	 * Returns the template store for the xpath templates.
-	 * 
-	 * @return the template store for the xpath templates
-	 */
-	public TemplateStore getXPathTemplateStore() {
-		if (fXPathTemplateStore == null) {
-			fXPathTemplateStore = new ContributionTemplateStore(
-					getXPathTemplateContextRegistry(), getPreferenceStore(),
-					"org.eclipse.wst.xml.xpath.ui.xpath_custom_templates"); //$NON-NLS-1$
-			try {
-				fXPathTemplateStore.load();
-			} catch (IOException e) {
-			}
-		}
-		return fXPathTemplateStore;
-	}
-
-	/**
-	 * Returns the template context type registry for xpath
-	 * 
-	 * @return the template context type registry for xpath
-	 */
-	public ContextTypeRegistry getXPathTemplateContextRegistry() {
-		if (fXPathContextTypeRegistry == null) {
-			ContributionContextTypeRegistry registry = new ContributionContextTypeRegistry();
-			registry.addContextType("xsl_xpath"); //$NON-NLS-1$
-			registry.addContextType("xpath_operator"); //$NON-NLS-1$
-			registry.addContextType("xpath_axis"); //$NON-NLS-1$
-			registry.addContextType("exslt_function"); //$NON-NLS-1$
-			registry.addContextType("xpath_2"); //$NON-NLS-1$
-			registry.addContextType("extension_function"); //$NON-NLS-1$
-			fXPathContextTypeRegistry = registry;
-		}
-
-		return fXPathContextTypeRegistry;
-	}
-
-}
diff --git a/bundles/org.eclipse.wst.xml.xpath.ui/src/org/eclipse/wst/xml/xpath/ui/internal/contentassist/CustomTemplateProposal.java b/bundles/org.eclipse.wst.xml.xpath.ui/src/org/eclipse/wst/xml/xpath/ui/internal/contentassist/CustomTemplateProposal.java
deleted file mode 100755
index ae3e741..0000000
--- a/bundles/org.eclipse.wst.xml.xpath.ui/src/org/eclipse/wst/xml/xpath/ui/internal/contentassist/CustomTemplateProposal.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Standards for Technology in Automotive Retail 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:
- *     David Carver - initial API based off wst.xml.ui.CustomTemplateProposal
- *     
- *******************************************************************************/
-package org.eclipse.wst.xml.xpath.ui.internal.contentassist;
-
-import org.eclipse.jface.text.IRegion;
-import org.eclipse.jface.text.templates.Template;
-import org.eclipse.jface.text.templates.TemplateContext;
-import org.eclipse.jface.text.templates.TemplateProposal;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.wst.sse.core.utils.StringUtils;
-import org.eclipse.wst.sse.ui.internal.contentassist.IRelevanceCompletionProposal;
-
-/**
- * Purpose of this class is to make the additional proposal info into content
- * fit for an HTML viewer (by escaping characters)
- */
-@SuppressWarnings("restriction")
-public class CustomTemplateProposal extends TemplateProposal implements
-		IRelevanceCompletionProposal {
-
-	private final Template fTemplate;
-
-	public CustomTemplateProposal(Template template, TemplateContext context,
-			IRegion region, Image image, int relevance) {
-		super(template, context, region, image, relevance);
-		this.fTemplate = template;
-	}
-
-	@Override
-	public String getDisplayString() {
-		return fTemplate.getName();
-	}
-
-	@Override
-	public String getAdditionalProposalInfo() {
-		return StringUtils.convertToHTMLContent(fTemplate.getDescription());
-	}
-}
diff --git a/bundles/org.eclipse.wst.xml.xpath.ui/src/org/eclipse/wst/xml/xpath/ui/internal/contentassist/XPathTemplateCompletionProcessor.java b/bundles/org.eclipse.wst.xml.xpath.ui/src/org/eclipse/wst/xml/xpath/ui/internal/contentassist/XPathTemplateCompletionProcessor.java
deleted file mode 100755
index f27bd9d..0000000
--- a/bundles/org.eclipse.wst.xml.xpath.ui/src/org/eclipse/wst/xml/xpath/ui/internal/contentassist/XPathTemplateCompletionProcessor.java
+++ /dev/null
@@ -1,203 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Standards for Technology in Automotive Retail 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:
- *     David Carver - STAR - initial API based off XMLTemplateCompletionProcessor
- *     
- *******************************************************************************/
-package org.eclipse.wst.xml.xpath.ui.internal.contentassist;
-
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.List;
-
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.IRegion;
-import org.eclipse.jface.text.ITextSelection;
-import org.eclipse.jface.text.ITextViewer;
-import org.eclipse.jface.text.Region;
-import org.eclipse.jface.text.contentassist.ICompletionProposal;
-import org.eclipse.jface.text.templates.ContextTypeRegistry;
-import org.eclipse.jface.text.templates.Template;
-import org.eclipse.jface.text.templates.TemplateCompletionProcessor;
-import org.eclipse.jface.text.templates.TemplateContext;
-import org.eclipse.jface.text.templates.TemplateContextType;
-import org.eclipse.jface.text.templates.TemplateException;
-import org.eclipse.jface.text.templates.TemplateProposal;
-import org.eclipse.jface.text.templates.persistence.TemplateStore;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.wst.xml.ui.internal.contentassist.ReplaceNameTemplateContext;
-import org.eclipse.wst.xml.xpath.ui.internal.XPathUIPlugin;
-import org.eclipse.wst.xml.xpath.ui.internal.templates.TemplateContextTypeIdsXPath;
-import org.eclipse.wst.xml.xpath.ui.internal.util.XPathPluginImageHelper;
-import org.eclipse.wst.xml.xpath.ui.internal.util.XPathPluginImages;
-
-/**
- * Completion processor for XML Templates. Most of the work is already done by
- * the XML Content Assist processor, so by the time the
- * XMLTemplateCompletionProcessor is asked for content assist proposals, the XML
- * content assist processor has already set the context type for templates.
- */
-public class XPathTemplateCompletionProcessor extends
-		TemplateCompletionProcessor {
-	private static final class ProposalComparator implements Comparator,
-			Serializable {
-
-		private static final long serialVersionUID = 1686588609390747536L;
-
-		public int compare(Object o1, Object o2) {
-			return ((TemplateProposal) o2).getRelevance()
-					- ((TemplateProposal) o1).getRelevance();
-		}
-	}
-
-	private static final Comparator fgProposalComparator = new ProposalComparator();
-	private String fContextTypeId = null;
-
-	/*
-	 * Copied from super class except instead of calling createContext(viewer,
-	 * region) call createContext(viewer, region, offset) instead
-	 */
-	public ICompletionProposal[] computeCompletionProposals(ITextViewer viewer,
-			int offset) {
-
-		ITextSelection selection = (ITextSelection) viewer
-				.getSelectionProvider().getSelection();
-
-		// adjust offset to end of normalized selection
-		if (selection.getOffset() == offset) {
-			offset = selection.getOffset() + selection.getLength();
-		}
-
-		String prefix = extractPrefix(viewer, offset);
-		Region region = new Region(offset - prefix.length(), prefix.length());
-		TemplateContext context = createContext(viewer, region, offset);
-		if (context == null) {
-			return new ICompletionProposal[0];
-		}
-
-		// name of the selection variables {line, word}_selection
-		context.setVariable("selection", selection.getText()); //$NON-NLS-1$
-
-		Template[] templates = getTemplates(context.getContextType().getId());
-
-		List matches = new ArrayList();
-		for (int i = 0; i < templates.length; i++) {
-			Template template = templates[i];
-			try {
-				context.getContextType().validate(template.getPattern());
-			} catch (TemplateException e) {
-				continue;
-			}
-			if (template.matches(prefix, context.getContextType().getId())) {
-				matches.add(createProposal(template, context, (IRegion) region,
-						getRelevance(template, prefix)));
-			}
-		}
-
-		Collections.sort(matches, fgProposalComparator);
-
-		return (ICompletionProposal[]) matches
-				.toArray(new ICompletionProposal[matches.size()]);
-	}
-
-	/**
-	 * Creates a concrete template context for the given region in the document.
-	 * This involves finding out which context type is valid at the given
-	 * location, and then creating a context of this type. The default
-	 * implementation returns a <code>SmartReplaceTemplateContext</code> for the
-	 * context type at the given location. This takes the offset at which
-	 * content assist was invoked into consideration.
-	 * 
-	 * @param viewer
-	 *            the viewer for which the context is created
-	 * @param region
-	 *            the region into <code>document</code> for which the context is
-	 *            created
-	 * @param offset
-	 *            the original offset where content assist was invoked
-	 * @return a template context that can handle template insertion at the
-	 *         given location, or <code>null</code>
-	 */
-	private TemplateContext createContext(ITextViewer viewer, IRegion region,
-			int offset) {
-		// pretty much same code as super.createContext except create
-		// SmartReplaceTemplateContext
-		TemplateContextType contextType = getContextType(viewer, region);
-		if (contextType != null) {
-			IDocument document = viewer.getDocument();
-			return new ReplaceNameTemplateContext(contextType, document, region
-					.getOffset(), region.getLength(), offset);
-		}
-		return null;
-	}
-
-	protected ICompletionProposal createProposal(Template template,
-			TemplateContext context, IRegion region, int relevance) {
-		return new CustomTemplateProposal(template, context, region,
-				getImage(template), relevance);
-	}
-
-	protected TemplateContextType getContextType(ITextViewer viewer,
-			IRegion region) {
-		TemplateContextType type = null;
-
-		ContextTypeRegistry registry = getTemplateContextRegistry();
-		if (registry != null) {
-			type = registry.getContextType(fContextTypeId);
-		}
-
-		return type;
-	}
-
-	protected Image getImage(Template template) {
-		if (TemplateContextTypeIdsXPath.AXIS
-				.equals(template.getContextTypeId())) {
-			return XPathPluginImageHelper.getInstance().getImage(
-					XPathPluginImages.IMG_XPATH_AXIS);
-		}
-
-		if (TemplateContextTypeIdsXPath.XPATH.equals(template
-				.getContextTypeId())) {
-			return XPathPluginImageHelper.getInstance().getImage(
-					XPathPluginImages.IMG_XPATH_FUNCTION);
-		}
-
-		if (TemplateContextTypeIdsXPath.OPERATOR.equals(template
-				.getContextTypeId())) {
-			return XPathPluginImageHelper.getInstance().getImage(
-					XPathPluginImages.IMG_OPERATOR);
-		}
-
-		return null;
-	}
-
-	private ContextTypeRegistry getTemplateContextRegistry() {
-		return XPathUIPlugin.getDefault().getXPathTemplateContextRegistry();
-	}
-
-	protected Template[] getTemplates(String contextTypeId) {
-		Template templates[] = null;
-
-		TemplateStore store = getTemplateStore();
-		if (store != null) {
-			templates = store.getTemplates(contextTypeId);
-		}
-
-		return templates;
-	}
-
-	private TemplateStore getTemplateStore() {
-		return XPathUIPlugin.getDefault().getXPathTemplateStore();
-	}
-
-	public void setContextType(String contextTypeId) {
-		fContextTypeId = contextTypeId;
-	}
-}
diff --git a/bundles/org.eclipse.wst.xml.xpath.ui/src/org/eclipse/wst/xml/xpath/ui/internal/messages.properties b/bundles/org.eclipse.wst.xml.xpath.ui/src/org/eclipse/wst/xml/xpath/ui/internal/messages.properties
deleted file mode 100644
index 6579845..0000000
--- a/bundles/org.eclipse.wst.xml.xpath.ui/src/org/eclipse/wst/xml/xpath/ui/internal/messages.properties
+++ /dev/null
@@ -1,33 +0,0 @@
-XPathComputer_0=IStructuredModel did not adapt to a Document
-XPathComputer_5=Refreshing XPath View
-XPathView_0=Location: 
-XPathView_1=XPath expression:
-XPathView_2=Sheet 
-XPathView_8=/
-XPathViewActions_0=Collapse All
-XPathViewActions_1=Link with Editor
-XPathPrefencePage_0=Expand the tree to edit the features for a particular XPath feature.
-
-# UI Preference Settings for views:
-XPathNavigator_XPath_Navigator=XPath Navigator
-XPathNavigator_Select_source_first=Select XML Source document first.
-XPathNavigator_XPath_Eval_Failed=XPath Expression evaluation failed :\r\n
-XPathNavigator_XML_Source_Document=XML Source Document:
-XPathNavigator_Context=XPath Context:
-XPathNavigator_Selection=Selection
-XPathNavigator_Document=Document
-XPathNavigator_Expression=XPath Expression:
-XPathNavigator_DOM_Tree=DOM Tree
-XPathNavigator_Text=Text
-XPathNavigator_Run_XPath_Query=Run XPath Query
-XPathNavigator_Run_on_selected=Run XPath Query on selected\ndocument context
-XPathNavigator_Refresh_Source_Docs=Refresh XML Source Documents
-XPathNavigator_Refresh_Source_Docs_Tip=Refresh XML Source Document list
-XPathNavigator_Show_In_Source=Show in Source
-XPathNavigator_Show_In_Source_Tip=Go to selection in XML Source Document.
-XPathNavigator_Node_could_not_be_selected=Node could not be selected.
-XPathNavigator_Nothing_selected=Nothing selected.
-XPathNavigator_XPath_Show_In_Source_Failed=Could not find source position :\r\n
-XPathNavigator_Namespaces=Prefixes...
-XPathNavigator_Namespaces_Tip=Edit namespace prefixes used in the XPath expression...
-XPathNavigator_Namespace_Prefixes=Namespace prefixes
diff --git a/bundles/org.eclipse.wst.xml.xpath.ui/src/org/eclipse/wst/xml/xpath/ui/internal/preferences/XPathPrefencePage.java b/bundles/org.eclipse.wst.xml.xpath.ui/src/org/eclipse/wst/xml/xpath/ui/internal/preferences/XPathPrefencePage.java
deleted file mode 100644
index e343dee..0000000
--- a/bundles/org.eclipse.wst.xml.xpath.ui/src/org/eclipse/wst/xml/xpath/ui/internal/preferences/XPathPrefencePage.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package org.eclipse.wst.xml.xpath.ui.internal.preferences;
-
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.wst.sse.ui.internal.preferences.ui.AbstractPreferencePage;
-import org.eclipse.wst.xml.xpath.ui.internal.Messages;
-
-@SuppressWarnings("restriction")
-public class XPathPrefencePage extends AbstractPreferencePage {
-
-	/**
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.wst.sse.ui.internal.preferences.ui.AbstractPreferencePage#createContents(org.eclipse.swt.widgets.Composite)
-	 * @deprecated
-	 */
-	protected Control createContents(Composite parent) {
-		Composite composite = createScrolledComposite(parent);
-
-		String description = Messages.XPathPrefencePage_0;
-		Text text = new Text(composite, SWT.READ_ONLY);
-		// some themes on GTK have different background colors for Text and
-		// Labels
-		text.setBackground(composite.getBackground());
-		text.setText(description);
-
-		setSize(composite);
-		return composite;
-	}
-
-}
diff --git a/bundles/org.eclipse.wst.xml.xpath.ui/src/org/eclipse/wst/xml/xpath/ui/internal/preferences/XPathTemplatePreferencePage.java b/bundles/org.eclipse.wst.xml.xpath.ui/src/org/eclipse/wst/xml/xpath/ui/internal/preferences/XPathTemplatePreferencePage.java
deleted file mode 100644
index d1553e6..0000000
--- a/bundles/org.eclipse.wst.xml.xpath.ui/src/org/eclipse/wst/xml/xpath/ui/internal/preferences/XPathTemplatePreferencePage.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Chase Technology Ltd - http://www.chasetechnology.co.uk
- * 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:
- *     Doug Satchwell (Chase Technology Ltd) - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xml.xpath.ui.internal.preferences;
-
-import org.eclipse.wst.xml.ui.internal.preferences.XMLTemplatePreferencePage;
-import org.eclipse.wst.xml.xpath.ui.internal.XPathUIPlugin;
-
-/**
- * XSLTemplatePreferencePage sets up the template preference page that contains
- * the templates for xpath, xpath 2.0, axis, operators, and exslt functions.
- * 
- * @author dcarver
- * 
- */
-public class XPathTemplatePreferencePage extends XMLTemplatePreferencePage {
-
-	/**
-	 * 
-	 */
-	public XPathTemplatePreferencePage() {
-		setPreferenceStore(XPathUIPlugin.getDefault().getPreferenceStore());
-		setTemplateStore(XPathUIPlugin.getDefault().getXPathTemplateStore());
-		setContextTypeRegistry(XPathUIPlugin.getDefault()
-				.getXPathTemplateContextRegistry());
-	}
-
-	/**
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jface.preference.IPreferencePage#performOk()
-	 */
-	@Override
-	public boolean performOk() {
-		boolean ok = super.performOk();
-		XPathUIPlugin.getDefault().savePluginPreferences();
-		return ok;
-	}
-}
diff --git a/bundles/org.eclipse.wst.xml.xpath.ui/src/org/eclipse/wst/xml/xpath/ui/internal/templates/TemplateContextTypeIdsXPath.java b/bundles/org.eclipse.wst.xml.xpath.ui/src/org/eclipse/wst/xml/xpath/ui/internal/templates/TemplateContextTypeIdsXPath.java
deleted file mode 100755
index fd6165c..0000000
--- a/bundles/org.eclipse.wst.xml.xpath.ui/src/org/eclipse/wst/xml/xpath/ui/internal/templates/TemplateContextTypeIdsXPath.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Standards for Technology in Automotive Retail 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:
- *     David Carver - STAR - bug 213849 - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.xml.xpath.ui.internal.templates;
-
-/**
- * This class contains the names and values for the XSL ContenxtTypes for the
- * XPath completion proposals.
- * 
- * @author dcarver
- * 
- */
-public class TemplateContextTypeIdsXPath {
-
-	/**
-	 * TODO: Add Javadoc
-	 */
-	public static final String XPATH = getXPath();
-
-	/**
-	 * TODO: Add Javadoc
-	 */
-	public static final String XPATH2 = getXPath2();
-
-	/**
-	 * TODO: Add Javadoc
-	 */
-	public static final String AXIS = getAXIS();
-
-	/**
-	 * TODO: Add Javadoc
-	 */
-	public static final String EXSLT = getEXSLT();
-
-	/**
-	 * TODO: Add Javadoc
-	 */
-	public static final String OPERATOR = getOperator();
-
-	/**
-	 * TODO: Add Javadoc
-	 */
-	public static final String CUSTOM = getCustom();
-
-	private static String getXPath() {
-		return "xsl_xpath"; //$NON-NLS-1$
-	}
-
-	private static String getXPath2() {
-		return "xpath_2"; //$NON-NLS-1$
-	}
-
-	private static String getAXIS() {
-		return "xpath_axis"; //$NON-NLS-1$
-	}
-
-	private static String getEXSLT() {
-		return "exslt_functions"; //$NON-NLS-1$
-	}
-
-	private static String getOperator() {
-		return "xpath_operator"; //$NON-NLS-1$
-	}
-
-	private static String getCustom() {
-		return "extension_function"; //$NON-NLS-1$
-	}
-}
diff --git a/bundles/org.eclipse.wst.xml.xpath.ui/src/org/eclipse/wst/xml/xpath/ui/internal/util/XPathPluginImageHelper.java b/bundles/org.eclipse.wst.xml.xpath.ui/src/org/eclipse/wst/xml/xpath/ui/internal/util/XPathPluginImageHelper.java
deleted file mode 100755
index a4fb40f..0000000
--- a/bundles/org.eclipse.wst.xml.xpath.ui/src/org/eclipse/wst/xml/xpath/ui/internal/util/XPathPluginImageHelper.java
+++ /dev/null
@@ -1,161 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Standards for Technology in Automotive Retail 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:
- *     David Carver - STAR - bug 213849 - initial API and implementation
- *     
- *******************************************************************************/
-package org.eclipse.wst.xml.xpath.ui.internal.util;
-
-import java.util.HashMap;
-
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.resource.ImageRegistry;
-import org.eclipse.jface.resource.JFaceResources;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.eclipse.wst.xml.xpath.ui.internal.XPathUIPlugin;
-
-/**
- * Helper class to handle images provided by this plug-in.
- * 
- * NOTE: For internal use only. For images used externally, please use the
- * Shared***ImageHelper class instead.
- * 
- * @author david carver based on work by amywu
- */
-public class XPathPluginImageHelper {
-	private static XPathPluginImageHelper instance = null;
-
-	/**
-	 * Gets the instance.
-	 * 
-	 * @return Returns a XMLEditorPluginImageHelper
-	 */
-	public synchronized static XPathPluginImageHelper getInstance() {
-		if (instance == null) {
-			instance = new XPathPluginImageHelper();
-		}
-		return instance;
-	}
-
-	// save a descriptor for each image
-	@SuppressWarnings("unchecked")
-	private HashMap fImageDescRegistry = null;
-
-	// private final String PLUGINID = XPathUIPlugin.PLUGIN_ID;
-
-	/**
-	 * Creates an image from the given resource and adds the image to the image
-	 * registry.
-	 * 
-	 * @param resource
-	 * @return Image
-	 */
-	private Image createImage(String resource) {
-		ImageDescriptor desc = getImageDescriptor(resource);
-		Image image = null;
-
-		if (desc != null) {
-			image = desc.createImage();
-			// dont add the missing image descriptor image to the image
-			// registry
-			if (!desc.equals(ImageDescriptor.getMissingImageDescriptor())) {
-				getImageRegistry().put(resource, image);
-			}
-		}
-		return image;
-	}
-
-	/**
-	 * Creates an image descriptor from the given imageFilePath and adds the
-	 * image descriptor to the image descriptor registry. If an image descriptor
-	 * could not be created, the default "missing" image descriptor is returned
-	 * but not added to the image descriptor registry.
-	 * 
-	 * @param imageFilePath
-	 * @return ImageDescriptor image descriptor for imageFilePath or default
-	 *         "missing" image descriptor if resource could not be found
-	 */
-	@SuppressWarnings("unchecked")
-	private ImageDescriptor createImageDescriptor(String imageFilePath) {
-		ImageDescriptor imageDescriptor = AbstractUIPlugin
-				.imageDescriptorFromPlugin(XPathUIPlugin.PLUGIN_ID,
-						imageFilePath);
-		if (imageDescriptor != null) {
-			getImageDescriptorRegistry().put(imageFilePath, imageDescriptor);
-		} else {
-			imageDescriptor = ImageDescriptor.getMissingImageDescriptor();
-		}
-
-		return imageDescriptor;
-	}
-
-	/**
-	 * Retrieves the image associated with resource from the image registry. If
-	 * the image cannot be retrieved, attempt to find and load the image at the
-	 * location specified in resource.
-	 * 
-	 * @param resource
-	 *            the image to retrieve
-	 * @return Image the image associated with resource or null if one could not
-	 *         be found
-	 */
-	public Image getImage(String resource) {
-		Image image = getImageRegistry().get(resource);
-		if (image == null) {
-			// create an image
-			image = createImage(resource);
-		}
-		return image;
-	}
-
-	/**
-	 * Retrieves the image descriptor associated with resource from the image
-	 * descriptor registry. If the image descriptor cannot be retrieved, attempt
-	 * to find and load the image descriptor at the location specified in
-	 * resource.
-	 * 
-	 * @param resource
-	 *            the image descriptor to retrieve
-	 * @return ImageDescriptor the image descriptor assocated with resource or
-	 *         the default "missing" image descriptor if one could not be found
-	 */
-	public ImageDescriptor getImageDescriptor(String resource) {
-		ImageDescriptor imageDescriptor = null;
-		Object o = getImageDescriptorRegistry().get(resource);
-		if (o == null) {
-			// create a descriptor
-			imageDescriptor = createImageDescriptor(resource);
-		} else {
-			imageDescriptor = (ImageDescriptor) o;
-		}
-		return imageDescriptor;
-	}
-
-	/**
-	 * Returns the image descriptor registry for this plugin.
-	 * 
-	 * @return HashMap - image descriptor registry for this plugin
-	 */
-	@SuppressWarnings("unchecked")
-	private HashMap getImageDescriptorRegistry() {
-		if (fImageDescRegistry == null) {
-			fImageDescRegistry = new HashMap();
-		}
-		return fImageDescRegistry;
-	}
-
-	/**
-	 * Returns the image registry for this plugin.
-	 * 
-	 * @return ImageRegistry - image registry for this plugin
-	 */
-	private ImageRegistry getImageRegistry() {
-		return JFaceResources.getImageRegistry();
-	}
-}
diff --git a/bundles/org.eclipse.wst.xml.xpath.ui/src/org/eclipse/wst/xml/xpath/ui/internal/util/XPathPluginImages.java b/bundles/org.eclipse.wst.xml.xpath.ui/src/org/eclipse/wst/xml/xpath/ui/internal/util/XPathPluginImages.java
deleted file mode 100755
index 698527a..0000000
--- a/bundles/org.eclipse.wst.xml.xpath.ui/src/org/eclipse/wst/xml/xpath/ui/internal/util/XPathPluginImages.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Standards for Technology in Automotive Retail 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:
- *     David Carver - STAR - bug 213849 - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xml.xpath.ui.internal.util;
-
-/**
- * Bundle of most images used by the XSL Plugins
- */
-public class XPathPluginImages {
-
-	/**
-	 * Path to the XPATH Images used for Content Assist
-	 */
-	public static final String IMG_XPATH_FUNCTION = "icons/full/function.gif"; //$NON-NLS-1$
-
-	/**
-	 * Path to the XPATH Images used for Content Assist
-	 */
-	public static final String IMG_XPATH_AXIS = "icons/full/directional.gif"; //$NON-NLS-1$
-
-	/**
-	 * Path to the XPATH Images used for Content Assist
-	 */
-	public static final String IMG_VARIABLES = "icons/full/variable.gif"; //$NON-NLS-1$	
-
-	/**
-	 * Path to the XPATH Images used for Content Assist
-	 */
-	public static final String IMG_OPERATOR = "icons/full/operation.gif"; //$NON-NLS-1$	
-
-}
diff --git a/bundles/org.eclipse.wst.xml.xpath.ui/src/org/eclipse/wst/xml/xpath/ui/internal/views/EditNamespacePrefixDialog.java b/bundles/org.eclipse.wst.xml.xpath.ui/src/org/eclipse/wst/xml/xpath/ui/internal/views/EditNamespacePrefixDialog.java
deleted file mode 100644
index fb84006..0000000
--- a/bundles/org.eclipse.wst.xml.xpath.ui/src/org/eclipse/wst/xml/xpath/ui/internal/views/EditNamespacePrefixDialog.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006, 2007 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 (adapted from EditSchemaInfoDialog):
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     Jesper Steen Moller - Extracted for use in XPath Navigator view
- *     
- *******************************************************************************/
-package org.eclipse.wst.xml.xpath.ui.internal.views;
-
-import java.util.List;
-
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.wst.xml.core.internal.contentmodel.util.NamespaceInfo;
-import org.eclipse.wst.xml.ui.internal.dialogs.NamespaceInfoErrorHelper;
-import org.eclipse.wst.xml.ui.internal.dialogs.UpdateListener;
-import org.eclipse.wst.xml.ui.internal.nsedit.CommonEditNamespacesDialog;
-import org.eclipse.wst.xml.xpath.ui.internal.Messages;
-
-public class EditNamespacePrefixDialog extends Dialog implements UpdateListener {
-	// protected NamespaceInfoTable namespaceInfoTable;
-	protected Label errorMessageLabel;
-	protected List<NamespaceInfo> namespaceInfoList;
-	protected IPath resourceLocation;
-
-	public EditNamespacePrefixDialog(Shell parentShell, IPath resourceLocation) {
-		super(parentShell);
-		setShellStyle(getShellStyle() | SWT.RESIZE);
-		this.resourceLocation = resourceLocation;
-	}
-
-	protected void createButtonsForButtonBar(Composite parent) {
-		createButton(parent, IDialogConstants.OK_ID, IDialogConstants.OK_LABEL,
-				true);
-		createButton(parent, IDialogConstants.CANCEL_ID,
-				IDialogConstants.CANCEL_LABEL, false);
-	}
-
-	protected Control createDialogArea(Composite parent) {
-		Composite dialogArea = (Composite) super.createDialogArea(parent);
-		// PlatformUI.getWorkbench().getHelpSystem().setHelp(dialogArea,
-		// XMLCommonUIContextIds.XCUI_SCHEMA_INFO_DIALOG);
-
-		CommonEditNamespacesDialog editNamespacesControl = new CommonEditNamespacesDialog(
-				dialogArea, resourceLocation,
-				Messages.XPathNavigator_Namespace_Prefixes, false, true);
-		editNamespacesControl.setNamespaceInfoList(namespaceInfoList);
-
-		editNamespacesControl.updateErrorMessage(namespaceInfoList);
-
-		getShell().setText(Messages.XPathNavigator_Namespace_Prefixes);
-		return dialogArea;
-	}
-
-	protected Control getDialogArea(Composite parent) {
-		return super.createDialogArea(parent);
-	}
-
-	public List<NamespaceInfo> getNamespaceInfoList() {
-		return namespaceInfoList;
-	}
-
-	public void setNamespaceInfoList(List<NamespaceInfo> list) {
-		namespaceInfoList = list;
-	}
-
-	public void updateErrorMessage(List<NamespaceInfo> namespaceInfoList) {
-		NamespaceInfoErrorHelper helper = new NamespaceInfoErrorHelper();
-		String errorMessage = helper.computeErrorMessage(namespaceInfoList,
-				null);
-		errorMessageLabel.setText(errorMessage != null ? errorMessage : ""); //$NON-NLS-1$
-	}
-
-	@SuppressWarnings("unchecked")
-	public void updateOccured(Object object, Object arg) {
-		updateErrorMessage((List<NamespaceInfo>) arg);
-	}
-}
diff --git a/bundles/org.eclipse.wst.xml.xpath.ui/src/org/eclipse/wst/xml/xpath/ui/internal/views/EmptyNodeList.java b/bundles/org.eclipse.wst.xml.xpath.ui/src/org/eclipse/wst/xml/xpath/ui/internal/views/EmptyNodeList.java
deleted file mode 100644
index 34e67a7..0000000
--- a/bundles/org.eclipse.wst.xml.xpath.ui/src/org/eclipse/wst/xml/xpath/ui/internal/views/EmptyNodeList.java
+++ /dev/null
@@ -1,14 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Chase Technology Ltd - http://www.chasetechnology.co.uk
- * 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:
- *     Doug Satchwell (Chase Technology Ltd) - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xml.xpath.ui.internal.views;
-
-public class EmptyNodeList {
-}
diff --git a/bundles/org.eclipse.wst.xml.xpath.ui/src/org/eclipse/wst/xml/xpath/ui/internal/views/JFaceNodeContentProviderXPath.java b/bundles/org.eclipse.wst.xml.xpath.ui/src/org/eclipse/wst/xml/xpath/ui/internal/views/JFaceNodeContentProviderXPath.java
deleted file mode 100644
index b416fb1..0000000
--- a/bundles/org.eclipse.wst.xml.xpath.ui/src/org/eclipse/wst/xml/xpath/ui/internal/views/JFaceNodeContentProviderXPath.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Chase Technology Ltd - http://www.chasetechnology.co.uk
- * 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:
- *     Doug Satchwell (Chase Technology Ltd) - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xml.xpath.ui.internal.views;
-
-import org.eclipse.jface.resource.FontRegistry;
-import org.eclipse.jface.viewers.ITreeContentProvider;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.wst.sse.core.internal.provisional.INodeAdapter;
-import org.eclipse.wst.sse.core.internal.provisional.INodeNotifier;
-import org.eclipse.wst.sse.ui.internal.contentoutline.IJFaceNodeAdapter;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
-public class JFaceNodeContentProviderXPath implements ITreeContentProvider {
-	FontRegistry registry = new FontRegistry();
-
-	protected IJFaceNodeAdapter getAdapter(Object adaptable) {
-		if (adaptable instanceof INodeNotifier) {
-			INodeAdapter adapter = ((INodeNotifier) adaptable)
-					.getAdapterFor(IJFaceNodeAdapter.class);
-			if (adapter instanceof IJFaceNodeAdapter) {
-				return (IJFaceNodeAdapter) adapter;
-			}
-		}
-
-		return null;
-	}
-
-	public Object[] getChildren(Object object) {
-		IJFaceNodeAdapter adapter = getAdapter(object);
-		if (adapter != null) {
-			return adapter.getChildren(object);
-		}
-		return new Object[0];
-	}
-
-	public Object[] getElements(Object object) {
-		if (object instanceof IDOMModel) {
-			Object topNode = ((IDOMModel) object).getDocument();
-			IJFaceNodeAdapter adapter = getAdapter(topNode);
-			if (adapter != null) {
-				return adapter.getElements(topNode);
-			}
-		} else if (object instanceof NodeList) {
-			NodeList nodeList = (NodeList) object;
-			if (nodeList.getLength() == 0) {
-				return new Object[] { new EmptyNodeList() };
-			} else {
-				Node[] nodes = new Node[nodeList.getLength()];
-				for (int i = 0; i < nodes.length; i++) {
-					nodes[i] = nodeList.item(i);
-				}
-				return nodes;
-			}
-		}
-		return new Object[0];
-	}
-
-	public Object getParent(Object object) {
-		IJFaceNodeAdapter adapter = getAdapter(object);
-		if (adapter != null) {
-			return adapter.getParent(object);
-		}
-		return null;
-	}
-
-	public boolean hasChildren(Object object) {
-		IJFaceNodeAdapter adapter = getAdapter(object);
-		if (adapter != null) {
-			return adapter.hasChildren(object);
-		}
-		return false;
-	}
-
-	public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
-	}
-
-	public void dispose() {
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.xml.xpath.ui/src/org/eclipse/wst/xml/xpath/ui/internal/views/JFaceNodeLabelProviderXPath.java b/bundles/org.eclipse.wst.xml.xpath.ui/src/org/eclipse/wst/xml/xpath/ui/internal/views/JFaceNodeLabelProviderXPath.java
deleted file mode 100644
index 029cdf4..0000000
--- a/bundles/org.eclipse.wst.xml.xpath.ui/src/org/eclipse/wst/xml/xpath/ui/internal/views/JFaceNodeLabelProviderXPath.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Chase Technology Ltd - http://www.chasetechnology.co.uk
- * 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:
- *     Doug Satchwell (Chase Technology Ltd) - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xml.xpath.ui.internal.views;
-
-import org.eclipse.jface.resource.FontRegistry;
-import org.eclipse.jface.viewers.IFontProvider;
-import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.swt.graphics.Font;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.wst.sse.core.internal.provisional.INodeAdapter;
-import org.eclipse.wst.sse.core.internal.provisional.INodeNotifier;
-import org.eclipse.wst.sse.ui.internal.contentoutline.IJFaceNodeAdapter;
-import org.w3c.dom.Attr;
-import org.w3c.dom.Element;
-import org.w3c.dom.NamedNodeMap;
-
-public class JFaceNodeLabelProviderXPath extends LabelProvider implements
-		IFontProvider {
-	FontRegistry registry = new FontRegistry();
-
-	protected IJFaceNodeAdapter getAdapter(Object adaptable) {
-		if (adaptable instanceof INodeNotifier) {
-			INodeAdapter adapter = ((INodeNotifier) adaptable)
-					.getAdapterFor(IJFaceNodeAdapter.class);
-			if (adapter instanceof IJFaceNodeAdapter) {
-				return (IJFaceNodeAdapter) adapter;
-			}
-		}
-		return null;
-	}
-
-	public Image getImage(Object element) {
-		if (element instanceof EmptyNodeList) {
-			return null;
-		}
-		return getAdapter(element).getLabelImage(element);
-	}
-
-	public String getText(Object element) {
-		if (element instanceof EmptyNodeList) {
-			return "<No Matches>";
-		}
-		IJFaceNodeAdapter adapter = getAdapter(element);
-		StringBuffer sb = new StringBuffer(adapter.getLabelText(element));
-		if (element instanceof Element) {
-			Element impl = (Element) element;
-			NamedNodeMap nnm = impl.getAttributes();
-			if (nnm.getLength() > 0) {
-				Attr a = (Attr) nnm.item(0);
-				String val = a.getNodeValue();
-				if (val.length() > 15) {
-					val = val.substring(0, 15);
-				}
-				sb.append(" ").append(a.getName()).append("=").append(val);
-			}
-		}
-		return sb.toString();
-	}
-
-	public boolean isLabelProperty(Object element, String property) {
-		return false;
-	}
-
-	public Font getFont(Object element) {
-		if (element instanceof EmptyNodeList) {
-			return registry.getItalic(Display.getCurrent().getSystemFont()
-					.getFontData()[0].getName());
-		}
-		return null;
-	}
-}
diff --git a/bundles/org.eclipse.wst.xml.xpath.ui/src/org/eclipse/wst/xml/xpath/ui/internal/views/XPathComputer.java b/bundles/org.eclipse.wst.xml.xpath.ui/src/org/eclipse/wst/xml/xpath/ui/internal/views/XPathComputer.java
deleted file mode 100644
index 96adf4b..0000000
--- a/bundles/org.eclipse.wst.xml.xpath.ui/src/org/eclipse/wst/xml/xpath/ui/internal/views/XPathComputer.java
+++ /dev/null
@@ -1,168 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Chase Technology Ltd - http://www.chasetechnology.co.uk 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:
- *     Doug Satchwell (Chase Technology Ltd) - initial API and implementation
- *     David Carver (STAR) - bug 261428 - XPath View not respecting namespaces.
- *******************************************************************************/
-package org.eclipse.wst.xml.xpath.ui.internal.views;
-
-import javax.xml.transform.TransformerException;
-import javax.xml.xpath.XPathExpressionException;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.ui.progress.IWorkbenchSiteProgressService;
-import org.eclipse.wst.sse.core.internal.provisional.IModelStateListener;
-import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-import org.eclipse.wst.xml.xpath.core.util.XSLTXPathHelper;
-import org.eclipse.wst.xml.xpath.ui.internal.Messages;
-import org.w3c.dom.Document;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
-public class XPathComputer {
-	private static final int UPDATE_DELAY = 500;
-	private static final byte[] XPATH_LOCK = new byte[0];
-	private XPathView xpathView;
-	private IModelStateListener modelStateListener = new IModelStateListener() {
-
-		public void modelAboutToBeChanged(IStructuredModel model) {
-		}
-
-		public void modelAboutToBeReinitialized(IStructuredModel structuredModel) {
-		}
-
-		public void modelChanged(IStructuredModel model) {
-			updateXPath();
-			compute();
-		}
-
-		public void modelDirtyStateChanged(IStructuredModel model,
-				boolean isDirty) {
-		}
-
-		public void modelReinitialized(IStructuredModel structuredModel) {
-		}
-
-		public void modelResourceDeleted(IStructuredModel model) {
-		}
-
-		public void modelResourceMoved(IStructuredModel oldModel,
-				IStructuredModel newModel) {
-		}
-	};
-	private Node node;
-	private IStructuredModel model;
-	private String expression;
-	private String text;
-	private NodeList nodeList;
-
-	public XPathComputer(XPathView xpathView) {
-		this.xpathView = xpathView;
-	}
-
-	public void setModel(IStructuredModel model) {
-		if (this.model != null) {
-			this.model.removeModelStateListener(modelStateListener);
-		}
-		this.model = model;
-		if (model != null) {
-			model.addModelStateListener(modelStateListener);
-			updateXPath();
-		} else {
-			node = null;
-		}
-	}
-
-	private void updateXPath() {
-		Document doc = (Document) model.getAdapter(Document.class);
-		if (doc == null) {
-			return;
-		}
-
-		try {
-			updateExpression();
-		} catch (XPathExpressionException e) {
-
-		}
-	}
-
-	private void updateExpression() throws XPathExpressionException {
-		synchronized (XPATH_LOCK) {
-			if (text != null) {
-				XSLTXPathHelper.compile(text);
-				this.expression = text;
-			} else {
-				this.expression = null;
-			}
-		}
-	}
-
-	public void setText(String text) throws XPathExpressionException {
-		this.text = text;
-		updateExpression();
-	}
-
-	public void setSelectedNode(Node node) {
-		this.node = node;
-	}
-
-	public void compute() {
-		final String[] xps = new String[1];
-		synchronized (XPATH_LOCK) {
-			xps[0] = expression;
-		}
-		Job refresh = new Job(Messages.XPathComputer_5) {
-			@Override
-			protected IStatus run(IProgressMonitor monitor) {
-				if (xps[0] != expression) {
-					return Status.CANCEL_STATUS;
-				}
-				return doCompute(xps[0]);
-			}
-		};
-		refresh.setSystem(true);
-		refresh.setPriority(Job.SHORT);
-		IWorkbenchSiteProgressService service = (IWorkbenchSiteProgressService) xpathView
-				.getSite().getService(IWorkbenchSiteProgressService.class);
-		service.schedule(refresh, UPDATE_DELAY);
-	}
-
-	private IStatus doCompute(String xp) {
-		IStatus status = executeXPath(xp);
-
-		xpathView.getSite().getShell().getDisplay().asyncExec(new Runnable() {
-			public void run() {
-				xpathView.xpathRecomputed(nodeList);
-			}
-		});
-		return status;
-	}
-
-	private IStatus executeXPath(String xp) {
-		try {
-			if ((xp != null) && (node != null)) {
-				synchronized (XPATH_LOCK) {
-					this.nodeList = XSLTXPathHelper.selectNodeList(node, xp);
-				}
-			}
-		} catch (TransformerException e) {
-			return Status.CANCEL_STATUS;
-		}
-		return Status.OK_STATUS;
-	}
-
-	public void dispose() {
-		if (model != null) {
-			model.removeModelStateListener(modelStateListener);
-			model = null;
-		}
-	}
-}
diff --git a/bundles/org.eclipse.wst.xml.xpath.ui/src/org/eclipse/wst/xml/xpath/ui/internal/views/XPathView.java b/bundles/org.eclipse.wst.xml.xpath.ui/src/org/eclipse/wst/xml/xpath/ui/internal/views/XPathView.java
deleted file mode 100644
index 60d00a6..0000000
--- a/bundles/org.eclipse.wst.xml.xpath.ui/src/org/eclipse/wst/xml/xpath/ui/internal/views/XPathView.java
+++ /dev/null
@@ -1,551 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Chase Technology Ltd - http://www.chasetechnology.co.uk
- * 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:
- *     Doug Satchwell (Chase Technology Ltd) - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xml.xpath.ui.internal.views;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import javax.xml.xpath.XPathExpressionException;
-
-import org.eclipse.core.runtime.ListenerList;
-import org.eclipse.core.runtime.SafeRunner;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.action.IMenuListener;
-import org.eclipse.jface.action.IMenuManager;
-import org.eclipse.jface.action.IToolBarManager;
-import org.eclipse.jface.action.MenuManager;
-import org.eclipse.jface.resource.JFaceColors;
-import org.eclipse.jface.util.SafeRunnable;
-import org.eclipse.jface.viewers.DoubleClickEvent;
-import org.eclipse.jface.viewers.IDoubleClickListener;
-import org.eclipse.jface.viewers.IPostSelectionProvider;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.viewers.TreeViewer;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.CTabFolder;
-import org.eclipse.swt.custom.CTabItem;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Menu;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IMemento;
-import org.eclipse.ui.IPartListener2;
-import org.eclipse.ui.ISelectionListener;
-import org.eclipse.ui.IViewSite;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.IWorkbenchPartReference;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.part.IShowInSource;
-import org.eclipse.ui.part.IShowInTarget;
-import org.eclipse.ui.part.IShowInTargetList;
-import org.eclipse.ui.part.ShowInContext;
-import org.eclipse.ui.part.ViewPart;
-import org.eclipse.ui.texteditor.ITextEditor;
-import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode;
-import org.eclipse.wst.xml.xpath.core.util.XSLTXPathHelper;
-import org.eclipse.wst.xml.xpath.ui.internal.Messages;
-import org.w3c.dom.Document;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
-public class XPathView extends ViewPart {
-	private boolean isFiringSelection = false;
-	private IPartListener2 partListener2 = new XPathPartListener();
-	private ISelectionListener selectionListener = new ISelectionListener() {
-		public void selectionChanged(IWorkbenchPart part, ISelection selection) {
-			if (part == getSite().getPage().getActiveEditor()) {
-				if (selection instanceof IStructuredSelection) {
-					currentSelection = (IStructuredSelection) selection;
-					if (!selection.isEmpty()
-							&& (currentSelection.getFirstElement() instanceof Node)) {
-						recalculateLocation((Node) currentSelection
-								.getFirstElement());
-						boolean isLinked = xpathViewActions
-								.isLinkedWithEditor(treeViewer);
-						if (isLinked) {
-							treeViewer.setSelection(currentSelection, true);
-						}
-					} else {
-						recalculateLocation(null);
-					}
-				}
-			}
-		}
-	};
-	private TreeViewer treeViewer;
-	private IEditorPart activeEditor;
-	private Text text;
-	// private JFaceNodeContentProviderXPath contentProvider;
-	private XPathComputer xpathComputer;
-	private Text locationText;
-	private XPathViewActions xpathViewActions = new XPathViewActions();
-	private IPostSelectionProvider selectionProvider = new SelectionProvider();
-	private String location = ""; //$NON-NLS-1$
-	private String message;
-	private boolean expressionValid = true;
-	private Integer currentSheet = Integer.valueOf(0);
-	private Map<Integer, String> sheetMap;
-	private IStructuredSelection currentSelection;
-
-	public void createPartControl(Composite parent) {
-		Composite parentComp = new Composite(parent, SWT.NONE);
-		GridLayout gl = new GridLayout(1, false);
-		gl.horizontalSpacing = 0;
-		gl.verticalSpacing = 0;
-		gl.marginHeight = 0;
-		gl.marginWidth = 0;
-		parentComp.setLayout(gl);
-		GridData gd = new GridData(SWT.FILL, SWT.NONE, true, false, 2, 1);
-		parentComp.setLayoutData(gd);
-
-		Composite comp = new Composite(parentComp, SWT.NONE);
-		comp.setLayout(new GridLayout(1, false));
-		comp.setLayoutData(new GridData(SWT.FILL, SWT.NONE, true, false));
-
-		Label label = new Label(comp, SWT.NONE);
-		label.setText(Messages.XPathView_1);
-
-		this.text = new Text(comp, SWT.BORDER);
-
-		gd = new GridData(SWT.FILL, SWT.NONE, true, false);
-		text.setLayoutData(gd);
-		text.addModifyListener(new ModifyListener() {
-			public void modifyText(ModifyEvent e) {
-				recomputeXPath();
-			}
-		});
-
-		this.locationText = new Text(comp, SWT.READ_ONLY | SWT.FULL_SELECTION);
-		gd = new GridData(SWT.FILL, SWT.NONE, true, false);
-		locationText.setLayoutData(gd);
-
-		this.treeViewer = new TreeViewer(parentComp, SWT.NONE);
-		gd = new GridData(SWT.FILL, SWT.FILL, true, true);
-		gd.horizontalSpan = 2;
-		treeViewer.getControl().setLayoutData(gd);
-		treeViewer.setLabelProvider(new JFaceNodeLabelProviderXPath());
-		treeViewer.setContentProvider(new JFaceNodeContentProviderXPath());
-		// treeViewer.setContentProvider(new BaseWorkbenchContentProvider());
-		// treeViewer.setLabelProvider(new WorkbenchLabelProvider());
-		treeViewer.addSelectionChangedListener(new ISelectionChangedListener() {
-
-			public void selectionChanged(SelectionChangedEvent event) {
-				if (getSite().getPage().getActivePart() == XPathView.this) {
-					handleTreeSelection((IStructuredSelection) event
-							.getSelection(), false);
-				}
-			}
-		});
-		treeViewer.addDoubleClickListener(new IDoubleClickListener() {
-
-			public void doubleClick(DoubleClickEvent event) {
-				handleTreeSelection(
-						(IStructuredSelection) event.getSelection(), true);
-			}
-
-		});
-
-		final CTabFolder folder = new CTabFolder(parentComp, SWT.BOTTOM
-				| SWT.FLAT);
-		gd = new GridData(SWT.FILL, SWT.NONE, true, false);
-		gd.heightHint = 0;
-		folder.setLayoutData(gd);
-		folder.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				CTabItem item = (CTabItem) e.item;
-				sheetMap.put(currentSheet, text.getText());
-				pageChange(folder.indexOf(item));
-			}
-		});
-
-		for (int i = 0; i < 5; i++) {
-			CTabItem item = new CTabItem(folder, SWT.NONE, i);
-			// item.setControl(comp);
-			item.setText(Messages.XPathView_2 + (i + 1));
-		}
-		folder.setSelection(currentSheet);
-		pageChange(currentSheet);
-
-		this.xpathComputer = new XPathComputer(this);
-		createMenu();
-		createToolbar();
-		createContextMenu();
-		// TODO
-		// hookGlobalActions();
-
-		getSite().setSelectionProvider(selectionProvider);
-
-		initEditorListener();
-
-		// TODO when xpath core plugin exists
-		// org.eclipse.jface.fieldassist.AutoCompleteField;
-	}
-
-	private void handleTreeSelection(IStructuredSelection selection,
-			boolean reveal) {
-		if (activeEditor != null) {
-			isFiringSelection = true;
-			if (selection.getFirstElement() != null) {
-				Object element = selection.getFirstElement();
-				if (element instanceof IDOMNode) {
-					IDOMNode node = (IDOMNode) element;
-					ITextEditor textEditor = (ITextEditor) activeEditor
-							.getAdapter(ITextEditor.class);
-
-					if (textEditor != null) {
-						getSite().getWorkbenchWindow().getActivePage()
-								.bringToTop(textEditor);
-						if (reveal) {
-							textEditor
-									.selectAndReveal(node.getStartOffset(),
-											node.getEndOffset()
-													- node.getStartOffset());
-						} else {
-							textEditor.setHighlightRange(node.getStartOffset(),
-									0, true);
-						}
-					}
-				}
-			}
-			isFiringSelection = false;
-		}
-	}
-
-	private void createContextMenu() {
-		MenuManager menuMgr = new MenuManager("#PopupMenu"); //$NON-NLS-1$
-		menuMgr.setRemoveAllWhenShown(true);
-		menuMgr.addMenuListener(new IMenuListener() {
-			public void menuAboutToShow(IMenuManager manager) {
-				xpathViewActions.fillContextMenu(manager);
-			}
-		});
-		Menu menu = menuMgr.createContextMenu(treeViewer.getControl());
-		treeViewer.getControl().setMenu(menu);
-		getSite().registerContextMenu(menuMgr, treeViewer);
-	}
-
-	private void pageChange(int index) {
-		currentSheet = index;
-		String exp = sheetMap.get(index);
-		if (exp != null) {
-			text.setText(exp);
-		} else {
-			text.setText("/"); //$NON-NLS-1$
-		}
-	}
-
-	private void createMenu() {
-		IMenuManager mgr = getViewSite().getActionBars().getMenuManager();
-		IAction[] items = xpathViewActions.createMenuContributions(treeViewer);
-		for (int i = 0; i < items.length; i++) {
-			IAction item = items[i];
-			mgr.add(item);
-		}
-	}
-
-	private void createToolbar() {
-		IToolBarManager mgr = getViewSite().getActionBars().getToolBarManager();
-		IAction[] items = xpathViewActions
-				.createToolbarContributions(treeViewer);
-		for (int i = 0; i < items.length; i++) {
-			IAction item = items[i];
-			mgr.add(item);
-		}
-	}
-
-	private void recalculateLocation(Node selected) {
-		this.location = XSLTXPathHelper.calculateXPathToNode(selected);
-		updateLocationText();
-	}
-
-	private void recomputeXPath() {
-		if (activeEditor != null) {
-			boolean valid = expressionValid;
-			try {
-				xpathComputer.setText(text.getText());
-				xpathComputer.compute();
-				valid = true;
-			} catch (XPathExpressionException e) {
-				valid = false;
-				if (e.getCause() != null) {
-					message = e.getCause().getMessage();
-				} else {
-					message = "Invalid XPath expression"; //$NON-NLS-1$
-				}
-			}
-			if (expressionValid != valid) {
-				expressionValid = valid;
-				updateLocationText();
-			}
-		}
-	}
-
-	void xpathRecomputed(final NodeList nodeList) {
-		Control refreshControl = treeViewer.getControl();
-		if ((refreshControl != null) && !refreshControl.isDisposed()) {
-			refreshControl.setRedraw(false);
-			// treeViewer.setInput(new NodeListWorkbenchAdapter(nodeList));
-			treeViewer.setInput(nodeList);
-			treeViewer.setSelection(currentSelection, true);
-			refreshControl.setRedraw(true);
-		}
-	}
-
-	private void updateLocationText() {
-		if (expressionValid) {
-			locationText.setText(Messages.XPathView_0 + location);
-			locationText.setForeground(null);
-		} else {
-			locationText.setText(message);
-			locationText.setForeground(JFaceColors.getErrorText(locationText
-					.getDisplay()));
-		}
-	}
-
-	private void initEditorListener() {
-		getSite().getPage().addPartListener(partListener2);
-		getSite().getWorkbenchWindow().getSelectionService()
-				.addSelectionListener(selectionListener);
-		editorActivated(getSite().getPage().getActiveEditor());
-	}
-
-	public void setFocus() {
-		text.setFocus();
-	}
-
-	public void dispose() {
-		getSite().getPage().removePartListener(partListener2);
-		getSite().getWorkbenchWindow().getSelectionService()
-				.removeSelectionListener(selectionListener);
-		xpathComputer.dispose();
-		super.dispose();
-	}
-
-	private void editorActivated(IWorkbenchPart part) {
-		if ((part != activeEditor) && (part instanceof IEditorPart)) {
-			IEditorPart editor = (IEditorPart) part;
-			IStructuredModel model = getEditorModel(editor);
-			if (model != null) {
-				activeEditor = editor;
-				xpathComputer.setModel(model);
-				xpathComputer.setSelectedNode((Document) model
-						.getAdapter(Document.class));
-			}
-			recomputeXPath();
-		}
-	}
-
-	private void editorClosed(IWorkbenchPart part) {
-		if (part == activeEditor) {
-			treeViewer.setInput(null);
-			locationText.setText("");
-			activeEditor = null;
-		}
-	}
-
-	private IStructuredModel getEditorModel(IEditorPart editor) {
-		return (IStructuredModel) editor.getAdapter(IStructuredModel.class);
-	}
-
-	@SuppressWarnings("unchecked")
-	public Object getAdapter(Class key) {
-		Object adapter = null;
-		if (key.equals(IShowInTarget.class) && (treeViewer != null)) {
-			adapter = new IShowInTarget() {
-				public boolean show(ShowInContext context) {
-					treeViewer.setSelection(context.getSelection());
-					return treeViewer.getSelection().equals(
-							context.getSelection());
-				}
-			};
-		} else if (key.equals(IShowInSource.class) && (activeEditor != null)) {
-			adapter = new IShowInSource() {
-				public ShowInContext getShowInContext() {
-					return new ShowInContext(activeEditor.getEditorInput(),
-							activeEditor.getEditorSite().getSelectionProvider()
-									.getSelection());
-				}
-			};
-		} else if (key.equals(IShowInTargetList.class)
-				&& (activeEditor != null)) {
-			adapter = activeEditor.getAdapter(key);
-		}
-		if (adapter == null) {
-			adapter = super.getAdapter(key);
-		}
-		return adapter;
-	}
-
-	public void saveState(IMemento memento) {
-		sheetMap.put(currentSheet, text.getText());
-		memento.putInteger("CurrentSheet", currentSheet); //$NON-NLS-1$
-		for (Map.Entry<Integer, String> entry : sheetMap.entrySet()) {
-			IMemento child = memento.createChild("Sheet"); //$NON-NLS-1$
-			child.putInteger("Index", entry.getKey()); //$NON-NLS-1$
-			child.putString("XPath", entry.getValue()); //$NON-NLS-1$
-		}
-		boolean link = xpathViewActions.linkWithEditor;
-		memento.putBoolean("LinkWithEditor", link);
-		super.saveState(memento);
-	}
-
-	@Override
-	public void init(IViewSite site, IMemento memento) throws PartInitException {
-		sheetMap = new HashMap<Integer, String>();
-		if (memento != null) {
-			IMemento[] sheets = memento.getChildren("Sheet"); //$NON-NLS-1$
-			if (sheets != null) {
-				currentSheet = memento.getInteger("CurrentSheet"); //$NON-NLS-1$
-				for (IMemento sheet : sheets) {
-					sheetMap
-							.put(
-									sheet.getInteger("Index"), sheet.getString("XPath")); //$NON-NLS-1$ //$NON-NLS-2$
-				}
-			}
-			Boolean linkWithEditor = memento.getBoolean("LinkWithEditor");
-			boolean link = false;
-			if (linkWithEditor != null) {
-				link = linkWithEditor.booleanValue();
-			}
-			xpathViewActions.setLinkWithEditor(link);
-		}
-		if (currentSheet == null) {
-			currentSheet = 0;
-		}
-		super.init(site, memento);
-	}
-
-	private class XPathPartListener implements IPartListener2 {
-		public void partActivated(IWorkbenchPartReference partRef) {
-			editorActivated(partRef.getPart(false));
-		}
-
-		public void partBroughtToTop(IWorkbenchPartReference partRef) {
-		}
-
-		public void partInputChanged(IWorkbenchPartReference partRef) {
-		}
-
-		public void partOpened(IWorkbenchPartReference partRef) {
-		}
-
-		public void partVisible(IWorkbenchPartReference partRef) {
-		}
-
-		public void partClosed(IWorkbenchPartReference partRef) {
-			editorClosed(partRef.getPart(false));
-		}
-
-		public void partDeactivated(IWorkbenchPartReference partRef) {
-		}
-
-		public void partHidden(IWorkbenchPartReference partRef) {
-		}
-	}
-
-	private class SelectionProvider implements IPostSelectionProvider {
-		private class PostSelectionChangedListener implements
-				ISelectionChangedListener {
-			public void selectionChanged(SelectionChangedEvent event) {
-				if (!isFiringSelection()) {
-					fireSelectionChanged(event, postListeners);
-				}
-			}
-		}
-
-		private class SelectionChangedListener implements
-				ISelectionChangedListener {
-			public void selectionChanged(SelectionChangedEvent event) {
-				if (!isFiringSelection()) {
-					fireSelectionChanged(event, listeners);
-				}
-			}
-		}
-
-		private ListenerList listeners = new ListenerList();
-		private ListenerList postListeners = new ListenerList();
-		private ISelectionChangedListener postSelectionChangedListener = new PostSelectionChangedListener();
-		private ISelectionChangedListener selectionChangedListener = new SelectionChangedListener();
-
-		public void addPostSelectionChangedListener(
-				ISelectionChangedListener listener) {
-			postListeners.add(listener);
-		}
-
-		public void addSelectionChangedListener(
-				ISelectionChangedListener listener) {
-			listeners.add(listener);
-		}
-
-		public void fireSelectionChanged(final SelectionChangedEvent event,
-				ListenerList listenerList) {
-			isFiringSelection = true;
-			Object[] listeners = listenerList.getListeners();
-			for (int i = 0; i < listeners.length; ++i) {
-				final ISelectionChangedListener l = (ISelectionChangedListener) listeners[i];
-				SafeRunner.run(new SafeRunnable() {
-					public void run() {
-						l.selectionChanged(event);
-					}
-				});
-			}
-			isFiringSelection = false;
-		}
-
-		public ISelectionChangedListener getPostSelectionChangedListener() {
-			return postSelectionChangedListener;
-		}
-
-		public ISelection getSelection() {
-			if (treeViewer != null) {
-				return treeViewer.getSelection();
-			}
-			return StructuredSelection.EMPTY;
-		}
-
-		public ISelectionChangedListener getSelectionChangedListener() {
-			return selectionChangedListener;
-		}
-
-		public boolean isFiringSelection() {
-			return isFiringSelection;
-		}
-
-		public void removePostSelectionChangedListener(
-				ISelectionChangedListener listener) {
-			postListeners.remove(listener);
-		}
-
-		public void removeSelectionChangedListener(
-				ISelectionChangedListener listener) {
-			listeners.remove(listener);
-		}
-
-		public void setSelection(ISelection selection) {
-			if (!isFiringSelection) {
-				treeViewer.setSelection(selection);
-			}
-		}
-	}
-}
diff --git a/bundles/org.eclipse.wst.xml.xpath.ui/src/org/eclipse/wst/xml/xpath/ui/internal/views/XPathViewActions.java b/bundles/org.eclipse.wst.xml.xpath.ui/src/org/eclipse/wst/xml/xpath/ui/internal/views/XPathViewActions.java
deleted file mode 100644
index 7e8d45c..0000000
--- a/bundles/org.eclipse.wst.xml.xpath.ui/src/org/eclipse/wst/xml/xpath/ui/internal/views/XPathViewActions.java
+++ /dev/null
@@ -1,107 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Chase Technology Ltd - http://www.chasetechnology.co.uk
- * 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:
- *     Doug Satchwell (Chase Technology Ltd) - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xml.xpath.ui.internal.views;
-
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.action.IMenuManager;
-import org.eclipse.jface.action.Separator;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.TreeViewer;
-import org.eclipse.ui.IWorkbenchActionConstants;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.eclipse.wst.xml.xpath.ui.internal.Messages;
-import org.eclipse.wst.xml.xpath.ui.internal.XPathUIPlugin;
-
-class XPathViewActions {
-	private ImageDescriptor COLLAPSE_D = AbstractUIPlugin
-			.imageDescriptorFromPlugin(XPathUIPlugin.PLUGIN_ID,
-					"icons/full/dlcl16/collapseall.gif");
-	private ImageDescriptor COLLAPSE_E = AbstractUIPlugin
-			.imageDescriptorFromPlugin(XPathUIPlugin.PLUGIN_ID,
-					"icons/full/elcl16/collapseall.gif");
-	private ImageDescriptor SYNCED_D = AbstractUIPlugin
-			.imageDescriptorFromPlugin(XPathUIPlugin.PLUGIN_ID,
-					"icons/full/dlcl16/synced.gif");
-	private ImageDescriptor SYNCED_E = AbstractUIPlugin
-			.imageDescriptorFromPlugin(XPathUIPlugin.PLUGIN_ID,
-					"icons/full/elcl16/synced.gif");
-
-	boolean linkWithEditor = false;
-	private CollapseTreeAction collapseAction;
-	private ToggleLinkAction toggleAction;
-
-	protected IAction[] createMenuContributions(TreeViewer viewer) {
-		return new IAction[] {};
-	}
-
-	protected IAction[] createToolbarContributions(TreeViewer viewer) {
-		this.collapseAction = new CollapseTreeAction(viewer);
-		this.toggleAction = new ToggleLinkAction();
-		toggleAction.setChecked(linkWithEditor);
-		return new IAction[] { collapseAction, toggleAction };
-	}
-
-	public ISelection getSelection(TreeViewer viewer, ISelection selection) {
-		return selection;
-	}
-
-	public boolean isLinkedWithEditor(TreeViewer treeViewer) {
-		return linkWithEditor;
-	}
-
-	void setLinkWithEditor(boolean isLinkWithEditor) {
-		linkWithEditor = isLinkWithEditor;
-	}
-
-	void fillContextMenu(IMenuManager manager) {
-		manager.add(collapseAction);
-		manager.add(toggleAction);
-		manager.add(new Separator(IWorkbenchActionConstants.MB_ADDITIONS));
-	}
-
-	// private static ImageDescriptor getImageDescriptor(String relativePath)
-	// {
-	// String iconPath = "icons/";
-	// return XMLUIPlugin.imageDescriptorFromPlugin(XMLUIPlugin.PLUGIN_ID,
-	// iconPath);
-	// }
-
-	private class CollapseTreeAction extends Action {
-		private TreeViewer fTreeViewer = null;
-
-		public CollapseTreeAction(TreeViewer viewer) {
-			super(Messages.XPathViewActions_0, AS_PUSH_BUTTON);
-			setImageDescriptor(COLLAPSE_E);
-			setDisabledImageDescriptor(COLLAPSE_D);
-			setToolTipText(getText());
-			fTreeViewer = viewer;
-		}
-
-		public void run() {
-			fTreeViewer.collapseAll();
-		}
-	}
-
-	private class ToggleLinkAction extends Action {
-		public ToggleLinkAction() {
-			super(Messages.XPathViewActions_1, AS_CHECK_BOX);
-			setToolTipText(getText());
-			setDisabledImageDescriptor(SYNCED_D);
-			setImageDescriptor(SYNCED_E);
-		}
-
-		public void run() {
-			setLinkWithEditor(isChecked());
-		}
-	}
-}
diff --git a/bundles/org.eclipse.wst.xml.xpath.ui/templates/fn.xml b/bundles/org.eclipse.wst.xml.xpath.ui/templates/fn.xml
deleted file mode 100644
index ddbef57..0000000
--- a/bundles/org.eclipse.wst.xml.xpath.ui/templates/fn.xml
+++ /dev/null
@@ -1,766 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--November 17, 2006--><bpel-xpath-functions>
-
-    <!-- Assistants and args repeated in the function defintions below -->
-
-    <assistant name="SimpleDateFormat" type="1">
-        <option value="&quot;yyyy.MM.dd G 'at' HH:mm:ss z&quot;">2001.07.04 AD at 12:08:56 PDT</option>
-        <option value="&quot;EEE, MMM d, ''yy&quot;">Wed, Jul 4, '01</option>
-        <option value="&quot;h:mm a&quot;">12:08 PM</option>
-        <option value="&quot;hh 'o''clock' a, zzzz&quot;">12 o'clock PM, Pacific Daylight Time</option>
-        <option value="&quot;K:mm a, z&quot;">0:08 PM, PDT</option>
-        <option value="&quot;yyyyy.MMMMM.dd GGG hh:mm aaa&quot;">02001.July.04 AD 12:08 PM</option>
-        <option value="&quot;EEE, d MMM yyyy HH:mm:ss Z&quot;">Wed, 4 Jul 2001 12:08:56 -0700</option>
-        <option value="&quot;yyMMddHHmmssZ&quot;">010704120856-0700</option>
-    </assistant>
-
-     <assistant name="LDAPScope">
-        <option value="'subtree'">Subtree Search (starting at the given Distinguished Name)</option>
-        <option value="'onelevel'">Onelevel Search (siblings of given Distinguished Name only)</option>
-        <option value="'object'">Object Search (given Distinguished Name only)</option>
-    </assistant>
-
-    <arg default="" name="dateFormat" optional="true" type="string">
-        <comment>Contains a string formatted according to java.text.SimpleDateFormat format.</comment>
-        <assistant ref="SimpleDateFormat"/>
-    </arg>
-
-    <arg default="" name="ldapfilter" type="string">
-        <comment>An LDAP filter. </comment>
-    </arg>
-
-    <arg default="'subtree'" name="ldapscope" optional="true" type="string">
-        <comment>An LDAP search scope. Values are object,onelevel,subtree.</comment>
-        <assistant ref="LDAPScope"/>
-    </arg>
-
-    <arg default="" name="password" type="string">
-        <comment>The user password.</comment>
-        <assistant ref="xpathPicker"/>
-
-    </arg>
-
-    <arg default="" name="fileName" type="string">
-        <comment>File name from the file system. Note that this file name is in the context of the Oracle BPEL Process Manager.</comment>
-        <assistant ref="filePicker"/>
-    </arg>
-
-    <arg default="" name="xpath" optional="true" type="string">
-        <comment>An XPath expression that resolves in an W3C XML DOM Element node</comment>
-    </arg>
-
-    <arg default="" name="templateURI" type="string">
-        <comment>A URI to the template. </comment>
-        <assistant ref="uriPicker"/>
-    </arg>
-
-    <arg default="" name="xsltInput" type="node">
-        <comment>A W3C XML DOM element. </comment>
-        <assistant ref="xpathPicker"/>
-    </arg>
-
-    <arg default="" name="xqueryContext" optional="true" type="node">
-        <comment>A W3C XML DOM element. </comment>
-        <assistant ref="xpathPicker"/>
-    </arg>
-
-    <arg default="'1'" name="item" type="number">
-        <comment>Item in array</comment>
-        <assistant ref="xpathPicker"/>
-    </arg>
-
-    <arg default="" name="properties" optional="true" type="node">
-        <comment>A W3C XML DOM element. </comment>
-        <assistant ref="xpathPicker"/>
-    </arg>
-
-    <arg default="" name="element1" type="node">
-        <comment>A W3C XML DOM element.  </comment>
-        <assistant ref="xpathPicker"/>
-
-    </arg>
-
-    <arg default="" name="element2" type="node">
-        <comment>A W3C XML DOM element.  </comment>
-        <assistant ref="xpathPicker"/>
-
-    </arg>
-
-
-    <arg default="" name="variableName" type="string">
-        <comment>The source variable for the data</comment>
-        <assistant ref="xpathPicker"/>
-
-    </arg>
-
-    <arg default="" name="partName" optional="true" type="string">
-        <comment>The part to select from the variable</comment>
-        <assistant ref="xpathPicker"/>
-
-    </arg>
-    <arg default="" name="locationPath" optional="true" type="string">
-        <comment>Provides an absolute location path (with '/' meaning the root of the document fragment representing the entire part) to identify the root of a subtree within the document fragment representing the part.</comment>
-    </arg>
-
-    <arg default="" name="index" optional="true" type="number">
-        <comment>Dynamic index value</comment>
-        <assistant ref="xpathPicker"/>
-
-    </arg>
-
-    <arg default="" name="aNode" type="node">
-        <comment>An XML DOM node. </comment>
-        <assistant ref="xpathPicker"/>
-    </arg>
-
-    <arg default="" name="xmlContentString" type="string">
-        <comment>XML Content formatted as a string. </comment>
-        <assistant ref="functions"/>
-    </arg>
-
-    <arg default="" name="nodeSet" type="node-set">
-        <comment>An XML DOM Node-Set </comment>
-        <assistant ref="xpathPicker"/>
-    </arg>
-
-    <arg default="" name="aNodeSet" optional="true" type="node-set">
-        <comment>An XML DOM Node-Set </comment>
-        <assistant ref="xpathPicker"/>
-    </arg>
-    <arg default="" name="object" type="object">
-        <comment>Any W3C XML DOM object or node-set.</comment>
-        <assistant ref="xpathPicker"/>
-    </arg>
-    <arg default="" name="aBoolean" type="boolean">
-        <comment>A boolean value expression or constant</comment>
-        <assistant ref="xpathPicker"/>
-    </arg>
-    
-    <!-- BPEL functions -->
-
-    
-    <function id="last" returns="number" visual="1">
-        <help>Returns a number equal to context size of the expression evaluation context.
-        </help>
-        <comment>
-            <![CDATA[ Returns a number equal to context size of the expression evaluation context. ]]>
-        </comment>
-    </function>
-
-    <function id="position" returns="number">
-        <help>Returns the index number of the node within the parent.
-            The position of the node is is 1-based, so the first node returns a position of 1. </help>
-        <comment>
-            <![CDATA[ Returns the position, or index number, of the node, relative to all the selected nodes in the node list.
-        The position of the node is is 1-based, so the first node returns a position of 1.]]>
-        </comment>
-    </function>
-
-    <function id="count" returns="number">
-        <help>This XPath 1.0 defined function returns the count of nodes
-            present in the supplied node-set</help>
-        <comment>
-            <![CDATA[ This XPath 1.0 defined function returns the count of nodes
-         present in the supplied node-set ]]>
-        </comment>
-        <arg ref="aNodeSet"/>
-    </function>
-
-
-    <function id="id" returns="node-set">
-        <help>Selects elements by their unique ID</help>
-        <comment>
-            <![CDATA[ Selects elements by their unique ID, <p>
-          When the argument is of type node-set, the result is the union of the
-          result of applying id() to the string value of each of the nodes in
-          the node-set argument.
-<p>
-When the argument is of any other type, it is converted to a string
-and then split into a white space separated list of tokens (white space is
-any sequence of characters matching the production); the result
-is a node-set containing the elements in the same document as the context
-node that have a unique ID equal to any of the tokens in the list. ]]>
-        </comment>
-
-        <arg default="" name="object" type="object">
-            <comment>The object or objects to apply the id function to.</comment>
-            <assistant ref="xpathPicker"/>
-        </arg>
-    </function>
-
-
-    <function id="local-name" returns="string">
-        <help>Returns the local part of the expanded name of the node in the node-set argument that is first in document order</help>
-        <comment>
-            <![CDATA[ Returns the local part of the expanded name of the node in the node-set
-        argument that is first in document order. <p>
-
-    ]]>
-        </comment>
-        <arg ref="nodeSet"/>
-    </function>
-
-
-    <function id="namespace-uri" returns="string">
-        <help>Returns the namespace Uniform Resource Identifier (URI) of the expanded name of the node
-            in the node-set argument that is first in document order.</help>
-        <comment>
-            <![CDATA[ Returns the namespace Uniform Resource Identifier
-        (URI) of the expanded name of the node in the node-set
-        argument that is first in document order.
-
-     ]]>
-        </comment>
-        <arg ref="nodeSet"/>
-    </function>
-
-
-    <function id="name" returns="string">
-        <help>Returns a string containing a QName representing the expanded
-            name of the node in the node-set argument that is first in document
-            order.
-        </help>
-        <comment>
-            <![CDATA[ Returns a string containing a QName representing
-        the expanded name of the node in the node-set argument
-        that is first in document order.
-     ]]>
-        </comment>
-        <arg ref="nodeSet"/>
-    </function>
-
-
-    <function id="string" returns="string" visual="1">
-        <help>Converts an object to a string.</help>
-        <comment>
-            <![CDATA[Converts an object to a string. ]]>
-        </comment>
-        <arg ref="object"/>
-    </function>
-
-    <function id="concat" returns="string">
-        <help>This XPath 1.0 defined function concatenates several strings together.</help>
-        <comment>
-            <![CDATA[ This XPath 1.0 defined function concatenates several strings together.]]>
-        </comment>
-
-        <arg default="" name="firstString" type="string">
-            <comment>First string to concatenate with</comment>
-            <assistant ref="xpathPicker"/>
-        </arg>
-        <arg default="" name="nextString" type="string">
-            <comment>Next string to concatenate with</comment>
-            <assistant ref="xpathPicker"/>
-        </arg>
-        <arg default="" name="oneMoreString" optional="*" type="string">
-            <comment>One more string. You can concatenate several strings at once.</comment>
-            <assistant ref="xpathPicker"/>
-        </arg>
-    </function>
-
-    <function id="contains" returns="string">
-        <help>Checks whether the first argument string contains
-            the second argument string.</help>
-        <comment>
-            <![CDATA[ Checks whether the first argument string
-        contains the second argument string. ]]>
-        </comment>
-
-        <arg default="" name="aString" type="string">
-            <comment>The string to inspect</comment>
-            <assistant ref="xpathPicker"/>
-        </arg>
-        <arg default="" name="searchString" type="string">
-            <comment>The search string </comment>
-            <assistant ref="xpathPicker"/>
-        </arg>
-    </function>
-
-
-    <function id="substring-before" returns="string">
-        <help>Returns the substring of the first argument string that
-            precedes the first occurrence of the second argument string
-            in the first argument string, or the empty string if
-            the first argument string does not contain the second argument
-            string.</help>
-        <comment>
-            <![CDATA[<div class="xpathHelp">
-  <H1 class=dtH1>substring-before Function</H1>
-  <P class=dtP>Returns the substring of the first argument string that precedes the first
-  occurrence of the second argument string in the first argument string, or the
-  empty string if the first argument string does not contain the second argument
-  string.</P><PRE class=syntax><I>string</I> substring-before(<I>string</I>, <I>string</I>)</PRE>
-  <H4 class=dtH4>Remarks</H4>
-  <P class=dtP>If an argument is not of type <I>string,</I> it is first converted to a
-  string and then evaluated.</P>
-  <P class=dtP>The following function call returns "1999":</P><PRE class=code>substring-before("1999/04/01","/")</PRE>
-  <P class=dtP>The following function call returns an empty string "":</P><PRE class=code>substring-before("1999/04/01","2")</PRE>
-  </div>
-
-        ]]>
-        </comment>
-
-        <arg default="" name="aString" type="string">
-            <comment>The string to search in</comment>
-            <assistant ref="xpathPicker"/>
-        </arg>
-        <arg default="" name="searchString" type="string">
-            <comment>The search string </comment>
-            <assistant ref="xpathPicker"/>
-        </arg>
-    </function>
-
-
-    <function id="substring-after" returns="string">
-        <help>Returns the substring of the first argument string that
-            follows the first occurrence of the second argument string
-            in the first argument string, or the empty string if
-            the first argument string does not contain the second argument
-            string.</help>
-        <comment>
-            <![CDATA[<div class="xpathHelp">
-
-  <H1 class=dtH1>substring-after Function</H1>
-  <P class=dtP>Returns the substring of the first argument string that follows the first
-  occurrence of the second argument string in the first argument string, or the
-  empty string if the first argument string does not contain the second argument
-  string.</P><PRE class=syntax><I>string</I> substring-after(<I>string</I>, <I>string</I>)</PRE>
-  <H4 class=dtH4>Remarks</H4>
-  <P class=dtP>If an argument is not of type <I>string,</I> it is first converted to a
-  string and then evaluated.</P>
-  <P class=dtP>The following function call returns "04/01":</P><PRE class=code>substring-after("1999/04/01","/")</PRE>
-  <P class=dtP>The following function call returns "99/04/01":</P><PRE class=code>substring-after("1999/04/01","19")</PRE>
-  <P class=dtP>The following function call returns an empty string "":</P><PRE class=code>substring-after("1999/04/01","2")</PRE>
-  </div>
-        ]]>
-        </comment>
-
-        <arg default="" name="aString" type="string">
-            <comment>The string to search in</comment>
-            <assistant ref="xpathPicker"/>
-        </arg>
-        <arg default="" name="searchString" type="string">
-            <comment>The search string </comment>
-            <assistant ref="xpathPicker"/>
-        </arg>
-    </function>
-
-    <function id="starts-with" returns="boolean">
-        <help>Returns true if the first argument string starts with
-            the second argument string; otherwise returns false.</help>
-        <comment>
-            <![CDATA[<div class="xpathHelp">
-  <H1 class=dtH1>starts-with Function</H1>
-  <P class=dtP>Returns true if the first argument string starts with the second argument
-  string; otherwise returns false.</P><PRE class=syntax><I>boolean</I> starts-with(<I>string</I>, <I>string</I>)</PRE>
-  <H4 class=dtH4>Remarks</H4>
-  <P class=dtP>If an argument is not of type <I>string,</I> it is first converted to a
-  string and then evaluated. The function is case-sensitive.</P>
-  </div>
-        ]]>
-        </comment>
-
-        <arg default="" name="aString" type="string">
-            <comment>The string to search in</comment>
-            <assistant ref="xpathPicker"/>
-        </arg>
-        <arg default="" name="searchString" type="string">
-            <comment>The search string </comment>
-            <assistant ref="xpathPicker"/>
-        </arg>
-    </function>
-
-
-    <function id="substring" returns="string">
-        <help>Returns the substring of the first argument
-            starting at the position specified in the second argument
-            and the length specified in the third argument.</help>
-        <comment>
-            <![CDATA[<div class="xpathHelp">
-  <H1 class=dtH1>substring Function</H1>
-  <P class=dtP>Returns the substring of the first argument starting at the position
-  specified in the second argument and the length specified in the third
-  argument.</P><PRE class=syntax><I>string</I> substring(<I>string</I>, <I>number</I>, <I>number</I>?)</PRE>
-  <H4 class=dtH4>Remarks</H4>
-  <P class=dtP>Each character in the string is considered to have a numeric position: the
-  position of the first character is 1, the position of the second character is 2,
-  and so on.</P>
-  <P class=dtP>If the third argument is not specified, it returns the substring starting at
-  the position specified in the second argument and continuing to the end of the
-  string.</P>
-  <P class=dtP>The following function call returns "234":</P><PRE class=code>substring("12345",2,3) </PRE>
-  <P class=dtP>The following function call returns "2345":</P><PRE class=code>substring("12345",2) </PRE>
-  <P class=dtP>The returned substring contains those characters for which the position of
-  the character is greater than or equal to the rounded value of the second
-  argument, and if the third argument is specified, less than the sum of the
-  rounded value of the second argument and the rounded value of the third
-  argument. The comparisons and addition used for the preceding follow the
-  standard IEEE 754 rules; rounding is done as if by a call to the <CODE
-  class=ce>round()</CODE> function.</P>
-  <P class=dtP>The following examples illustrate unusual cases.</P>
-  <BLOCKQUOTE class=dtBlock><CODE class=ce>substring("12345", 1.5, 2.6)</CODE>
-  returns "<CODE class=ce>234</CODE>"</BLOCKQUOTE>
-  <BLOCKQUOTE class=dtBlock><CODE class=ce>substring("12345", 0, 3)</CODE> returns
-  "<CODE class=ce>12</CODE>"</BLOCKQUOTE>
-  <BLOCKQUOTE class=dtBlock><CODE class=ce>substring("12345", 0 div 0, 3)</CODE>
-  returns <CODE class=ce>""</CODE></BLOCKQUOTE>
-  <BLOCKQUOTE class=dtBlock><CODE class=ce>substring("12345", 1, 0 div 0)</CODE>
-  returns <CODE class=ce>""</CODE></BLOCKQUOTE>
-  <BLOCKQUOTE class=dtBlock><CODE class=ce>substring("12345", -42, 1 div 0)</CODE>
-  returns <CODE class=ce>"12345"</CODE></BLOCKQUOTE>
-  <BLOCKQUOTE class=dtBlock><CODE class=ce>substring("12345", -1 div 0, 1 div 0)</CODE> returns <CODE class=ce>""</CODE></BLOCKQUOTE>
-  </div>
-        ]]>
-        </comment>
-
-        <arg default="" name="aString" type="string">
-            <comment>The string to compute substring on</comment>
-            <assistant ref="xpathPicker"/>
-        </arg>
-        <arg default="" name="startPosition" type="number">
-            <comment>Start Position (first position is index == 1)</comment>
-            <assistant ref="xpathPicker"/>
-        </arg>
-        <arg default="" name="length" optional="true" type="number">
-            <comment>Length of characters to extract</comment>
-            <assistant ref="xpathPicker"/>
-        </arg>
-
-    </function>
-
-
-    <function id="string-length" returns="number">
-        <help>Returns the number of characters in the string.</help>
-        <comment>
-            <![CDATA[<div class="xpathHelp">
-  <H1 class=dtH1>string-length Function</H1>
-  <P class=dtP>Returns the number of characters in the string.</P><PRE class=syntax><I>number</I> string-length(<I>string</I>)</PRE>
-  <H4 class=dtH4>Remarks</H4>
-  <P class=dtP>If the argument is omitted, it returns the number of characters in the
-  string-value of the context node.</P>
-  <P class=dtP>The following function call returns 4:</P><PRE class=code>string-length("abcd")</PRE>
-  <P class=dtP>The following function call returns 5:</P><PRE class=code>string-length("ab cd")</PRE>
-  <P class=dtP>If an argument is not of type <I>string,</I> it is first converted to a
-  string and then evaluated.</P>
-  </div>
-        ]]>
-        </comment>
-
-        <arg default="" name="aString" type="string">
-            <comment>The string to compute the length on</comment>
-            <assistant ref="xpathPicker"/>
-        </arg>
-
-    </function>
-
-
-    <function id="normalize-space" returns="string">
-        <help>Returns the argument string with the white space stripped.</help>
-        <comment>
-            <![CDATA[<div class="xpathHelp">
-  <H1 class=dtH1>normalize-space Function</H1>
-  <P class=dtP>Returns the argument string with the leading, trailing, and repeating white
-  spaces stripped.</P><PRE class=syntax><I>string</I> normalize-space(<I>string</I>)</PRE>
-  <H4 class=dtH4>Remarks</H4>
-  <P class=dtP>White space is normalized by stripping leading and trailing white space and
-  replacing sequences of white space characters with a single space. If the
-  argument is omitted, the string-value of the context node is normalized and
-  returned.</P>
-  <P class=dtP>The following function call returns "abc def":</P><PRE class=code>normalize-space("  abc    def  ")</PRE>
-  <P class=dtP>If an argument is not of the type string<I>,</I> it is first converted to a
-  string and then evaluated. See the example below.</P>
-
-  </div>
-        ]]>
-        </comment>
-
-        <arg default="" name="aString" type="string">
-            <comment>The string to normalize</comment>
-            <assistant ref="xpathPicker"/>
-        </arg>
-
-    </function>
-
-    <function id="translate" returns="string">
-        <help>Returns the first argument string with occurrences
-            of characters in the second argument string replaced by
-            the character at the corresponding position in the third
-            argument string.</help>
-        <comment>
-            <![CDATA[<div class="xpathHelp">
-  <H1 class=dtH1>translate Function</H1>
-  <P class=dtP>Returns the first argument string with occurrences of characters in the
-  second argument string replaced by the character at the corresponding position
-  in the third argument string.</P><PRE class=syntax><I>string</I> translate(<I>string</I>, <I>string</I>, <I>string</I>)</PRE>
-  <H4 class=dtH4>Remarks</H4>
-  <P class=dtP>This function provides a mapping of characters on the first argument. The
-  second and third arguments describes the scheme of the mapping. </P>
-  <P class=dtP>The following function call returns "BAr":</P><PRE class=code>translate("bar","abc","ABC")</PRE>
-  <P class=dtP>If there is a character in the second argument string with no character at a
-  corresponding position in the third argument string (because the second argument
-  string is longer than the third argument string), occurrences of that character
-  in the first argument string are removed.</P>
-  <P class=dtP>The following function call returns "AAA":</P><PRE class=code>translate("--aaa--","abc-","ABC")</PRE>
-  <P class=dtP>If a character occurs more than once in the second argument string, the first
-  occurrence determines the replacement character. If the third argument string is
-  longer than the second argument string, excess characters are ignored.</P>
-  <P class=dtP>If an argument is not of type <I>string,</I> it is first converted to a
-  string and then evaluated.</P>
-
-
-  </div>
-        ]]>
-        </comment>
-
-        <arg default="" name="aString" type="string">
-            <comment>The string to translate</comment>
-            <assistant ref="xpathPicker"/>
-        </arg>
-
-        <arg default="" name="strOccur" type="string">
-            <comment>The string to translate from</comment>
-            <assistant ref="xpathPicker"/>
-        </arg>
-
-        <arg default="" name="strRepl" type="string">
-            <comment>The string to translate to</comment>
-            <assistant ref="xpathPicker"/>
-        </arg>
-
-    </function>
-
-
-
-    <!-- Boolean functions -->
-
-
-    <function id="boolean" returns="boolean" visual="1">
-        <help>Converts the argument to a Boolean.</help>
-        <comment>
-            <![CDATA[<div class="xpathHelp">
-  <H1 class=dtH1>boolean Function</H1>
-  <P class=dtP>Converts the argument to a Boolean.</P><PRE class=syntax><I>boolean</I> boolean(<I>value</I>)</PRE>
-  <H4 class=dtH4>Remarks</H4>
-  <P class=dtP>Converts argument to a Boolean as follows.
-  <UL type=disc>
-  <LI>A negative or positive number is true<CODE class=ce> </CODE>and any value
-  that contains either zero or a NaN value
-  is false.
-  <LI>A node-set is false if empty and only true if it is nonempty.
-  <LI>A string is false if it is zero-length and only true<CODE class=ce>
-  </CODE>if its length is greater than zero.
-  <LI>An object of a type other than the four basic types is converted to a
-  Boolean in a way that is dependent on that type. </LI></UL>
-
-  </div>
-        ]]>
-        </comment>
-        <arg ref="object"/>
-    </function>
-
-
-    <function id="not" returns="boolean">
-        <help>Returns true if the argument is false; otherwise false.</help>
-        <comment>
-            <![CDATA[<div class="xpathHelp">
-  <H1 class=dtH1>not Function</H1>
-  <P class=dt>Returns true if the argument is false; otherwise false.</P><PRE class=syntax><I>boolean</I> not(boolean)</PRE>
-
-  </div>
-        ]]>
-        </comment>
-        <arg ref="aBoolean"/>
-    </function>
-
-
-    <function id="true" returns="boolean">
-        <help>Returns true.</help>
-        <comment>
-            <![CDATA[<div class="xpathHelp">
-  <H1 class=dtH1>true Function</H1>
-  <P class=dtP>Returns true.</P><PRE class=syntax><I>boolean</I> true()</PRE>
-
-  </div>
-        ]]>
-        </comment>
-    </function>
-
-
-    <function id="false" returns="boolean">
-        <help>Returns false.</help>
-        <comment>
-            <![CDATA[<div class="xpathHelp">
-  <H1 class=dtH1>false Function</H1>
-  <P class=dtP>Returns false.</P><PRE class=syntax><I>boolean</I> false()</PRE>
-
-  </div>
-        ]]>
-        </comment>
-    </function>
-
-
-    <function id="lang" returns="boolean">
-        <help>Returns true if the xml:lang attribute of the
-            context node is the same as the argument string.</help>
-        <comment>
-            <![CDATA[<div class="xpathHelp">
-  <H1 class=dtH1>lang Function</H1>
-  <P class=dtP>Returns true if the <CODE class=ce>xml:lang</CODE> attribute of the context
-  node is the same as a sublanguage of the language specified by the argument
-  string.</P>
-  <H4 class=dtH4>Syntax</H4><PRE class=syntax><I>boolean</I> lang(<I>string</I>)</PRE>
-  <H4 class=dtH4>Remarks</H4>
-  <P class=dtP>The language of the context node is determined by the value of the <CODE
-  class=ce>xml:lang</CODE> attribute on the context node, or if the context node
-  has no <CODE class=ce>xml:lang</CODE> attribute, by the value of the <CODE
-  class=ce>xml:lang</CODE> attribute on the nearest ancestor of the context node
-  that has an <CODE class=ce>xml:lang</CODE> attribute. If there is no such
-  attribute, <CODE class=ce>lang()</CODE> returns false. If there is such an
-  attribute, <CODE class=ce>lang()</CODE> returns true if the attribute value is
-  equal to the argument (ignoring case) or if there is a suffix starting with
-  "<CODE class=ce>-</CODE>", such that the attribute value is equal to the
-  argument, ignoring the suffix of the attribute value and ignoring case.</P>
-  <P class=dtP>Given the following XML elements:</P><PRE class=code>&lt;para xml:lang="en"/&gt;
-  &lt;div xml:lang="en"&gt;&lt;para/&gt;&lt;/div&gt;
-  &lt;para xml:lang="EN"/&gt;
-  &lt;para xml:lang="en-us"/&gt;</PRE>
-  <P class=dtP>The following function call returns true for all:</P><PRE class=code>lang("en")</PRE>
-
-  </div>
-        ]]>
-        </comment>
-
-        <arg ref="aString"/>
-    </function>
-
-
-    <!-- Number functions -->
-
-    <function id="number" returns="number" visual="1">
-        <help>Evaluates the argument expressions to obtain a numeric result.</help>
-        <comment>
-            <![CDATA[<div class="xpathHelp">
-  <H1 class=dtH1>number Function</H1>
-  <P class=dtP>Converts the argument to a number.</P><PRE class=syntax><I>number</I> number(<I>object</I>?)</PRE>
-  <H4 class=dtH4>Remarks</H4>
-  <P class=dtP>Converts its argument to a number as follows.
-  <UL type=disc>
-  <LI>A string that consists of optional white space followed by an optional minus
-  sign followed by a number followed by white space is converted to the IEEE 754
-  number that is nearest (according to the IEEE 754 round-to-nearest rule) to the
-  mathematical value represented by the string; any other string is converted to
-  NaN.
-  <LI>Boolean true is converted to 1; Boolean false is converted to 0.
-  <LI>A node-set is first converted to a string and then converted in the same way
-  as a string argument.
-  <LI>An object of a type other than the four basic types (node-set, Boolean,
-  number, or string) is converted to a number in a way that is dependent on that
-  type. </LI></UL>
-  <P class=dtP>If the argument is omitted, it defaults to a node-set with the context node
-  as its only member.</P>
-  <BLOCKQUOTE class=dtBlock><B class=le>Note&nbsp;&nbsp;&nbsp;</B>The <CODE
-  class=ce>number()</CODE> function should not be used for conversion of numeric
-  data occurring in an element in an XML document unless the element is of a type
-  that represents numeric data in a language-neutral format (that would typically
-  be transformed into a language-specific format for presentation to a user). In
-  addition, the <CODE class=ce>number()</CODE> function cannot be used unless the
-  language-neutral format used by the element is consistent with the XML Path
-  Language (XPath) syntax for a number.</BLOCKQUOTE>
-
-  </div>
-        ]]>
-        </comment>
-
-        <arg default="" name="object" optional="true" type="object">
-            <comment>Any W3C XML DOM object or node-set.</comment>
-            <assistant ref="xpathPicker"/>
-        </arg>
-    </function>
-
-    <function id="sum" returns="number">
-        <help>Returns the sum of all nodes in the node-set. Each node
-            is first converted to a number value before summing.</help>
-        <comment>
-            <![CDATA[<H1 class=dtH1>sum Function</H1>
-<P class=dtP>Returns the sum of all nodes in the node-set. Each node is first converted to
-a number value before summing.</P><PRE class=syntax><I>number</I> sum(<I>node-set</I>)</PRE>
-            ]]>
-        </comment>
-
-        <arg ref="nodeSet"/>&gt;
-
-    </function>
-
-
-    <function id="floor" returns="number">
-        <help>Returns the largest integer that is not greater
-            than the argument.</help>
-        <comment>
-            <![CDATA[<H1 class=dtH1>floor Function</H1>
-<P class=dtP>Returns the largest integer that is not
-greater than the argument.</P>
-<PRE class=syntax><I>number</I> floor(<I>number</I>)</PRE>
-  ]]>
-        </comment>
-
-        <arg default="" name="aNumber" type="number">
-            <comment>Number to compute the floor of</comment>
-            <assistant ref="xpathPicker"/>
-        </arg>
-
-    </function>
-
-
-    <function id="ceiling" returns="number">
-        <help>Returns the smallest integer that is not less than the argument.</help>
-        <comment>
-            <![CDATA[
-    <H1 class=dtH1>ceiling Function</H1>
-    <P class=dtP>Returns the smallest integer that is not
-    less than the argument.</P>
-    <PRE class=syntax><I>number</I> ceiling(<I>number</I>)</PRE>
-
-    ]]>
-        </comment>
-
-        <arg default="" name="aNumber" type="number">
-            <comment>Number to compute the ceiling of</comment>
-            <assistant ref="xpathPicker"/>
-        </arg>
-
-    </function>
-
-
-    <function id="round" returns="number">
-        <help>Returns an integer closest in value to the argument.</help>
-        <comment>
-            <![CDATA[
-    <H1 class=dtH1>round Function</H1>
-    <P class=dtP>Returns an integer closest in value to the argument.</P><PRE class=syntax><I>number</I> round(<I>number</I>)</PRE>
-    <H4 class=dtH4>Remarks</H4>
-    <P class=dtP>If there are two such numbers, the one that is closest to positive infinity
-    is returned.</P>
-    <P class=dtP>If the argument is NaN, NaN is returned.</P>
-    <P class=dtP>If the argument is positive infinity, positive infinity is returned.</P>
-    <P class=dtP>If the argument is negative infinity, negative infinity is returned.</P>
-    <P class=dtP>If the argument is positive zero, positive zero is returned.</P>
-    <P class=dtP>If the argument is negative zero, negative zero is returned.</P>
-    <P class=dtP>If the argument is less than zero but greater than or equal to -0.5, negative
-    zero is returned.</P>
-    <P class=dtP>For the last two cases, the result of calling the <CODE
-    class=ce>round()</CODE> function is not the same as the result of adding 0.5 and
-    then calling the <CODE class=ce>floor()</CODE> function because positive zero
-    will be returned in such cases.</P>
-
-    ]]>
-        </comment>
-
-        <arg default="" name="aNumber" type="number">
-            <comment>Number to round up</comment>
-            <assistant ref="xpathPicker"/>
-        </arg>
-
-    </function>
-
-
-</bpel-xpath-functions>
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.xml.xpath.ui/templates/xpath_axis_templates.xml b/bundles/org.eclipse.wst.xml.xpath.ui/templates/xpath_axis_templates.xml
deleted file mode 100644
index e3545a9..0000000
--- a/bundles/org.eclipse.wst.xml.xpath.ui/templates/xpath_axis_templates.xml
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<templates>
-	<template id="org.eclipse.wst.xslt.templates.xpath.axis.child"
-	          autoinsert="true" context="xpath_axis" deleted="false"
-	          description="The child axis contains the children of the context node"
-	          enabled="true" name="child::">child::${cursor}</template>
-   	<template id="org.eclipse.wst.xslt.templates.xpath.axis.descendant"
-	          autoinsert="true" context="xpath_axis" deleted="false"
-	          description="The descendant axis contains the descendants of the context node; a descendant is a child or a child of a child and so on; thus the descendant axis never contains attribute or namespace nodes"
-	          enabled="true" name="descendant::">descendant::${cursor}</template>	          
-   	<template id="org.eclipse.wst.xslt.templates.xpath.axis.parent"
-	          autoinsert="true" context="xpath_axis" deleted="false"
-	          description="The parent axis contains the parent of the context node, if there is one."
-	          enabled="true" name="parent::">parent::${cursor}</template>
-   	<template id="org.eclipse.wst.xslt.templates.xpath.axis.parentshortcut"
-	          autoinsert="true" context="xpath_axis" deleted="false"
-	          description=".. is a shortcut for the parent:: axis. The parent axis contains the parent of the context node, if there is one."
-	          enabled="true" name="..">../${cursor}</template>	          
-	          
-   	<template id="org.eclipse.wst.xslt.templates.xpath.axis.ancestor"
-	          autoinsert="true" context="xpath_axis" deleted="false"
-	          description="The ancestor axis contains the ancestors of the context node; the ancestors of the context node consist of the parent of context node and the parent's parent and so on; thus, the ancestor axis will always include the root node, unless the context node is the root node."
-	          enabled="true" name="ancestor::">ancestor::${cursor}</template>	          
-   	<template id="org.eclipse.wst.xslt.templates.xpath.axis.followingsibling"
-	          autoinsert="true" context="xpath_axis" deleted="false"
-	          description="The following-sibling axis contains all the following siblings of the context node; if the context node is an attribute node or namespace node, the following-sibling axis is empty"
-	          enabled="true" name="following-sibling::">following-sibling::${cursor}</template>	          
-   	<template id="org.eclipse.wst.xslt.templates.xpath.axis.preceding-sibling"
-	          autoinsert="true" context="xpath_axis" deleted="false"
-	          description="The preceding-sibling axis contains all the preceding siblings of the context node; if the context node is an attribute node or namespace node, the preceding-sibling axis is empty."
-	          enabled="true" name="preceding-sibling::">preceding-sibling::${cursor}</template>	          
-   	<template id="org.eclipse.wst.xslt.templates.xpath.axis.following"
-	          autoinsert="true" context="xpath_axis" deleted="false"
-	          description="The following axis contains all nodes in the same document as the context node that are after the context node in document order, excluding any descendants and excluding attribute nodes and namespace nodes."
-	          enabled="true" name="following::">following::${cursor}</template>	          
-   	<template id="org.eclipse.wst.xslt.templates.xpath.axis.preceding"
-	          autoinsert="true" context="xpath_axis" deleted="false"
-	          description="The preceding axis contains all nodes in the same document as the context node that are before the context node in document order, excluding any ancestors and excluding attribute nodes and namespace nodes."
-	          enabled="true" name="preceding::">preceding::${cursor}</template>	          
-   	<template id="org.eclipse.wst.xslt.templates.xpath.axis.attribute"
-	          autoinsert="true" context="xpath_axis" deleted="false"
-	          description="The attribute axis contains the attributes of the context node; the axis will be empty unless the context node is an element."
-	          enabled="true" name="attribute::">attribute::${cursor}</template>
-   	<template id="org.eclipse.wst.xslt.templates.xpath.axis.attributeshortcut"
-	          autoinsert="true" context="xpath_axis" deleted="false"
-	          description="@ is a short cut for the attribute:: axis. The attribute axis contains the attributes of the context node; the axis will be empty unless the context node is an element."
-	          enabled="true" name="@">@${cursor}</template>	          
-   	<template id="org.eclipse.wst.xslt.templates.xpath.axis.namespace"
-	          autoinsert="true" context="xpath_axis" deleted="false"
-	          description="The namespace axis contains the namespace nodes of the context node; the axis will be empty unless the context node is an element."
-	          enabled="true" name="namespace::">attribute::${cursor}</template>	          
-   	<template id="org.eclipse.wst.xslt.templates.xpath.axis.self"
-	          autoinsert="true" context="xpath_axis" deleted="false"
-	          description="The self axis contains just the context node itself."
-	          enabled="true" name="self::">self::${cursor}</template>
-	<template id="org.eclipse.wst.xslt.templates.xpath.axis.selfshortcut"
-	          autoinsert="true" context="xpath_axis" deleted="false"
-	          description=". is a short cut for the self:: axis. The self axis contains just the context node itself."
-	          enabled="true" name=".">.${cursor}</template>	          
-   	<template id="org.eclipse.wst.xslt.templates.xpath.axis.descendantorself"
-	          autoinsert="true" context="xpath_axis" deleted="false"
-	          description="The descendant-or-self axis contains the context node and the descendants of the context node."
-	          enabled="true" name="descendant-or-self::">descendant-or-self::${cursor}</template>	          
-   	<template id="org.eclipse.wst.xslt.templates.xpath.axis.ancestororself"
-	          autoinsert="true" context="xpath_axis" deleted="false"
-	          description="the ancestor-or-self axis contains the context node and the ancestors of the context node; thus, the ancestor axis will always include the root node."
-	          enabled="true" name="ancestor-or-self::">ancestor-or-self::${cursor}</template>	          
-	          	          
-</templates>
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.xml.xpath.ui/templates/xpath_operator_templates.xml b/bundles/org.eclipse.wst.xml.xpath.ui/templates/xpath_operator_templates.xml
deleted file mode 100644
index dcca9b6..0000000
--- a/bundles/org.eclipse.wst.xml.xpath.ui/templates/xpath_operator_templates.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<templates>
-	<template id="org.eclipse.wst.xslt.templates.xpath.operator.addition"
-	          autoinsert="true" context="xpath_operator" deleted="false"
-	          description="Addition"
-	          enabled="true" name="+">+ ${cursor}</template>
-	<template id="org.eclipse.wst.xslt.templates.xpath.operator.subtraction"
-	          autoinsert="true" context="xpath_operator" deleted="false"
-	          description="Subtraction"
-	          enabled="true" name="-">- ${cursor}</template>
-	<template id="org.eclipse.wst.xslt.templates.xpath.operator.multiplication"
-	          autoinsert="true" context="xpath_operator" deleted="false"
-	          description="Multiplication"
-	          enabled="true" name="*">* ${cursor}</template>
-	<template id="org.eclipse.wst.xslt.templates.xpath.operator.division"
-	          autoinsert="true" context="xpath_operator" deleted="false"
-	          description="Division"
-	          enabled="true" name="div">div ${cursor}</template>
-	<template id="org.eclipse.wst.xslt.templates.xpath.operator.equal"
-	          autoinsert="true" context="xpath_operator" deleted="false"
-	          description="Equal"
-	          enabled="true" name="=">= ${cursor}</template>
-	<template id="org.eclipse.wst.xslt.templates.xpath.operator.notequal"
-	          autoinsert="true" context="xpath_operator" deleted="false"
-	          description="Not Equal"
-	          enabled="true" name="!=">!= ${cursor}</template>
-	<template id="org.eclipse.wst.xslt.templates.xpath.operator.lessthan"
-	          autoinsert="true" context="xpath_operator" deleted="false"
-	          description="Less Than"
-	          enabled="true" name="&lt;">&amp;lt; ${cursor}</template>
-	<template id="org.eclipse.wst.xslt.templates.xpath.operator.lessthanorequal"
-	          autoinsert="true" context="xpath_operator" deleted="false"
-	          description="Less Than or equal to"
-	          enabled="true" name="&lt;">&amp;lt;= ${cursor}</template>
-	<template id="org.eclipse.wst.xslt.templates.xpath.operator.greaterthan"
-	          autoinsert="true" context="xpath_operator" deleted="false"
-	          description="Greater than"
-	          enabled="true" name=">">> ${cursor}</template>
-	<template id="org.eclipse.wst.xslt.templates.xpath.operator.greaterthanorequal"
-	          autoinsert="true" context="xpath_operator" deleted="false"
-	          description="Greater than or equal to"
-	          enabled="true" name=">=">>= ${cursor}</template>
-	<template id="org.eclipse.wst.xslt.templates.xpath.operator.or"
-	          autoinsert="true" context="xpath_operator" deleted="false"
-	          description="or"
-	          enabled="true" name="or">or ${cursor}</template>
-	<template id="org.eclipse.wst.xslt.templates.xpath.operator.and"
-	          autoinsert="true" context="xpath_operator" deleted="false"
-	          description="and"
-	          enabled="true" name="and">and ${cursor}</template>
-	<template id="org.eclipse.wst.xslt.templates.xpath.string"
-	          autoinsert="true" context="xpath_operator" deleted="false"
-	          description="Modulus (division remainder)"
-	          enabled="true" name="mod">mod ${cursor}</template>
-	<template id="org.eclipse.wst.xslt.templates.xpath.operator.ornodes"
-	          autoinsert="true" context="xpath_operator" deleted="false"
-	          description="Computes two node sets. i.e. //book | //cd"
-	          enabled="true" name="|">| ${cursor}</template>
-	          
-</templates>
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.xml.xpath.ui/templates/xpath_templates.xml b/bundles/org.eclipse.wst.xml.xpath.ui/templates/xpath_templates.xml
deleted file mode 100644
index 245228c..0000000
--- a/bundles/org.eclipse.wst.xml.xpath.ui/templates/xpath_templates.xml
+++ /dev/null
@@ -1,165 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  Descriptions for the XPath functions come from the XPath 1.0 specification
-  maintained by the Word Wide Web Consortium.  The specification can be found
-  at:
-  
-  http://www.w3.org/TR/xpath
- -->
-<templates>
-	<template id="org.eclipse.wst.xslt.templates.xpath.last"
-		autoinsert="true" context="xsl_xpath" deleted="false"
-		description="The last function returns a number equal to the context size from the expression evaluation context."
-		enabled="true" name="last()">last()</template>
-	<template id="org.eclipse.wst.xslt.templates.xpath.postion"
-		autoinsert="true" context="xsl_xpath" deleted="false"
-		description="The position function returns a number equal to the context position from the expression evaluation context."
-		enabled="true" name="position()">position()</template>
-	<template id="org.eclipse.wst.xslt.templates.xpath.count"
-	          autoinsert="true" context="xml_xpath" deleted="false"
-	          description=""
-	          enabled="true" name="count(node-set)">count(${cursor})</template>
-	<template id="org.eclipse.wst.xslt.templates.xpath.id"
-	          autoinsert="true" context="xsl_xpath" deleted="false"
-	          description="The id function selects elements by their unique ID. When the argument to id is of type node-set, then the result is the union of the result of applying id to the string-value of each of the nodes in the argument node-set. When the argument to id is of any other type, the argument is converted to a string as if by a call to the string function; the string is split into a whitespace-separated list of tokens (whitespace is any sequence of characters matching the production S); the result is a node-set containing the elements in the same document as the context node that have a unique ID equal to any of the tokens in the list."
-	          enabled="true" name="id(node-set)">id(${cursor})</template>
-	<template id="org.eclipse.wst.xslt.templates.xpath.local_name"
-	          autoinsert="true" context="xsl_xpath" deleted="false"
-	          description="The local-name function returns the local part of the expanded-name of the node in the argument node-set that is first in document order. If the argument node-set is empty or the first node has no expanded-name, an empty string is returned. If the argument is omitted, it defaults to a node-set with the context node as its only member."
-	          enabled="true" name="local-name(node-set)">local-name(${cursor})</template>
-	<template id="org.eclipse.wst.xslt.templates.xpath.namespace_uri"
-	          autoinsert="true" context="xsl_xpath" deleted="false"
-	          description="The namespace-uri function returns the namespace URI of the expanded-name of the node in the argument node-set that is first in document order. If the argument node-set is empty, the first node has no expanded-name, or the namespace URI of the expanded-name is null, an empty string is returned. If the argument is omitted, it defaults to a node-set with the context node as its only member."
-	          enabled="true" name="namespace_uri(node-set)">namespace_uri(${cursor})</template>
-	<template id="org.eclipse.wst.xslt.templates.xpath.name"
-	          autoinsert="true" context="xsl_xpath" deleted="false"
-	          description="The name function returns a string containing a QName representing the expanded-name of the node in the argument node-set that is first in document order. The QName must represent the expanded-name with respect to the namespace declarations in effect on the node whose expanded-name is being represented. Typically, this will be the QName that occurred in the XML source. This need not be the case if there are namespace declarations in effect on the node that associate multiple prefixes with the same namespace. However, an implementation may include information about the original prefix in its representation of nodes; in this case, an implementation can ensure that the returned string is always the same as the QName used in the XML source. If the argument node-set is empty or the first node has no expanded-name, an empty string is returned. If the argument it omitted, it defaults to a node-set with the context node as its only member."
-	          enabled="true" name="name(node-set)">name(${cursor})</template>
-	<template id="org.eclipse.wst.xslt.templates.xpath.string"
-	          autoinsert="true" context="xsl_xpath" deleted="false"
-	          description="Returns the string value of the argument. The argument could be a number, boolean, or node-set"
-	          enabled="true" name="string(arg)">string(${cursor})</template>
-	<template id="org.eclipse.wst.xslt.templates.xpath.concat"
-	          autoinsert="true" context="xsl_xpath" deleted="false"
-	          description="The concat function returns the concatenation of its arguments."
-	          enabled="true" name="concat(string, string, string*)">concat(${cursor}, )</template>
-	<template id="org.eclipse.wst.xslt.templates.xpath.startswith"
-	          autoinsert="true" context="xsl_xpath" deleted="false"
-	          description="The starts-with function returns true if the first argument string starts with the second argument string, and otherwise returns false."
-	          enabled="true" name="starts-with(arg, arg)">starts-with(${cursor}, )</template>
-	<template id="org.eclipse.wst.xslt.templates.xpath.contains"
-	          autoinsert="true" context="xsl_xpath" deleted="false"
-	          description="The contains function returns true if the first argument string contains the second argument string, and otherwise returns false."
-	          enabled="true" name="contains(string, string)">contains(${cursor}, )</template>
-	<template id="org.eclipse.wst.xslt.templates.xpath.substringbefore"
-	          autoinsert="true" context="xsl_xpath" deleted="false"
-	          description='The substring-before function returns the substring of the first argument string that precedes the first occurrence of the second argument string in the first argument string, or the empty string if the first argument string does not contain the second argument string. For example, substring-before("1999/04/01","/") returns 1999.'
-	          enabled="true" name="substring-before(string, string)">substring-before(${cursor}, )</template>
-	<template id="org.eclipse.wst.xslt.templates.xpath.substringafter"
-	          autoinsert="true" context="xsl_xpath" deleted="false"
-	          description='The substring-after function returns the substring of the first argument string that follows the first occurrence of the second argument string in the first argument string, or the empty string if the first argument string does not contain the second argument string. For example, substring-after("1999/04/01","/") returns 04/01, and substring-after("1999/04/01","19") returns 99/04/01.'
-	          enabled="true" name="substring-after(string, string)">substring-after(${cursor}, )</template>
-	<template id="org.eclipse.wst.xslt.templates.xpath.substring"
-	          autoinsert="true" context="xsl_xpath" deleted="false"
-	          description='The substring function returns the substring of the first argument starting at the position specified in the second argument with length specified in the third argument. For example, substring("12345",2,3) returns "234". If the third argument is not specified, it returns the substring starting at the position specified in the second argument and continuing to the end of the string. For example, substring("12345",2) returns "2345".'
-	          enabled="true" name="substring(string, number, number?)">substring(${cursor}, )</template>
-	<template id="org.eclipse.wst.xslt.templates.xpath.stringlength"
-	          autoinsert="true" context="xsl_xpath" deleted="false"
-	          description='The string-length returns the number of characters in the string. If the argument is omitted, it defaults to the context node converted to a string, in other words the string-value of the context node.'
-	          enabled="true" name="string-length(string?)">string-length(${cursor})</template>
-	<template id="org.eclipse.wst.xslt.templates.xpath.normalizespace"
-	          autoinsert="true" context="xsl_xpath" deleted="false"
-	          description='The normalize-space function returns the argument string with whitespace normalized by stripping leading and trailing whitespace and replacing sequences of whitespace characters by a single space. Whitespace characters are the same as those allowed by the S production in XML. If the argument is omitted, it defaults to the context node converted to a string, in other words the string-value of the context node.'
-	          enabled="true" name="normalize-space(string?)">normalize-space(${cursor})</template>
-	<template id="org.eclipse.wst.xslt.templates.xpath.translate"
-	          autoinsert="true" context="xsl_xpath" deleted="false"
-	          description='The translate function returns the first argument string with occurrences of characters in the second argument string replaced by the character at the corresponding position in the third argument string.'
-	          enabled="true" name="translate(string, string, string)">translate(${cursor}, , )</template>
-	<template id="org.eclipse.wst.xslt.templates.xpath.boolean"
-	          autoinsert="true" context="xsl_xpath" deleted="false"
-	          description='Returns a boolean value for a number, string, or node-set'
-	          enabled="true" name="boolean(arg)">boolean(${cursor})</template>
-	<template id="org.eclipse.wst.xslt.templates.xpath.not"
-	          autoinsert="true" context="xsl_xpath" deleted="false"
-	          description='The not function returns true if its argument is false, and false otherwise.'
-	          enabled="true" name="not(boolean)">not(${cursor})</template>
-	<template id="org.eclipse.wst.xslt.templates.xpath.true"
-	          autoinsert="true" context="xsl_xpath" deleted="false"
-	          description='Returns a boolean true value.'
-	          enabled="true" name="true()">true()${cursor}</template>
-	<template id="org.eclipse.wst.xslt.templates.xpath.false"
-	          autoinsert="true" context="xsl_xpath" deleted="false"
-	          description='Returns a boolean false value.'
-	          enabled="true" name="false()">false()${cursor}</template>
-	<template id="org.eclipse.wst.xslt.templates.xpath.lang"
-	          autoinsert="true" context="xsl_xpath" deleted="false"
-	          description='The lang function returns true or false depending on whether the language of the context node as specified by xml:lang attributes is the same as or is a sublanguage of the language specified by the argument string. The language of the context node is determined by the value of the xml:lang attribute on the context node, or, if the context node has no xml:lang attribute, by the value of the xml:lang attribute on the nearest ancestor of the context node that has an xml:lang attribute. If there is no such attribute, then lang returns false. If there is such an attribute, then lang returns true if the attribute value is equal to the argument ignoring case, or if there is some suffix starting with - such that the attribute value is equal to the argument ignoring that suffix of the attribute value and ignoring case.'
-	          enabled="true" name="lang(string)">lang(${cursor})</template>
-	<template id="org.eclipse.wst.xslt.templates.xpath.number"
-	          autoinsert="true" context="xsl_xpath" deleted="false"
-	          description='Returns a boolean false value.'
-	          enabled="true" name="number(arg)">number(${cursor})</template>
-	<template id="org.eclipse.wst.xslt.templates.xpath.number"
-	          autoinsert="true" context="xsl_xpath" deleted="false"
-	          description='Returns the numeric value of the argument. The argument could be a boolean, string, or node-set.'
-	          enabled="true" name="number(arg)">number(${cursor})</template>
-	<template id="org.eclipse.wst.xslt.templates.xpath.sum"
-	          autoinsert="true" context="xsl_xpath" deleted="false"
-	          description='The sum function returns the sum, for each node in the argument node-set, of the result of converting the string-values of the node to a number.'
-	          enabled="true" name="sum(node-set)">sum(${cursor})</template>
-	<template id="org.eclipse.wst.xslt.templates.xpath.floor"
-	          autoinsert="true" context="xsl_xpath" deleted="false"
-	          description='The floor function returns the largest (closest to positive infinity) number that is not greater than the argument and that is an integer.'
-	          enabled="true" name="floor(number)">floor(${cursor})</template>
-	<template id="org.eclipse.wst.xslt.templates.xpath.ceiling"
-	          autoinsert="true" context="xsl_xpath" deleted="false"
-	          description='The ceiling function returns the smallest (closest to negative infinity) number that is not less than the argument and that is an integer.'
-	          enabled="true" name="ceiling(number)">ceiling(${cursor})</template>
-	<template id="org.eclipse.wst.xslt.templates.xpath.round"
-	          autoinsert="true" context="xsl_xpath" deleted="false"
-	          description='The round function returns the number that is closest to the argument and that is an integer. If there are two such numbers, then the one that is closest to positive infinity is returned. If the argument is NaN, then NaN is returned. If the argument is positive infinity, then positive infinity is returned. If the argument is negative infinity, then negative infinity is returned. If the argument is positive zero, then positive zero is returned. If the argument is negative zero, then negative zero is returned. If the argument is less than zero, but greater than or equal to -0.5, then negative zero is returned.'
-	          enabled="true" name="round(number)">round(${cursor})</template>
-	<template id="org.eclipse.wst.xslt.templates.xpath.round"
-	          autoinsert="true" context="xsl_xpath" deleted="false"
-	          description='The round function returns the number that is closest to the argument and that is an integer. If there are two such numbers, then the one that is closest to positive infinity is returned. If the argument is NaN, then NaN is returned. If the argument is positive infinity, then positive infinity is returned. If the argument is negative infinity, then negative infinity is returned. If the argument is positive zero, then positive zero is returned. If the argument is negative zero, then negative zero is returned. If the argument is less than zero, but greater than or equal to -0.5, then negative zero is returned.'
-	          enabled="true" name="round(number)">round(${cursor})</template>
-	          
-	<!-- XSL XPath Extensions -->
-	<template id="org.eclipse.wst.xslt.templates.xpath.xslkey"
-	          autoinsert="true" context="xsl_xpath" deleted="false"
-	          description='XSL XPath Extension Function: The key function does for keys what the id function does for IDs. The first argument specifies the name of the key. The value of the argument must be a QName, which is expanded as described in [2.4 Qualified Names]. When the second argument to the key function is of type node-set, then the result is the union of the result of applying the key function to the string value of each of the nodes in the argument node-set. When the second argument to key is of any other type, the argument is converted to a string as if by a call to the string function; it returns a node-set containing the nodes in the same document as the context node that have a value for the named key equal to this string. '
-	          enabled="true" name="key(string, arg)">key(${cursor}, )</template>
-	<template id="org.eclipse.wst.xslt.templates.xpath.xsldocument"
-	          autoinsert="true" context="xsl_xpath" deleted="false"
-	          description='XSL XPath Extension Function:The document function allows access to XML documents other than the main source document.'
-	          enabled="true" name="document(arg, node-set?)">document(${cursor})</template>
-	<template id="org.eclipse.wst.xslt.templates.xpath.xslformatnumber"
-	          autoinsert="true" context="xsl_xpath" deleted="false"
-	          description='XSL XPath Extension Function: The format-number function converts its first argument to a string using the format pattern string specified by the second argument and the decimal-format named by the third argument, or the default decimal-format, if there is no third argument.'
-	          enabled="true" name="format-number(number, string, string?)">format-number(${cursor}, )</template>
-	<template id="org.eclipse.wst.xslt.templates.xpath.xslcurrent"
-	          autoinsert="true" context="xsl_xpath" deleted="false"
-	          description='XSL XPath Extension Function: The current function returns a node-set that has the current node as its only member. For an outermost expression (an expression not occurring within another expression), the current node is always the same as the context node.'
-	          enabled="true" name="current()">current() ${cursor}</template>
-	<template id="org.eclipse.wst.xslt.templates.xpath.xslunparseentityuri"
-	          autoinsert="true" context="xsl_xpath" deleted="false"
-	          description='XSL XPath Extension Function: The unparsed-entity-uri returns the URI of the unparsed entity with the specified name in the same document as the context node (see [3.3 Unparsed Entities]). It returns the empty string if there is no such entity.'
-	          enabled="true" name="unparsed-entity-uri(string)">unparsed-entity-uri(${cursor})</template>
-	<template id="org.eclipse.wst.xslt.templates.xpath.xslgenerateid"
-	          autoinsert="true" context="xsl_xpath" deleted="false"
-	          description='XSL XPath Extension Function: The generate-id function returns a string that uniquely identifies the node in the argument node-set that is first in document order. The unique identifier must consist of ASCII alphanumeric characters and must start with an alphabetic character. Thus, the string is syntactically an XML name. An implementation is free to generate an identifier in any convenient way provided that it always generates the same identifier for the same node and that different identifiers are always generated from different nodes. An implementation is under no obligation to generate the same identifiers each time a document is transformed. There is no guarantee that a generated unique identifier will be distinct from any unique IDs specified in the source document. If the argument node-set is empty, the empty string is returned. If the argument is omitted, it defaults to the context node.'
-	          enabled="true" name="generate-id(node-set?)">generate-id(${cursor})</template>
-	<template id="org.eclipse.wst.xslt.templates.xpath.xslsystemproperty"
-	          autoinsert="true" context="xsl_xpath" deleted="false"
-	          description='XSL XPath Extension Function: The argument must evaluate to a string that is a QName. The QName is expanded into a name using the namespace declarations in scope for the expression. The system-property function returns an object representing the value of the system property identified by the name. If there is no such system property, the empty string should be returned.'	
-	          enabled="true" name="system-property(string)">system-property(${cursor})</template>
-	<template id="org.eclipse.wst.xslt.templates.xpath.xslelementavailable"
-	          autoinsert="true" context="xsl_xpath" deleted="false"
-	          description='XSL XPath Extension Function: The argument must evaluate to a string that is a QName. The QName is expanded into an expanded-name using the namespace declarations in scope for the expression. The element-available function returns true if and only if the expanded-name is the name of an instruction. If the expanded-name has a namespace URI equal to the XSLT namespace URI, then it refers to an element defined by XSLT. Otherwise, it refers to an extension element. If the expanded-name has a null namespace URI, the element-available function will return false. '	
-	          enabled="true" name="element-available(string)">element-available(${cursor})</template>
-	<template id="org.eclipse.wst.xslt.templates.xpath.xslfunctionavailable"
-	          autoinsert="true" context="xsl_xpath" deleted="false"
-	          description='XSL XPath Extension Function: The argument must evaluate to a string that is a QName. The QName is expanded into an expanded-name using the namespace declarations in scope for the expression. The function-available function returns true if and only if the expanded-name is the name of a function in the function library. If the expanded-name has a non-null namespace URI, then it refers to an extension function; otherwise, it refers to a function defined by XPath or XSLT.'	
-	          enabled="true" name="function-available(string)">function-available(${cursor})</template>
-  
-</templates>
\ No newline at end of file