1 files changed, 0 insertions, 39 deletions
diff --git a/tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample842.wsdl b/tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample842.wsdl
deleted file mode 100644
index 3f1d97da4..000000000
--- a/tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsCrossDepends/sample842.wsdl
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<wsdl:definitions name="sample" targetNamespace="http://www.example.org/sample842" xmlns:tns="http://www.example.org/sample842" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/">
-<wsdl:import namespace="http://www.example.org/sample840" location="sample840.wsdl"/>
-<wsdl:import namespace="http://www.example.org/sample185" location="./sample185.wsdl"/>
-<wsdl:import namespace="http://www.example.org/sample411" location=".\sample411.wsdl"/>
-<wsdl:types>
-<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.org/sample842">
-<xsd:element name="NewOperationResponse" type="xsd:string"/><xsd:element name="NewOperationRequest" type="xsd:string"/></xsd:schema>
-</wsdl:types>
-<wsdl:message name="NewOperationResponse">
-<wsdl:part name="NewOperationResponse" element="tns:NewOperationResponse"/>
-</wsdl:message>
-<wsdl:message name="NewOperationRequest">
-<wsdl:part name="NewOperationRequest" element="tns:NewOperationRequest"/>
-</wsdl:message>
-<wsdl:portType name="sample">
-<wsdl:operation name="NewOperation">
-<wsdl:input message="tns:NewOperationRequest"/>
-<wsdl:output message="tns:NewOperationResponse"/>
-</wsdl:operation>
-</wsdl:portType>
-<wsdl:binding name="sampleSOAP" type="tns:sample">
-<soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
-<wsdl:operation name="NewOperation">
-<soap:operation soapAction="http://www.example.org/sample/NewOperation"/>
-<wsdl:input>
-<soap:body use="literal" parts=" NewOperationRequest"/>
-</wsdl:input>
-<wsdl:output>
-<soap:body use="literal" parts=" NewOperationResponse"/>
-</wsdl:output>
-</wsdl:operation>
-</wsdl:binding>
-<wsdl:service name="sample">
-<wsdl:port name="sampleSOAP" binding="tns:sampleSOAP">
-<soap:address location="http://www.example.org/"/>
-</wsdl:port>
-</wsdl:service>
-</wsdl:definitions>
-\ No newline at end of file
diff --git a/plugins/org.eclipse.jem.beaninfo.ui/.project b/plugins/org.eclipse.jem.beaninfo.ui/.project
deleted file mode 100644
index 3898d5625..000000000
--- a/plugins/org.eclipse.jem.beaninfo.ui/.project
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.jem.beaninfo.ui</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-
-	</buildSpec>
-	<natures>
-	</natures>
-</projectDescription>
diff --git a/plugins/org.eclipse.jem.beaninfo.ui/OBSOLETE-moved to org.eclipse.jem.ui b/plugins/org.eclipse.jem.beaninfo.ui/OBSOLETE-moved to org.eclipse.jem.ui
deleted file mode 100644
index e69de29bb..000000000
--- a/plugins/org.eclipse.jem.beaninfo.ui/OBSOLETE-moved to org.eclipse.jem.ui
+++ /dev/null
diff --git a/plugins/org.eclipse.jst.common.annotations.controller/.classpath b/plugins/org.eclipse.jst.common.annotations.controller/.classpath
deleted file mode 100644
index 409868143..000000000
--- a/plugins/org.eclipse.jst.common.annotations.controller/.classpath
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="controller"/>
-	<classpathentry kind="src" path="property_files"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/plugins/org.eclipse.jst.common.annotations.controller/.cvsignore b/plugins/org.eclipse.jst.common.annotations.controller/.cvsignore
deleted file mode 100644
index 9910b2da3..000000000
--- a/plugins/org.eclipse.jst.common.annotations.controller/.cvsignore
+++ /dev/null
@@ -1,4 +0,0 @@
-bin
-temp.folder
-build.xml
-controller.jar
diff --git a/plugins/org.eclipse.jst.common.annotations.controller/.project b/plugins/org.eclipse.jst.common.annotations.controller/.project
deleted file mode 100644
index 8cc7f2234..000000000
--- a/plugins/org.eclipse.jst.common.annotations.controller/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.jst.common.annotations.controller</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.pde.PluginNature</nature>
-	</natures>
-</projectDescription>
diff --git a/plugins/org.eclipse.jst.common.annotations.controller/META-INF/MANIFEST.MF b/plugins/org.eclipse.jst.common.annotations.controller/META-INF/MANIFEST.MF
deleted file mode 100644
index 5a90739e3..000000000
--- a/plugins/org.eclipse.jst.common.annotations.controller/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,19 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Annotation Controller Plug-in
-Bundle-SymbolicName: org.eclipse.jst.common.annotations.controller; singleton:=true
-Bundle-Version: 0.7.0
-Bundle-ClassPath: controller.jar
-Bundle-Vendor: Eclipse.org
-Bundle-Localization: plugin
-Export-Package: org.eclipse.jst.common.internal.annotations.controller,
- org.eclipse.jst.common.internal.annotations.registry
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.core.resources,
- org.eclipse.emf.ecore,
- org.eclipse.wst.common.frameworks,
- org.eclipse.jdt.core,
- org.eclipse.wst.common.emf,
- org.eclipse.jst.common.annotations.core,
- org.eclipse.jem.util,
- org.eclipse.jem.workbench
diff --git a/plugins/org.eclipse.jst.common.annotations.controller/about.html b/plugins/org.eclipse.jst.common.annotations.controller/about.html
deleted file mode 100644
index 6f6b96c4c..000000000
--- a/plugins/org.eclipse.jst.common.annotations.controller/about.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>February 24, 2005</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; 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 (&quot;Redistributor&quot;) 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.</p>
-
-</body>
-</html>
-\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.common.annotations.controller/build.properties b/plugins/org.eclipse.jst.common.annotations.controller/build.properties
deleted file mode 100644
index 3a63f7ede..000000000
--- a/plugins/org.eclipse.jst.common.annotations.controller/build.properties
+++ /dev/null
@@ -1,21 +0,0 @@
-###############################################################################
-# Copyright (c) 2003, 2004 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-bin.includes = .template,\
-               plugin.xml,\
-               src/,\
-               controller.jar,\
-               schema/,\
-               META-INF/,\
-               about.html
-src.includes = schema/
-source.controller.jar = controller/,\
-                        property_files/
-output.controller.jar = bin/
diff --git a/plugins/org.eclipse.jst.common.annotations.controller/controller/org/eclipse/jst/common/internal/annotations/controller/AnnotationsController.java b/plugins/org.eclipse.jst.common.annotations.controller/controller/org/eclipse/jst/common/internal/annotations/controller/AnnotationsController.java
deleted file mode 100644
index 31a30cd46..000000000
--- a/plugins/org.eclipse.jst.common.annotations.controller/controller/org/eclipse/jst/common/internal/annotations/controller/AnnotationsController.java
+++ /dev/null
@@ -1,86 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Mar 25, 2004
- */
-package org.eclipse.jst.common.internal.annotations.controller;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * Annotations Controller interface used for communicating with emitters and determining available
- * tag sets
- */
-public interface AnnotationsController {
-
-	/**
-	 * Determines if a tag handler is installed for the specified tag
-	 * 
-	 * @param tagset
-	 *            the name of a tagset (e.g. "ejb")
-	 * @return true only if the given tagset is available and enabled
-	 */
-	public boolean isTagHandlerInstalled(String tagset);
-
-	/**
-	 * Disables annotation processing for the specified resource
-	 * 
-	 * @param modelObject
-	 *            The Annotated EMF Object
-	 * @param tagset
-	 *            The name of the annotations tagset to disable on the object
-	 * @return an IStatus representing success or failure
-	 */
-	public IStatus disableAnnotations(EObject modelObject, String tagset);
-
-	/**
-	 * Returns the associated annotated file if the specified model object was generated via
-	 * annotations from a parent resource and is enabled
-	 * 
-	 * @param modelObject
-	 *            The Annotated EMF Object
-	 * @return the annotated source file associated with the given modelObject
-	 */
-	public IFile getEnabledAnnotationFile(EObject modelObject);
-
-	/**
-	 * Process the annotations on the given resource during creation
-	 * 
-	 * @return all files touched by the annotations processing
-	 * @throws CoreException
-	 *             if a problem occurs while processing
-	 */
-	public IFile[] process(IResource res) throws CoreException;
-
-	/**
-	 * Process the annotations on the given resource array
-	 * 
-	 * @return all files touched by the annotations processing
-	 * @throws CoreException
-	 *             if a problem occurs while processing
-	 */
-	public IFile[] process(IResource[] res) throws CoreException;
-
-	/**
-	 * Provides the annotation processor an opportunity to initialize
-	 */
-	public void initialize(IProject project);
-
-	/**
-	 * Provides the annotation processor an opportunity to dispose and cleanup
-	 */
-	public void dispose();
-}
-\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.common.annotations.controller/controller/org/eclipse/jst/common/internal/annotations/controller/AnnotationsControllerHelper.java b/plugins/org.eclipse.jst.common.annotations.controller/controller/org/eclipse/jst/common/internal/annotations/controller/AnnotationsControllerHelper.java
deleted file mode 100644
index cf6568522..000000000
--- a/plugins/org.eclipse.jst.common.annotations.controller/controller/org/eclipse/jst/common/internal/annotations/controller/AnnotationsControllerHelper.java
+++ /dev/null
@@ -1,153 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.common.internal.annotations.controller;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.jem.workbench.utility.JemProjectUtilities;
-import org.eclipse.jst.common.internal.annotations.core.AnnotationsAdapter;
-
-/**
- * @author mdelder
- *  
- */
-public class AnnotationsControllerHelper {
-	private static final String ANNOTATION_BUILDER = "com.ibm.ws.rapiddeploy.annotations.core.AnnotationBuilder"; //$NON-NLS-1$
-	public static final AnnotationsControllerHelper INSTANCE = new AnnotationsControllerHelper();
-
-	protected AnnotationsControllerHelper() {
-		super();
-	}
-
-	/**
-	 * 
-	 * @param eObject
-	 *            the annotated? model object
-	 * @return true only if the object has annotations
-	 */
-	public boolean isAnnotated(EObject eObject) {
-		return AnnotationsAdapter.getAnnotations(eObject, AnnotationsAdapter.GENERATED) != null;
-	}
-
-	/**
-	 * A convenience method to tag a model object as annotated
-	 * 
-	 * @param eObject
-	 * @param value
-	 */
-	public void setAnnotated(EObject eObject, String value) {
-		AnnotationsAdapter.addAnnotations(eObject, AnnotationsAdapter.GENERATED, value);
-	}
-
-	/**
-	 * A convenience method to tag a model object as annotated Annotations Adapters can hold extra
-	 * information.
-	 * 
-	 * @param eObject
-	 * @param name
-	 *            A string key
-	 * @param value
-	 *            A String value
-	 */
-	public void addAnnotations(EObject eObject, String name, Object value) {
-		AnnotationsAdapter.addAnnotations(eObject, name, value);
-	}
-
-	/**
-	 * A convenience method to tag a model object as annotated Annotations Adapters can hold extra
-	 * information.
-	 * 
-	 * @param eObject
-	 * @param name
-	 *            A string key
-	 * @param value
-	 *            A String value
-	 */
-	public Object getAnnotations(EObject eObject, String name) {
-		return AnnotationsAdapter.getAnnotations(eObject, name);
-	}
-
-	/**
-	 * Acquires the generated annotation comment and parses the Fragment URL of the following form
-	 * to return the tagset name:
-	 * 
-	 * com.acme.ejbs.MyEJB# <tagset>/ <fragment>. <fragment-pointer>
-	 * 
-	 * @param eObject
-	 *            The annotated object
-	 * @return the value of <tagset>in the URL example
-	 */
-	public String getTagset(EObject eObject) {
-
-		String generatedComment = (String) AnnotationsAdapter.getAnnotations(eObject, AnnotationsAdapter.GENERATED);
-		if (generatedComment == null || generatedComment.length() == 0)
-			return null;
-		int poundit = generatedComment.indexOf('#');
-		int slash = generatedComment.indexOf('/');
-		if (poundit < 0 || slash < 0 || poundit >= slash)
-			return null;
-		return generatedComment.substring(poundit + 1, slash);
-
-	}
-
-	/**
-	 * Returns the CompilationUnit associated with the given model object
-	 * 
-	 * @param eObject
-	 *            an Annotated model Object
-	 * @return The compilation unit which was responsible for the generation of the model object
-	 */
-	public ICompilationUnit getAnnotatedCU(EObject eObject) {
-		String fragementString = (String) AnnotationsAdapter.getAnnotations(eObject, AnnotationsAdapter.GENERATED);
-		if (fragementString == null)
-			return null;
-
-		String typeString = fragementString.substring(0, fragementString.indexOf('#'));
-		IType itype;
-
-		if (typeString != null && (itype = findType(typeString, eObject)) != null) {
-			try {
-				return itype.getCompilationUnit().getWorkingCopy(null);
-			} catch (JavaModelException e) {
-				Logger.getLogger().logError(e);
-			}
-		}
-		return null;
-	}
-
-	protected IType findType(String type, EObject eObject) {
-		IType result = null;
-		IProject project = ProjectUtilities.getProject(eObject);
-		IJavaProject javaProject = JemProjectUtilities.getJavaProject(project);
-		if (javaProject != null)
-			try {
-				result = javaProject.findType(type);
-			} catch (JavaModelException e) {
-				Logger.getLogger().logError(e);
-			}
-		return result;
-	}
-
-	/**
-	 * Return true if <code>project</code> has annotation support enabled on it.
-	 * 
-	 * @return
-	 */
-	public boolean hasAnnotationSupport(IProject project) {
-		return ProjectUtilities.hasBuilder(project, ANNOTATION_BUILDER);
-	}
-}
-\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.common.annotations.controller/controller/org/eclipse/jst/common/internal/annotations/controller/AnnotationsControllerManager.java b/plugins/org.eclipse.jst.common.annotations.controller/controller/org/eclipse/jst/common/internal/annotations/controller/AnnotationsControllerManager.java
deleted file mode 100644
index ba0eb0c3c..000000000
--- a/plugins/org.eclipse.jst.common.annotations.controller/controller/org/eclipse/jst/common/internal/annotations/controller/AnnotationsControllerManager.java
+++ /dev/null
@@ -1,206 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Mar 25, 2004
- */
-package org.eclipse.jst.common.internal.annotations.controller;
-
-import java.util.Iterator;
-import java.util.Map;
-import java.util.SortedSet;
-import java.util.TreeSet;
-import java.util.WeakHashMap;
-
-import org.eclipse.core.resources.ICommand;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.jem.util.RegistryReader;
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.jst.common.internal.annotations.registry.AnnotationsControllerResources;
-import org.eclipse.wst.common.frameworks.internal.enablement.EnablementIdentifier;
-import org.eclipse.wst.common.frameworks.internal.enablement.EnablementIdentifierEvent;
-import org.eclipse.wst.common.frameworks.internal.enablement.EnablementManager;
-import org.eclipse.wst.common.frameworks.internal.enablement.IEnablementIdentifier;
-import org.eclipse.wst.common.frameworks.internal.enablement.IEnablementIdentifierListener;
-import org.eclipse.wst.common.frameworks.internal.enablement.Identifiable;
-import org.eclipse.wst.common.frameworks.internal.enablement.IdentifiableComparator;
-import org.eclipse.wst.common.internal.emf.utilities.Assert;
-
-
-/**
- * AnnotationsControllerRegistry for reading annotations controller extensions
- */
-public class AnnotationsControllerManager extends RegistryReader implements IEnablementIdentifierListener {
-
-	public static final AnnotationsControllerManager INSTANCE = new AnnotationsControllerManager();
-	public static final String ANNOTATION_BUILDER = "com.ibm.ws.rapiddeploy.annotations.core.AnnotationBuilder"; //$NON-NLS-1$
-
-	static {
-		INSTANCE.readRegistry();
-	}
-
-	private SortedSet descriptors;
-
-	private Map annotationsControllers;
-
-	public static class Descriptor implements Identifiable {
-
-		public static final String ANNOTATIONS_CONTROLLER = "annotationsController"; //$NON-NLS-1$
-
-		public static final String ATT_ID = "id"; //$NON-NLS-1$
-
-		public static final String CLASS = "class"; //$NON-NLS-1$
-
-		private final IConfigurationElement configElement;
-		private final String ID;
-		private final int loadOrder;
-		private static int loadOrderCounter = 0;
-
-		public Descriptor(IConfigurationElement aConfigElement) {
-			super();
-			Assert.isLegal(ANNOTATIONS_CONTROLLER.equals(aConfigElement.getName()), AnnotationsControllerResources.getString("AnnotationsControllerManager_ERROR_0")); //$NON-NLS-1$
-			this.configElement = aConfigElement;
-			this.ID = this.configElement.getAttribute(ATT_ID);
-			loadOrder = loadOrderCounter++;
-		}
-
-		/*
-		 * (non-Javadoc)
-		 * 
-		 * @see org.eclipse.wst.common.frameworks.internal.enablement.Identifiable#getID()
-		 */
-		public String getID() {
-			return ID;
-		}
-
-		/*
-		 * (non-Javadoc)
-		 * 
-		 * @see org.eclipse.wst.common.frameworks.internal.enablement.Identifiable#getLoadOrder()
-		 */
-		public int getLoadOrder() {
-			return loadOrder;
-		}
-
-		public AnnotationsController createInstance() {
-			AnnotationsController instance = null;
-			try {
-				instance = (AnnotationsController) configElement.createExecutableExtension(CLASS);
-			} catch (CoreException e) {
-				Logger.getLogger().logError(e);
-			}
-			return instance;
-		}
-	}
-
-	/**
-	 * Default constructor
-	 */
-	public AnnotationsControllerManager() {
-		super("org.eclipse.jst.common.annotations.controller", "annotationsController"); //$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	/**
-	 * read extension element
-	 */
-	public boolean readElement(IConfigurationElement element) {
-		if (!element.getName().equals(Descriptor.ANNOTATIONS_CONTROLLER))
-			return false;
-		addAnnotationController(new Descriptor(element));
-		return true;
-	}
-
-	/**
-	 * @param descriptor
-	 */
-	protected void addAnnotationController(Descriptor descriptor) {
-		EnablementManager.INSTANCE.getIdentifier(descriptor.getID(), null).addIdentifierListener(this);
-		getDescriptors().add(descriptor);
-	}
-
-	/**
-	 * @return Returns the annotationControllers.
-	 */
-	protected SortedSet getDescriptors() {
-		if (descriptors == null)
-			descriptors = new TreeSet(IdentifiableComparator.getInstance());
-		return descriptors;
-	}
-
-	public Descriptor getDescriptor(IProject project) {
-		for (Iterator iter = getDescriptors().iterator(); iter.hasNext();) {
-			Descriptor descriptor = (Descriptor) iter.next();
-			IEnablementIdentifier identifier = EnablementManager.INSTANCE.getIdentifier(descriptor.getID(), project);
-			if (identifier.isEnabled())
-				return descriptor;
-		}
-		return null;
-	}
-
-	/**
-	 * Determine if any annotations are supported
-	 */
-	public boolean isAnyAnnotationsSupported() {
-		return getDescriptors().size() > 0;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.wst.common.frameworks.internal.enablement.IEnablementIdentifierListener#identifierChanged(org.eclipse.wst.common.frameworks.internal.enablement.EnablementIdentifierEvent)
-	 */
-	public void identifierChanged(EnablementIdentifierEvent identifierEvent) {
-		IProject project = ((EnablementIdentifier) identifierEvent.getIdentifier()).getProject();
-		getAnnotationsControllers().remove(project);
-	}
-
-	/**
-	 * Return the annotations controller for the specified project
-	 */
-	public AnnotationsController getAnnotationsController(IProject project) {
-		AnnotationsController controller = (AnnotationsController) getAnnotationsControllers().get(project);
-		if (controller == null) {
-			if (!hasBuilder(project, ANNOTATION_BUILDER))
-				return null;
-			Descriptor descriptor = getDescriptor(project);
-			if (descriptor != null)
-				getAnnotationsControllers().put(project, (controller = descriptor.createInstance()));
-		}
-
-		return controller;
-	}
-
-	/**
-	 * @return Returns the annotationControllers.
-	 */
-	public Map getAnnotationsControllers() {
-		if (annotationsControllers == null)
-			annotationsControllers = new WeakHashMap();
-		return annotationsControllers;
-	}
-
-	public boolean hasBuilder(IProject project, String builderName) {
-		try {
-			ICommand[] builders = project.getDescription().getBuildSpec();
-			for (int i = 0; i < builders.length; i++) {
-				ICommand builder = builders[i];
-				if (builder != null) {
-					if (builder.getBuilderName().equals(builderName))
-						return true;
-				}
-			}
-		} catch (Exception e) {
-			// Do nothing
-		}
-		return false;
-	}
-}
-\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.common.annotations.controller/controller/org/eclipse/jst/common/internal/annotations/registry/AnnotationTagDynamicInitializer.java b/plugins/org.eclipse.jst.common.annotations.controller/controller/org/eclipse/jst/common/internal/annotations/registry/AnnotationTagDynamicInitializer.java
deleted file mode 100644
index 85e8d8799..000000000
--- a/plugins/org.eclipse.jst.common.annotations.controller/controller/org/eclipse/jst/common/internal/annotations/registry/AnnotationTagDynamicInitializer.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/* ***************************************************************************************************
- * Licensed Materials - Property of IBM
- *
- * 5724-I66
- * 
- * � Copyright IBM Corporation 2004. All Rights Reserved.
- * 
- * Note to U.S. Government Users Restricted Rights:  Use, duplication or disclosure restricted by GSA 
- * ADP  Schedule Contract with IBM Corp.
- *  
- *****************************************************************************************************/
-package org.eclipse.jst.common.internal.annotations.registry;
-
-/**
- * This method will be called by the AnnotationTagRegistry
- * when it is time to register the tags for a given
- * TagSet.  An AnnotationTagDynamicInitializer defined
- * using the annotationTagDynamicInitializer.
- * 
- * @see com.ibm.wtp.annotations.registry.AnnotationTagRegistry
- */
-public interface AnnotationTagDynamicInitializer {
-	void registerTags();
-}
-\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.common.annotations.controller/controller/org/eclipse/jst/common/internal/annotations/registry/AnnotationTagRegistry.java b/plugins/org.eclipse.jst.common.annotations.controller/controller/org/eclipse/jst/common/internal/annotations/registry/AnnotationTagRegistry.java
deleted file mode 100644
index 3d3b97a59..000000000
--- a/plugins/org.eclipse.jst.common.annotations.controller/controller/org/eclipse/jst/common/internal/annotations/registry/AnnotationTagRegistry.java
+++ /dev/null
@@ -1,511 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Aug 22, 2003
- *
- * To change the template for this generated file go to
- * Window&gt;Preferences&gt;Java&gt;Code Generation&gt;Code and Comments
- */
-package org.eclipse.jst.common.internal.annotations.registry;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExtension;
-import org.eclipse.core.runtime.IExtensionPoint;
-import org.eclipse.core.runtime.IExtensionRegistry;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.osgi.framework.Bundle;
-
-/**
- * @author kelleyp
- * 
- * Singleton that parses the annotation tag information from the annotation-taghandler extension
- * point, and provides an interface for accessing it for other classes. Largely taken from the
- * AnnotationProcessor builder.
- */
-
-public class AnnotationTagRegistry {
-
-	/**
-	 * Set to true once we've read in the annotation tag information from the plugin registry.
-	 */
-	private static boolean initialized = false;
-	private static final String ANNOTATION_TAG_INFO = "org.eclipse.jst.common.annotations.controller.AnnotationTagInfo"; //$NON-NLS-1$
-
-	/**
-	 * List of tag specs for all of the tags.
-	 */
-	private static ArrayList allTagSpecs = new ArrayList() {
-		final private static long serialVersionUID = 8683452581122892190L;
-
-		private void scopeAll(Collection c, boolean forAdd) {
-			Iterator iter = c.iterator();
-			while (iter.hasNext()) {
-				TagSpec ts = (TagSpec) iter.next();
-				if (forAdd)
-					addScope(ts);
-				else
-					removeScope(ts);
-			}
-		}
-
-		private void addScope(TagSpec ts) {
-			if (ts == null)
-				return;
-			switch (ts.getScope()) {
-				case TagSpec.FIELD :
-					fieldTags.put(ts.getTagName(), ts);
-					break;
-				case TagSpec.METHOD :
-					methodTags.put(ts.getTagName(), ts);
-					break;
-				case TagSpec.TYPE :
-					typeTags.put(ts.getTagName(), ts);
-					break;
-			}
-		}
-
-		private void removeScope(TagSpec ts) {
-			if (ts == null)
-				return;
-			switch (ts.getScope()) {
-				case TagSpec.FIELD :
-					fieldTags.remove(ts.getTagName());
-					break;
-				case TagSpec.METHOD :
-					methodTags.remove(ts.getTagName());
-					break;
-				case TagSpec.TYPE :
-					typeTags.remove(ts.getTagName());
-					break;
-			}
-		}
-
-		public void add(int index, Object element) {
-			super.add(index, element);
-			addScope((TagSpec)element);
-		}
-
-		public boolean add(Object o) {
-			TagSpec newTagSpec = (TagSpec)o;
-			// search for already existing tag spec with same name and same tag set name
-			for (int i=0; i<this.size(); i++) {
-				TagSpec tagSpec = (TagSpec) get(i);
-				if (tagSpec.getTagName().equals(newTagSpec.getTagName())) {
-					remove(tagSpec);
-					removeScope(tagSpec);
-				}	
-			}
-			// add the new tag spec
-			addScope(newTagSpec);
-			return super.add(newTagSpec);
-		}
-
-		public boolean addAll(Collection c) {
-			scopeAll(c, true);
-			return super.addAll(c);
-		}
-
-		public boolean addAll(int index, Collection c) {
-			scopeAll(c, true);
-			return super.addAll(index, c);
-		}
-
-		public Object remove(int index) {
-			Object result = super.remove(index);
-			removeScope((TagSpec) result);
-			return result;
-		}
-
-		public boolean remove(Object o) {
-			removeScope((TagSpec) o);
-			return super.remove(o);
-		}
-
-		public boolean removeAll(Collection c) {
-			scopeAll(c, false);
-			return super.removeAll(c);
-		}
-
-		public boolean retainAll(Collection c) {
-			Iterator iter = this.iterator();
-			while (iter.hasNext()) {
-				TagSpec ts = (TagSpec) iter.next();
-				if (!c.contains(ts))
-					removeScope(ts);
-			}
-			return super.retainAll(c);
-		}
-	};
-
-	/**
-	 * Map from a tag name to a InitTagInfo. Only live during up to the end of the init() method.
-	 */
-	private static Hashtable tagAttribs = new Hashtable();
-
-	/**
-	 * Division of tag names between allowed scopes.
-	 */
-	private static Map methodTags = new HashMap();
-
-	private static Map typeTags = new HashMap();
-
-	private static Map fieldTags = new HashMap();
-	
-	private static final String CLASS_PROP = "class"; //$NON-NLS-1$
-	private static final String DYNAMIC_INITIALIZER_EX_PT = "annotationTagDynamicInitializer"; //$NON-NLS-1$
-	private static final String ANNOTATIONS_CONTROLLER_NAMESPACE = "org.eclipse.jst.common.annotations.controller"; //$NON-NLS-1$
-
-	/**
-	 * Helper for init, parse the tag attributes for a AnnotationTagInfo tag.
-	 * 
-	 * @param elems
-	 *            Array of "attrib" configuration elements.
-	 * @param tagName
-	 *            Lowercased name of the tag these attributes are associated with.
-	 */
-	private static InitTagInfo parseTagAttribs(IConfigurationElement[] elems, String tagName, String scope) {
-		int i;
-		ArrayList attribList = new ArrayList();
-
-		InitTagInfo tagInf = new InitTagInfo(tagName, scope, attribList);
-
-		for (i = 0; i < elems.length; i++) {
-			IConfigurationElement elem = elems[i];
-
-			if (elem.getName().equalsIgnoreCase("attrib")) { //$NON-NLS-1$
-				TagAttribSpec tas = new TagAttribSpec(elem.getAttribute("name"), elem.getAttribute("description")); //$NON-NLS-1$ //$NON-NLS-2$
-				String use = elem.getAttribute("use"); //$NON-NLS-1$
-
-				tas.setType(elem.getAttribute("type")); //$NON-NLS-1$
-
-				// add valid values
-				if ("enum".equals(elem.getAttribute("type"))) { //$NON-NLS-1$ //$NON-NLS-2$
-					IConfigurationElement[] validValues = elem.getChildren("enumValues"); //$NON-NLS-1$
-					List valuesList = new ArrayList();
-					for (int j = 0; j < validValues.length; j++) {
-						String value = validValues[j].getAttribute("value"); //$NON-NLS-1$
-						valuesList.add(value);
-					}
-					String[] validValuesArray = new String[valuesList.size()];
-					validValuesArray = (String[]) valuesList.toArray(validValuesArray);
-
-					tas.setValidValues(validValuesArray);
-				}
-
-				if (use == null) {
-					tas.clearRequired();
-				} else if (use.equalsIgnoreCase("required")) { //$NON-NLS-1$
-					tas.setRequired();
-				} else if (use.equalsIgnoreCase("optional")) { //$NON-NLS-1$
-					tas.clearRequired();
-				} else {
-					// Unlikely, unless annotation extension spec changes
-					// without changes here.
-					System.err.println(AnnotationsControllerResources.getString("AnnotationTagRegistry.9") + use); //$NON-NLS-1$
-					return null;
-				}
-
-				IConfigurationElement[] elemUniqueArray = elem.getChildren("unique"); //$NON-NLS-1$
-				if (elemUniqueArray.length > 0) {
-					tas.setUnique();
-					if (elemUniqueArray[0].getAttribute("scope") != null) //$NON-NLS-1$
-						tas.getUnique().setScope(TagAttribSpec.uniqueScopeFromString(elemUniqueArray[0].getAttribute("scope"))); //$NON-NLS-1$
-					if (elemUniqueArray.length > 1) {
-						Logger.getLogger().logError(AnnotationsControllerResources.getString("TagAttribSpec.2") + elemUniqueArray.length); //$NON-NLS-1$
-					}
-				} else {
-					tas.clearUnique();
-				}
-
-				attribList.add(tas);
-			}
-		}
-		return tagInf;
-	}
-
-	/**
-	 * Return the tag set name from a full tag name.
-	 * 
-	 * @param name
-	 *            Full tag name (without the '@' at the beginning)
-	 * @return
-	 */
-	public static String tagSetFromTagName(String name) {
-		if (name == null)
-			return null;
-		int idx = name.lastIndexOf('.');
-
-		if (idx != -1)
-			return name.substring(0, idx);
-		return ""; //$NON-NLS-1$
-	}
-
-	/**
-	 * Return the short name from a full tag name.
-	 * 
-	 * @param name
-	 *            Full tag name (without the '@' at the beginning)
-	 * @return
-	 */
-	public static String tagFromTagName(String name) {
-		if (name == null)
-			return null;
-		int idx = name.indexOf('.');
-
-		if (idx != -1) {
-			return name.substring(idx + 1);
-		}
-		// Default to the whole name being the tagset.
-		return name;
-	}
-
-	/**
-	 * Reads in all of the tag attribute information from all annotation-tag-info extensions defined
-	 * in the system, and initializes the tagAttribs hashtable with them.
-	 * 
-	 * @param registry
-	 */
-	private static void readAllAttributeInfo(IExtensionPoint xp) {
-
-		if (xp == null) {
-			return;
-		}
-
-		IExtension[] exts = xp.getExtensions();
-		Bundle bundle = null;
-		for (int i = 0; i < exts.length; i++) {
-			IConfigurationElement[] elems = exts[i].getConfigurationElements();
-			bundle = Platform.getBundle(exts[i].getNamespace());
-			String identifier = exts[i].getUniqueIdentifier();
-
-			IConfigurationElement elem = null;
-			String tagName = null;
-			String scope = null;
-			String tagSet = null;
-			String fullTagName = null;
-			for (int j = 0; j < elems.length; j++) {
-				elem = elems[j];
-				if (!elem.getName().equalsIgnoreCase("AnnotationTagInfo")) { //$NON-NLS-1$
-					continue;
-				}
-				tagSet = elem.getAttribute("tagSet"); //$NON-NLS-1$
-				tagName = elem.getAttribute("tagName"); //$NON-NLS-1$
-				scope = elem.getAttribute("scope"); //$NON-NLS-1$
-				if (isNullOrEmpty(tagSet) || isNullOrEmpty(tagName) || isNullOrEmpty(scope)) {
-					Logger.getLogger().log(AnnotationsControllerResources.getString("AnnotationTagRegistry.10", new Object[]{identifier})); //$NON-NLS-1$ //$NON-NLS-2$
-					continue;
-				}
-				fullTagName = tagSet + "." + tagName; //$NON-NLS-1$
-
-				InitTagInfo tagInf = parseTagAttribs(elem.getChildren(), fullTagName.toLowerCase(), scope); //$NON-NLS-1$
-				String key = (fullTagName + "#" + scope).toLowerCase(); //$NON-NLS-1$
-				/*
-				 * There should only ever be one AnnotationTagInfo tag for any one annotation tag.
-				 */
-				if (tagAttribs.containsKey(key)) {
-					Logger.getLogger().log(AnnotationsControllerResources.getString("AnnotationTagRegistry.0") + tagName + "'."); //$NON-NLS-1$ //$NON-NLS-2$
-				} else {
-					tagInf.bundle = bundle;
-					tagAttribs.put(key, tagInf);
-				}
-			}
-		}
-	}
-
-	private static boolean isNullOrEmpty(String aString) {
-		return aString == null || aString.length() == 0;
-	}
-
-	/**
-	 * Reads tagSpec information in from the plugin registry. Taken from AnnotationProcessor.
-	 * 
-	 * @return True if initialization completed successfully.
-	 * @throws CoreException
-	 *             If there were problems reading the registry.
-	 */
-	private static/* synchronized */boolean init() throws CoreException {
-
-		 /* Prevent multiple initialization */
-       if (initialized) {
-           return true;
-       }
-      initializeStaticTagDefinitions();
-      initiaizeDynamicTagDefinitions();
-       initialized = true;
-
-       /* Don't need this anymore */
-       tagAttribs = null;
-
-       return true;
-   }
-	
-	private static void initializeStaticTagDefinitions() throws CoreException {
-		IExtensionRegistry registry = Platform.getExtensionRegistry();
-
-		// TODO: Not even checking the tagset extension point yet.
-		IExtensionPoint xp = registry.getExtensionPoint(ANNOTATION_TAG_INFO);
-
-        if (xp == null)
-            return;
-
-        IExtension[] x = xp.getExtensions();
-
-        /* Get all tag attribute information */
-        readAllAttributeInfo(xp);
-		for (int j = 0; j < x.length; j++) {
-			IConfigurationElement[] tagSpecs = x[j].getConfigurationElements();
-			for (int i = 0; i < tagSpecs.length; i++) {
-				IConfigurationElement tagSpec = tagSpecs[i];
-				String tagName = tagSpec.getAttribute("tagSet") + "." + tagSpec.getAttribute("tagName"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-				String scope = tagSpec.getAttribute("scope"); //$NON-NLS-1$
-				String multiplicity = tagSpec.getAttribute("multiplicity"); //$NON-NLS-1$
-				TagSpec ts = null;
-				if (multiplicity != null)
-					ts = new TagSpec(tagName, TagSpec.scopeFromString(scope), TagSpec.multiplicityFromString(multiplicity));
-				else
-					ts = new TagSpec(tagName, TagSpec.scopeFromString(scope), TagSpec.Multiplicity.ONE);
-				String key = (tagName + "#" + scope).toLowerCase(); //$NON-NLS-1$
-				InitTagInfo tagInf = (InitTagInfo) tagAttribs.get(key);
-
-				allTagSpecs.add(ts);
-
-				if (tagInf != null) {
-					ts.setAttributes(tagInf.attributes);
-					ts.setBundle(tagInf.bundle);
-				}
-			}
-		}
-    }
-
-	private static void initiaizeDynamicTagDefinitions() {
-		IExtensionPoint xp = Platform.getExtensionRegistry().getExtensionPoint(ANNOTATIONS_CONTROLLER_NAMESPACE, DYNAMIC_INITIALIZER_EX_PT);
-		if (xp == null)
-			return;
-		IExtension[] extensions = xp.getExtensions();
-		for (int i = 0; i < extensions.length; i++) {
-			IExtension extension = extensions[i];
-			IConfigurationElement[] elements = extension.getConfigurationElements();
-			for (int j = 0; j < elements.length; j++) {
-				try {
-					AnnotationTagDynamicInitializer initializer = (AnnotationTagDynamicInitializer) elements[j].createExecutableExtension(CLASS_PROP);
-					initializer.registerTags();
-				} catch (CoreException e) {
-					Logger.getLogger().logError(e);
-				}
-			}
-		}
-	}
-	
-	/**
-	 * 
-	 * @return List of AnnotationTagRegistry.TagSpecs for all tags.
-	 * @throws CoreException
-	 *             If there were problems reading the initialization data from the plugin registry.
-	 */
-	public static synchronized List getAllTagSpecs() {
-		return allTagSpecs;
-	}
-
-	public static synchronized boolean isMethodTag(String tagName) {
-		return methodTags.containsKey(tagName);
-	}
-
-	public static synchronized boolean isFieldTag(String tagName) {
-		return fieldTags.containsKey(tagName);
-	}
-
-	public static synchronized boolean isTypeTag(String tagName) {
-		return typeTags.containsKey(tagName);
-	}
-
-	/**
-	 * Answers the tagspec for the specified method tag name.
-	 * 
-	 * @param tagName
-	 *            Full name for a tag.
-	 * @return a TagSpec for the tag name, or null if no tag with that name is registered.
-	 */
-	public static synchronized TagSpec getMethodTag(String tagName) {
-		return (TagSpec) methodTags.get(tagName);
-	}
-
-	/**
-	 * Answers the tagspec for the specified field tag name.
-	 * 
-	 * @param tagName
-	 *            Full name for a tag.
-	 * @return a TagSpec for the tag name, or null if no tag with that name is registered.
-	 */
-	public static synchronized TagSpec getFieldTag(String tagName) {
-		return (TagSpec) fieldTags.get(tagName);
-	}
-
-	/**
-	 * Answers the tagspec for the specified type tag name.
-	 * 
-	 * @param tagName
-	 *            Full name for a tag.
-	 * @return a TagSpec for the tag name, or null if no tag with that name is registered.
-	 */
-	public static synchronized TagSpec getTypeTag(String tagName) {
-		return (TagSpec) typeTags.get(tagName);
-	}
-
-	private static class InitTagInfo {
-		private String name;
-
-		private List attributes;
-
-		private Bundle bundle;
-
-		private String scope;
-
-		public InitTagInfo(String name, String scope, List att) {
-			attributes = att;
-			this.name = name;
-			this.scope = scope;
-		}
-
-		/*
-		 * (non-Javadoc)
-		 * 
-		 * @see java.lang.Object#equals(java.lang.Object)
-		 */
-		public boolean equals(Object obj) {
-			if (this == obj)
-				return true;
-			else if (!(obj instanceof InitTagInfo))
-				return false;
-
-			return name.equals(((InitTagInfo) obj).name) || (scope.equals(((InitTagInfo) obj).name));
-
-		}
-	}
-
-	static {
-		try {
-			AnnotationTagRegistry.init();
-		} catch (CoreException e) {
-			Logger.getLogger().logError(AnnotationsControllerResources.getString("AnnotationTagRegistry_ERROR_1")); //$NON-NLS-1$
-			Logger.getLogger().logError(e);
-		}
-	}
-}
-\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.common.annotations.controller/controller/org/eclipse/jst/common/internal/annotations/registry/AnnotationTagsetRegistry.java b/plugins/org.eclipse.jst.common.annotations.controller/controller/org/eclipse/jst/common/internal/annotations/registry/AnnotationTagsetRegistry.java
deleted file mode 100644
index d86e11748..000000000
--- a/plugins/org.eclipse.jst.common.annotations.controller/controller/org/eclipse/jst/common/internal/annotations/registry/AnnotationTagsetRegistry.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Apr 7, 2004
- *
- * To change the template for this generated file go to
- * Window - Preferences - Java - Code Generation - Code and Comments
- */
-package org.eclipse.jst.common.internal.annotations.registry;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.jem.util.RegistryReader;
-
-/**
- * @author mdelder
- * 
- * To change the template for this generated type comment go to Window - Preferences - Java - Code
- * Generation - Code and Comments
- */
-public class AnnotationTagsetRegistry extends RegistryReader {
-
-	public static final AnnotationTagsetRegistry INSTANCE = new AnnotationTagsetRegistry();
-
-	private Map index;
-
-	protected AnnotationTagsetRegistry() {
-		super("org.eclipse.wst.common.internal.annotations.controller", TagsetDescriptor.TAGSET); //$NON-NLS-1$
-		readRegistry();
-	}
-
-	private List descriptors;
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.wst.common.frameworks.internal.RegistryReader#readElement(org.eclipse.core.runtime.IConfigurationElement)
-	 */
-	public boolean readElement(IConfigurationElement element) {
-		if (TagsetDescriptor.TAGSET.equals(element.getName())) {
-			getDescriptors().add(new TagsetDescriptor(element));
-			return true;
-		}
-		return false;
-	}
-
-	public TagsetDescriptor getDescriptor(String name) {
-		if (name != null && name.length() > 0) {
-
-			/* Index descriptors to avoid unnecessary searching */
-			TagsetDescriptor descriptor = (TagsetDescriptor) getIndex().get(name);
-			if (descriptor != null)
-				return descriptor;
-
-			for (Iterator itr = AnnotationTagsetRegistry.INSTANCE.getDescriptors().iterator(); itr.hasNext();) {
-				descriptor = (TagsetDescriptor) itr.next();
-				if (name.equals(descriptor.getName())) {
-					getIndex().put(descriptor.getName(), descriptor);
-					return descriptor;
-
-				}
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * @return Returns the descriptors.
-	 */
-	protected List getDescriptors() {
-		if (descriptors == null)
-			descriptors = new ArrayList();
-		return descriptors;
-	}
-
-	/**
-	 * @return Returns the index.
-	 */
-	protected Map getIndex() {
-		if (index == null)
-			index = new HashMap();
-		return index;
-	}
-
-	/**
-	 * @param descriptor
-	 */
-	public void registerTagset(TagsetDescriptor descriptor) {
-		if (descriptor != null && getDescriptor(descriptor.getName()) == null)
-			getDescriptors().add(descriptor);
-	}
-}
-\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.common.annotations.controller/controller/org/eclipse/jst/common/internal/annotations/registry/AnnotationsControllerResources.java b/plugins/org.eclipse.jst.common.annotations.controller/controller/org/eclipse/jst/common/internal/annotations/registry/AnnotationsControllerResources.java
deleted file mode 100644
index f357d90a1..000000000
--- a/plugins/org.eclipse.jst.common.annotations.controller/controller/org/eclipse/jst/common/internal/annotations/registry/AnnotationsControllerResources.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Mar 8, 2004
- *
- * To change the template for this generated file go to
- * Window - Preferences - Java - Code Generation - Code and Comments
- */
-
-package org.eclipse.jst.common.internal.annotations.registry;
-
-import java.text.MessageFormat;
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-/**
- * @author kkatyal
- * 
- * To change the template for this generated type comment go to Window - Preferences - Java - Code
- * Generation - Code and Comments
- */
-public class AnnotationsControllerResources {
-
-	private static final String BUNDLE_NAME = "annotationcontroller";//$NON-NLS-1$
-	private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle.getBundle(BUNDLE_NAME);
-
-	/**
-	 *  
-	 */
-	private AnnotationsControllerResources() {
-		// Default constructor
-	}
-
-	/**
-	 * @param key
-	 * @return
-	 */
-	public static String getString(String key) {
-		try {
-			return RESOURCE_BUNDLE.getString(key);
-		} catch (MissingResourceException e) {
-			return '!' + key + '!';
-		}
-	}
-
-	public static String getString(String key, Object[] args) {
-		try {
-			RESOURCE_BUNDLE.getString(key);
-		} catch (MissingResourceException e) {
-			return '!' + key + '!';
-		}
-
-		return MessageFormat.format(key, args);
-	}
-
-}
-\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.common.annotations.controller/controller/org/eclipse/jst/common/internal/annotations/registry/AttributeValueProposalHelper.java b/plugins/org.eclipse.jst.common.annotations.controller/controller/org/eclipse/jst/common/internal/annotations/registry/AttributeValueProposalHelper.java
deleted file mode 100644
index be5670b60..000000000
--- a/plugins/org.eclipse.jst.common.annotations.controller/controller/org/eclipse/jst/common/internal/annotations/registry/AttributeValueProposalHelper.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.common.internal.annotations.registry;
-
-/**
- * @author DABERG
- *  
- */
-public class AttributeValueProposalHelper {
-	private String replacementString;
-	private int valueOffset = 0;
-	private int replacementLength = 0;
-	private String valueDisplayString;
-	private boolean ensureBeginQuote = true;
-	private boolean ensureEndQuote = true;
-
-	public AttributeValueProposalHelper(String replacementString, int valueOffset, int replacementLength, String valueDisplayString) {
-		this.replacementString = replacementString;
-		this.valueOffset = valueOffset;
-		this.replacementLength = replacementLength;
-		this.valueDisplayString = valueDisplayString;
-	}
-
-	public int getReplacementLength() {
-		return replacementLength;
-	}
-
-	public void setReplacementLength(int replacementLength) {
-		this.replacementLength = replacementLength;
-	}
-
-	public String getReplacementString() {
-		return replacementString;
-	}
-
-	public void setReplacementString(String replacementString) {
-		this.replacementString = replacementString;
-	}
-
-	public String getValueDisplayString() {
-		return valueDisplayString;
-	}
-
-	public void setValueDisplayString(String valueDisplayString) {
-		this.valueDisplayString = valueDisplayString;
-	}
-
-	public int getValueOffset() {
-		return valueOffset;
-	}
-
-	public void setValueOffset(int valueOffset) {
-		this.valueOffset = valueOffset;
-	}
-
-	public boolean ensureBeginQuote() {
-		return ensureBeginQuote;
-	}
-
-	public void setEnsureBeginQuote(boolean ensureBeginQuote) {
-		this.ensureBeginQuote = ensureBeginQuote;
-	}
-
-	public boolean ensureEndQuote() {
-		return ensureEndQuote;
-	}
-
-	public void setEnsureEndQuote(boolean ensureEndQuote) {
-		this.ensureEndQuote = ensureEndQuote;
-	}
-}
-\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.common.annotations.controller/controller/org/eclipse/jst/common/internal/annotations/registry/AttributeValuesHelper.java b/plugins/org.eclipse.jst.common.annotations.controller/controller/org/eclipse/jst/common/internal/annotations/registry/AttributeValuesHelper.java
deleted file mode 100644
index 76c0a8f65..000000000
--- a/plugins/org.eclipse.jst.common.annotations.controller/controller/org/eclipse/jst/common/internal/annotations/registry/AttributeValuesHelper.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Jul 1, 2004
- */
-package org.eclipse.jst.common.internal.annotations.registry;
-
-import org.eclipse.jdt.core.IJavaElement;
-
-/**
- * @author jlanuti
- */
-public interface AttributeValuesHelper {
-	static final String[] EMPTY_VALUES = new String[0];
-	static final AttributeValueProposalHelper[] EMPTY_PROPOSAL_HELPERS = new AttributeValueProposalHelper[0];
-
-	/**
-	 * Return a simple String array containing the valid values for the given
-	 * {@link TagAttributeSpec}and {@link IJavaElement}.
-	 * 
-	 * @param tas
-	 * @param javaElement
-	 * @return
-	 */
-	public String[] getValidValues(TagAttribSpec tas, IJavaElement javaElement);
-
-	/**
-	 * This is a more advanced api for returning valid values for a given {@link TagAttribSpec}.
-	 * This api provides you with more flexibility to control the replacement string that is used
-	 * for the completion.
-	 * 
-	 * @param tas
-	 * @param partialValue
-	 * @param valueOffset
-	 * @param javaElement
-	 * @return
-	 */
-	public AttributeValueProposalHelper[] getAttributeValueProposalHelpers(TagAttribSpec tas, String partialValue, int valueOffset, IJavaElement javaElement);
-
-}
-\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.common.annotations.controller/controller/org/eclipse/jst/common/internal/annotations/registry/TagAttribSpec.java b/plugins/org.eclipse.jst.common.annotations.controller/controller/org/eclipse/jst/common/internal/annotations/registry/TagAttribSpec.java
deleted file mode 100644
index 7b635906d..000000000
--- a/plugins/org.eclipse.jst.common.annotations.controller/controller/org/eclipse/jst/common/internal/annotations/registry/TagAttribSpec.java
+++ /dev/null
@@ -1,350 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Aug 25, 2003
- *
- * To change the template for this generated file go to
- * Window&gt;Preferences&gt;Java&gt;Code Generation&gt;Code and Comments
- */
-package org.eclipse.jst.common.internal.annotations.registry;
-
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.jst.common.internal.annotations.core.AnnotationsCoreResources;
-
-/**
- * @author kelleyp Information on a single parameter for a tag. Parameters have names, and can be
- *         marked as being required. (ie, not optional)
- */
-public class TagAttribSpec {
-	private String attribName;
-	private int flags;
-	private String helpKey;
-	private int type = Type.TEXT;
-	private static final int FLG_REQUIRED = 1;
-	private String[] validValues;
-	private TagSpec tagSpec;
-
-	/* Enum for type */
-	public interface Type {
-		public static final int TEXT = 0;
-		public static final int BOOLEAN = 1;
-		public static final int JAVATYPE = 2;
-		public static final int ENUM = 3;
-	}
-
-	public class Unique {
-		public static final int MODULE = 0;
-		public static final int FILE = 1;
-		public static final int TYPE = 2;
-		public static final int METHOD = 3;
-		public static final int FIELD = 4;
-
-		private int scope = MODULE;
-
-		public int getScope() {
-			return scope;
-		}
-
-		public void setScope(int in) {
-			scope = in;
-		}
-	}
-
-	private Unique unique;
-
-	public Unique getUnique() {
-		return unique;
-	}
-
-	public boolean isUnique() {
-		return unique != null;
-	}
-
-	public void setUnique() {
-		unique = new Unique();
-	}
-
-	public void clearUnique() {
-		unique = null;
-	}
-
-	/**
-	 * Converts a string representation of a tag attribute type to the integer representation.
-	 * 
-	 * @param name
-	 * @return Integer type, defaults to TEXT if the type name is not recognized.
-	 */
-	public static int typeNameToType(String name) {
-		//TODO add enum
-		if (name != null) {
-			if (name.equalsIgnoreCase("text") || name.equalsIgnoreCase("string")) { //$NON-NLS-1$ //$NON-NLS-2$
-				return Type.TEXT;
-			} else if (name.equalsIgnoreCase("boolean") || name.equalsIgnoreCase("bool")) { //$NON-NLS-1$ //$NON-NLS-2$
-				return Type.BOOLEAN;
-			} else if (name.equalsIgnoreCase("javaType")) { //$NON-NLS-1$
-				return Type.JAVATYPE;
-			}
-		}
-		return Type.TEXT;
-	}
-
-	/**
-	 * Converts a type enum to a type string.
-	 * 
-	 * @param ty
-	 * @return
-	 */
-	public static String typeToTypeName(int ty) {
-		switch (ty) {
-			case Type.TEXT :
-				return "string"; //$NON-NLS-1$
-			case Type.BOOLEAN :
-				return "bool"; //$NON-NLS-1$
-			case Type.JAVATYPE :
-				return "javaType"; //$NON-NLS-1$
-			default :
-				return "string"; //$NON-NLS-1$
-		}
-	}
-
-	/**
-	 * Constructs a TagAttribSpec with <code>name</code> as the attribute name.
-	 * 
-	 * @param name
-	 *            Name for the attribute. Must not be null.
-	 * @throws IllegalArgumentException
-	 *             if name is null.
-	 */
-	public TagAttribSpec(String name) throws IllegalArgumentException {
-		this(name, null);
-	}
-
-	public TagAttribSpec(String name, String hlpKey) {
-		setAttribName(name);
-		setHelpKey(hlpKey);
-	}
-
-	/**
-	 * Sets the type of this attribute.
-	 * 
-	 * @param t
-	 *            TEXT | BOOLEAN
-	 */
-	public void setType(int t) {
-		type = t;
-	}
-
-	/**
-	 * Sets the type of this attribute.
-	 * 
-	 * @param typename
-	 *            String representation, should be text or boolean.
-	 */
-	public void setType(String typename) {
-		type = typeNameToType(typename);
-	}
-
-	public int getType() {
-		return type;
-	}
-
-	public boolean valueIsJavaType() {
-		return type == Type.JAVATYPE;
-	}
-
-	public boolean valueIsText() {
-		return type == Type.TEXT;
-	}
-
-	public boolean valueIsBool() {
-		return type == Type.BOOLEAN;
-	}
-
-	/**
-	 * @return Name of the attribute.
-	 */
-	public String getAttribName() {
-		return attribName;
-	}
-
-	/**
-	 * Sets the attribute name. This can not be null.
-	 * 
-	 * @param name
-	 *            New name for the attribute.
-	 * @throws IllegalArgumentException
-	 *             if the name is null.
-	 */
-	public void setAttribName(String name) throws IllegalArgumentException {
-		if (name == null) {
-			throw new IllegalArgumentException(AnnotationsCoreResources.getString("TagAttribSpec.6")); //$NON-NLS-1$
-		}
-		attribName = name;
-	}
-
-	/**
-	 * 
-	 * @return true if this is a required attribute.
-	 */
-	public boolean isRequired() {
-		return (flags & FLG_REQUIRED) != 0;
-	}
-
-	/**
-	 * Sets the required flag for this attribute.
-	 */
-	public void setRequired() {
-		flags |= FLG_REQUIRED;
-	}
-
-	/**
-	 * Clears the required flag for this attribute.
-	 *  
-	 */
-	public void clearRequired() {
-		flags &= (~FLG_REQUIRED);
-	}
-
-	/**
-	 * 
-	 * @return The help key for this tag attribute. Should never return null.
-	 */
-	public String getTextKey(int aType) {
-		if (aType != TagSpec.HELP_TEXT) {
-			return null;
-		}
-
-		if (helpKey == null) {
-			helpKey = defaultHelpKey();
-		}
-		return helpKey;
-	}
-
-	/**
-	 * Formats the help text so it includes type and use information.
-	 */
-	public String transformLocalizedText(String txt) {
-		if (txt == null)
-			return txt;
-		StringBuffer buf = new StringBuffer(txt.length() + 50);
-
-		buf.append("<b>Type: "); //$NON-NLS-1$
-		buf.append(typeToTypeName(type));
-		buf.append(", Use: "); //$NON-NLS-1$
-		if (this.isRequired()) {
-			buf.append("required"); //$NON-NLS-1$
-		} else {
-			buf.append("optional"); //$NON-NLS-1$
-		}
-		if (this.isUnique()) {
-			buf.append(", unique:scope: "); //$NON-NLS-1$
-			buf.append(TagAttribSpec.uniqueScopeToString(this.getUnique().getScope())); //$NON-NLS-1$
-		}
-		buf.append("</b><p>"); //$NON-NLS-1$
-		buf.append(txt);
-		buf.append("</p>"); //$NON-NLS-1$
-		return buf.toString();
-
-	}
-
-	/**
-	 * 
-	 * @return The help key for this tag attribute. Should never return null.
-	 */
-	public String getHelpKey() {
-		return getTextKey(TagSpec.HELP_TEXT);
-	}
-
-	/**
-	 * Sets the help key. Setting this to null resets the help key to the default help key.
-	 * 
-	 * @param key
-	 */
-	public void setHelpKey(String key) {
-		helpKey = key;
-	}
-
-	/**
-	 * @return the default help key name for this tag.
-	 *  
-	 */
-	private String defaultHelpKey() {
-		return "ath." + attribName; //$NON-NLS-1$
-	}
-
-	public static int uniqueScopeFromString(String scopeStr) {
-		if (scopeStr != null) {
-			if (scopeStr.equalsIgnoreCase("module"))return TagAttribSpec.Unique.MODULE; //$NON-NLS-1$
-			if (scopeStr.equalsIgnoreCase("file"))return TagAttribSpec.Unique.FILE; //$NON-NLS-1$
-			if (scopeStr.equalsIgnoreCase("type"))return TagAttribSpec.Unique.TYPE; //$NON-NLS-1$
-			if (scopeStr.equalsIgnoreCase("method"))return TagAttribSpec.Unique.METHOD; //$NON-NLS-1$
-			if (scopeStr.equalsIgnoreCase("field"))return TagAttribSpec.Unique.FIELD; //$NON-NLS-1$
-		}
-		Logger.getLogger().logError(AnnotationsControllerResources.getString("TagAttribSpec.1") + scopeStr); //$NON-NLS-1$
-		return TagAttribSpec.Unique.MODULE;
-	}
-
-	public static String uniqueScopeToString(int scope) {
-		switch (scope) {
-			case TagAttribSpec.Unique.MODULE :
-				return "module"; //$NON-NLS-1$
-			case TagAttribSpec.Unique.FILE :
-				return "file"; //$NON-NLS-1$
-			case TagAttribSpec.Unique.TYPE :
-				return "type"; //$NON-NLS-1$
-			case TagAttribSpec.Unique.METHOD :
-				return "method"; //$NON-NLS-1$
-			case TagAttribSpec.Unique.FIELD :
-				return "field"; //$NON-NLS-1$
-			default :
-				Logger.getLogger().logError(AnnotationsControllerResources.getString("TagAttribSpec.1") + scope); //$NON-NLS-1$
-				return "unknown value"; //$NON-NLS-1$
-
-		}
-	}
-
-	/**
-	 * @return Returns the validValues.
-	 */
-	public String[] getValidValues() {
-		return validValues;
-	}
-
-	/**
-	 * @param validValues
-	 *            The validValues to set.
-	 */
-	public void setValidValues(String[] validValues) {
-		this.validValues = validValues;
-	}
-
-	public TagSpec getTagSpec() {
-		return tagSpec;
-	}
-
-	void setTagSpec(TagSpec tagSpec) {
-		this.tagSpec = tagSpec;
-	}
-
-	public String lookupTagHelp() throws MissingResourceException {
-		ResourceBundle b = getTagSpec().getResourceBundle();
-		if (b == null)
-			return null;
-		String key = getHelpKey();
-		String val = b.getString(getHelpKey());
-		if (val == key)
-			val = null;
-		return transformLocalizedText(val);
-	}
-}
-\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.common.annotations.controller/controller/org/eclipse/jst/common/internal/annotations/registry/TagSpec.java b/plugins/org.eclipse.jst.common.annotations.controller/controller/org/eclipse/jst/common/internal/annotations/registry/TagSpec.java
deleted file mode 100644
index 70ee7270e..000000000
--- a/plugins/org.eclipse.jst.common.annotations.controller/controller/org/eclipse/jst/common/internal/annotations/registry/TagSpec.java
+++ /dev/null
@@ -1,331 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Aug 22, 2003
- *
- * To change the template for this generated file go to
- * Window&gt;Preferences&gt;Java&gt;Code Generation&gt;Code and Comments
- */
-package org.eclipse.jst.common.internal.annotations.registry;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Status;
-import org.osgi.framework.Bundle;
-
-/**
- * All of the information in a single tagSpec tag, including the enclosing handler.
- */
-public class TagSpec {
-
-	/**
-	 * Handle to the descriptor of the plugin that declared the completion information for this tag,
-	 * if any.
-	 */
-	Bundle bundle;
-
-	protected ResourceBundle resourceBundle;
-
-	private boolean attemptedToFindResourceBundle = false;
-
-	private AttributeValuesHelper validValuesHelper;
-	private TagsetDescriptor tagsetDescriptor;
-
-	/**
-	 * Name of the tag.
-	 */
-	private String tagName;
-
-	/**
-	 * Scope of the tag: METHOD | FIELD | TYPE
-	 */
-	private int scope;
-
-	/**
-	 * Multiplicity of the tag: ONE | MANY
-	 */
-	private int multiplicity;
-
-	/**
-	 * Attributes that can be set for this tag. (Instances of TagAttribSpec)
-	 */
-	private List attributes = new ArrayList();
-
-	private String helpKey;
-
-	/**
-	 * Text type for use with localized text container.
-	 */
-	public static final int HELP_TEXT = 0;
-
-	public static final int METHOD = 0;
-
-	public static final int TYPE = 1;
-
-	public static final int FIELD = 2;
-
-	public interface Multiplicity {
-		public static final int ONE = 1;
-
-		public static final int MANY = 2;
-	}
-
-	public TagSpec(String aName, int aScope, int aMultiplicity) {
-		tagName = aName;
-		scope = aScope;
-		multiplicity = aMultiplicity;
-	}
-
-	public static int scopeFromString(String s) throws CoreException {
-		if (s != null) {
-			if (s.equalsIgnoreCase("type")) { //$NON-NLS-1$
-				return TagSpec.TYPE;
-			} else if (s.equalsIgnoreCase("field")) { //$NON-NLS-1$
-				return TagSpec.FIELD;
-			} else if (s.equalsIgnoreCase("method")) { //$NON-NLS-1$
-				return TagSpec.METHOD;
-			} else {
-				// Should be impossible unless the annotation-taghandler.exsd or
-				// calling code changes.
-				//TODO: Logging
-				throw new CoreException(new Status(IStatus.ERROR, "org.eclipse.wst.common.internal.annotations.controller", IStatus.OK, AnnotationsControllerResources.getString("TagSpec.3") + s, null)); //$NON-NLS-1$ //$NON-NLS-2$
-			}
-		}
-		throw new CoreException(new Status(IStatus.ERROR, "org.eclipse.wst.common.internal.annotations.controller", IStatus.OK, AnnotationsControllerResources.getString("TagSpec.4"), null)); //$NON-NLS-1$ //$NON-NLS-2$
-
-	}
-
-	public static int multiplicityFromString(String s) throws CoreException {
-		if (s != null) {
-			if (s.equalsIgnoreCase("1")) { //$NON-NLS-1$
-				return TagSpec.Multiplicity.ONE;
-			} else if (s.equalsIgnoreCase("*")) { //$NON-NLS-1$
-				return TagSpec.Multiplicity.MANY;
-			}
-			throw new CoreException(new Status(IStatus.ERROR, "org.eclipse.wst.common.internal.annotations.controller", IStatus.OK, AnnotationsControllerResources.getString("TagSpec.4"), null)); //$NON-NLS-1$ //$NON-NLS-2$
-		}
-		//Return default
-		return TagSpec.Multiplicity.ONE;
-	}
-
-	/**
-	 * @return Scope for tag, METHOD | TYPE | FIELD
-	 */
-	public int getScope() {
-		return scope;
-	}
-
-	/**
-	 * @return multiplicity for tag, ONE | MANY
-	 */
-	public int getMultiplicity() {
-		return multiplicity;
-	}
-
-	/**
-	 * @return Name of the tag
-	 */
-	public String getTagName() {
-		return tagName;
-	}
-
-	public TagsetDescriptor getTagSetDescriptor() {
-		if (tagsetDescriptor == null) {
-			String tagSetName = getTagName();
-			int index = tagSetName.lastIndexOf('.');
-			if (index == -1)
-				tagSetName = ""; //$NON-NLS-1$
-			else
-				tagSetName = tagSetName.substring(index + 1);
-			tagsetDescriptor = AnnotationTagsetRegistry.INSTANCE.getDescriptor(tagSetName);
-		}
-		return tagsetDescriptor;
-	}
-
-	/**
-	 * Sets the scope of this tag.
-	 * 
-	 * @param i
-	 *            METHOD | TYPE | FIELD
-	 */
-	public void setScope(int i) {
-		scope = i;
-	}
-
-	/**
-	 * Sets the multiplicity of this tag.
-	 * 
-	 * @param i
-	 *            ONE | MANY
-	 */
-	public void setMultiplicity(int i) {
-		multiplicity = i;
-	}
-
-	/**
-	 * Sets the name of the tag
-	 * 
-	 * @param string
-	 *            Name for the tag.
-	 */
-	public void setTagName(String string) {
-		tagName = string;
-	}
-
-	/**
-	 * 
-	 * @return List of attributes for this tag.
-	 */
-	public List getAttributes() {
-		return attributes;
-	}
-
-	/**
-	 * Adds an attribute to the list of attributes for this tag.
-	 * 
-	 * @param att
-	 *            A TagAttribSpec
-	 */
-	public void addAttribute(TagAttribSpec att) {
-		if (att == null)
-			return;
-		attributes.add(att);
-		att.setTagSpec(this);
-	}
-
-	/**
-	 * Sets the list of attributes for this tag.
-	 * 
-	 * @param lst
-	 *            An array list of TagAttribSpecs
-	 */
-	public void setAttributes(List lst) {
-		if (lst == null)
-			attributes.clear();
-		else {
-			attributes = lst;
-			for (int i = 0; i < lst.size(); i++) {
-				TagAttribSpec tas = (TagAttribSpec) lst.get(i);
-				tas.setTagSpec(this);
-			}
-		}
-	}
-
-	/**
-	 * Looks for attribute named <code>attName</code>. Case insensitive.
-	 * 
-	 * @param attName
-	 *            Name to look for
-	 * @return A TagAttribSpec, or null if none was found.
-	 */
-	public TagAttribSpec attributeNamed(String attName) {
-		Iterator i = getAttributes().iterator();
-
-		while (i.hasNext()) {
-			TagAttribSpec tas = (TagAttribSpec) i.next();
-
-			if (attName.equalsIgnoreCase(tas.getAttribName())) {
-				return tas;
-			}
-		}
-		return null;
-
-	}
-
-	/**
-	 * @return Returns the declaringPlugin.
-	 */
-	public Bundle getBundle() {
-		return bundle;
-	}
-
-	/**
-	 * @param declaringPlugin
-	 *            The declaringPlugin to set.
-	 */
-	protected void setBundle(Bundle bundle) {
-		this.bundle = bundle;
-	}
-
-	/**
-	 * @return Returns the resourceBundle.
-	 */
-	public ResourceBundle getResourceBundle() {
-		if (resourceBundle == null && !attemptedToFindResourceBundle) {
-			attemptedToFindResourceBundle = true;
-			Bundle aBundle = getBundle();
-			if (aBundle != null)
-				resourceBundle = Platform.getResourceBundle(bundle);
-		}
-		return resourceBundle;
-	}
-
-	/**
-	 * @param resourceBundle
-	 *            The resourceBundle to set.
-	 */
-	public void setResourceBundle(ResourceBundle resourceBundle) {
-		attemptedToFindResourceBundle = false;
-		this.resourceBundle = resourceBundle;
-	}
-
-	/**
-	 * @return Returns the validValuesHelper.
-	 */
-	public AttributeValuesHelper getValidValuesHelper() {
-		if (validValuesHelper == null && getTagSetDescriptor() != null)
-			setValidValuesHelper(getTagSetDescriptor().getValidValuesHelper());
-		return validValuesHelper;
-	}
-
-	/**
-	 * @param validValuesHelper
-	 *            The validValuesHelper to set.
-	 */
-	public void setValidValuesHelper(AttributeValuesHelper validValuesHelper) {
-		this.validValuesHelper = validValuesHelper;
-	}
-
-	public String getHelpKey() {
-		if (helpKey == null)
-			helpKey = computeHelpKey();
-		return helpKey;
-	}
-
-	/**
-	 * @return
-	 */
-	protected String computeHelpKey() {
-		return "tagh." + getTagName(); //$NON-NLS-1$
-	}
-
-	public void setHelpKey(String helpKey) {
-		this.helpKey = helpKey;
-	}
-
-	public String lookupTagHelp() throws MissingResourceException {
-		ResourceBundle b = getResourceBundle();
-		if (b == null)
-			return null;
-		String key = getHelpKey();
-		String val = b.getString(getHelpKey());
-		if (val == key)
-			val = null;
-		return val;
-	}
-}
-\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.common.annotations.controller/controller/org/eclipse/jst/common/internal/annotations/registry/TagsetDescriptor.java b/plugins/org.eclipse.jst.common.annotations.controller/controller/org/eclipse/jst/common/internal/annotations/registry/TagsetDescriptor.java
deleted file mode 100644
index 8e4c4da60..000000000
--- a/plugins/org.eclipse.jst.common.annotations.controller/controller/org/eclipse/jst/common/internal/annotations/registry/TagsetDescriptor.java
+++ /dev/null
@@ -1,146 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Apr 7, 2004
- *
- * To change the template for this generated file go to
- * Window - Preferences - Java - Code Generation - Code and Comments
- */
-package org.eclipse.jst.common.internal.annotations.registry;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.core.runtime.IConfigurationElement;
-
-
-/**
- * @author mdelder
- * 
- * To change the template for this generated type comment go to Window - Preferences - Java - Code
- * Generation - Code and Comments
- */
-public class TagsetDescriptor {
-
-	public static final String TAGSET = "AnnotationTagSet"; //$NON-NLS-1$
-	public static final String ATT_NAME = "name"; //$NON-NLS-1$
-	public static final String ATT_DISPLAY_NAME = "displayName"; //$NON-NLS-1$
-	public static final String ATT_DESCRIPTION = "description"; //$NON-NLS-1$
-	public static final String ATT_PARENT_TAGSET = "parentTagset"; //$NON-NLS-1$
-	public static final String ATT_VALID_VALUES_HELPER = "validValuesHelper"; //$NON-NLS-1$
-
-	private final IConfigurationElement element;
-
-	protected String name;
-	protected String displayName;
-	protected String description;
-	protected String parentTagset;
-	protected AttributeValuesHelper validValuesHelper;
-
-	protected TagsetDescriptor() {
-		element = null;
-	}
-
-	public TagsetDescriptor(IConfigurationElement element) {
-		this.element = element;
-		init();
-	}
-
-	/**
-	 *  
-	 */
-	private void init() {
-		this.name = this.element.getAttribute(ATT_NAME);
-		this.displayName = this.element.getAttribute(ATT_DISPLAY_NAME);
-		this.description = this.element.getAttribute(ATT_DESCRIPTION);
-		this.parentTagset = this.element.getAttribute(ATT_PARENT_TAGSET);
-		// set the valid values helper if there is one
-		try {
-			String validValuesHelperName = this.element.getAttribute(ATT_VALID_VALUES_HELPER);
-			if (validValuesHelperName != null) {
-				Class loaded = Class.forName(validValuesHelperName);
-				this.validValuesHelper = (AttributeValuesHelper) loaded.newInstance();
-			}
-		} catch (Exception e) {
-			// Do nothing
-		}
-	}
-
-	/**
-	 * @return Returns the description.
-	 */
-	public String getDescription() {
-		return description;
-	}
-
-	/**
-	 * @return Returns the displayName.
-	 */
-	public String getDisplayName() {
-		return displayName;
-	}
-
-	/**
-	 * @return Returns the element.
-	 */
-	public IConfigurationElement getElement() {
-		return element;
-	}
-
-	/**
-	 * @return Returns the name.
-	 */
-	public String getName() {
-		return name;
-	}
-
-	/**
-	 * @return Returns the parentTagset.
-	 */
-	public String getParentTagset() {
-		return parentTagset;
-	}
-
-	public TagsetDescriptor[] getDirectDependents() {
-
-		if (getName() == null || getName().equals("")) //$NON-NLS-1$
-			return new TagsetDescriptor[0];
-
-		List dependents = new ArrayList();
-
-		TagsetDescriptor descriptor = null;
-		for (Iterator itr = AnnotationTagsetRegistry.INSTANCE.getDescriptors().iterator(); itr.hasNext();) {
-			descriptor = (TagsetDescriptor) itr.next();
-			if (getName().equals(descriptor.getParentTagset()))
-				dependents.add(descriptor);
-		}
-
-		TagsetDescriptor[] descriptors = new TagsetDescriptor[dependents.size()];
-		dependents.toArray(descriptors);
-		return descriptors;
-	}
-
-	/**
-	 * @return Returns the validValuesHelper.
-	 */
-	public AttributeValuesHelper getValidValuesHelper() {
-		return validValuesHelper;
-	}
-
-	/**
-	 * @param validValuesHelper
-	 *            The validValuesHelper to set.
-	 */
-	public void setValidValuesHelper(AttributeValuesHelper validValuesHelper) {
-		this.validValuesHelper = validValuesHelper;
-	}
-}
-\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.common.annotations.controller/plugin.xml b/plugins/org.eclipse.jst.common.annotations.controller/plugin.xml
deleted file mode 100644
index 00df4d6e2..000000000
--- a/plugins/org.eclipse.jst.common.annotations.controller/plugin.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin>
-
-     <extension-point id="annotationsController" name="Annotations Controller" schema="schema/annotationsController.exsd"/>
-   <extension-point id="AnnotationTagInfo" name="annotation tag info" schema="schema/annotation-tag-info.exsd"/>
-   <extension-point id="AnnotationTagSet" name="annotation tagset" schema="schema/annotation.tagset.exsd"/>
-   <extension-point id="annotationTagDynamicInitializer" name="annotationTagDynamicInitializer" schema="schema/annotationTagDynamicInitializer.exsd"/>
-</plugin>
diff --git a/plugins/org.eclipse.jst.common.annotations.controller/prepareforpii.xml b/plugins/org.eclipse.jst.common.annotations.controller/prepareforpii.xml
deleted file mode 100644
index 833fffa60..000000000
--- a/plugins/org.eclipse.jst.common.annotations.controller/prepareforpii.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<project name="PrepareForPII" default="main" basedir=".">
-		
-	<!-- Setup temp variables -->
-	<target name="init">
-		<property name="nlsDir" value="d:/NLS/Corona/0526"/>
-		<property name="plugin" value="com.ibm.wtp.annotations.controller"/>
-		<property name="plugindir" value="d:/workspaceCorona/${plugin}"/>
-		<property name="outputDir" value="${nlsDir}/${plugin}"/>
-		
-	
-	</target>
-
-	<!-- Create the destination dir -->
-	<target name="nlsDir" depends="init">
-		<mkdir dir="${nlsDir}"/>
-	</target>
-	
-	<!-- Create the destination dir -->
-	<target name="plugindir" depends="nlsDir">
-		<delete dir="${outputDir}"/>
-		<mkdir dir="${outputDir}"/>
-	</target>
-
-	<!-- Move the files to the correct locations in the workspace. -->
-	<target name="main" depends="plugindir">
-	
-		<messageIdGen folderPath = "${plugindir}" componentId = "E" />
-		
-		<copy todir = "${outputDir}/property_files" >
-			 <fileset dir="${plugindir}/property_files">
-           	  <include name="**/*.properties"/>
-  			 </fileset>
-  		</copy>
-  		
-	</target>
-</project>
diff --git a/plugins/org.eclipse.jst.common.annotations.controller/property_files/annotationcontroller.properties b/plugins/org.eclipse.jst.common.annotations.controller/property_files/annotationcontroller.properties
deleted file mode 100644
index 390e7736b..000000000
--- a/plugins/org.eclipse.jst.common.annotations.controller/property_files/annotationcontroller.properties
+++ /dev/null
@@ -1,23 +0,0 @@
-###############################################################################
-# Copyright (c) 2003, 2004 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-TagSpec.3=Unknown tag scope:
-TagSpec.4=Null tag scope.
-TagSpec.5=Unknown tag multiplicity:
-TagSpec.6=Null tag multiplicity.
-TagAttribSpec.1=Unknown 'unique' scope value:
-TagAttribSpec.1=More than one 'unique' tag defined:
-AnnotationTagParser.0=Null event handler.
-AnnotationTagParser.1=
-AnnotationTagRegistry.0=More than one 'AnnotationTagInfo' tag for the tag '
-AnnotationTagRegistry.9=parseTagAttribs: unknown 'use' value:
-AnnotationTagRegistry.10=Incomplete element AnnotationTagInfo in plugin {0}
-AnnotationTagRegistry.11=parseTagAttribs: unknown 'isJavaTypeIdentifier' value:
-AnnotationsControllerManager_ERROR_0=IWAE0001E Invalid IConfigurationElement used to create AnnotationsControllerRegistry.Descriptor.
diff --git a/plugins/org.eclipse.jst.common.annotations.controller/schema/annotation-tag-info.exsd b/plugins/org.eclipse.jst.common.annotations.controller/schema/annotation-tag-info.exsd
deleted file mode 100644
index 3bdae47d5..000000000
--- a/plugins/org.eclipse.jst.common.annotations.controller/schema/annotation-tag-info.exsd
+++ /dev/null
@@ -1,251 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.jst.common.annotations.controller">
-<annotation>
-      <appInfo>
-         <meta.schema plugin="org.eclipse.jst.common.annotations.controller" id="XAnnotationTagInfo" name="Annotation Tag Info"/>
-      </appInfo>
-      <documentation>
-         Describes the tags contained by a tag set and the tag&apos;s attributes.
-      </documentation>
-   </annotation>
-
-   <element name="extension">
-      <complexType>
-         <sequence>
-            <element ref="AnnotationTagInfo" minOccurs="1" maxOccurs="unbounded"/>
-         </sequence>
-         <attribute name="point" type="string" use="required">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="id" type="string">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="name" type="string">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="AnnotationTagInfo">
-      <complexType>
-         <sequence>
-            <element ref="attrib" minOccurs="0" maxOccurs="unbounded"/>
-         </sequence>
-         <attribute name="tagSet" type="string" use="required">
-            <annotation>
-               <documentation>
-                  Name of the tag set this tag comes underneath.  ( for instance, if we&apos;re defining the &lt;code&gt;@ejb.bean&lt;/code&gt;
-tag, then the tag set would be &lt;code&gt;ejb&lt;/code&gt;. )  The tag set must have been defined using the annotation.tagset extension point.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="tagName" type="string" use="required">
-            <annotation>
-               <documentation>
-                  Name of the tag.  ( if we&apos;re defining the &lt;code&gt;@ejb.bean&lt;/code&gt; tag, then the tagName would be &lt;code&gt;bean&lt;/code&gt; ).
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="scope" use="required">
-            <annotation>
-               <documentation>
-                  Scope of the bean.  Must be &lt;code&gt;type&lt;/code&gt;,&lt;code&gt;method&lt;/code&gt;, or &lt;code&gt;field&lt;/code&gt;.
-               </documentation>
-            </annotation>
-            <simpleType>
-               <restriction base="string">
-                  <enumeration value="type">
-                  </enumeration>
-                  <enumeration value="method">
-                  </enumeration>
-                  <enumeration value="field">
-                  </enumeration>
-               </restriction>
-            </simpleType>
-         </attribute>
-         <attribute name="multiplicity" use="default" value="1">
-            <annotation>
-               <documentation>
-                  Multiplicity of the tagset.  Must be &lt;code&gt;1&lt;/code&gt; or&lt;code&gt;*&lt;/code&gt;. The default value is 1, if not specified.
-               </documentation>
-            </annotation>
-            <simpleType>
-               <restriction base="string">
-                  <enumeration value="1">
-                  </enumeration>
-                  <enumeration value="*">
-                  </enumeration>
-               </restriction>
-            </simpleType>
-         </attribute>
-         <attribute name="description" type="string">
-            <annotation>
-               <documentation>
-                  Optional description.  May be a description string, or a
-key to localized text for the description in the declaring plugin&apos;s resource bundle. No default if this is
-not specified.
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="attrib">
-      <complexType>
-         <sequence>
-            <element ref="unique" minOccurs="0" maxOccurs="1"/>
-            <element ref="enumValues" minOccurs="0" maxOccurs="unbounded"/>
-         </sequence>
-         <attribute name="name" type="string" use="required">
-            <annotation>
-               <documentation>
-                  Name of the attribute.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="description" type="string">
-            <annotation>
-               <documentation>
-                  Description text for the attribute, or key pointing to the localized description text inside of the declaring plugin&apos;s resource bundle.  If not specified, defaults to &lt;code&gt;ath.ATTRIBUTE_NAME&lt;/code&gt;.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="use" use="default" value="optional">
-            <annotation>
-               <documentation>
-                  Sets whether this tag is &lt;code&gt;optional&lt;/code&gt; or &lt;code&gt;required&lt;/code&gt;.  The default is &lt;code&gt;optional&lt;/code&gt;.
-               </documentation>
-            </annotation>
-            <simpleType>
-               <restriction base="string">
-                  <enumeration value="optional">
-                  </enumeration>
-                  <enumeration value="required">
-                  </enumeration>
-               </restriction>
-            </simpleType>
-         </attribute>
-         <attribute name="type" use="default" value="string">
-            <annotation>
-               <documentation>
-                  Type of the attribute, &lt;code&gt;string|boolean|javaType&lt;/code&gt;.  Defaults to &lt;code&gt;string&lt;/code&gt; if not specified.
-               </documentation>
-            </annotation>
-            <simpleType>
-               <restriction base="string">
-                  <enumeration value="string">
-                  </enumeration>
-                  <enumeration value="bool">
-                  </enumeration>
-                  <enumeration value="javaType">
-                  </enumeration>
-                  <enumeration value="enum">
-                  </enumeration>
-               </restriction>
-            </simpleType>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="unique">
-      <annotation>
-         <documentation>
-            Specifies that the attribute value is unique within the specified scope.
-         </documentation>
-      </annotation>
-      <complexType>
-         <attribute name="scope" use="default" value="module">
-            <annotation>
-               <documentation>
-                  The scope of the uniqueness for the attribute value. It is one of the &lt;code&gt;module&lt;/code&gt;, &lt;code&gt;file&lt;/code&gt;, &lt;code&gt;type&lt;/code&gt;, &lt;code&gt;method&lt;/code&gt;,or  &lt;code&gt;field&lt;/code&gt;. The default value is &apos;module&apos;.
-               </documentation>
-            </annotation>
-            <simpleType>
-               <restriction base="string">
-                  <enumeration value="module">
-                  </enumeration>
-                  <enumeration value="file">
-                  </enumeration>
-                  <enumeration value="type">
-                  </enumeration>
-                  <enumeration value="method">
-                  </enumeration>
-                  <enumeration value="field">
-                  </enumeration>
-               </restriction>
-            </simpleType>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="enumValues">
-      <complexType>
-         <attribute name="value" type="string" use="required">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="since"/>
-      </appInfo>
-      <documentation>
-         [Enter the first release in which this extension point appears.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="examples"/>
-      </appInfo>
-      <documentation>
-         [Enter extension point usage example here.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="apiInfo"/>
-      </appInfo>
-      <documentation>
-         [Enter API information here.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="implementation"/>
-      </appInfo>
-      <documentation>
-         [Enter information about supplied implementation of this extension point.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="copyright"/>
-      </appInfo>
-      <documentation>
-         
-      </documentation>
-   </annotation>
-
-</schema>
diff --git a/plugins/org.eclipse.jst.common.annotations.controller/schema/annotation.tagset.exsd b/plugins/org.eclipse.jst.common.annotations.controller/schema/annotation.tagset.exsd
deleted file mode 100644
index 4f459bec0..000000000
--- a/plugins/org.eclipse.jst.common.annotations.controller/schema/annotation.tagset.exsd
+++ /dev/null
@@ -1,134 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.jst.common.annotations.controller">
-<annotation>
-      <appInfo>
-         <meta.schema plugin="org.eclipse.jst.common.annotations.controller" id="pXAnnotationTagset" name="Annotations Tag Set"/>
-      </appInfo>
-      <documentation>
-         Allows clients to define a tag set for an annotation 
-tag.  A tag set named X would contain all of the tags that
-look like &lt;code&gt;@X.tag&lt;/code&gt;.  So the &lt;code&gt;ejb&lt;/code&gt;
-tag set would contain the &lt;code&gt;@ejb.bean&lt;/code&gt; tag, 
-the &lt;code&gt;@ejb.persistence&lt;/code&gt; tag, the &lt;code&gt;@ejb.pk&lt;/code&gt; tag, etc...
-      </documentation>
-   </annotation>
-
-   <element name="extension">
-      <complexType>
-         <sequence>
-            <element ref="AnnotationTagSet" minOccurs="1" maxOccurs="unbounded"/>
-         </sequence>
-         <attribute name="point" type="string" use="required">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="id" type="string">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="name" type="string">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="AnnotationTagSet">
-      <complexType>
-         <attribute name="name" type="string" use="required">
-            <annotation>
-               <documentation>
-                  Name of the tagset.  The name for the tagset that contains the &lt;code&gt;@ejb.bean&lt;/code&gt; tag would be &lt;code&gt;ejb&lt;/code&gt;.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="displayName" type="string">
-            <annotation>
-               <documentation>
-                  The text of the display name for the tag, or a resource
-key pointing to the localized display name inside of the
-declaring plugin&apos;s resource bundle.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="description" type="string">
-            <annotation>
-               <documentation>
-                  A description of the tag set.  Can be the text of the 
-description, or a key for the declaring plugin&apos;s resource bundle that points to the localized text for the tag set description.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="parentTagset" type="string">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="validValuesHelper" type="string">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="since"/>
-      </appInfo>
-      <documentation>
-         [Enter the first release in which this extension point appears.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="examples"/>
-      </appInfo>
-      <documentation>
-         [Enter extension point usage example here.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="apiInfo"/>
-      </appInfo>
-      <documentation>
-         [Enter API information here.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="implementation"/>
-      </appInfo>
-      <documentation>
-         [Enter information about supplied implementation of this extension point.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="copyright"/>
-      </appInfo>
-      <documentation>
-         
-      </documentation>
-   </annotation>
-
-</schema>
diff --git a/plugins/org.eclipse.jst.common.annotations.controller/schema/annotationTagDynamicInitializer.exsd b/plugins/org.eclipse.jst.common.annotations.controller/schema/annotationTagDynamicInitializer.exsd
deleted file mode 100644
index 1f999e18e..000000000
--- a/plugins/org.eclipse.jst.common.annotations.controller/schema/annotationTagDynamicInitializer.exsd
+++ /dev/null
@@ -1,102 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="com.ibm.wtp.annotations.controller">
-<annotation>
-      <appInfo>
-         <meta.schema plugin="com.ibm.wtp.annotations.controller" id="annotationTagDynamicInitializer" name="annotationTagDynamicInitializer"/>
-      </appInfo>
-      <documentation>
-         This extension point is used to allow for clients to define their annotation tags dynamically.  This means that it is not necessary to statically define annotation tags using the tag-info extension point.  The extensions for this point will be called just after initializing the static annotation tags from the tag-info extension point.
-      </documentation>
-   </annotation>
-
-   <element name="extension">
-      <complexType>
-         <sequence>
-            <element ref="initializer"/>
-         </sequence>
-         <attribute name="id" type="string">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="point" type="string" use="required">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="name" type="string">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-               <appInfo>
-                  <meta.attribute translatable="true"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="initializer">
-      <complexType>
-         <attribute name="class" type="string" use="required">
-            <annotation>
-               <documentation>
-                  Set the qualified name of a class that implements the com.ibm.wtp.annotations.registry.AnnotationTagDynamicInitializer interface.  This class must have a default constructor.
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="since"/>
-      </appInfo>
-      <documentation>
-         [Enter the first release in which this extension point appears.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="examples"/>
-      </appInfo>
-      <documentation>
-         [Enter extension point usage example here.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="apiInfo"/>
-      </appInfo>
-      <documentation>
-         [Enter API information here.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="implementation"/>
-      </appInfo>
-      <documentation>
-         [Enter information about supplied implementation of this extension point.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="copyright"/>
-      </appInfo>
-      <documentation>
-         
-      </documentation>
-   </annotation>
-
-</schema>
diff --git a/plugins/org.eclipse.jst.common.annotations.controller/schema/annotationsController.exsd b/plugins/org.eclipse.jst.common.annotations.controller/schema/annotationsController.exsd
deleted file mode 100644
index dc3e5e135..000000000
--- a/plugins/org.eclipse.jst.common.annotations.controller/schema/annotationsController.exsd
+++ /dev/null
@@ -1,106 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.jst.common.annotations.controller">
-<annotation>
-      <appInfo>
-         <meta.schema plugin="org.eclipse.jst.common.annotations.controller" id="annotationsController" name="Annotations Controller"/>
-      </appInfo>
-      <documentation>
-         The annotationsController is used in generating annotated beans.
-      </documentation>
-   </annotation>
-
-   <element name="extension">
-      <complexType>
-         <sequence>
-            <element ref="annotationsController" minOccurs="1" maxOccurs="unbounded"/>
-         </sequence>
-         <attribute name="point" type="string" use="required">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="id" type="string">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="name" type="string">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="annotationsController">
-      <complexType>
-         <attribute name="id" type="string" use="required">
-            <annotation>
-               <documentation>
-                  The id is used to coordinate precedence using function groups so this must be consistent with the function group bindings.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="class" type="string" use="required">
-            <annotation>
-               <documentation>
-                  This is the name of the extension class defined by the extension
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="since"/>
-      </appInfo>
-      <documentation>
-         [Enter the first release in which this extension point appears.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="examples"/>
-      </appInfo>
-      <documentation>
-         [Enter extension point usage example here.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="apiInfo"/>
-      </appInfo>
-      <documentation>
-         [Enter API information here.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="implementation"/>
-      </appInfo>
-      <documentation>
-         [Enter information about supplied implementation of this extension point.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="copyright"/>
-      </appInfo>
-      <documentation>
-         
-      </documentation>
-   </annotation>
-
-</schema>
diff --git a/plugins/org.eclipse.jst.common.annotations.core/.classpath b/plugins/org.eclipse.jst.common.annotations.core/.classpath
deleted file mode 100644
index ccf4d764f..000000000
--- a/plugins/org.eclipse.jst.common.annotations.core/.classpath
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="src" path="property_files"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/plugins/org.eclipse.jst.common.annotations.core/.cvsignore b/plugins/org.eclipse.jst.common.annotations.core/.cvsignore
deleted file mode 100644
index d3fa362df..000000000
--- a/plugins/org.eclipse.jst.common.annotations.core/.cvsignore
+++ /dev/null
@@ -1,4 +0,0 @@
-bin
-temp.folder
-annotations-core.jar
-build.xml
diff --git a/plugins/org.eclipse.jst.common.annotations.core/.project b/plugins/org.eclipse.jst.common.annotations.core/.project
deleted file mode 100644
index 51f02e380..000000000
--- a/plugins/org.eclipse.jst.common.annotations.core/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.jst.common.annotations.core</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/plugins/org.eclipse.jst.common.annotations.core/META-INF/MANIFEST.MF b/plugins/org.eclipse.jst.common.annotations.core/META-INF/MANIFEST.MF
deleted file mode 100644
index 7a06e3e69..000000000
--- a/plugins/org.eclipse.jst.common.annotations.core/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,12 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Annotation Core Plug-in
-Bundle-SymbolicName: org.eclipse.jst.common.annotations.core
-Bundle-Version: 0.7.0
-Bundle-ClassPath: annotations-core.jar
-Bundle-Vendor: Eclipse.org
-Bundle-Localization: plugin
-Export-Package: .,
- org.eclipse.jst.common.internal.annotations.core
-Require-Bundle: org.eclipse.emf.ecore,
- org.eclipse.wst.common.emf
diff --git a/plugins/org.eclipse.jst.common.annotations.core/about.html b/plugins/org.eclipse.jst.common.annotations.core/about.html
deleted file mode 100644
index 6f6b96c4c..000000000
--- a/plugins/org.eclipse.jst.common.annotations.core/about.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>February 24, 2005</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; 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 (&quot;Redistributor&quot;) 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.</p>
-
-</body>
-</html>
-\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.common.annotations.core/build.properties b/plugins/org.eclipse.jst.common.annotations.core/build.properties
deleted file mode 100644
index 9762dd021..000000000
--- a/plugins/org.eclipse.jst.common.annotations.core/build.properties
+++ /dev/null
@@ -1,19 +0,0 @@
-###############################################################################
-# Copyright (c) 2003, 2004 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-bin.includes = plugin.xml,\
-               annotations-core.jar.jar,\
-               annotations-core.jar,\
-               META-INF/,\
-               about.html
-src.includes=schema/
-source.annotations-core.jar=src/,\
-                              property_files/
-output.annotations-core.jar=bin/
diff --git a/plugins/org.eclipse.jst.common.annotations.core/plugin.xml b/plugins/org.eclipse.jst.common.annotations.core/plugin.xml
deleted file mode 100644
index 7bf65fb5f..000000000
--- a/plugins/org.eclipse.jst.common.annotations.core/plugin.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin>
-
-    
-</plugin>
diff --git a/plugins/org.eclipse.jst.common.annotations.core/prepareforpii.xml b/plugins/org.eclipse.jst.common.annotations.core/prepareforpii.xml
deleted file mode 100644
index 87718a68e..000000000
--- a/plugins/org.eclipse.jst.common.annotations.core/prepareforpii.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<project name="PrepareForPII" default="main" basedir=".">
-		
-	<!-- Setup temp variables -->
-	<target name="init">
-		<property name="nlsDir" value="d:/NLS/Corona/0526"/>
-		<property name="plugin" value="com.ibm.wtp.annotations.core"/>
-		<property name="plugindir" value="d:/workspaceCorona/${plugin}"/>
-		<property name="outputDir" value="${nlsDir}/${plugin}"/>
-		
-	
-	</target>
-
-	<!-- Create the destination dir -->
-	<target name="nlsDir" depends="init">
-		<mkdir dir="${nlsDir}"/>
-	</target>
-	
-	<!-- Create the destination dir -->
-	<target name="plugindir" depends="nlsDir">
-		<delete dir="${outputDir}"/>
-		<mkdir dir="${outputDir}"/>
-	</target>
-
-	<!-- Move the files to the correct locations in the workspace. -->
-	<target name="main" depends="plugindir">
-	
-		<messageIdGen folderPath = "${plugindir}" componentId = "E" />
-		
-		<copy todir = "${outputDir}/property_files" >
-			 <fileset dir="${plugindir}/property_files">
-           	  <include name="**/*.properties"/>
-  			 </fileset>
-  		</copy>
-  		
-	</target>
-</project>
diff --git a/plugins/org.eclipse.jst.common.annotations.core/property_files/annotationcore.properties b/plugins/org.eclipse.jst.common.annotations.core/property_files/annotationcore.properties
deleted file mode 100644
index 92b4d62a4..000000000
--- a/plugins/org.eclipse.jst.common.annotations.core/property_files/annotationcore.properties
+++ /dev/null
@@ -1,16 +0,0 @@
-###############################################################################
-# Copyright (c) 2003, 2004 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-TagSpec.3=Unknown tag scope:
-TagSpec.4=Null tag scope.
-AnnotationTagParser.0=Null event handler.
-AnnotationTagParser.1=
-AnnotationTagRegistry.0=More than one 'AnnotationTagInfo' tag for the tag '
-AnnotationTagRegistry.9=parseTagAttribs: unknown 'use' value:
diff --git a/plugins/org.eclipse.jst.common.annotations.core/src/org/eclipse/jst/common/internal/annotations/core/AnnotatedCommentHandler.java b/plugins/org.eclipse.jst.common.annotations.core/src/org/eclipse/jst/common/internal/annotations/core/AnnotatedCommentHandler.java
deleted file mode 100644
index 47767e3c6..000000000
--- a/plugins/org.eclipse.jst.common.annotations.core/src/org/eclipse/jst/common/internal/annotations/core/AnnotatedCommentHandler.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.common.internal.annotations.core;
-
-import java.util.HashMap;
-import java.util.Map;
-
-
-
-/**
- * @author mdelder
- *  
- */
-public class AnnotatedCommentHandler implements TagParseEventHandler {
-
-	private Map annotations;
-
-	private Token annotationToken;
-
-	/**
-	 *  
-	 */
-	public AnnotatedCommentHandler() {
-		super();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.wst.common.internal.annotations.core.TagParseEventHandler#annotationTag(org.eclipse.wst.common.internal.annotations.core.Token)
-	 */
-	public void annotationTag(Token tag) {
-		this.annotationToken = tag;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.wst.common.internal.annotations.core.TagParseEventHandler#endOfTag(int)
-	 */
-	public void endOfTag(int pos) {
-		// Do nothing
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.wst.common.internal.annotations.core.TagParseEventHandler#attribute(org.eclipse.wst.common.internal.annotations.core.Token,
-	 *      int, org.eclipse.wst.common.internal.annotations.core.Token)
-	 */
-	public void attribute(Token name, int equalsPosition, Token value) {
-		if (value.getText() == null || value.getText().length() == 0)
-			getAnnotations().put(this.annotationToken.getText(), name.getText());
-		else
-			getAnnotations().put(name.getText(), value.getText());
-	}
-
-	/**
-	 * @return Returns the annotations.
-	 */
-	public Map getAnnotations() {
-		if (annotations == null)
-			annotations = new HashMap();
-		return annotations;
-	}
-}
-\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.common.annotations.core/src/org/eclipse/jst/common/internal/annotations/core/AnnotationTagParser.java b/plugins/org.eclipse.jst.common.annotations.core/src/org/eclipse/jst/common/internal/annotations/core/AnnotationTagParser.java
deleted file mode 100644
index f87a38ad5..000000000
--- a/plugins/org.eclipse.jst.common.annotations.core/src/org/eclipse/jst/common/internal/annotations/core/AnnotationTagParser.java
+++ /dev/null
@@ -1,266 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Nov 11, 2003
- *
- * To change the template for this generated file go to
- * Window&gt;Preferences&gt;Java&gt;Code Generation&gt;Code and Comments
- */
-package org.eclipse.jst.common.internal.annotations.core;
-
-/**
- * @author Pat Kelley
- * 
- * To change the template for this generated type comment go to
- * Window&gt;Preferences&gt;Java&gt;Code Generation&gt;Code and Comments
- */
-public class AnnotationTagParser {
-
-	private TagParseEventHandler handler;
-
-	private char[] input;
-
-	int pos;
-
-	int endOfLastGoodAttParse;
-
-	public AnnotationTagParser(TagParseEventHandler tp) {
-		if (tp == null) {
-			throw new IllegalArgumentException(AnnotationsCoreResources.getString("AnnotationTagParser.0")); //$NON-NLS-1$
-		}
-		handler = tp;
-	}
-
-	private boolean eos() {
-		return pos >= input.length;
-	}
-
-	private boolean isWS(char c) {
-		return c == ' ' || c == '\n' || c == '\r' || c == '\t';
-	}
-
-	private void skipWS() {
-		while (pos < input.length && (isWS(input[pos]) || input[pos] == '*')) {
-			pos++;
-		}
-	}
-
-	// Caller is expected to make sure the eos has not been reached.
-	private char peek() {
-		return input[pos];
-	}
-
-	// Caller is expected to check for EOS.
-	private char nextChar() {
-		return input[pos++];
-	}
-
-	private boolean isNextChar(char c) {
-		if (eos())
-			return false;
-		return peek() == c;
-	}
-
-	private boolean isIDChar(char c) {
-		return !isWS(c) && c != '=' && c != '@' && c != '\"';
-	}
-
-	private Token collectID() {
-		StringBuffer b = new StringBuffer(16);
-		Token t = new Token();
-
-		t.setBeginning(pos);
-		while (!eos() && isIDChar(peek())) {
-			b.append(nextChar());
-		}
-		t.setEnd(pos - 1);
-		t.setText(b.toString());
-		return t;
-	}
-
-	private Token expectAttribName() {
-		if (eos()) {
-			return null;
-		}
-		int save = pos;
-
-		Token retval = collectID();
-		if (retval.length() == 0) {
-			pos = save;
-			return null;
-		}
-		return retval;
-	}
-
-	private Token expectTag() {
-		if (eos()) {
-			return null;
-		}
-		int savePos = pos;
-
-		if (nextChar() != '@') {
-			return null;
-		}
-
-		if (eos() || isWS(peek())) {
-			return null;
-		}
-
-		Token retval = expectAttribName();
-
-		if (retval.length() == 0) {
-			pos = savePos + 1;
-		}
-		retval.setBeginning(savePos);
-
-		// Save end of parse so we can pass it as the end of the parsed tag.
-		endOfLastGoodAttParse = pos;
-		return retval;
-	}
-
-	private Token expectQuotedValue() {
-		skipWS();
-		if (eos()) {
-			return null;
-		}
-
-		Token tok = new Token();
-
-		tok.setBeginning(pos);
-		if (peek() != '\"') {
-			return null;
-		}
-		nextChar();
-
-		if (eos()) {
-			return null;
-		}
-
-		StringBuffer b = new StringBuffer(64);
-
-		while (!eos() && peek() != '\"') {
-			b.append(nextChar());
-		}
-		if (!eos()) {
-			nextChar();
-		}
-
-		tok.setEnd(pos - 1);
-		tok.setText(b.toString());
-		return tok;
-	}
-
-	private boolean expectAssign() {
-		if (eos()) {
-			return false;
-		}
-
-		if (nextChar() == '=') {
-			return true;
-		}
-		pos--;
-		return false;
-	}
-
-	private Token mkNullToken() {
-		Token retval = new Token();
-
-		retval.setBeginning(pos);
-		retval.setEnd(pos - 1);
-		retval.setText(""); //$NON-NLS-1$
-		return retval;
-	}
-
-	private boolean parseNextAttribute() {
-		skipWS();
-		if (eos()) {
-			return false;
-		}
-		Token key = collectID();
-
-		if (key == null || key.length() == 0) {
-			return false;
-		}
-
-		skipWS();
-		if (eos()) {
-			// Go ahead and report it, even though it is a partial attribute. (
-			// we still fail here )
-			handler.attribute(key, -1, mkNullToken());
-			return false;
-		}
-
-		int eqPos = pos;
-
-		if (!expectAssign()) {
-			// Even though we won't parse this as a full attribute, go ahead and
-			// call the handler with it. Some clients want to see partial
-			// attributes.
-			handler.attribute(key, -1, mkNullToken());
-			return false;
-		}
-		skipWS();
-
-		if (eos()) {
-			// Same here - we fail on it, but we report it anyway
-			handler.attribute(key, eqPos, mkNullToken());
-			return false;
-		}
-		Token value = expectQuotedValue();
-
-		if (value == null) {
-			value = collectID();
-			if (isNextChar('=')) {
-				pos = value.getBeginning();
-				value = mkNullToken();
-			}
-		}
-		endOfLastGoodAttParse = pos;
-		handler.attribute(key, eqPos, value);
-		return true;
-	}
-
-	private void parseAttributes() {
-		while (!eos() && parseNextAttribute()) {
-			// loop while not end of string
-		}
-	}
-
-	private void skipToTagChar() {
-		while (!eos() && peek() != '@') {
-			nextChar();
-		}
-	}
-
-	public void setParserInput(char[] text) {
-		input = text;
-		pos = 0;
-		endOfLastGoodAttParse = 0;
-	}
-
-	public void setParserInput(String text) {
-		setParserInput(text.toCharArray());
-	}
-
-	public void parse() {
-		while (!eos()) {
-			skipToTagChar();
-			Token tag = expectTag();
-			if (tag == null) {
-				break;
-			}
-			handler.annotationTag(tag);
-			parseAttributes();
-			handler.endOfTag(endOfLastGoodAttParse);
-		}
-	}
-
-}
-\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.common.annotations.core/src/org/eclipse/jst/common/internal/annotations/core/AnnotationsAdapter.java b/plugins/org.eclipse.jst.common.annotations.core/src/org/eclipse/jst/common/internal/annotations/core/AnnotationsAdapter.java
deleted file mode 100644
index d9431cf2a..000000000
--- a/plugins/org.eclipse.jst.common.annotations.core/src/org/eclipse/jst/common/internal/annotations/core/AnnotationsAdapter.java
+++ /dev/null
@@ -1,161 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.common.internal.annotations.core;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.emf.common.notify.impl.AdapterImpl;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.impl.EStructuralFeatureImpl;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.wst.common.internal.emf.utilities.CloneablePublic;
-
-
-
-/**
- * @author mdelder
- *  
- */
-public class AnnotationsAdapter extends AdapterImpl implements CloneablePublic {
-
-	public static final String GENERATED = "generated"; //$NON-NLS-1$
-
-	protected final static String ADAPTER_TYPE = AnnotationsAdapter.class.getName();
-
-	public final static EStructuralFeature NOTIFICATION_FEATURE = new EStructuralFeatureImpl() {
-		// anonymous inner class
-	};
-
-	private Map annotationsMap;
-
-	/**
-	 *  
-	 */
-	public AnnotationsAdapter() {
-		super();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see java.lang.Object#clone()
-	 */
-	public Object clone() { // throws CloneNotSupportedException {
-		//return super.clone();
-		return null;
-	}
-
-	/**
-	 * @param emfObject
-	 * @param string
-	 */
-	public static void addAnnotations(EObject emfObject, String name, Object value) {
-		if (emfObject == null)
-			return;
-		AnnotationsAdapter adapter = getAdapter(emfObject);
-		adapter.addAnnotations(name, value);
-	}
-
-
-	/**
-	 * @param emfObject
-	 * @param string
-	 */
-	public static Object getAnnotations(EObject emfObject, String name) {
-		if (emfObject == null)
-			return null;
-		return internalGetAnnotations(emfObject, name);
-	}
-
-	protected static Object internalGetAnnotations(EObject emfObject, String name) {
-		if (emfObject == null)
-			return null;
-		AnnotationsAdapter adapter = getAdapter(emfObject);
-		return (adapter == null) ? internalGetAnnotations(emfObject.eContainer(), name) : adapter.getAnnotations(name);
-	}
-
-
-	/**
-	 * @param emfObject
-	 * @param string
-	 */
-	public static Object removeAnnotations(EObject emfObject, String name) {
-		if (emfObject == null)
-			return null;
-		AnnotationsAdapter adapter = getAdapter(emfObject);
-		return adapter.removeAnnotations(name);
-	}
-
-	/**
-	 * @param name
-	 * @param value
-	 */
-	protected void addAnnotations(String name, Object value) {
-		getAnnnotations().put(name, value);
-	}
-
-	protected Object getAnnotations(String name) {
-		return getAnnnotations().get(name);
-	}
-
-	protected Object removeAnnotations(String name) {
-		return getAnnnotations().remove(name);
-	}
-
-	/**
-	 * @return
-	 */
-	protected Map getAnnnotations() {
-		if (annotationsMap == null)
-			annotationsMap = new HashMap();
-		return annotationsMap;
-	}
-
-	/**
-	 * @param emfObject
-	 * @return
-	 */
-	protected static AnnotationsAdapter getAdapter(EObject emfObject) {
-		AnnotationsAdapter adapter = retrieveExistingAdapter(emfObject);
-		return adapter == null ? createAdapter(emfObject) : adapter;
-	}
-
-	/**
-	 * @param emfObject
-	 * @return
-	 */
-	protected static AnnotationsAdapter createAdapter(EObject emfObject) {
-		AnnotationsAdapter adapter = new AnnotationsAdapter();
-		adapter.setTarget(emfObject);
-		emfObject.eAdapters().add(adapter);
-		return adapter;
-	}
-
-	/**
-	 * @param emfObject
-	 * @return
-	 */
-	protected static AnnotationsAdapter retrieveExistingAdapter(EObject emfObject) {
-		return (AnnotationsAdapter) EcoreUtil.getExistingAdapter(emfObject, ADAPTER_TYPE);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.emf.common.notify.impl.AdapterImpl#isAdapterForType(java.lang.Object)
-	 */
-	public boolean isAdapterForType(Object type) {
-		return ADAPTER_TYPE.equals(type);
-	}
-
-}
-\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.common.annotations.core/src/org/eclipse/jst/common/internal/annotations/core/AnnotationsCoreResources.java b/plugins/org.eclipse.jst.common.annotations.core/src/org/eclipse/jst/common/internal/annotations/core/AnnotationsCoreResources.java
deleted file mode 100644
index e7fdec11a..000000000
--- a/plugins/org.eclipse.jst.common.annotations.core/src/org/eclipse/jst/common/internal/annotations/core/AnnotationsCoreResources.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Mar 8, 2004
- *
- * To change the template for this generated file go to
- * Window - Preferences - Java - Code Generation - Code and Comments
- */
-
-package org.eclipse.jst.common.internal.annotations.core;
-
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-/**
- * @author kkatyal
- * 
- * To change the template for this generated type comment go to Window - Preferences - Java - Code
- * Generation - Code and Comments
- */
-public class AnnotationsCoreResources {
-
-	private static final String BUNDLE_NAME = "annotationcore";//$NON-NLS-1$
-	private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle.getBundle(BUNDLE_NAME);
-
-	/**
-	 *  
-	 */
-	private AnnotationsCoreResources() {
-		// TODO Auto-generated constructor stub
-	}
-
-	/**
-	 * @param key
-	 * @return
-	 */
-	public static String getString(String key) {
-		// TODO Auto-generated method stub
-		try {
-			return RESOURCE_BUNDLE.getString(key);
-		} catch (MissingResourceException e) {
-			return '!' + key + '!';
-		}
-	}
-}
-\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.common.annotations.core/src/org/eclipse/jst/common/internal/annotations/core/AnnotationsTranslator.java b/plugins/org.eclipse.jst.common.annotations.core/src/org/eclipse/jst/common/internal/annotations/core/AnnotationsTranslator.java
deleted file mode 100644
index f110ad3c8..000000000
--- a/plugins/org.eclipse.jst.common.annotations.core/src/org/eclipse/jst/common/internal/annotations/core/AnnotationsTranslator.java
+++ /dev/null
@@ -1,150 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.common.internal.annotations.core;
-
-import java.util.Iterator;
-import java.util.Map;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.wst.common.internal.emf.resource.Translator;
-
-
-
-/**
- * @author mdelder
- *  
- */
-public class AnnotationsTranslator extends Translator {
-
-	private AnnotatedCommentHandler handler;
-
-	private AnnotationTagParser parser;
-
-	public static final AnnotationsTranslator INSTANCE = new AnnotationsTranslator();
-
-	/**
-	 * @param domNameAndPath
-	 * @param aFeature
-	 */
-	public AnnotationsTranslator() {
-		super("#comment", AnnotationsAdapter.NOTIFICATION_FEATURE, Translator.COMMENT_FEATURE); //$NON-NLS-1$
-	}
-
-	/**
-	 * @param domNameAndPath
-	 * @param aFeature
-	 */
-	public AnnotationsTranslator(String domNameAndPath) {
-		super(domNameAndPath, AnnotationsAdapter.NOTIFICATION_FEATURE, Translator.COMMENT_FEATURE);
-	}
-
-	/**
-	 * @param domNameAndPath
-	 * @param aFeature
-	 * @param style
-	 */
-	public AnnotationsTranslator(String domNameAndPath, int style) {
-		super(domNameAndPath, AnnotationsAdapter.NOTIFICATION_FEATURE, style | Translator.COMMENT_FEATURE);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see com.ibm.wtp.emf.xml.Translator#setMOFValue(org.eclipse.emf.ecore.EObject,
-	 *      java.lang.Object)
-	 */
-	public void setMOFValue(EObject emfObject, Object value) {
-		if (value == null)
-			return;
-		getHandler().getAnnotations().clear();
-		getParser().setParserInput(value.toString());
-		getParser().parse();
-		String name;
-		Map annotations = getHandler().getAnnotations();
-		for (Iterator keys = annotations.keySet().iterator(); keys.hasNext();) {
-			name = (String) keys.next();
-			AnnotationsAdapter.addAnnotations(emfObject, name, annotations.get(name));
-		}
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see com.ibm.etools.emf2xml.impl.Translator#isSetMOFValue(org.eclipse.emf.ecore.EObject)
-	 */
-	public boolean isSetMOFValue(EObject emfObject) {
-		return getMOFValue(emfObject) != null;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see com.ibm.etools.emf2xml.impl.Translator#getMOFValue(org.eclipse.emf.ecore.EObject)
-	 */
-	public Object getMOFValue(EObject emfObject) {
-		return AnnotationsAdapter.getAnnotations(emfObject, AnnotationsAdapter.GENERATED);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see com.ibm.etools.emf2xml.impl.Translator#unSetMOFValue(org.eclipse.emf.ecore.EObject)
-	 */
-	public void unSetMOFValue(EObject emfObject) {
-		AnnotationsAdapter.removeAnnotations(emfObject, AnnotationsAdapter.GENERATED);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see com.ibm.etools.emf2xml.impl.Translator#featureExists(org.eclipse.emf.ecore.EObject)
-	 */
-	public boolean featureExists(EObject emfObject) {
-		return true;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see com.ibm.etools.emf2xml.impl.Translator#isDataType()
-	 */
-	public boolean isDataType() {
-		return true;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see com.ibm.etools.emf2xml.impl.Translator#isMapFor(java.lang.Object, java.lang.Object,
-	 *      java.lang.Object)
-	 */
-	public boolean isMapFor(Object aFeature, Object oldValue, Object newValue) {
-		return (aFeature == feature);
-	}
-
-	/**
-	 * @return Returns the handler.
-	 */
-	protected AnnotatedCommentHandler getHandler() {
-		if (handler == null)
-			handler = new AnnotatedCommentHandler();
-		return handler;
-	}
-
-	/**
-	 * @return Returns the parser.
-	 */
-	protected AnnotationTagParser getParser() {
-		if (parser == null)
-			parser = new AnnotationTagParser(getHandler());
-		return parser;
-	}
-}
-\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.common.annotations.core/src/org/eclipse/jst/common/internal/annotations/core/TagParseEventHandler.java b/plugins/org.eclipse.jst.common.annotations.core/src/org/eclipse/jst/common/internal/annotations/core/TagParseEventHandler.java
deleted file mode 100644
index f9794150c..000000000
--- a/plugins/org.eclipse.jst.common.annotations.core/src/org/eclipse/jst/common/internal/annotations/core/TagParseEventHandler.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Nov 11, 2003
- *
- * To change the template for this generated file go to
- * Window&gt;Preferences&gt;Java&gt;Code Generation&gt;Code and Comments
- */
-package org.eclipse.jst.common.internal.annotations.core;
-
-
-/**
- * Parser and interface for objects that want to receive parsing events. When parsing is started
- * through the <code>parse()</code> method, event methods are called for interesting features in
- * the parse. ( like a SAX ContentHandler )
- * 
- * @author Pat Kelley
- */
-public interface TagParseEventHandler {
-
-	/**
-	 * Called when the annotation tag is encountered. This will always be the first piece of content
-	 * encountered. Followed by a endOfTag( ) call when the end of the tag is reached.
-	 */
-	public void annotationTag(Token tag);
-
-	/**
-	 * Called when the entire annotation for a single tag has been parsed.
-	 * 
-	 * @param pos
-	 *            Position in the stream of the end of the annotation.
-	 */
-	public void endOfTag(int pos);
-
-	/**
-	 * Called for every attribute setting encountered for an annotation tag.
-	 * 
-	 * @param name
-	 *            Name of the attribute.
-	 * @param equalsPosition
-	 *            Source position of the equals sign, or -1 if no equals sign was found.
-	 * @param value
-	 *            Value of the attribute, with any quotes stripped off. Will be zero length token if
-	 *            no attribute was found.
-	 */
-	public void attribute(Token name, int equalsPosition, Token value);
-}
-\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.common.annotations.core/src/org/eclipse/jst/common/internal/annotations/core/Token.java b/plugins/org.eclipse.jst.common.annotations.core/src/org/eclipse/jst/common/internal/annotations/core/Token.java
deleted file mode 100644
index 9d0310236..000000000
--- a/plugins/org.eclipse.jst.common.annotations.core/src/org/eclipse/jst/common/internal/annotations/core/Token.java
+++ /dev/null
@@ -1,103 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Nov 11, 2003
- *
- * To change the template for this generated file go to
- * Window&gt;Preferences&gt;Java&gt;Code Generation&gt;Code and Comments
- */
-package org.eclipse.jst.common.internal.annotations.core;
-
-/**
- * A string, and the range it was taken from in the source file. The range is inclusive. (ie, with
- * source "ABCD", the beginning and end for the Token "BC" would be (1,2) )
- * 
- * @author Pat Kelley
- * 
- * To change the template for this generated type comment go to
- * Window&gt;Preferences&gt;Java&gt;Code Generation&gt;Code and Comments
- */
-public class Token {
-	private String text;
-	private int beginning;
-	private int end;
-
-
-
-	/**
-	 * @return Position in original source of the first character of this token.
-	 */
-	public int getBeginning() {
-		return beginning;
-	}
-
-	/**
-	 * @return Position in the original source of the last character of this token.
-	 */
-	public int getEnd() {
-		return end;
-	}
-
-	/**
-	 * @return The token string.
-	 */
-	public String getText() {
-		return text;
-	}
-
-	/**
-	 * @param i
-	 *            A source position
-	 */
-	public void setBeginning(int i) {
-		beginning = i;
-	}
-
-	/**
-	 * @param i
-	 *            A source position.
-	 */
-	public void setEnd(int i) {
-		end = i;
-	}
-
-	/**
-	 * @param string
-	 */
-	public void setText(String string) {
-		text = string;
-	}
-
-	public int length() {
-		return text.length();
-	}
-
-	/**
-	 * Tests whether <code>srcPos</code> comes immediately after the last character in this token.
-	 * 
-	 * @param srcPos
-	 *            A position in the original source the token came from.
-	 * @return true if srcPos comes immediately after this token.
-	 */
-	public boolean immediatelyPrecedes(int srcPos) {
-		return end + 1 == srcPos;
-	}
-
-	/**
-	 * Tests whether srcPos is within the original source range range of the token.
-	 * 
-	 * @param srcPos
-	 * @return
-	 */
-	public boolean contains(int srcPos) {
-		return srcPos >= beginning && srcPos <= end;
-	}
-}
-\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.common.annotations.ui/.classpath b/plugins/org.eclipse.jst.common.annotations.ui/.classpath
deleted file mode 100644
index ccf4d764f..000000000
--- a/plugins/org.eclipse.jst.common.annotations.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="property_files"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/plugins/org.eclipse.jst.common.annotations.ui/.cvsignore b/plugins/org.eclipse.jst.common.annotations.ui/.cvsignore
deleted file mode 100644
index 2521e52aa..000000000
--- a/plugins/org.eclipse.jst.common.annotations.ui/.cvsignore
+++ /dev/null
@@ -1,4 +0,0 @@
-bin
-temp.folder
-build.xml
-ui.jar
diff --git a/plugins/org.eclipse.jst.common.annotations.ui/.project b/plugins/org.eclipse.jst.common.annotations.ui/.project
deleted file mode 100644
index 04b8576ce..000000000
--- a/plugins/org.eclipse.jst.common.annotations.ui/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.jst.common.annotations.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>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/plugins/org.eclipse.jst.common.annotations.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.jst.common.annotations.ui/META-INF/MANIFEST.MF
deleted file mode 100644
index bb6fb3a3b..000000000
--- a/plugins/org.eclipse.jst.common.annotations.ui/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,26 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Ui Plug-in
-Bundle-SymbolicName: org.eclipse.jst.common.annotations.ui; singleton:=true
-Bundle-Version: 0.7.0
-Bundle-ClassPath: ui.jar
-Bundle-Activator: org.eclipse.jst.common.internal.annotations.ui.UiPlugin
-Bundle-Vendor: Eclipse.org
-Bundle-Localization: plugin
-Export-Package: .,
- org.eclipse.jst.common.internal.annotations.ui
-Require-Bundle: org.eclipse.ui.views,
- org.eclipse.ui.editors,
- org.eclipse.core.resources,
- org.eclipse.ui,
- org.eclipse.jdt.ui,
- org.eclipse.jdt.core,
- org.eclipse.jface.text,
- org.eclipse.ui.workbench.texteditor,
- org.eclipse.ui.ide,
- org.eclipse.swt,
- org.eclipse.core.runtime,
- org.eclipse.core.runtime,
- org.eclipse.jst.common.annotations.core,
- org.eclipse.jst.common.annotations.controller
-Eclipse-AutoStart: true
diff --git a/plugins/org.eclipse.jst.common.annotations.ui/about.html b/plugins/org.eclipse.jst.common.annotations.ui/about.html
deleted file mode 100644
index 6f6b96c4c..000000000
--- a/plugins/org.eclipse.jst.common.annotations.ui/about.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>February 24, 2005</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; 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 (&quot;Redistributor&quot;) 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.</p>
-
-</body>
-</html>
-\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.common.annotations.ui/build.properties b/plugins/org.eclipse.jst.common.annotations.ui/build.properties
deleted file mode 100644
index e7f5c0569..000000000
--- a/plugins/org.eclipse.jst.common.annotations.ui/build.properties
+++ /dev/null
@@ -1,18 +0,0 @@
-###############################################################################
-# Copyright (c) 2003, 2004 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-bin.includes = plugin.xml,\
-               ui.jar,\
-               META-INF/,\
-               about.html
-src.includes=schema/
-source.ui.jar=src/,\
-                property_files/
-output.ui.jar=bin/
diff --git a/plugins/org.eclipse.jst.common.annotations.ui/plugin.xml b/plugins/org.eclipse.jst.common.annotations.ui/plugin.xml
deleted file mode 100644
index f1ba7fc72..000000000
--- a/plugins/org.eclipse.jst.common.annotations.ui/plugin.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin>
-
-     <extension
-         point="org.eclipse.jdt.ui.javadocCompletionProcessor">
-      <javadocCompletionProcessor
-            name="AnnotationsCompletionProcessor"
-            class="org.eclipse.jst.common.internal.annotations.ui.AnnotationTagCompletionProc"
-            id="AnnotationsCompletionProcessor">
-      </javadocCompletionProcessor>
-   </extension>
-
-</plugin>
diff --git a/plugins/org.eclipse.jst.common.annotations.ui/prepareforpii.xml b/plugins/org.eclipse.jst.common.annotations.ui/prepareforpii.xml
deleted file mode 100644
index 9a4918e29..000000000
--- a/plugins/org.eclipse.jst.common.annotations.ui/prepareforpii.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<project name="PrepareForPII" default="main" basedir=".">
-		
-	<!-- Setup temp variables -->
-	<target name="init">
-		<property name="nlsDir" value="d:/NLS/Corona/0526"/>
-		<property name="plugin" value="com.ibm.wtp.annotations.ui"/>
-		<property name="plugindir" value="d:/workspaceCorona/${plugin}"/>
-		<property name="outputDir" value="${nlsDir}/${plugin}"/>
-		
-	
-	</target>
-
-	<!-- Create the destination dir -->
-	<target name="nlsDir" depends="init">
-		<mkdir dir="${nlsDir}"/>
-	</target>
-	
-	<!-- Create the destination dir -->
-	<target name="plugindir" depends="nlsDir">
-		<delete dir="${outputDir}"/>
-		<mkdir dir="${outputDir}"/>
-	</target>
-
-	<!-- Move the files to the correct locations in the workspace. -->
-	<target name="main" depends="plugindir">
-	
-		<messageIdGen folderPath = "${plugindir}" componentId = "E" />
-		
-		<copy todir = "${outputDir}/property_files" >
-			 <fileset dir="${plugindir}/property_files">
-           	  <include name="**/*.properties"/>
-  			 </fileset>
-  		</copy>
-  		
-	</target>
-</project>
diff --git a/plugins/org.eclipse.jst.common.annotations.ui/property_files/taghandlerui.properties b/plugins/org.eclipse.jst.common.annotations.ui/property_files/taghandlerui.properties
deleted file mode 100644
index a18410741..000000000
--- a/plugins/org.eclipse.jst.common.annotations.ui/property_files/taghandlerui.properties
+++ /dev/null
@@ -1,12 +0,0 @@
-###############################################################################
-# Copyright (c) 2003, 2004 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-J2EEAnnotationsCompletionProcessor.3=Error parsing attributes - was expecing a '=' but found '
-J2EEAnnotationsCompletionProcessor.4=' instead.
diff --git a/plugins/org.eclipse.jst.common.annotations.ui/schema/AnnotationUI.exsd b/plugins/org.eclipse.jst.common.annotations.ui/schema/AnnotationUI.exsd
deleted file mode 100644
index b3af9ecea..000000000
--- a/plugins/org.eclipse.jst.common.annotations.ui/schema/AnnotationUI.exsd
+++ /dev/null
@@ -1,104 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.jst.common.annotations.ui">
-<annotation>
-      <appInfo>
-         <meta.schema plugin="org.eclipse.jst.common.annotations.ui" id="AnnotationUI" name="AnnotationUI"/>
-      </appInfo>
-      <documentation>
-         Extension point for enabling content assist for an existing tag set.
-      </documentation>
-   </annotation>
-
-   <element name="extension">
-      <complexType>
-         <sequence>
-            <element ref="AutoCompleteData" minOccurs="0" maxOccurs="unbounded"/>
-         </sequence>
-         <attribute name="point" type="string" use="required">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="id" type="string">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="name" type="string">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="AutoCompleteData">
-      <annotation>
-         <documentation>
-            Enables content assist for a single tag set.
-         </documentation>
-      </annotation>
-      <complexType>
-         <attribute name="tagSet" type="string" use="required">
-            <annotation>
-               <documentation>
-                  Name of the tag set code assist should be enabled for.
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="since"/>
-      </appInfo>
-      <documentation>
-         [Enter the first release in which this extension point appears.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="examples"/>
-      </appInfo>
-      <documentation>
-         [Enter extension point usage example here.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="apiInfo"/>
-      </appInfo>
-      <documentation>
-         [Enter API information here.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="implementation"/>
-      </appInfo>
-      <documentation>
-         [Enter information about supplied implementation of this extension point.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="copyright"/>
-      </appInfo>
-      <documentation>
-         
-      </documentation>
-   </annotation>
-
-</schema>
diff --git a/plugins/org.eclipse.jst.common.annotations.ui/src/org/eclipse/jst/common/internal/annotations/ui/AnnotationTagCompletionProc.java b/plugins/org.eclipse.jst.common.annotations.ui/src/org/eclipse/jst/common/internal/annotations/ui/AnnotationTagCompletionProc.java
deleted file mode 100644
index 8870163de..000000000
--- a/plugins/org.eclipse.jst.common.annotations.ui/src/org/eclipse/jst/common/internal/annotations/ui/AnnotationTagCompletionProc.java
+++ /dev/null
@@ -1,726 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Mar 9, 2004
- *
- * To change the template for this generated file go to
- * Window - Preferences - Java - Code Generation - Code and Comments
- */
-package org.eclipse.jst.common.internal.annotations.ui;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.MissingResourceException;
-import java.util.Set;
-import java.util.TreeSet;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IField;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.ui.JavaUI;
-import org.eclipse.jdt.ui.text.java.IJavaCompletionProposal;
-import org.eclipse.jdt.ui.text.java.IJavadocCompletionProcessor;
-import org.eclipse.jface.text.BadLocationException;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.contentassist.IContextInformation;
-import org.eclipse.jst.common.internal.annotations.core.AnnotationTagParser;
-import org.eclipse.jst.common.internal.annotations.core.TagParseEventHandler;
-import org.eclipse.jst.common.internal.annotations.core.Token;
-import org.eclipse.jst.common.internal.annotations.registry.AnnotationTagRegistry;
-import org.eclipse.jst.common.internal.annotations.registry.AttributeValueProposalHelper;
-import org.eclipse.jst.common.internal.annotations.registry.AttributeValuesHelper;
-import org.eclipse.jst.common.internal.annotations.registry.TagAttribSpec;
-import org.eclipse.jst.common.internal.annotations.registry.TagSpec;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.part.FileEditorInput;
-
-
-/**
- * @author Pat Kelley
- * 
- * To change the template for this generated type comment go to Window - Preferences - Java - Code
- * Generation - Code and Comments
- */
-public class AnnotationTagCompletionProc implements IJavadocCompletionProcessor, TagParseEventHandler {
-	private static final String[] BOOLEAN_VALID_VALUES = new String[]{"false", "true"}; //$NON-NLS-1$ //$NON-NLS-2$
-	ICompilationUnit m_icu;
-
-	IDocument m_doc;
-
-	List m_tags;
-
-	// Instance variables active when maybeCompleteAttribute is live.
-	Token m_tagName;
-
-	/**
-	 * Set of all attributes names encountered. Only live when maybeCompleteAttribute is live.
-	 */
-	Set m_attSet = new TreeSet();
-
-	/**
-	 * List of Attribute. Only live when maybeCompleAttribute is live.
-	 */
-	List m_attributes = new ArrayList();
-
-	AnnotationTagParser m_parser = new AnnotationTagParser(this);
-
-	/**
-	 * Scope of the tag. TagSpec.TYPE | TagSpec.METHOD | TagSpec.FIELD. Not valid until
-	 * getAnnotationArea has been called for a completions request, and only then if
-	 * getAnnotationArea() did not return null.
-	 */
-	int m_tagScope;
-
-	public AnnotationTagCompletionProc() {
-		initTagInfo();
-	}
-
-	private void initTagInfo() {
-		if (m_tags == null)
-			m_tags = AnnotationTagRegistry.getAllTagSpecs();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jdt.ui.text.java.IJavadocCompletionProcessor#computeContextInformation(org.eclipse.jdt.core.ICompilationUnit,
-	 *      int)
-	 */
-	public IContextInformation[] computeContextInformation(ICompilationUnit cu, int offset) {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jdt.ui.text.java.IJavadocCompletionProcessor#computeCompletionProposals(org.eclipse.jdt.core.ICompilationUnit,
-	 *      int, int, int)
-	 */
-	public IJavaCompletionProposal[] computeCompletionProposals(ICompilationUnit cu, int offset, int length, int flags) {
-		IEditorInput editorInput = new FileEditorInput((IFile) cu.getResource());
-
-		// Set up completion processor state.
-		m_doc = JavaUI.getDocumentProvider().getDocument(editorInput);
-		m_icu = cu;
-
-		try {
-			AnnotationArea area = getAnnotationArea(offset);
-
-			if (area == null) {
-				return null;
-			}
-
-			// Check for tag completion first. ( the easier case )
-			String tsf = getTagSoFarIfNotCompleted(area.beginOffset, offset);
-
-			if (tsf != null) {
-				return getTagCompletionsFor(tsf, area, length);
-			}
-
-			// Ach, have to try the harder case now, where we parse the
-			// annotation
-			return maybeCompleteAttribute(area, offset);
-
-		} catch (JavaModelException e) {
-			// Silently fail.
-			return null;
-		} catch (BadLocationException ex) {
-			return null;
-		}
-	}
-
-	private IJavaCompletionProposal[] maybeCompleteAttribute(AnnotationArea area, int cursorPos) throws BadLocationException {
-		m_attSet.clear();
-		m_attributes.clear();
-
-		m_parser.setParserInput(m_doc.get(area.beginOffset, area.length()));
-		m_parser.parse();
-
-		TagSpec ts = getTagSpecForTagName(m_tagName.getText());
-
-		// Do we even recognize this tag?
-		if (ts == null) {
-			return null;
-		}
-
-		// Loop through and determine whether the cursor is within a attribute
-		// assignment, or between assignements.
-		Attribute target = null;
-		Attribute last = null;
-		Attribute before = null;
-		Attribute a = null;
-		boolean between = false;
-		int rCurPos = area.relativeCursorPos(cursorPos);
-		Iterator i = m_attributes.iterator();
-		while (i.hasNext()) {
-			a = (Attribute) i.next();
-
-			if (a.contains(rCurPos)) {
-				target = a;
-				break;
-			} else if (last != null) {
-				// See if the cursor is between, but not directly adjacent to
-				// the last two attributes.
-				if (rCurPos > last.maxExtent() + 1 && rCurPos < a.minExtent() - 1) {
-					between = true;
-					break;
-				} else if (a.immediatelyPrecedes(rCurPos)) {
-					before = a;
-					break;
-				}
-			}
-			last = a;
-		}
-
-		if (target == null) {
-			if (between) {
-				// If we're between attributes, suggest all possible attributes.
-				return attributeCompletionsFor(ts, cursorPos, 0, "", true); //$NON-NLS-1$
-			} else if (before != null) {
-				// We're right after the attribute named in 'before', so set the
-				// target to it, and fall
-				//  through to the target handling code.
-				target = before;
-			} else {
-				// not between and not immediately after an attribute. We are
-				// past the end of the parsed annotation.
-				//  Only offer suggestions if it looks like the last annotation
-				// attribute is valid.
-				if (a == null) {
-					// No annotations attributes, suggest everything.
-					return attributeCompletionsFor(ts, cursorPos, 0, "", true); //$NON-NLS-1$
-				} else if (rCurPos > a.maxExtent()) {
-					if (a.hasAssignment() && a.hasValue()) {
-						// Last annotation was good, and we're past it, so do
-						// completions for anything
-						return attributeCompletionsFor(ts, cursorPos, 0, "", true); //$NON-NLS-1$
-					} else if (a.hasAssignment())
-						return attributeValidValuesFor(ts, a, area, cursorPos);
-					else
-						return attributeCompletionsFor(ts, cursorPos - a.name.length(), 0, a.name.getText(), true);
-				} else {
-					// Didn't match anything, not past the end - we're probably
-					// the first attribute
-					// being added to the tag.
-					return attributeCompletionsFor(ts, cursorPos, 0, "", true); //$NON-NLS-1$
-				}
-			}
-		}
-
-		// Completion for a partial attribute name?
-		if (target.name.immediatelyPrecedes(rCurPos)) {
-			return attributeCompletionsFor(ts, area.relativeToAbs(target.name.getBeginning()), target.name.length(), target.name.getText(), !target.hasAssignment());
-		}
-
-		// Are we in the middle of a name?
-		if (target.name.contains(rCurPos)) {
-			// We've opted to replace the entire name for this case, which seems
-			// to make the most sense.
-			return attributeCompletionsFor(ts, area.relativeToAbs(target.name.getBeginning()), target.name.length(), target.name.getText().substring(0, rCurPos - target.name.getBeginning()), !target.hasAssignment());
-		}
-
-		// If we got this far, we're either in a value, or really confused.
-		// try and return valid values or bail?
-		if (a.value != null && (a.value.contains(rCurPos) || (target.hasAssignment() && area.relativeCursorPos(cursorPos) > a.name.getBeginning())))
-			return attributeValidValuesFor(ts, a, area, cursorPos);
-		return attributeCompletionsFor(ts, cursorPos, 0, "", true); //$NON-NLS-1$
-	}
-
-	/**
-	 * @return valid values for the attribute
-	 */
-	private IJavaCompletionProposal[] attributeValidValuesFor(TagSpec ts, Attribute a, AnnotationArea area, int cursorPos) {
-		TagAttribSpec tas = ts.attributeNamed(a.name.getText());
-		if (tas == null)
-			return null;
-		String[] validValues = getValidValues(tas, a, area);
-		String partialValue = calculatePartialValue(a, area, cursorPos);
-		int valueOffset = calculateValueOffset(a, area, cursorPos);
-		if (validValues == null || validValues.length == 0)
-			return createCustomAttributeCompletionProposals(ts, tas, partialValue, valueOffset, a.value.getText(), area.javaElement);
-		return createAttributeCompletionProposals(partialValue, valueOffset, validValues);
-	}
-
-	/**
-	 * @param ts
-	 * @param tas
-	 * @param partialValue
-	 * @param valueOffset
-	 * @param value
-	 * @param javaElement
-	 * @return
-	 */
-	private IJavaCompletionProposal[] createCustomAttributeCompletionProposals(TagSpec ts, TagAttribSpec tas, String partialValue, int valueOffset, String value, IJavaElement javaElement) {
-		AttributeValuesHelper helper = ts.getValidValuesHelper();
-		if (helper == null)
-			return null;
-		AttributeValueProposalHelper[] proposalHelpers = helper.getAttributeValueProposalHelpers(tas, partialValue, valueOffset, javaElement);
-		if (proposalHelpers == null || proposalHelpers.length == 0)
-			return null;
-		IJavaCompletionProposal[] proposals = new IJavaCompletionProposal[proposalHelpers.length];
-		AnnotationTagProposal proposal;
-		for (int i = 0; i < proposalHelpers.length; i++) {
-			proposal = new AnnotationTagProposal(proposalHelpers[i]);
-			//proposal.setPartialValueString(partialValue);
-			proposals[i] = proposal;
-		}
-		return proposals;
-	}
-
-	private IJavaCompletionProposal[] createAttributeCompletionProposals(String partialValue, int valueOffset, String[] validValues) {
-		List resultingValues = new ArrayList();
-		for (int i = 0; i < validValues.length; i++) {
-			String rplString = validValues[i];
-			if (partialValue != null && !rplString.startsWith(partialValue))
-				continue;
-			AnnotationTagProposal prop = new AnnotationTagProposal(rplString, valueOffset, 0, null, rplString, 1);
-			prop.setEnsureQuoted(true);
-			//prop.setPartialValueString(partialValue);
-			resultingValues.add(prop);
-		}
-		if (resultingValues.isEmpty())
-			return null;
-		return (IJavaCompletionProposal[]) resultingValues.toArray(new IJavaCompletionProposal[resultingValues.size()]);
-	}
-
-	private String[] getValidValues(TagAttribSpec tas, Attribute a, AnnotationArea area) {
-		String[] validValues = tas.getValidValues();
-		if (validValues == null || validValues.length == 0) {
-			AttributeValuesHelper helper = tas.getTagSpec().getValidValuesHelper();
-			if (helper == null)
-				return null;
-			validValues = helper.getValidValues(tas, area.javaElement);
-			if ((validValues == null || validValues.length == 0) && tas.valueIsBool())
-				validValues = BOOLEAN_VALID_VALUES;
-		}
-		return validValues;
-	}
-
-	/**
-	 * @param a
-	 * @param area
-	 * @param cursorPos
-	 * @return
-	 */
-	private int calculateValueOffset(Attribute a, AnnotationArea area, int cursorPos) {
-		if (a.value == null)
-			return cursorPos;
-		int nameEnd = a.name.getEnd();
-		int valBeg = a.value.getBeginning();
-		if (valBeg > nameEnd + 2)
-			return area.relativeToAbs(nameEnd + 2); //Value too far away to be correct.
-		return area.relativeToAbs(valBeg);
-	}
-
-	/**
-	 * @param a
-	 * @param area
-	 * @param cursorPos
-	 * @return
-	 */
-	private String calculatePartialValue(Attribute a, AnnotationArea area, int cursorPos) {
-		if (a.value == null)
-			return null;
-		int nameEnd = a.name.getEnd();
-		int valueBeg = a.value.getBeginning();
-		if (valueBeg > nameEnd + 2)
-			return null; //Value is too far away so it must not be part of this attribute.
-		int relativePos = area.relativeCursorPos(cursorPos);
-		if (a.value.contains(relativePos)) {
-			boolean hasBeginQuote = valueBeg - nameEnd == 2;
-			String value = a.value.getText();
-			int end = relativePos - valueBeg;
-			if (hasBeginQuote)
-				end--;
-			if (end > -1) {
-				int length = value.length();
-				if (end < length)
-					return value.substring(0, end);
-				else if (end == length)
-					return value;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * @param tagName
-	 * @return
-	 */
-	private TagSpec getTagSpecForTagName(String tagName) {
-		String simpleName = tagName;
-		if (tagName != null && tagName.length() > 0 && tagName.charAt(0) == '@')
-			simpleName = tagName.length() == 2 ? "" : tagName.substring(1); //$NON-NLS-1$
-		switch (m_tagScope) {
-			case TagSpec.TYPE :
-				return AnnotationTagRegistry.getTypeTag(simpleName);
-			case TagSpec.METHOD :
-				return AnnotationTagRegistry.getMethodTag(simpleName);
-			case TagSpec.FIELD :
-				return AnnotationTagRegistry.getFieldTag(simpleName);
-		}
-		return null;
-	}
-
-	private IJavaCompletionProposal[] attributeCompletionsFor(TagSpec ts, int replaceOffset, int replaceLength, String partialAttributeName, boolean appendEquals) {
-		Iterator i = ts.getAttributes().iterator();
-		List props = new ArrayList();
-		while (i.hasNext()) {
-			TagAttribSpec tas = (TagAttribSpec) i.next();
-			String aname = tas.getAttribName();
-
-			// Don't suggest attributes that have already been specified.
-			if (!m_attSet.contains(aname)) {
-				if (aname.startsWith(partialAttributeName)) {
-					String rtxt = appendEquals ? aname + '=' : aname;
-					AnnotationTagProposal prop = new AnnotationTagProposal(rtxt, replaceOffset, replaceLength, null, aname, 1);
-					prop.setHelpText(lookupAttHelp(tas));
-					props.add(prop);
-				}
-			}
-		}
-		if (props.isEmpty()) {
-			return null;
-		}
-		return (IJavaCompletionProposal[]) props.toArray(new IJavaCompletionProposal[props.size()]);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see com.ibm.ws.rd.annotations.TagParseEventHandler#annotationTag(com.ibm.ws.rd.annotations.Token)
-	 */
-	public void annotationTag(Token tag) {
-		m_tagName = tag;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see com.ibm.ws.rd.annotations.TagParseEventHandler#endOfTag(int)
-	 */
-	public void endOfTag(int pos) {
-		// Do nothing
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see com.ibm.ws.rd.annotations.TagParseEventHandler#attribute(com.ibm.ws.rd.annotations.Token,
-	 *      int, com.ibm.ws.rd.annotations.Token)
-	 */
-	public void attribute(Token name, int equalsPosition, Token value) {
-		m_attributes.add(new Attribute(name, equalsPosition, value));
-		m_attSet.add(name.getText());
-	}
-
-	private String getReplacementForTag(TagSpec ts, int beginIndex) {
-		StringBuffer bud = new StringBuffer(32);
-
-		bud.append('@');
-		bud.append(ts.getTagName());
-
-		String prefix = getArrayPrefixForMultipleAttribs(beginIndex);
-		List attributes = ts.getAttributes();
-
-		for (int i = 0; i < attributes.size(); i++) {
-			TagAttribSpec tas = (TagAttribSpec) attributes.get(i);
-
-			if (tas.isRequired()) {
-				bud.append(prefix);
-				bud.append(tas.getAttribName());
-				bud.append('=');
-			}
-		}
-		return bud.toString();
-	}
-
-	private String getArrayPrefixForMultipleAttribs(int beginIndex) {
-		String result = null;
-		String source = null;
-		// Get source from compilation unit
-		try {
-			source = m_icu.getSource();
-			if (source == null || beginIndex < 0)
-				return result;
-			// trim off everything after our begin index
-			source = source.substring(0, beginIndex + 1);
-			int newLineIndex = source.lastIndexOf('\n');
-			//if we are on first line...
-			if (newLineIndex == -1)
-				newLineIndex = 0;
-			// Get the current line
-			String currentLine = source.substring(newLineIndex, beginIndex + 1);
-			// Currently we have to have the '@' sign to show our menu
-			int annotationIndex = currentLine.lastIndexOf('@');
-			result = currentLine.substring(0, annotationIndex);
-			result = result + "  "; //$NON-NLS-1$
-		} catch (Exception e) {
-			// Do nothing
-		}
-
-		return result;
-	}
-
-	private IJavaCompletionProposal[] getTagCompletionsFor(String partialTagName, AnnotationArea area, int selectLength) {
-		List found = new ArrayList();
-
-		for (int i = 0; i < m_tags.size(); i++) {
-			TagSpec ts = (TagSpec) m_tags.get(i);
-			String tname = ts.getTagName();
-
-			if (ts.getScope() == m_tagScope && tname.startsWith(partialTagName)) {
-				String rtxt = getReplacementForTag(ts, area.beginOffset);
-				String labl = '@' + tname;
-				AnnotationTagProposal prop = new AnnotationTagProposal(rtxt, area.beginOffset, Math.max(selectLength, rtxt.length()), null, labl, 1);
-				prop.setHelpText(lookupTagHelp(ts));
-				found.add(prop);
-			}
-		}
-
-		if (!found.isEmpty()) {
-			return (IJavaCompletionProposal[]) found.toArray(new IJavaCompletionProposal[found.size()]);
-		}
-		return null;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jdt.ui.text.java.IJavadocCompletionProcessor#getErrorMessage()
-	 */
-	public String getErrorMessage() {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	private static boolean isWS1(char c) {
-		return c == ' ' || c == '\t' || c == '*' || c == '\r' || c == '\n';
-	}
-
-	private String getTagSoFarIfNotCompleted(int startingAt, int cursorAt) throws BadLocationException {
-		if (m_doc.getChar(startingAt) != '@') {
-			return null;
-		}
-
-		int firstChar = startingAt + 1;
-
-		if (firstChar == cursorAt) {
-			return ""; //$NON-NLS-1$
-		}
-
-		for (int i = firstChar; i < cursorAt; i++) {
-			char c = m_doc.getChar(i);
-
-			if (isWS1(c)) {
-				return null;
-			}
-		}
-
-		return m_doc.get(firstChar, cursorAt - firstChar);
-	}
-
-	/**
-	 * Calculates the the area of the annotation we're trying to complete. Also initializes
-	 * m_tagScope.
-	 * 
-	 * @param fromOffset
-	 * @return
-	 * @throws JavaModelException
-	 */
-	private AnnotationArea getAnnotationArea(int fromOffset) throws JavaModelException {
-		// First, roughly calculate the end of the comment.
-		IJavaElement el = m_icu.getElementAt(fromOffset);
-		int absmax, absmin;
-		if (el == null)
-			return null;
-		int ty = el.getElementType();
-
-		switch (ty) {
-			case IJavaElement.FIELD :
-				IField f = (IField) el;
-				absmax = f.getNameRange().getOffset();
-				absmin = f.getSourceRange().getOffset();
-				m_tagScope = TagSpec.FIELD;
-				break;
-
-			case IJavaElement.TYPE :
-				IType t = (IType) el;
-				absmax = t.getNameRange().getOffset();
-				absmin = t.getSourceRange().getOffset();
-				m_tagScope = TagSpec.TYPE;
-				break;
-
-			case IJavaElement.METHOD :
-				IMethod m = (IMethod) el;
-				absmax = m.getNameRange().getOffset();
-				absmin = m.getSourceRange().getOffset();
-				m_tagScope = TagSpec.METHOD;
-				break;
-
-			default :
-				m_tagScope = -1;
-				return null;
-		}
-
-		// Make sure we're not after the name for the member.
-		if (absmax < fromOffset) {
-			return null;
-		}
-
-		int min = 0, max = 0;
-		try {
-			// Search backwards for the starting '@'.
-			boolean found = false;
-			for (min = fromOffset; min >= absmin; min--) {
-				if (m_doc.getChar(min) == '@') {
-					found = true;
-					break;
-				}
-			}
-			if (!found) {
-				return null;
-			}
-
-			// Search forwards for the next '@', or the end of the comment.
-			for (max = fromOffset + 1; max < absmax; max++) {
-				if (m_doc.getChar(max) == '@') {
-					break;
-				}
-			}
-		} catch (BadLocationException e) {
-			return null;
-		}
-
-		return new AnnotationArea(el, min, Math.min(absmax, max));
-	}
-
-	private String lookupTagHelp(TagSpec ts) {
-		if (ts != null)
-			try {
-				return ts.lookupTagHelp();
-			} catch (MissingResourceException e) {
-				// Do nothing, return null
-			}
-		return null;
-	}
-
-	private String lookupAttHelp(TagAttribSpec tas) {
-		if (tas != null)
-			try {
-				return tas.lookupTagHelp();
-			} catch (MissingResourceException e) {
-				// Do nothing, return null
-			}
-		return null;
-	}
-
-	/**
-	 * A range that goes from the beginning position up to, but not including, the end position.
-	 */
-	private static class AnnotationArea {
-		/**
-		 * Document offset of the beginning of the javadoc annotation.
-		 */
-		int beginOffset;
-
-		/**
-		 * Document offset of the end of the area that could contain an annotation.
-		 */
-		int endOffset;
-		/**
-		 * The Java element that this annotation is assigned.
-		 * 
-		 * @param beg
-		 * @param end
-		 */
-		IJavaElement javaElement;
-
-		public AnnotationArea(IJavaElement javaElement, int beg, int end) {
-			this.javaElement = javaElement;
-			beginOffset = beg;
-			endOffset = end;
-		}
-
-		public boolean contains(int offset) {
-			return offset >= beginOffset && offset < endOffset;
-		}
-
-		public int length() {
-			return endOffset - beginOffset;
-		}
-
-		/**
-		 * Returns the cursor position relative to the area. Only valid if
-		 * <code>this.contains( absCursorPos )</code>
-		 * 
-		 * @param absCursorPos
-		 * @return
-		 */
-		public int relativeCursorPos(int absCursorPos) {
-			return absCursorPos - beginOffset;
-		}
-
-		public int relativeToAbs(int relPos) {
-			return beginOffset + relPos;
-		}
-	}
-
-	private static class Attribute {
-		Token name;
-
-		Token value;
-
-		int equalsPos;
-
-		Attribute(Token n, int ep, Token v) {
-			name = n;
-			value = v;
-			equalsPos = ep;
-		}
-
-		public boolean hasAssignment() {
-			return equalsPos != -1;
-		}
-
-		public boolean hasValue() {
-			return value.length() != 0;
-		}
-
-		public boolean contains(int srcPos) {
-			return srcPos >= minExtent() && srcPos <= maxExtent();
-		}
-
-		public int minExtent() {
-			return name.getBeginning();
-		}
-
-		public int maxExtent() {
-			if (hasAssignment()) {
-				if (hasValue())
-					return value.getEnd();
-				return equalsPos;
-			}
-			return name.getEnd();
-		}
-
-		public boolean immediatelyPrecedes(int pos) {
-			return maxExtent() + 1 == pos;
-		}
-	}
-
-}
-\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.common.annotations.ui/src/org/eclipse/jst/common/internal/annotations/ui/AnnotationTagProposal.java b/plugins/org.eclipse.jst.common.annotations.ui/src/org/eclipse/jst/common/internal/annotations/ui/AnnotationTagProposal.java
deleted file mode 100644
index 0ea57731c..000000000
--- a/