some final polish before putting in the build
diff --git a/features/org.eclipse.wst.jsdt_tests.feature/.cvsignore b/features/org.eclipse.wst.jsdt_tests.feature/.cvsignore
new file mode 100644
index 0000000..c14487c
--- /dev/null
+++ b/features/org.eclipse.wst.jsdt_tests.feature/.cvsignore
@@ -0,0 +1 @@
+build.xml
diff --git a/features/org.eclipse.wst.jsdt_tests.feature/.settings/org.eclipse.core.resources.prefs b/features/org.eclipse.wst.jsdt_tests.feature/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000..06da1cb
--- /dev/null
+++ b/features/org.eclipse.wst.jsdt_tests.feature/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,3 @@
+#Wed Dec 12 03:20:23 EST 2007
+eclipse.preferences.version=1
+encoding/<project>=ISO-8859-1
diff --git a/features/org.eclipse.wst.jsdt_tests.feature/feature.xml b/features/org.eclipse.wst.jsdt_tests.feature/feature.xml
index f4a7e50..a0ae464 100644
--- a/features/org.eclipse.wst.jsdt_tests.feature/feature.xml
+++ b/features/org.eclipse.wst.jsdt_tests.feature/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.wst.jsdt_tests.feature"
label="%featureName"
- version="2.0.1.qualifier"
+ version="1.0.0.qualifier"
provider-name="%providerName">
<description>
@@ -25,7 +25,7 @@
id="org.eclipse.wst.jsdt.core.tests.compiler"
download-size="0"
install-size="0"
- version="0.0.0"/>
+ version="0.0.0"/>
<plugin
id="org.eclipse.wst.jsdt.core.tests.model"
diff --git a/tests/org.eclipse.wst.jsdt.core.tests.compiler/.classpath b/tests/org.eclipse.wst.jsdt.core.tests.compiler/.classpath
index 751c8f2..ce73933 100644
--- a/tests/org.eclipse.wst.jsdt.core.tests.compiler/.classpath
+++ b/tests/org.eclipse.wst.jsdt.core.tests.compiler/.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.4"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="output" path="bin"/>
</classpath>
diff --git a/tests/org.eclipse.wst.jsdt.core.tests.compiler/.cvsignore b/tests/org.eclipse.wst.jsdt.core.tests.compiler/.cvsignore
new file mode 100644
index 0000000..7722bc8
--- /dev/null
+++ b/tests/org.eclipse.wst.jsdt.core.tests.compiler/.cvsignore
@@ -0,0 +1,2 @@
+build.xml
+javaCompiler...args
diff --git a/tests/org.eclipse.wst.jsdt.core.tests.compiler/.settings/org.eclipse.core.resources.prefs b/tests/org.eclipse.wst.jsdt.core.tests.compiler/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000..5fc8110
--- /dev/null
+++ b/tests/org.eclipse.wst.jsdt.core.tests.compiler/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,3 @@
+#Wed Dec 12 03:20:36 EST 2007
+eclipse.preferences.version=1
+encoding/<project>=ISO-8859-1
diff --git a/tests/org.eclipse.wst.jsdt.core.tests.compiler/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.wst.jsdt.core.tests.compiler/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000..e23f845
--- /dev/null
+++ b/tests/org.eclipse.wst.jsdt.core.tests.compiler/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,7 @@
+#Wed Dec 12 03:10:27 EST 2007
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
+org.eclipse.jdt.core.compiler.compliance=1.4
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
+org.eclipse.jdt.core.compiler.source=1.3
diff --git a/tests/org.eclipse.wst.jsdt.core.tests.compiler/META-INF/MANIFEST.MF b/tests/org.eclipse.wst.jsdt.core.tests.compiler/META-INF/MANIFEST.MF
index 5360697..4737d63 100644
--- a/tests/org.eclipse.wst.jsdt.core.tests.compiler/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.wst.jsdt.core.tests.compiler/META-INF/MANIFEST.MF
@@ -2,17 +2,20 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.wst.jsdt.core.tests.compiler; singleton:=true
-Bundle-Version: 3.3.0.qualifier
+Bundle-Version: 1.0.0.qualifier
Bundle-Vendor: %providerName
Bundle-Localization: plugin
Require-Bundle: org.eclipse.core.resources,
org.eclipse.core.runtime,
org.eclipse.wst.jsdt.core,
org.junit
-Export-Package: org.eclipse.wst.jsdt.core.tests.compiler.parser,
+Export-Package: org.eclipse.wst.jsdt.core.tests.compiler,
+ org.eclipse.wst.jsdt.core.tests.compiler.parser,
org.eclipse.wst.jsdt.core.tests.compiler.regression,
org.eclipse.wst.jsdt.core.tests.eval,
org.eclipse.wst.jsdt.core.tests.eval.target,
+ org.eclipse.wst.jsdt.core.tests.interpret,
org.eclipse.wst.jsdt.core.tests.junit.extension,
org.eclipse.wst.jsdt.core.tests.runtime,
org.eclipse.wst.jsdt.core.tests.util
+Bundle-RequiredExecutionEnvironment: J2SE-1.4
diff --git a/tests/org.eclipse.wst.jsdt.core.tests.compiler/build.properties b/tests/org.eclipse.wst.jsdt.core.tests.compiler/build.properties
index 63ce77f..78c39da 100644
--- a/tests/org.eclipse.wst.jsdt.core.tests.compiler/build.properties
+++ b/tests/org.eclipse.wst.jsdt.core.tests.compiler/build.properties
@@ -1,6 +1,7 @@
-source.compiler.jar = src/
-output.compiler.jar = bin/
-bin.includes = plugin.xml,\
- compiler.jar,\
- test.xml
+bin.includes = test.xml,\
+ .,\
+ plugin.properties,\
+ META-INF/
src.includes = test.xml
+source.. = src/
+jars.compile.order = .
diff --git a/tests/org.eclipse.wst.jsdt.core.tests.compiler/plugin.properties b/tests/org.eclipse.wst.jsdt.core.tests.compiler/plugin.properties
new file mode 100644
index 0000000..7793cd8
--- /dev/null
+++ b/tests/org.eclipse.wst.jsdt.core.tests.compiler/plugin.properties
@@ -0,0 +1,16 @@
+###############################################################################
+# Copyright (c) 2007 IBM Corporation and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+# IBM Corporation - initial API and implementation
+###############################################################################
+
+#
+# Messages in plugin.xml.
+#
+pluginName=JSDT Tests - Compiler
+providerName=Eclipse.org
diff --git a/tests/org.eclipse.wst.jsdt.core.tests.compiler/plugin.xml b/tests/org.eclipse.wst.jsdt.core.tests.compiler/plugin.xml
deleted file mode 100644
index 8b8bbbf..0000000
--- a/tests/org.eclipse.wst.jsdt.core.tests.compiler/plugin.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin>
-
-
-</plugin>
diff --git a/tests/org.eclipse.wst.jsdt.core.tests.model/.cvsignore b/tests/org.eclipse.wst.jsdt.core.tests.model/.cvsignore
new file mode 100644
index 0000000..7722bc8
--- /dev/null
+++ b/tests/org.eclipse.wst.jsdt.core.tests.model/.cvsignore
@@ -0,0 +1,2 @@
+build.xml
+javaCompiler...args
diff --git a/tests/org.eclipse.wst.jsdt.core.tests.model/.settings/org.eclipse.core.resources.prefs b/tests/org.eclipse.wst.jsdt.core.tests.model/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000..45bf61e
--- /dev/null
+++ b/tests/org.eclipse.wst.jsdt.core.tests.model/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,3 @@
+#Wed Dec 12 03:20:44 EST 2007
+eclipse.preferences.version=1
+encoding/<project>=ISO-8859-1
diff --git a/tests/org.eclipse.wst.jsdt.core.tests.model/META-INF/MANIFEST.MF b/tests/org.eclipse.wst.jsdt.core.tests.model/META-INF/MANIFEST.MF
index 6b7fc54..2633cf1 100644
--- a/tests/org.eclipse.wst.jsdt.core.tests.model/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.wst.jsdt.core.tests.model/META-INF/MANIFEST.MF
@@ -2,8 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.wst.jsdt.core.tests.model; singleton:=true
-Bundle-Version: 3.3.0.qualifier
-Bundle-ClassPath: jdtcoretestsmodel.jar
+Bundle-Version: 1.0.0.qualifier
Bundle-Vendor: %providerName
Bundle-Localization: plugin
Export-Package: org.eclipse.wst.jsdt.core.tests,
diff --git a/tests/org.eclipse.wst.jsdt.core.tests.model/build.properties b/tests/org.eclipse.wst.jsdt.core.tests.model/build.properties
index 1cd330e..c417648 100644
--- a/tests/org.eclipse.wst.jsdt.core.tests.model/build.properties
+++ b/tests/org.eclipse.wst.jsdt.core.tests.model/build.properties
@@ -1,5 +1,7 @@
-source.model.jar = src/
-output.model.jar = bin/
bin.includes = plugin.xml,\
- model.jar,\
- workspace/
+ workspace/,\
+ .,\
+ test.xml,\
+ plugin.properties,\
+ META-INF/
+source.. = src/
diff --git a/tests/org.eclipse.wst.jsdt.core.tests.model/plugin.properties b/tests/org.eclipse.wst.jsdt.core.tests.model/plugin.properties
new file mode 100644
index 0000000..e27a896
--- /dev/null
+++ b/tests/org.eclipse.wst.jsdt.core.tests.model/plugin.properties
@@ -0,0 +1,19 @@
+###############################################################################
+# Copyright (c) 2007 IBM Corporation and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+# IBM Corporation - initial API and implementation
+###############################################################################
+
+#
+# Messages in plugin.xml.
+#
+pluginName=JSDT Tests - Model
+providerName=Eclipse.org
+
+classpathVariableInitializer.deprecated.0 = Test deprecated flag
+classpathVariableInitializer.deprecated.1 = A deprecated and read-only initializer
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.jsdt.core.tests.model/plugin.xml b/tests/org.eclipse.wst.jsdt.core.tests.model/plugin.xml
index 8644ca5..7cf07e1 100644
--- a/tests/org.eclipse.wst.jsdt.core.tests.model/plugin.xml
+++ b/tests/org.eclipse.wst.jsdt.core.tests.model/plugin.xml
@@ -14,7 +14,7 @@
class="org.eclipse.wst.jsdt.core.tests.model.VariablesInitializer"/>
<classpathVariableInitializer
class="org.eclipse.wst.jsdt.core.tests.model.VariablesInitializer"
- deprecated="Test deprecated flag"
+ deprecated="%classpathVariableInitializer.deprecated.0"
variable="TEST_DEPRECATED">
</classpathVariableInitializer>
<classpathVariableInitializer
@@ -24,7 +24,7 @@
</classpathVariableInitializer>
<classpathVariableInitializer
class="org.eclipse.wst.jsdt.core.tests.model.VariablesInitializer"
- deprecated="A deprecated and read-only initializer"
+ deprecated="%classpathVariableInitializer.deprecated.1"
readOnly="true"
variable="TEST_DEPRECATED_READ_ONLY">
</classpathVariableInitializer>
@@ -64,4 +64,4 @@
</compilationParticipant>
</extension>
-</plugin>
\ No newline at end of file
+</plugin>