wtp.jsf --> jst.jsf refactoring
diff --git a/jsf/tests/org.eclipse.jst.jsf.metadata.tests/plugin.xml b/jsf/tests/org.eclipse.jst.jsf.metadata.tests/plugin.xml
index b96788b..c2cb584 100644
--- a/jsf/tests/org.eclipse.jst.jsf.metadata.tests/plugin.xml
+++ b/jsf/tests/org.eclipse.jst.jsf.metadata.tests/plugin.xml
@@ -54,7 +54,7 @@
             class="org.eclipse.jst.jsf.metadata.tests.metadataprocessing.MetaDataEnabledBarkAdapter"
             typeid="org.eclipse.jst.jsf.metadata.tests.MyBooleanType"/>
       <MetaDataEnabledFeature
-            class="org.eclipse.wtp.jsf.core.tests.NoImplPossibleVals"
+            class="org.eclipse.jst.jsf.core.tests.NoImplPossibleVals"
             typeid="org.eclipse.jst.jsf.metadata.tests.NoImplType"/>
    </extension>
 </plugin>
diff --git a/jsf/tests/org.eclipse.jst.jsf.metadata.tests/src/com/foobar/DifferentParser.java b/jsf/tests/org.eclipse.jst.jsf.metadata.tests/src/com/foobar/DifferentParser.java
index 053b761..03dad44 100644
--- a/jsf/tests/org.eclipse.jst.jsf.metadata.tests/src/com/foobar/DifferentParser.java
+++ b/jsf/tests/org.eclipse.jst.jsf.metadata.tests/src/com/foobar/DifferentParser.java
@@ -2,7 +2,7 @@
 
 import junit.framework.Assert;
 
-import org.eclipse.wtp.jsf.contentmodel.annotation.internal.CMAnnotationFileParser;
+import org.eclipse.jst.jsf.contentmodel.annotation.internal.CMAnnotationFileParser;
 
 public class DifferentParser extends CMAnnotationFileParser {
 	public DifferentParser(){
diff --git a/jsf/tests/org.eclipse.jst.jsf.metadata.tests/src/org/eclipse/jst/jsf/metadata/tests/annotations/AnnotationHelperTestCases.java b/jsf/tests/org.eclipse.jst.jsf.metadata.tests/src/org/eclipse/jst/jsf/metadata/tests/annotations/AnnotationHelperTestCases.java
index d27741f..5f793ae 100644
--- a/jsf/tests/org.eclipse.jst.jsf.metadata.tests/src/org/eclipse/jst/jsf/metadata/tests/annotations/AnnotationHelperTestCases.java
+++ b/jsf/tests/org.eclipse.jst.jsf.metadata.tests/src/org/eclipse/jst/jsf/metadata/tests/annotations/AnnotationHelperTestCases.java
@@ -7,8 +7,8 @@
 import junit.framework.TestCase;
 
 import org.eclipse.core.runtime.Platform;
-import org.eclipse.wtp.jsf.contentmodel.annotation.internal.provisional.CMAnnotationHelper;
-import org.eclipse.wtp.jsf.contentmodel.annotation.internal.provisional.CMAnnotationPropertyValue;
+import org.eclipse.jst.jsf.contentmodel.annotation.internal.provisional.CMAnnotationHelper;
+import org.eclipse.jst.jsf.contentmodel.annotation.internal.provisional.CMAnnotationPropertyValue;
 
 /**
  * Test all methods in CMAnnotationHelper
diff --git a/jsf/tests/org.eclipse.jst.jsf.metadata.tests/src/org/eclipse/jst/jsf/metadata/tests/annotations/AnnotationMapTestCases.java b/jsf/tests/org.eclipse.jst.jsf.metadata.tests/src/org/eclipse/jst/jsf/metadata/tests/annotations/AnnotationMapTestCases.java
index 695923e..9131658 100644
--- a/jsf/tests/org.eclipse.jst.jsf.metadata.tests/src/org/eclipse/jst/jsf/metadata/tests/annotations/AnnotationMapTestCases.java
+++ b/jsf/tests/org.eclipse.jst.jsf.metadata.tests/src/org/eclipse/jst/jsf/metadata/tests/annotations/AnnotationMapTestCases.java
@@ -6,9 +6,9 @@
 import junit.framework.TestCase;
 
 import org.eclipse.core.runtime.Platform;
-import org.eclipse.wtp.jsf.contentmodel.annotation.internal.CMAnnotationFileRegistry;
-import org.eclipse.wtp.jsf.contentmodel.annotation.internal.CMAnnotationMap;
-import org.eclipse.wtp.jsf.contentmodel.annotation.internal.provisional.CMAnnotationHelper;
+import org.eclipse.jst.jsf.contentmodel.annotation.internal.CMAnnotationFileRegistry;
+import org.eclipse.jst.jsf.contentmodel.annotation.internal.CMAnnotationMap;
+import org.eclipse.jst.jsf.contentmodel.annotation.internal.provisional.CMAnnotationHelper;
 
 /**
  * Test functions in the CMAnnotationMap.  
diff --git a/jsf/tests/org.eclipse.jst.jsf.metadata.tests/src/org/eclipse/jst/jsf/metadata/tests/annotations/CaseInsensitiveAnnotationsTestCases.java b/jsf/tests/org.eclipse.jst.jsf.metadata.tests/src/org/eclipse/jst/jsf/metadata/tests/annotations/CaseInsensitiveAnnotationsTestCases.java
index 9d5a37b..36251ea 100644
--- a/jsf/tests/org.eclipse.jst.jsf.metadata.tests/src/org/eclipse/jst/jsf/metadata/tests/annotations/CaseInsensitiveAnnotationsTestCases.java
+++ b/jsf/tests/org.eclipse.jst.jsf.metadata.tests/src/org/eclipse/jst/jsf/metadata/tests/annotations/CaseInsensitiveAnnotationsTestCases.java
@@ -5,8 +5,8 @@
 import junit.framework.Assert;
 import junit.framework.TestCase;
 
-import org.eclipse.wtp.jsf.contentmodel.annotation.internal.provisional.CMAnnotationHelper;
-import org.eclipse.wtp.jsf.contentmodel.annotation.internal.provisional.CMAnnotationPropertyValue;
+import org.eclipse.jst.jsf.contentmodel.annotation.internal.provisional.CMAnnotationHelper;
+import org.eclipse.jst.jsf.contentmodel.annotation.internal.provisional.CMAnnotationPropertyValue;
 /**
  * Ensure case insensitive meta-data can be located correctly.
  * Uses /testfiles/metadata/CaseInsensitive.xml
diff --git a/jsf/tests/org.eclipse.jst.jsf.metadata.tests/src/org/eclipse/jst/jsf/metadata/tests/annotations/DuplicateAnnotationsTestCases.java b/jsf/tests/org.eclipse.jst.jsf.metadata.tests/src/org/eclipse/jst/jsf/metadata/tests/annotations/DuplicateAnnotationsTestCases.java
index fb26e81..090b726 100644
--- a/jsf/tests/org.eclipse.jst.jsf.metadata.tests/src/org/eclipse/jst/jsf/metadata/tests/annotations/DuplicateAnnotationsTestCases.java
+++ b/jsf/tests/org.eclipse.jst.jsf.metadata.tests/src/org/eclipse/jst/jsf/metadata/tests/annotations/DuplicateAnnotationsTestCases.java
@@ -5,8 +5,8 @@
 import junit.framework.Assert;
 import junit.framework.TestCase;
 
-import org.eclipse.wtp.jsf.contentmodel.annotation.internal.provisional.CMAnnotationHelper;
-import org.eclipse.wtp.jsf.contentmodel.annotation.internal.provisional.CMAnnotationPropertyValue;
+import org.eclipse.jst.jsf.contentmodel.annotation.internal.provisional.CMAnnotationHelper;
+import org.eclipse.jst.jsf.contentmodel.annotation.internal.provisional.CMAnnotationPropertyValue;
 
 /**
  * Make sure that multiple annotations are being dealt with correctly.
diff --git a/jsf/tests/org.eclipse.jst.jsf.metadata.tests/src/org/eclipse/jst/jsf/metadata/tests/annotations/NegativeAnnotationFileTestCases.java b/jsf/tests/org.eclipse.jst.jsf.metadata.tests/src/org/eclipse/jst/jsf/metadata/tests/annotations/NegativeAnnotationFileTestCases.java
index 5437eda..ef1ac78 100644
--- a/jsf/tests/org.eclipse.jst.jsf.metadata.tests/src/org/eclipse/jst/jsf/metadata/tests/annotations/NegativeAnnotationFileTestCases.java
+++ b/jsf/tests/org.eclipse.jst.jsf.metadata.tests/src/org/eclipse/jst/jsf/metadata/tests/annotations/NegativeAnnotationFileTestCases.java
@@ -3,7 +3,7 @@
 import junit.framework.Assert;
 import junit.framework.TestCase;
 
-import org.eclipse.wtp.jsf.contentmodel.annotation.internal.provisional.CMAnnotationHelper;
+import org.eclipse.jst.jsf.contentmodel.annotation.internal.provisional.CMAnnotationHelper;
 
 /**
  * Intended to test system level setup problems
diff --git a/jsf/tests/org.eclipse.jst.jsf.metadata.tests/src/org/eclipse/jst/jsf/metadata/tests/metadataprocessing/MetaDataEnabledBarkAdapter.java b/jsf/tests/org.eclipse.jst.jsf.metadata.tests/src/org/eclipse/jst/jsf/metadata/tests/metadataprocessing/MetaDataEnabledBarkAdapter.java
index a300317..c7a6cd5 100644
--- a/jsf/tests/org.eclipse.jst.jsf.metadata.tests/src/org/eclipse/jst/jsf/metadata/tests/metadataprocessing/MetaDataEnabledBarkAdapter.java
+++ b/jsf/tests/org.eclipse.jst.jsf.metadata.tests/src/org/eclipse/jst/jsf/metadata/tests/metadataprocessing/MetaDataEnabledBarkAdapter.java
@@ -2,11 +2,11 @@
 
 import java.util.List;
 
+import org.eclipse.jst.jsf.contentmodel.annotation.internal.provisional.CMAnnotationHelper;
 import org.eclipse.jst.jsf.metadata.tests.Activator;
 import org.eclipse.jst.jsf.metadata.tests.metadataprocessing.features.IBarker;
 import org.eclipse.jst.jsf.metadataprocessors.internal.provisional.AbstractMetaDataEnabledFeature;
 import org.eclipse.jst.jsf.metadataprocessors.internal.provisional.features.IPossibleValues;
-import org.eclipse.wtp.jsf.contentmodel.annotation.internal.provisional.CMAnnotationHelper;
 
 /**
  * Test class implementing existing and new fetaure type for
diff --git a/jsf/tests/org.eclipse.jst.jsf.metadata.tests/testfiles/metadata/CaseInsensitive.xml b/jsf/tests/org.eclipse.jst.jsf.metadata.tests/testfiles/metadata/CaseInsensitive.xml
index 31a1a01..a978254 100644
--- a/jsf/tests/org.eclipse.jst.jsf.metadata.tests/testfiles/metadata/CaseInsensitive.xml
+++ b/jsf/tests/org.eclipse.jst.jsf.metadata.tests/testfiles/metadata/CaseInsensitive.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <grammar-annotations
-	xmlns="http://org.eclipse.wtp.jsf.core/grammarAnnotationSchema"
+	xmlns="http://org.eclipse.jst.jsf.core/grammarAnnotationSchema"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://org.eclipse.wtp.jsf.core/grammarAnnotationSchema" 	
+	xsi:schemaLocation="http://org.eclipse.jst.jsf.core/grammarAnnotationSchema" 	
 	caseSensitive="false">
 	<cm-element name="Foo">
 		<cm-attribute name="Value">
diff --git a/jsf/tests/org.eclipse.jst.jsf.metadata.tests/testfiles/metadata/FileA.xml b/jsf/tests/org.eclipse.jst.jsf.metadata.tests/testfiles/metadata/FileA.xml
index c8b9e11..8aa2860 100644
--- a/jsf/tests/org.eclipse.jst.jsf.metadata.tests/testfiles/metadata/FileA.xml
+++ b/jsf/tests/org.eclipse.jst.jsf.metadata.tests/testfiles/metadata/FileA.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<grammar-annotation xmlns:p="http://org.eclipse.wtp.jsf.core/grammarAnnotationSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://org.eclipse.wtp.jsf.core/grammarAnnotationSchema ../../../org.eclipse.wtp.jsf.core/schema/grammar-annotations.xsd ">
+<grammar-annotation xmlns:p="http://org.eclipse.jst.jsf.core/grammarAnnotationSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://org.eclipse.jst.jsf.core/grammarAnnotationSchema ../../../org.eclipse.jst.jsf.core/schema/grammar-annotations.xsd ">
   <cm-element name="Foo">
   	<cm-attribute name="Value">
   		<property name="Type">
diff --git a/jsf/tests/org.eclipse.jst.jsf.metadata.tests/testfiles/metadata/FileB.xml b/jsf/tests/org.eclipse.jst.jsf.metadata.tests/testfiles/metadata/FileB.xml
index a77c641..7594789 100644
--- a/jsf/tests/org.eclipse.jst.jsf.metadata.tests/testfiles/metadata/FileB.xml
+++ b/jsf/tests/org.eclipse.jst.jsf.metadata.tests/testfiles/metadata/FileB.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <grammar-annotation 
-	xmlns="http://org.eclipse.wtp.jsf.core/grammarAnnotationSchema" 
+	xmlns="http://org.eclipse.jst.jsf.core/grammarAnnotationSchema" 
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
 	>
   <cm-element name="Foo">
diff --git a/jsf/tests/org.eclipse.jst.jsf.metadata.tests/testfiles/metadata/jsf_test.xml b/jsf/tests/org.eclipse.jst.jsf.metadata.tests/testfiles/metadata/jsf_test.xml
index ba19d27..3f00fbf 100644
--- a/jsf/tests/org.eclipse.jst.jsf.metadata.tests/testfiles/metadata/jsf_test.xml
+++ b/jsf/tests/org.eclipse.jst.jsf.metadata.tests/testfiles/metadata/jsf_test.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <grammar-annotations
-	xmlns="http://org.eclipse.wtp.jsf.core/grammarAnnotationSchema"
+	xmlns="http://org.eclipse.jst.jsf.core/grammarAnnotationSchema"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://org.eclipse.wtp.jsf.core/grammarAnnotationSchema" >
+	xsi:schemaLocation="http://org.eclipse.jst.jsf.core/grammarAnnotationSchema" >
 	<cm-element name="validator">
 		<cm-attribute name="validatorId">
 			<property name="attr-val-content-assistant">
diff --git a/jsf/tests/org.eclipse.jst.jsf.metadataprocessingtests2/src/org/eclipse/jst/jsf/metadataprocessingtests2/NoImplPossibleVals.java b/jsf/tests/org.eclipse.jst.jsf.metadataprocessingtests2/src/org/eclipse/jst/jsf/metadataprocessingtests2/NoImplPossibleVals.java
index 9f54375..c4506d2 100644
--- a/jsf/tests/org.eclipse.jst.jsf.metadataprocessingtests2/src/org/eclipse/jst/jsf/metadataprocessingtests2/NoImplPossibleVals.java
+++ b/jsf/tests/org.eclipse.jst.jsf.metadataprocessingtests2/src/org/eclipse/jst/jsf/metadataprocessingtests2/NoImplPossibleVals.java
@@ -3,11 +3,11 @@
 
 import java.util.List;
 
+import org.eclipse.jst.jsf.contentmodel.annotation.internal.provisional.CMAnnotationHelper;
 import org.eclipse.jst.jsf.metadataprocessors.internal.provisional.AbstractMetaDataEnabledFeature;
 import org.eclipse.jst.jsf.metadataprocessors.internal.provisional.AbstractRootTypeDescriptor;
 import org.eclipse.jst.jsf.metadataprocessors.internal.provisional.IMetaDataEnabledFeature;
 import org.eclipse.jst.jsf.metadataprocessors.internal.provisional.features.IPossibleValues;
-import org.eclipse.wtp.jsf.contentmodel.annotation.internal.provisional.CMAnnotationHelper;
 
 public class NoImplPossibleVals extends AbstractMetaDataEnabledFeature implements
 		IPossibleValues {