Move to Java 5.
diff --git a/jsf/tests/org.eclipse.jst.jsf.designtime.tests/.classpath b/jsf/tests/org.eclipse.jst.jsf.designtime.tests/.classpath
index 751c8f2..304e861 100644
--- a/jsf/tests/org.eclipse.jst.jsf.designtime.tests/.classpath
+++ b/jsf/tests/org.eclipse.jst.jsf.designtime.tests/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/jsf/tests/org.eclipse.jst.jsf.designtime.tests/.settings/org.eclipse.jdt.core.prefs b/jsf/tests/org.eclipse.jst.jsf.designtime.tests/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000..7254127
--- /dev/null
+++ b/jsf/tests/org.eclipse.jst.jsf.designtime.tests/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,7 @@
+#Tue Apr 10 09:03:49 PDT 2007
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.5
diff --git a/jsf/tests/org.eclipse.jst.jsf.designtime.tests/META-INF/MANIFEST.MF b/jsf/tests/org.eclipse.jst.jsf.designtime.tests/META-INF/MANIFEST.MF
index a0798f2..14de731 100644
--- a/jsf/tests/org.eclipse.jst.jsf.designtime.tests/META-INF/MANIFEST.MF
+++ b/jsf/tests/org.eclipse.jst.jsf.designtime.tests/META-INF/MANIFEST.MF
@@ -14,3 +14,4 @@
  org.eclipse.jst.jsf.core,
  org.eclipse.jst.jsf.common
 Eclipse-LazyStart: true
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/jsf/tests/org.eclipse.jst.jsf.designtime.tests/build.properties b/jsf/tests/org.eclipse.jst.jsf.designtime.tests/build.properties
index 34d2e4d..bd471e1 100644
--- a/jsf/tests/org.eclipse.jst.jsf.designtime.tests/build.properties
+++ b/jsf/tests/org.eclipse.jst.jsf.designtime.tests/build.properties
@@ -2,3 +2,5 @@
 output.. = bin/
 bin.includes = META-INF/,\
                .
+javacSource=1.5
+javacTarget=1.5 
\ No newline at end of file
diff --git a/jsf/tests/org.eclipse.jst.jsf.designtime.tests/plugin.properties b/jsf/tests/org.eclipse.jst.jsf.designtime.tests/plugin.properties
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/jsf/tests/org.eclipse.jst.jsf.designtime.tests/plugin.properties
diff --git a/jsf/tests/org.eclipse.jst.jsf.facesconfig.ui.test/.classpath b/jsf/tests/org.eclipse.jst.jsf.facesconfig.ui.test/.classpath
index 751c8f2..304e861 100644
--- a/jsf/tests/org.eclipse.jst.jsf.facesconfig.ui.test/.classpath
+++ b/jsf/tests/org.eclipse.jst.jsf.facesconfig.ui.test/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/jsf/tests/org.eclipse.jst.jsf.facesconfig.ui.test/.settings/org.eclipse.jdt.core.prefs b/jsf/tests/org.eclipse.jst.jsf.facesconfig.ui.test/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000..b66c5d4
--- /dev/null
+++ b/jsf/tests/org.eclipse.jst.jsf.facesconfig.ui.test/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,7 @@
+#Tue Apr 10 09:09:59 PDT 2007
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.5
diff --git a/jsf/tests/org.eclipse.jst.jsf.facesconfig.ui.test/META-INF/MANIFEST.MF b/jsf/tests/org.eclipse.jst.jsf.facesconfig.ui.test/META-INF/MANIFEST.MF
index 0dc6131..61df6d2 100644
--- a/jsf/tests/org.eclipse.jst.jsf.facesconfig.ui.test/META-INF/MANIFEST.MF
+++ b/jsf/tests/org.eclipse.jst.jsf.facesconfig.ui.test/META-INF/MANIFEST.MF
@@ -7,3 +7,4 @@
 Fragment-Host: org.eclipse.jst.jsf.facesconfig.ui;bundle-version="0.5.0.qualifier"
 Bundle-Localization: plugin
 Require-Bundle: org.junit
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/jsf/tests/org.eclipse.jst.jsf.facesconfig.ui.test/build.properties b/jsf/tests/org.eclipse.jst.jsf.facesconfig.ui.test/build.properties
index 34d2e4d..bd471e1 100644
--- a/jsf/tests/org.eclipse.jst.jsf.facesconfig.ui.test/build.properties
+++ b/jsf/tests/org.eclipse.jst.jsf.facesconfig.ui.test/build.properties
@@ -2,3 +2,5 @@
 output.. = bin/
 bin.includes = META-INF/,\
                .
+javacSource=1.5
+javacTarget=1.5 
\ No newline at end of file
diff --git a/jsf/tests/org.eclipse.jst.jsf.facesconfig.ui.test/plugin.properties b/jsf/tests/org.eclipse.jst.jsf.facesconfig.ui.test/plugin.properties
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/jsf/tests/org.eclipse.jst.jsf.facesconfig.ui.test/plugin.properties
diff --git a/jsf/tests/org.eclipse.jst.jsf.metadata.tests/.classpath b/jsf/tests/org.eclipse.jst.jsf.metadata.tests/.classpath
index 751c8f2..304e861 100644
--- a/jsf/tests/org.eclipse.jst.jsf.metadata.tests/.classpath
+++ b/jsf/tests/org.eclipse.jst.jsf.metadata.tests/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/jsf/tests/org.eclipse.jst.jsf.metadata.tests/.settings/org.eclipse.jdt.core.prefs b/jsf/tests/org.eclipse.jst.jsf.metadata.tests/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000..fd4ebac
--- /dev/null
+++ b/jsf/tests/org.eclipse.jst.jsf.metadata.tests/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,7 @@
+#Tue Apr 10 09:29:46 PDT 2007
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.5
diff --git a/jsf/tests/org.eclipse.jst.jsf.metadata.tests/META-INF/MANIFEST.MF b/jsf/tests/org.eclipse.jst.jsf.metadata.tests/META-INF/MANIFEST.MF
index 1a8be5f..d098643 100644
--- a/jsf/tests/org.eclipse.jst.jsf.metadata.tests/META-INF/MANIFEST.MF
+++ b/jsf/tests/org.eclipse.jst.jsf.metadata.tests/META-INF/MANIFEST.MF
@@ -32,3 +32,4 @@
 Eclipse-LazyStart: true
 Export-Package: org.eclipse.jst.jsf.metadata.tests
 Plugin-Class: org.eclipse.jst.jsf.metadata.tests.MetadataTestsPlugin
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/jsf/tests/org.eclipse.jst.jsf.metadata.tests/build.properties b/jsf/tests/org.eclipse.jst.jsf.metadata.tests/build.properties
index 8bae107..987f31f 100644
--- a/jsf/tests/org.eclipse.jst.jsf.metadata.tests/build.properties
+++ b/jsf/tests/org.eclipse.jst.jsf.metadata.tests/build.properties
@@ -15,3 +15,5 @@
 source.jsfmetadatatests.jar = src/
 output.jsfmetadatatests.jar = bin/
 jars.compile.order = jsfmetadatatests.jar
+javacSource=1.5
+javacTarget=1.5 
\ No newline at end of file
diff --git a/jsf/tests/org.eclipse.jst.jsf.metadata.tests/plugin.properties b/jsf/tests/org.eclipse.jst.jsf.metadata.tests/plugin.properties
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/jsf/tests/org.eclipse.jst.jsf.metadata.tests/plugin.properties
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 59bf7ce..c4ebcc5 100644
--- a/jsf/tests/org.eclipse.jst.jsf.metadata.tests/plugin.xml
+++ b/jsf/tests/org.eclipse.jst.jsf.metadata.tests/plugin.xml
@@ -8,8 +8,7 @@
             uri="http://org.eclipse.jsf/test"/>
       <standardMetaDataFile
             location="/testfiles/metadata/jsf_test.xml"
-            uri="http://org.eclipse.jsf/test2"
-            parser="com.foobar.DifferentParser"/>
+            uri="http://org.eclipse.jsf/test2"/>
       <standardMetaDataFile
             location="/testfiles/metadata/FileA.xml"
             uri="http://org.eclipse.jsf/mergetest1"/>
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 d014ed1..a249a95 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
@@ -13,14 +13,10 @@
 
 import java.util.List;
 
-import org.eclipse.jst.jsf.contentmodel.annotation.internal.provisional.CMAnnotationHelper;
-import org.eclipse.jst.jsf.metadata.tests.MetadataTestsPlugin;
 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 sun.security.action.GetLongAction;
-
 /**
  * Test class implementing existing and new fetaure type for
  * testing the MetaDataEnabledFeature Extension
diff --git a/jsf/tests/org.eclipse.jst.jsf.metadataprocessingtests2/.classpath b/jsf/tests/org.eclipse.jst.jsf.metadataprocessingtests2/.classpath
index 751c8f2..304e861 100644
--- a/jsf/tests/org.eclipse.jst.jsf.metadataprocessingtests2/.classpath
+++ b/jsf/tests/org.eclipse.jst.jsf.metadataprocessingtests2/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/jsf/tests/org.eclipse.jst.jsf.metadataprocessingtests2/.settings/org.eclipse.jdt.core.prefs b/jsf/tests/org.eclipse.jst.jsf.metadataprocessingtests2/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000..df300a3
--- /dev/null
+++ b/jsf/tests/org.eclipse.jst.jsf.metadataprocessingtests2/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,7 @@
+#Tue Apr 10 09:31:09 PDT 2007
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.5
diff --git a/jsf/tests/org.eclipse.jst.jsf.metadataprocessingtests2/META-INF/MANIFEST.MF b/jsf/tests/org.eclipse.jst.jsf.metadataprocessingtests2/META-INF/MANIFEST.MF
index d3f7879..c40e522 100644
--- a/jsf/tests/org.eclipse.jst.jsf.metadataprocessingtests2/META-INF/MANIFEST.MF
+++ b/jsf/tests/org.eclipse.jst.jsf.metadataprocessingtests2/META-INF/MANIFEST.MF
@@ -10,3 +10,4 @@
  org.eclipse.jst.jsf.common,
  org.eclipse.jst.jsf.core
 Eclipse-LazyStart: true
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/jsf/tests/org.eclipse.jst.jsf.metadataprocessingtests2/build.properties b/jsf/tests/org.eclipse.jst.jsf.metadataprocessingtests2/build.properties
index d539296..c44ce14 100644
--- a/jsf/tests/org.eclipse.jst.jsf.metadataprocessingtests2/build.properties
+++ b/jsf/tests/org.eclipse.jst.jsf.metadataprocessingtests2/build.properties
@@ -15,3 +15,5 @@
                plugin.xml,\
                metadata/,\
                about.html
+javacSource=1.5
+javacTarget=1.5 
\ No newline at end of file
diff --git a/jsf/tests/org.eclipse.jst.jsf.metadataprocessingtests2/plugin.properties b/jsf/tests/org.eclipse.jst.jsf.metadataprocessingtests2/plugin.properties
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/jsf/tests/org.eclipse.jst.jsf.metadataprocessingtests2/plugin.properties