Fix non-code references to "internal.provisional" package names.

19 files changed, 44 insertions, 44 deletions

diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/Entity.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/Entity.java
index 17d31681b..f1a0c1444 100644
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/Entity.java
+++ b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/Entity.java
@@ -49,7 +49,7 @@ public interface Entity extends EObject {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Child Entities</em>' containment reference list.
 	 * @see org.eclipse.jst.jsf.common.metadata.MetadataPackage#getEntity_ChildEntities()
-	 * @model type="org.eclipse.jst.jsf.common.metadata.internal.provisional.Entity" containment="true"
+	 * @model type="org.eclipse.jst.jsf.common.metadata.Entity" containment="true"
 	 *        extendedMetaData="kind='element' name='entity'"
 	 * @generated
 	 */
@@ -66,7 +66,7 @@ public interface Entity extends EObject {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Traits</em>' containment reference list.
 	 * @see org.eclipse.jst.jsf.common.metadata.MetadataPackage#getEntity_Traits()
-	 * @model type="org.eclipse.jst.jsf.common.metadata.internal.provisional.Trait" containment="true"
+	 * @model type="org.eclipse.jst.jsf.common.metadata.Trait" containment="true"
 	 *        extendedMetaData="kind='element' name='trait'"
 	 * @generated
 	 */
@@ -135,7 +135,7 @@ public interface Entity extends EObject {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Include Groups</em>' reference list.
 	 * @see org.eclipse.jst.jsf.common.metadata.MetadataPackage#getEntity_IncludeGroups()
-	 * @model type="org.eclipse.jst.jsf.common.metadata.internal.provisional.IncludeEntityGroup"
+	 * @model type="org.eclipse.jst.jsf.common.metadata.IncludeEntityGroup"
 	 *        extendedMetaData="kind='element' name='include-entity-group'"
 	 * @generated
 	 */
@@ -144,7 +144,7 @@ public interface Entity extends EObject {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @model visitorDataType="org.eclipse.jst.jsf.common.metadata.internal.provisional.IEntityVisitor"
+	 * @model visitorDataType="org.eclipse.jst.jsf.common.metadata.query.IEntityVisitor"
 	 * @generated
 	 */
 	void accept(IEntityVisitor visitor);
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/MetadataPackage.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/MetadataPackage.java
index 20959b6d9..48fea9654 100644
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/MetadataPackage.java
+++ b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/MetadataPackage.java
@@ -610,7 +610,7 @@ public interface MetadataPackage extends EPackage {
 	 * <!-- end-user-doc -->
 	 * @return the meta object for data type '<em>ITrait Visitor</em>'.
 	 * @see org.eclipse.jst.jsf.common.metadata.query.ITraitVisitor
-	 * @model instanceClass="org.eclipse.jst.jsf.common.metadata.internal.provisional.query.ITraitVisitor" serializable="false"
+	 * @model instanceClass="org.eclipse.jst.jsf.common.metadata.query.ITraitVisitor" serializable="false"
 	 * @generated
 	 */
 	EDataType getITraitVisitor();
@@ -621,7 +621,7 @@ public interface MetadataPackage extends EPackage {
 	 * <!-- end-user-doc -->
 	 * @return the meta object for data type '<em>IEntity Visitor</em>'.
 	 * @see org.eclipse.jst.jsf.common.metadata.query.IEntityVisitor
-	 * @model instanceClass="org.eclipse.jst.jsf.common.metadata.internal.provisional.query.IEntityVisitor" serializable="false"
+	 * @model instanceClass="org.eclipse.jst.jsf.common.metadata.query.IEntityVisitor" serializable="false"
 	 * @generated
 	 */
 	EDataType getIEntityVisitor();
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/Model.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/Model.java
index 59941e077..4801be1b9 100644
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/Model.java
+++ b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/Model.java
@@ -48,7 +48,7 @@ public interface Model extends Entity {
 	 * @return the value of the '<em>Source Model Provider</em>' attribute.
 	 * @see #setSourceModelProvider(IMetaDataSourceModelProvider)
 	 * @see org.eclipse.jst.jsf.common.metadata.MetadataPackage#getModel_SourceModelProvider()
-	 * @model unique="false" dataType="org.eclipse.jst.jsf.common.metadata.internal.provisional.IMetaDataSourceModelProvider" transient="true" volatile="true"
+	 * @model unique="false" dataType="org.eclipse.jst.jsf.common.metadata.IMetaDataSourceModelProvider" transient="true" volatile="true"
 	 * @generated
 	 */
 	IMetaDataSourceModelProvider getSourceModelProvider();
@@ -74,7 +74,7 @@ public interface Model extends Entity {
 	 * @return the value of the '<em>Current Model Context</em>' attribute.
 	 * @see #setCurrentModelContext(ModelKeyDescriptor)
 	 * @see org.eclipse.jst.jsf.common.metadata.MetadataPackage#getModel_CurrentModelContext()
-	 * @model dataType="org.eclipse.jst.jsf.common.metadata.internal.provisional.ModelContext" transient="true" volatile="true"
+	 * @model dataType="org.eclipse.jst.jsf.common.metadata.ModelContext" transient="true" volatile="true"
 	 * @generated
 	 */
 	ModelKeyDescriptor getCurrentModelContext();
@@ -100,7 +100,7 @@ public interface Model extends Entity {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Entity Groups</em>' reference list.
 	 * @see org.eclipse.jst.jsf.common.metadata.MetadataPackage#getModel_EntityGroups()
-	 * @model type="org.eclipse.jst.jsf.common.metadata.internal.provisional.EntityGroup"
+	 * @model type="org.eclipse.jst.jsf.common.metadata.EntityGroup"
 	 *        extendedMetaData="kind='element' name='entityGroup'"
 	 * @generated
 	 */
@@ -117,7 +117,7 @@ public interface Model extends Entity {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @model visitorDataType="org.eclipse.jst.jsf.common.metadata.internal.provisional.IEntityVisitor"
+	 * @model visitorDataType="org.eclipse.jst.jsf.common.metadata.IEntityVisitor"
 	 * @generated
 	 */
 	void accept(IEntityVisitor visitor);
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/Trait.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/Trait.java
index 6c905741d..e698bfe35 100644
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/Trait.java
+++ b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/Trait.java
@@ -100,7 +100,7 @@ public interface Trait extends EObject {
 	 * @return the value of the '<em>Source Model Provider</em>' attribute.
 	 * @see #setSourceModelProvider(IMetaDataSourceModelProvider)
 	 * @see org.eclipse.jst.jsf.common.metadata.MetadataPackage#getTrait_SourceModelProvider()
-	 * @model dataType="org.eclipse.jst.jsf.common.metadata.internal.provisional.IMetaDataSourceModelProvider"
+	 * @model dataType="org.eclipse.jst.jsf.common.metadata.IMetaDataSourceModelProvider"
 	 * @generated
 	 */
 	IMetaDataSourceModelProvider getSourceModelProvider();
@@ -118,7 +118,7 @@ public interface Trait extends EObject {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @model visitorDataType="org.eclipse.jst.jsf.common.metadata.internal.provisional.ITraitVisitor"
+	 * @model visitorDataType="org.eclipse.jst.jsf.common.metadata.query.ITraitVisitor"
 	 *        annotation="http://www.eclipse.org/emf/2002/GenModel body='visitor.visit(this);'"
 	 * @generated
 	 */
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/MetaDataModelContextImpl.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/MetaDataModelContextImpl.java
index a487e16b9..8ede738c1 100644
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/MetaDataModelContextImpl.java
+++ b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/MetaDataModelContextImpl.java
@@ -34,21 +34,21 @@ public class MetaDataModelContextImpl implements IMetaDataModelContext, Cloneabl
 		this.uri = uri;
 	}
 	/* (non-Javadoc)
-	 * @see org.eclipse.jst.jsf.common.metadata.internal.provisional.query.IMetaDataModelContext#getDomain()
+	 * @see org.eclipse.jst.jsf.common.metadata.query.IMetaDataModelContext#getDomain()
 	 */
 	public String getDomain() {
 		return domain;
 	}
 
 	/* (non-Javadoc)
-	 * @see org.eclipse.jst.jsf.common.metadata.internal.provisional.query.IMetaDataModelContext#getProject()
+	 * @see org.eclipse.jst.jsf.common.metadata.query.IMetaDataModelContext#getProject()
 	 */
 	public IProject getProject() {		
 		return project;
 	}
 
 	/* (non-Javadoc)
-	 * @see org.eclipse.jst.jsf.common.metadata.internal.provisional.query.IMetaDataModelContext#getURI()
+	 * @see org.eclipse.jst.jsf.common.metadata.query.IMetaDataModelContext#getURI()
 	 */
 	public String getURI() {
 		return uri;
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/MetaDataModelMergeAssistantImpl.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/MetaDataModelMergeAssistantImpl.java
index de5cd5b8c..c9fa89e2b 100644
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/MetaDataModelMergeAssistantImpl.java
+++ b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/MetaDataModelMergeAssistantImpl.java
@@ -71,7 +71,7 @@ public class MetaDataModelMergeAssistantImpl implements
 
 
 	/* (non-Javadoc)
-	 * @see org.eclipse.jst.jsf.common.metadata.internal.IMetaDataModelMergeAssistant#addEntityGroup(org.eclipse.jst.jsf.common.metadata.internal.provisional.EntityGroup)
+	 * @see org.eclipse.jst.jsf.common.metadata.internal.IMetaDataModelMergeAssistant#addEntityGroup(org.eclipse.jst.jsf.common.metadata.EntityGroup)
 	 */
 	public void addEntityGroup(EntityGroup entityGroup) {
 		Model model = (Model)getMergedModel().getRoot();
@@ -81,7 +81,7 @@ public class MetaDataModelMergeAssistantImpl implements
 	}
 
 	/* (non-Javadoc)
-	 * @see org.eclipse.jst.jsf.common.metadata.internal.IMetaDataModelMergeAssistant#addEntity(org.eclipse.jst.jsf.common.metadata.internal.provisional.Entity)
+	 * @see org.eclipse.jst.jsf.common.metadata.internal.IMetaDataModelMergeAssistant#addEntity(org.eclipse.jst.jsf.common.metadata.Entity)
 	 */
 	public boolean addEntity(final Entity entity) {
 		Entity mmEntity = getMergedEntity(entity);
@@ -172,7 +172,7 @@ public class MetaDataModelMergeAssistantImpl implements
 	}
 
 	/* (non-Javadoc)
-	 * @see org.eclipse.jst.jsf.common.metadata.internal.IMetaDataModelMergeAssistant#addTrait(org.eclipse.jst.jsf.common.metadata.internal.provisional.Entity, org.eclipse.jst.jsf.common.metadata.internal.provisional.Trait)
+	 * @see org.eclipse.jst.jsf.common.metadata.internal.IMetaDataModelMergeAssistant#addTrait(org.eclipse.jst.jsf.common.metadata.Entity, org.eclipse.jst.jsf.common.metadata.Trait)
 	 */
 	public boolean addTrait(Entity entity, Trait trait) {
 		Entity returnedEntity = getMergedEntity(entity);
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/PluginRelativeStandardMetaDataSourceFileLocator.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/PluginRelativeStandardMetaDataSourceFileLocator.java
index 67facf152..b43e92f76 100644
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/PluginRelativeStandardMetaDataSourceFileLocator.java
+++ b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/PluginRelativeStandardMetaDataSourceFileLocator.java
@@ -53,7 +53,7 @@ public class PluginRelativeStandardMetaDataSourceFileLocator extends StandardMet
 	 * This implementation assumes that the basename of the bundle is the same 
 	 * as the source file name and in the same directory.
 	 * 
-	 * @see org.eclipse.jst.jsf.contentmodel.annotation.internal.provisional.ICMAnnotationSourceFileLocator#getResourceBundle()
+	 * @see org.eclipse.jst.jsf.contentmodel.annotation.ICMAnnotationSourceFileLocator#getResourceBundle()
 	 */
 	public ResourceBundle getResourceBundle() throws IOException, MalformedURLException {
 		if (resourceBundle == null){
@@ -95,7 +95,7 @@ public class PluginRelativeStandardMetaDataSourceFileLocator extends StandardMet
 //	 * This implementation assumes that the basename of the bundle is the same 
 //	 * as the source file name and in the same directory.
 //	 * 
-//	 * @see org.eclipse.jst.jsf.contentmodel.annotation.internal.provisional.ICMAnnotationSourceFileLocator#getResourceBundle()
+//	 * @see org.eclipse.jst.jsf.contentmodel.annotation.ICMAnnotationSourceFileLocator#getResourceBundle()
 //	 */
 //	public ResourceBundle getResourceBundle() throws IOException, MalformedURLException {
 //		URL bundleURL = getAnnotationPropertiesFileBasenameURL();
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/query/AbstractResultSet.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/query/AbstractResultSet.java
index db39d8e9f..8271497ce 100644
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/query/AbstractResultSet.java
+++ b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/query/AbstractResultSet.java
@@ -29,7 +29,7 @@ public abstract class AbstractResultSet/*<T>*/ implements IResultSet/*<T>*/ {
 	}
 	
 	/* (non-Javadoc)
-	 * @see org.eclipse.jst.jsf.common.metadata.internal.provisional.query.IResultSet#close()
+	 * @see org.eclipse.jst.jsf.common.metadata.query.IResultSet#close()
 	 */
 	public void close() {
 		//nothing to do really
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/query/SimpleMetaDataQueryVisitorImpl.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/query/SimpleMetaDataQueryVisitorImpl.java
index 04364cfe2..43a2d0412 100644
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/query/SimpleMetaDataQueryVisitorImpl.java
+++ b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/query/SimpleMetaDataQueryVisitorImpl.java
@@ -53,7 +53,7 @@ public class SimpleMetaDataQueryVisitorImpl implements IEntityQueryVisitor, ITra
 	}
 	
 	/* (non-Javadoc)
-	 * @see org.eclipse.jst.jsf.common.metadata.internal.provisional.query.ITraitQueryVisitor#findTraits(org.eclipse.jst.jsf.common.metadata.internal.provisional.Entity, java.lang.String)
+	 * @see org.eclipse.jst.jsf.common.metadata.query.ITraitQueryVisitor#findTraits(org.eclipse.jst.jsf.common.metadata.Entity, java.lang.String)
 	 */
 	public IResultSet/*<Trait>*/ findTraits(final Entity entity, final String traitQuery){
 		
@@ -71,7 +71,7 @@ public class SimpleMetaDataQueryVisitorImpl implements IEntityQueryVisitor, ITra
 	}
 
 	/* (non-Javadoc)
-	 * @see org.eclipse.jst.jsf.common.metadata.internal.provisional.query.ITraitVisitor#visit(org.eclipse.jst.jsf.common.metadata.internal.provisional.Trait)
+	 * @see org.eclipse.jst.jsf.common.metadata.query.ITraitVisitor#visit(org.eclipse.jst.jsf.common.metadata.Trait)
 	 */
 	public void visit(Trait trait) {		
 		if (trait.equals(traitQuery))
@@ -82,7 +82,7 @@ public class SimpleMetaDataQueryVisitorImpl implements IEntityQueryVisitor, ITra
 
 
 	/* (non-Javadoc)
-	 * @see org.eclipse.jst.jsf.common.metadata.internal.provisional.query.IEntityQueryVisitor#findEntities(org.eclipse.jst.jsf.common.metadata.internal.provisional.Entity, java.lang.String)
+	 * @see org.eclipse.jst.jsf.common.metadata.query.IEntityQueryVisitor#findEntities(org.eclipse.jst.jsf.common.metadata.Entity, java.lang.String)
 	 */
 	public IResultSet/*<Entity>*/ findEntities(Entity initialEntityContext,
 			String entityKey) {
@@ -122,7 +122,7 @@ public class SimpleMetaDataQueryVisitorImpl implements IEntityQueryVisitor, ITra
 	}
 	
 	/* (non-Javadoc)
-	 * @see org.eclipse.jst.jsf.common.metadata.internal.provisional.query.IEntityVisitor#visit(org.eclipse.jst.jsf.common.metadata.internal.provisional.Entity)
+	 * @see org.eclipse.jst.jsf.common.metadata.query.IEntityVisitor#visit(org.eclipse.jst.jsf.common.metadata.Entity)
 	 */
 	public void visit(Entity key) {		
 		switch (entityComparator.compareTo(key)){
@@ -136,14 +136,14 @@ public class SimpleMetaDataQueryVisitorImpl implements IEntityQueryVisitor, ITra
 		checkShouldStopVisitingEntities();
 	}
 	/* (non-Javadoc)
-	 * @see org.eclipse.jst.jsf.common.metadata.internal.provisional.query.IEntityVisitor#visitCompleted()
+	 * @see org.eclipse.jst.jsf.common.metadata.query.IEntityVisitor#visitCompleted()
 	 */
 	public void visitCompleted() {
 		entityComparator.popContext();
 	}
 	
 	/* (non-Javadoc)
-	 * @see org.eclipse.jst.jsf.common.metadata.internal.provisional.query.IMetaDataVisitor#stopVisiting()
+	 * @see org.eclipse.jst.jsf.common.metadata.query.IMetaDataVisitor#stopVisiting()
 	 */
 	public boolean stopVisiting() {
 		return _stop;
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/sets/mapping/AbstractObjectInjectiveSetMapping.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/sets/mapping/AbstractObjectInjectiveSetMapping.java
index 6aeac2d08..d09007153 100644
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/sets/mapping/AbstractObjectInjectiveSetMapping.java
+++ b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/sets/mapping/AbstractObjectInjectiveSetMapping.java
@@ -15,7 +15,7 @@ public abstract class AbstractObjectInjectiveSetMapping implements
         ObjectInjectiveSetMapping {
 
     /* (non-Javadoc)
-     * @see org.eclipse.jst.jsf.common.sets.internal.provisional.mapping.ObjectInjectiveSetMapping#mapIterator(org.eclipse.jst.jsf.common.sets.internal.provisional.AxiomaticSet)
+     * @see org.eclipse.jst.jsf.common.sets.mapping.ObjectInjectiveSetMapping#mapIterator(org.eclipse.jst.jsf.common.sets.AxiomaticSet)
      */
     public Iterator mapIterator(final AxiomaticSet set) 
     {
@@ -47,7 +47,7 @@ public abstract class AbstractObjectInjectiveSetMapping implements
     public abstract Object map(Object element);
     
     /* (non-Javadoc)
-     * @see org.eclipse.jst.jsf.common.sets.internal.provisional.mapping.AxiomaticSetMapping#map(org.eclipse.jst.jsf.common.sets.internal.provisional.AxiomaticSet)
+     * @see org.eclipse.jst.jsf.common.sets.mapping.AxiomaticSetMapping#map(org.eclipse.jst.jsf.common.sets.AxiomaticSet)
      */
     public final AxiomaticSet map(AxiomaticSet set) {
        AxiomaticSet resultSet = new ConcreteAxiomaticSet();
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/contentmodel/annotation/internal/CMAnnotationFileParser.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/contentmodel/annotation/internal/CMAnnotationFileParser.java
index 6fe254968..1fa3ec90a 100644
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/contentmodel/annotation/internal/CMAnnotationFileParser.java
+++ b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/contentmodel/annotation/internal/CMAnnotationFileParser.java
@@ -68,7 +68,7 @@ public class CMAnnotationFileParser implements ICMAnnotationFileParser {
 	}
 
 	/* (non-Javadoc)
-	 * @see org.eclipse.jst.jsf.contentmodel.annotation.internal.provisional.ICMAnnotationFileParser#parse(org.eclipse.jst.jsf.contentmodel.annotation.internal.ICMAnnotationAdvisor, org.eclipse.jst.jsf.contentmodel.annotation.internal.provisional.CMAnnotationSourceFileLocator)
+	 * @see org.eclipse.jst.jsf.contentmodel.annotation.ICMAnnotationFileParser#parse(org.eclipse.jst.jsf.contentmodel.annotation.internal.ICMAnnotationAdvisor, org.eclipse.jst.jsf.contentmodel.annotation.CMAnnotationSourceFileLocator)
 	 */
 	public void parse(ICMAnnotationAdvisor advisor, CMAnnotationSourceFileLocator locator)
 			throws Exception {
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/contentmodel/annotation/internal/CMAnnotationFileRegistry.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/contentmodel/annotation/internal/CMAnnotationFileRegistry.java
index 0d73e46a9..50f093e31 100644
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/contentmodel/annotation/internal/CMAnnotationFileRegistry.java
+++ b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/contentmodel/annotation/internal/CMAnnotationFileRegistry.java
@@ -32,7 +32,7 @@ import org.eclipse.osgi.util.NLS;
  * Using the CMAnnotationFileRegistryReader, extenders of <code>org.eclipse.jst.jsf.contentmodel.annotations.annotationFiles</code> are loaded
  * into the annotationFilesMap keyed by uri.   There can be multiple annotationFiles mapped to the same uri.
  * 
- * This registry should only be accessed by clients using the <code>org.eclipse.jst.jsf.contentmodel.annotation.internal.provisional.CMAnnotationHelper</code>.
+ * This registry should only be accessed by clients using the <code>org.eclipse.jst.jsf.contentmodel.annotation.CMAnnotationHelper</code>.
  * Only when the system attempts to access an annotation for a content model, will the file be parsed and cached.
  * 
  * When queried, CMAnnotationPropertyValue objects are returned for each named property found in each annotation file for a particular uri.
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/contentmodel/annotation/internal/CMPluginRelativeSourceFileLocator.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/contentmodel/annotation/internal/CMPluginRelativeSourceFileLocator.java
index bb92d5093..b6f876b1c 100644
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/contentmodel/annotation/internal/CMPluginRelativeSourceFileLocator.java
+++ b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/contentmodel/annotation/internal/CMPluginRelativeSourceFileLocator.java
@@ -51,7 +51,7 @@ public class CMPluginRelativeSourceFileLocator extends CMAnnotationSourceFileLoc
 	 * This implementation assumes that the basename of the bundle is the same 
 	 * as the source file name and in the same directory.
 	 * 
-	 * @see org.eclipse.jst.jsf.contentmodel.annotation.internal.provisional.ICMAnnotationSourceFileLocator#getResourceBundle()
+	 * @see org.eclipse.jst.jsf.contentmodel.annotation.ICMAnnotationSourceFileLocator#getResourceBundle()
 	 */
 	public ResourceBundle getResourceBundle() throws IOException, MalformedURLException {
 		URL bundleURL = getAnnotationPropertiesFileBasenameURL();
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/resolver/structureddocument/internal/impl/DOMContextResolver.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/resolver/structureddocument/internal/impl/DOMContextResolver.java
index e6540a07b..0c6917459 100644
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/resolver/structureddocument/internal/impl/DOMContextResolver.java
+++ b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/resolver/structureddocument/internal/impl/DOMContextResolver.java
@@ -37,7 +37,7 @@ public class DOMContextResolver implements IDOMContextResolver
 	}
 	
 	/* (non-Javadoc)
-	 * @see org.eclipse.jst.jsf.context.resolver.structureddocument.internal.provisional.IDOMContextResolver#getDOMDocument()
+	 * @see org.eclipse.jst.jsf.context.resolver.structureddocument.IDOMContextResolver#getDOMDocument()
 	 */
 	public Document getDOMDocument() 
 	{
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/resolver/structureddocument/internal/impl/TaglibContextResolver.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/resolver/structureddocument/internal/impl/TaglibContextResolver.java
index cb2c18dd7..efd0930cf 100644
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/resolver/structureddocument/internal/impl/TaglibContextResolver.java
+++ b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/resolver/structureddocument/internal/impl/TaglibContextResolver.java
@@ -45,7 +45,7 @@ class TaglibContextResolver implements ITaglibContextResolver
 	}
 	
 	/* (non-Javadoc)
-	 * @see org.eclipse.jst.jsf.context.resolver.structureddocument.internal.provisional.ITaglibContextResolver#getTagPrefixForURI(java.lang.String)
+	 * @see org.eclipse.jst.jsf.context.resolver.structureddocument.ITaglibContextResolver#getTagPrefixForURI(java.lang.String)
 	 */
 	public String getTagPrefixForURI(String uri) 
 	{
@@ -94,7 +94,7 @@ class TaglibContextResolver implements ITaglibContextResolver
     }
     
 	/* (non-Javadoc)
-	 * @see org.eclipse.jst.jsf.context.resolver.structureddocument.internal.provisional.ITaglibContextResolver#getTagURIForNodeName(org.w3c.dom.Node)
+	 * @see org.eclipse.jst.jsf.context.resolver.structureddocument.ITaglibContextResolver#getTagURIForNodeName(org.w3c.dom.Node)
 	 */
 	public String getTagURIForNodeName(final Node node) 
     {
@@ -119,7 +119,7 @@ class TaglibContextResolver implements ITaglibContextResolver
 
 
 	/* (non-Javadoc)
-     * @see org.eclipse.jst.jsf.context.resolver.structureddocument.internal.provisional.ITaglibContextResolver#getTagsByNamespaceURI(java.lang.String, java.lang.String)
+     * @see org.eclipse.jst.jsf.context.resolver.structureddocument.ITaglibContextResolver#getTagsByNamespaceURI(java.lang.String, java.lang.String)
      */
     public NodeList getTagsByNamespaceURI(String uri, String tagName) 
 	{
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/IBeanInstanceSymbol.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/IBeanInstanceSymbol.java
index a0688eceb..34e1956f3 100644
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/IBeanInstanceSymbol.java
+++ b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/IBeanInstanceSymbol.java
@@ -40,7 +40,7 @@ public interface IBeanInstanceSymbol extends IInstanceSymbol, IDescribedInDetail
 	 * <!-- end-user-doc -->
      * @return the value of the '<em>Properties</em>' reference list.
      * @see org.eclipse.jst.jsf.context.symbol.SymbolPackage#getIBeanInstanceSymbol_Properties()
-     * @model type="org.eclipse.jst.jsf.context.symbol.internal.provisional.IBeanPropertySymbol" changeable="false" volatile="true"
+     * @model type="org.eclipse.jst.jsf.context.symbol.IBeanPropertySymbol" changeable="false" volatile="true"
      * @generated
      */
 	EList getProperties();
@@ -56,7 +56,7 @@ public interface IBeanInstanceSymbol extends IInstanceSymbol, IDescribedInDetail
 	 * <!-- end-user-doc -->
      * @return the value of the '<em>Methods</em>' reference list.
      * @see org.eclipse.jst.jsf.context.symbol.SymbolPackage#getIBeanInstanceSymbol_Methods()
-     * @model type="org.eclipse.jst.jsf.context.symbol.internal.provisional.IBeanMethodSymbol" changeable="false" volatile="true"
+     * @model type="org.eclipse.jst.jsf.context.symbol.IBeanMethodSymbol" changeable="false" volatile="true"
      * @generated
      */
 	EList getMethods();
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/IJavaTypeDescriptor2.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/IJavaTypeDescriptor2.java
index f681a1250..60547c7ed 100644
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/IJavaTypeDescriptor2.java
+++ b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/IJavaTypeDescriptor2.java
@@ -53,7 +53,7 @@ public interface IJavaTypeDescriptor2 extends ITypeDescriptor {
      * @return the value of the '<em>Type</em>' attribute.
      * @see #setType(IType)
      * @see org.eclipse.jst.jsf.context.symbol.SymbolPackage#getIJavaTypeDescriptor2_Type()
-     * @model dataType="org.eclipse.jst.jsf.context.symbol.internal.provisional.IType"
+     * @model dataType="org.eclipse.jst.jsf.context.symbol.IType"
      * @generated
      */
 	IType getType();
@@ -79,7 +79,7 @@ public interface IJavaTypeDescriptor2 extends ITypeDescriptor {
 	 * <!-- end-user-doc -->
      * @return the value of the '<em>Bean Properties</em>' reference list.
      * @see org.eclipse.jst.jsf.context.symbol.SymbolPackage#getIJavaTypeDescriptor2_BeanProperties()
-     * @model type="org.eclipse.jst.jsf.context.symbol.internal.provisional.IBeanPropertySymbol" volatile="true"
+     * @model type="org.eclipse.jst.jsf.context.symbol.IBeanPropertySymbol" volatile="true"
      * @generated
      */
 	EList getBeanProperties();
@@ -95,7 +95,7 @@ public interface IJavaTypeDescriptor2 extends ITypeDescriptor {
 	 * <!-- end-user-doc -->
      * @return the value of the '<em>Bean Methods</em>' reference list.
      * @see org.eclipse.jst.jsf.context.symbol.SymbolPackage#getIJavaTypeDescriptor2_BeanMethods()
-     * @model type="org.eclipse.jst.jsf.context.symbol.internal.provisional.IBeanPropertySymbol" volatile="true"
+     * @model type="org.eclipse.jst.jsf.context.symbol.IBeanPropertySymbol" volatile="true"
      * @generated
      */
 	EList getBeanMethods();
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/ITypeDescriptor.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/ITypeDescriptor.java
index 116cb95bc..d93443983 100644
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/ITypeDescriptor.java
+++ b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/ITypeDescriptor.java
@@ -41,7 +41,7 @@ public interface ITypeDescriptor extends EObject {
      * <!-- end-user-doc -->
      * @return the value of the '<em>Properties</em>' reference list.
      * @see org.eclipse.jst.jsf.context.symbol.SymbolPackage#getITypeDescriptor_Properties()
-     * @model type="org.eclipse.jst.jsf.context.symbol.internal.provisional.IPropertySymbol" volatile="true"
+     * @model type="org.eclipse.jst.jsf.context.symbol.IPropertySymbol" volatile="true"
      * @generated
      */
     EList getProperties();
@@ -131,7 +131,7 @@ public interface ITypeDescriptor extends EObject {
      * <!-- end-user-doc -->
      * @return the value of the '<em>Methods</em>' reference list.
      * @see org.eclipse.jst.jsf.context.symbol.SymbolPackage#getITypeDescriptor_Methods()
-     * @model type="org.eclipse.jst.jsf.context.symbol.internal.provisional.IMethodSymbol" volatile="true"
+     * @model type="org.eclipse.jst.jsf.context.symbol.IMethodSymbol" volatile="true"
      * @generated
      */
     EList getMethods();
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/source/AbstractSymbolSourceProviderFactory.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/source/AbstractSymbolSourceProviderFactory.java
index 3d7a6ed93..c83c21373 100644
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/source/AbstractSymbolSourceProviderFactory.java
+++ b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/source/AbstractSymbolSourceProviderFactory.java
@@ -35,7 +35,7 @@ public abstract class AbstractSymbolSourceProviderFactory implements
     }
     
     /* (non-Javadoc)
-     * @see org.eclipse.jst.jsf.context.symbol.internal.provisional.source.ISymbolSourceProviderFactory#createInstance(org.eclipse.core.resources.IProject)
+     * @see org.eclipse.jst.jsf.context.symbol.source.ISymbolSourceProviderFactory#createInstance(org.eclipse.core.resources.IProject)
      */
     public final ISymbolSourceProvider createInstance(IProject project) 
     {