[331381] Move JUnits that depend on Java SE 1.6 to new plugin that requires Java SE 1.6
diff --git a/tests/org.eclipse.jst.jee.tests/.classpath b/tests/org.eclipse.jst.jee.tests/.classpath
new file mode 100644
index 0000000..1bc4c24
--- /dev/null
+++ b/tests/org.eclipse.jst.jee.tests/.classpath
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="src" path="jee-tests"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/tests/org.eclipse.jst.jee.tests/.project b/tests/org.eclipse.jst.jee.tests/.project
new file mode 100644
index 0000000..0519860
--- /dev/null
+++ b/tests/org.eclipse.jst.jee.tests/.project
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.jst.jee.tests</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/tests/org.eclipse.jst.jee.tests/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.jst.jee.tests/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000..d5ac5e5
--- /dev/null
+++ b/tests/org.eclipse.jst.jee.tests/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,59 @@
+#Fri Nov 19 14:37:44 CST 2010
+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.problem.nullReference=ignore
+org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
+org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
+org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
+org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
+org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
+org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
+org.eclipse.jdt.core.compiler.problem.unusedImport=error
+org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
+org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
+org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
+org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
+org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
+org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
+org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
+org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
+org.eclipse.jdt.core.compiler.problem.deprecation=warning
+org.eclipse.jdt.core.compiler.source=1.6
+org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
+org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
+org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
+org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
+org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
+org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
+org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
+org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
+org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
+org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
+org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
+org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
+org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
+org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
+org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
+org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled
+org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
+org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
+org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
+org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
+org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
+org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
+org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
+org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
+org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
+org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
diff --git a/tests/org.eclipse.jst.jee.tests/.settings/org.eclipse.jdt.ui.prefs b/tests/org.eclipse.jst.jee.tests/.settings/org.eclipse.jdt.ui.prefs
new file mode 100644
index 0000000..5993ccb
--- /dev/null
+++ b/tests/org.eclipse.jst.jee.tests/.settings/org.eclipse.jdt.ui.prefs
@@ -0,0 +1,3 @@
+#Sat Mar 24 11:01:21 EDT 2007
+eclipse.preferences.version=1
+org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8"?><templates/>
diff --git a/tests/org.eclipse.jst.jee.tests/.settings/org.eclipse.pde.prefs b/tests/org.eclipse.jst.jee.tests/.settings/org.eclipse.pde.prefs
new file mode 100644
index 0000000..ed07971
--- /dev/null
+++ b/tests/org.eclipse.jst.jee.tests/.settings/org.eclipse.pde.prefs
@@ -0,0 +1,15 @@
+#Sat Mar 24 10:56:39 EDT 2007
+compilers.incompatible-environment=1
+compilers.p.build=1
+compilers.p.deprecated=1
+compilers.p.missing-packages=1
+compilers.p.no-required-att=0
+compilers.p.not-externalized-att=1
+compilers.p.unknown-attribute=1
+compilers.p.unknown-class=1
+compilers.p.unknown-element=1
+compilers.p.unknown-resource=1
+compilers.p.unresolved-ex-points=0
+compilers.p.unresolved-import=0
+compilers.use-project=true
+eclipse.preferences.version=1
diff --git a/tests/org.eclipse.jst.jee.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.jst.jee.tests/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..61dbcd7
--- /dev/null
+++ b/tests/org.eclipse.jst.jee.tests/META-INF/MANIFEST.MF
@@ -0,0 +1,19 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: JEE Tests Plug-in
+Bundle-SymbolicName: org.eclipse.jst.jee.tests;singleton:=true
+Bundle-Version: 1.0.000.qualifier
+Bundle-ClassPath: jee-tests.jar
+Bundle-Activator: org.eclipse.wtp.jee.headless.tests.plugin.HeadlessTestsPlugin
+Bundle-Localization: plugin
+Export-Package: org.eclipse.wtp.jee.headless.tests.appclient.operations,
+ org.eclipse.wtp.jee.headless.tests.ejb.operations,
+ org.eclipse.wtp.jee.headless.tests.plugin,
+ org.eclipse.wtp.jee.headless.tests.web.operations
+Require-Bundle: org.eclipse.jst.j2ee.tests,
+ org.eclipse.wst.common.tests,
+ org.eclipse.wst.server.core,
+ org.eclipse.jem.util,
+ org.eclipse.core.runtime
+Eclipse-LazyStart: true
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/tests/org.eclipse.jst.jee.tests/META-INF/eclipse.inf b/tests/org.eclipse.jst.jee.tests/META-INF/eclipse.inf
new file mode 100644
index 0000000..86da494
--- /dev/null
+++ b/tests/org.eclipse.jst.jee.tests/META-INF/eclipse.inf
@@ -0,0 +1,6 @@
+# We do not want any nested jars 
+# signed or normalized for packing
+# see bug 274743 Some unit tests are sensitive to details of build
+# https://bugs.eclipse.org/bugs/show_bug.cgi?id=274743
+jarprocessor.exclude=true
+jarprocessor.exclude.children=true
diff --git a/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC50_AddToEAR_Defaults.jar b/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC50_AddToEAR_Defaults.jar
new file mode 100644
index 0000000..2d6a578
--- /dev/null
+++ b/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC50_AddToEAR_Defaults.jar
Binary files differ
diff --git a/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC50_AddToEAR_InterestingName_Defaults.jar b/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC50_AddToEAR_InterestingName_Defaults.jar
new file mode 100644
index 0000000..1be3b0e
--- /dev/null
+++ b/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC50_AddToEAR_InterestingName_Defaults.jar
Binary files differ
diff --git a/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC50_AddToEAR_InterestingName_NoBuild.jar b/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC50_AddToEAR_InterestingName_NoBuild.jar
new file mode 100644
index 0000000..1be3b0e
--- /dev/null
+++ b/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC50_AddToEAR_InterestingName_NoBuild.jar
Binary files differ
diff --git a/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC50_AddToEAR_InterestingName_Source.jar b/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC50_AddToEAR_InterestingName_Source.jar
new file mode 100644
index 0000000..1be3b0e
--- /dev/null
+++ b/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC50_AddToEAR_InterestingName_Source.jar
Binary files differ
diff --git a/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC50_AddToEAR_InterestingName_Source_NoBuild.jar b/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC50_AddToEAR_InterestingName_Source_NoBuild.jar
new file mode 100644
index 0000000..1be3b0e
--- /dev/null
+++ b/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC50_AddToEAR_InterestingName_Source_NoBuild.jar
Binary files differ
diff --git a/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC50_AddToEAR_NoBuild.jar b/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC50_AddToEAR_NoBuild.jar
new file mode 100644
index 0000000..2d6a578
--- /dev/null
+++ b/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC50_AddToEAR_NoBuild.jar
Binary files differ
diff --git a/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC50_AddToEAR_Source.jar b/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC50_AddToEAR_Source.jar
new file mode 100644
index 0000000..2d6a578
--- /dev/null
+++ b/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC50_AddToEAR_Source.jar
Binary files differ
diff --git a/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC50_AddToEAR_Source_NoBuild.jar b/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC50_AddToEAR_Source_NoBuild.jar
new file mode 100644
index 0000000..2d6a578
--- /dev/null
+++ b/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC50_AddToEAR_Source_NoBuild.jar
Binary files differ
diff --git a/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC50_Defaults_Defaults.jar b/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC50_Defaults_Defaults.jar
new file mode 100644
index 0000000..8f4fee5
--- /dev/null
+++ b/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC50_Defaults_Defaults.jar
Binary files differ
diff --git a/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC50_Defaults_NoBuild.jar b/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC50_Defaults_NoBuild.jar
new file mode 100644
index 0000000..8f4fee5
--- /dev/null
+++ b/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC50_Defaults_NoBuild.jar
Binary files differ
diff --git a/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC50_Defaults_Source.jar b/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC50_Defaults_Source.jar
new file mode 100644
index 0000000..8f4fee5
--- /dev/null
+++ b/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC50_Defaults_Source.jar
Binary files differ
diff --git a/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC50_Defaults_Source_NoBuild.jar b/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC50_Defaults_Source_NoBuild.jar
new file mode 100644
index 0000000..8f4fee5
--- /dev/null
+++ b/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC50_Defaults_Source_NoBuild.jar
Binary files differ
diff --git a/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC50_InterestingName_Defaults.jar b/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC50_InterestingName_Defaults.jar
new file mode 100644
index 0000000..c5d2706
--- /dev/null
+++ b/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC50_InterestingName_Defaults.jar
Binary files differ
diff --git a/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC50_InterestingName_NoBuild.jar b/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC50_InterestingName_NoBuild.jar
new file mode 100644
index 0000000..c5d2706
--- /dev/null
+++ b/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC50_InterestingName_NoBuild.jar
Binary files differ
diff --git a/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC50_InterestingName_Source.jar b/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC50_InterestingName_Source.jar
new file mode 100644
index 0000000..c5d2706
--- /dev/null
+++ b/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC50_InterestingName_Source.jar
Binary files differ
diff --git a/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC50_InterestingName_Source_NoBuild.jar b/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC50_InterestingName_Source_NoBuild.jar
new file mode 100644
index 0000000..c5d2706
--- /dev/null
+++ b/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC50_InterestingName_Source_NoBuild.jar
Binary files differ
diff --git a/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC50_NoDefaultClass_Defaults.jar b/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC50_NoDefaultClass_Defaults.jar
new file mode 100644
index 0000000..1d17147
--- /dev/null
+++ b/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC50_NoDefaultClass_Defaults.jar
Binary files differ
diff --git a/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC50_NoDefaultClass_NoBuild.jar b/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC50_NoDefaultClass_NoBuild.jar
new file mode 100644
index 0000000..1d17147
--- /dev/null
+++ b/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC50_NoDefaultClass_NoBuild.jar
Binary files differ
diff --git a/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC50_NoDefaultClass_Source.jar b/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC50_NoDefaultClass_Source.jar
new file mode 100644
index 0000000..1d17147
--- /dev/null
+++ b/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC50_NoDefaultClass_Source.jar
Binary files differ
diff --git a/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC50_NoDefaultClass_Source_NoBuild.jar b/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC50_NoDefaultClass_Source_NoBuild.jar
new file mode 100644
index 0000000..1d17147
--- /dev/null
+++ b/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC50_NoDefaultClass_Source_NoBuild.jar
Binary files differ
diff --git a/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC60_AddToEAR_InterestingName_WithDD_Defaults.jar b/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC60_AddToEAR_InterestingName_WithDD_Defaults.jar
new file mode 100644
index 0000000..a6350a2
--- /dev/null
+++ b/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC60_AddToEAR_InterestingName_WithDD_Defaults.jar
Binary files differ
diff --git a/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC60_AddToEAR_InterestingName_WithDD_NoBuild.jar b/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC60_AddToEAR_InterestingName_WithDD_NoBuild.jar
new file mode 100644
index 0000000..6319172
--- /dev/null
+++ b/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC60_AddToEAR_InterestingName_WithDD_NoBuild.jar
Binary files differ
diff --git a/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC60_AddToEAR_InterestingName_WithDD_Source.jar b/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC60_AddToEAR_InterestingName_WithDD_Source.jar
new file mode 100644
index 0000000..8afc75c
--- /dev/null
+++ b/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC60_AddToEAR_InterestingName_WithDD_Source.jar
Binary files differ
diff --git a/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC60_AddToEAR_InterestingName_WithDD_Source_NoBuild.jar b/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC60_AddToEAR_InterestingName_WithDD_Source_NoBuild.jar
new file mode 100644
index 0000000..fbc1719
--- /dev/null
+++ b/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC60_AddToEAR_InterestingName_WithDD_Source_NoBuild.jar
Binary files differ
diff --git a/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC60_AddToEAR_WithDD_Defaults.jar b/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC60_AddToEAR_WithDD_Defaults.jar
new file mode 100644
index 0000000..fd2e0a9
--- /dev/null
+++ b/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC60_AddToEAR_WithDD_Defaults.jar
Binary files differ
diff --git a/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC60_AddToEAR_WithDD_NoBuild.jar b/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC60_AddToEAR_WithDD_NoBuild.jar
new file mode 100644
index 0000000..a4ec26d
--- /dev/null
+++ b/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC60_AddToEAR_WithDD_NoBuild.jar
Binary files differ
diff --git a/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC60_AddToEAR_WithDD_Source.jar b/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC60_AddToEAR_WithDD_Source.jar
new file mode 100644
index 0000000..7cf87d2
--- /dev/null
+++ b/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC60_AddToEAR_WithDD_Source.jar
Binary files differ
diff --git a/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC60_AddToEAR_WithDD_Source_NoBuild.jar b/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC60_AddToEAR_WithDD_Source_NoBuild.jar
new file mode 100644
index 0000000..5eb844e
--- /dev/null
+++ b/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC60_AddToEAR_WithDD_Source_NoBuild.jar
Binary files differ
diff --git a/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC60_NoDefaultClass_WithDD_Defaults.jar b/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC60_NoDefaultClass_WithDD_Defaults.jar
new file mode 100644
index 0000000..30abbed
--- /dev/null
+++ b/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC60_NoDefaultClass_WithDD_Defaults.jar
Binary files differ
diff --git a/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC60_NoDefaultClass_WithDD_NoBuild.jar b/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC60_NoDefaultClass_WithDD_NoBuild.jar
new file mode 100644
index 0000000..9e98f9b
--- /dev/null
+++ b/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC60_NoDefaultClass_WithDD_NoBuild.jar
Binary files differ
diff --git a/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC60_NoDefaultClass_WithDD_Source.jar b/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC60_NoDefaultClass_WithDD_Source.jar
new file mode 100644
index 0000000..8160341
--- /dev/null
+++ b/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC60_NoDefaultClass_WithDD_Source.jar
Binary files differ
diff --git a/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC60_NoDefaultClass_WithDD_Source_NoBuild.jar b/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC60_NoDefaultClass_WithDD_Source_NoBuild.jar
new file mode 100644
index 0000000..4e10e37
--- /dev/null
+++ b/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC60_NoDefaultClass_WithDD_Source_NoBuild.jar
Binary files differ
diff --git a/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC60_WithDD_Defaults.jar b/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC60_WithDD_Defaults.jar
new file mode 100644
index 0000000..cacb37c
--- /dev/null
+++ b/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC60_WithDD_Defaults.jar
Binary files differ
diff --git a/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC60_WithDD_NoBuild.jar b/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC60_WithDD_NoBuild.jar
new file mode 100644
index 0000000..de17b04
--- /dev/null
+++ b/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC60_WithDD_NoBuild.jar
Binary files differ
diff --git a/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC60_WithDD_Source.jar b/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC60_WithDD_Source.jar
new file mode 100644
index 0000000..fd4e308
--- /dev/null
+++ b/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC60_WithDD_Source.jar
Binary files differ
diff --git a/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC60_WithDD_Source_NoBuild.jar b/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC60_WithDD_Source_NoBuild.jar
new file mode 100644
index 0000000..6849c8c
--- /dev/null
+++ b/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC60_WithDD_Source_NoBuild.jar
Binary files differ
diff --git a/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB30_AddToEAR_Defaults_Defaults.jar b/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB30_AddToEAR_Defaults_Defaults.jar
new file mode 100644
index 0000000..b09afce
--- /dev/null
+++ b/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB30_AddToEAR_Defaults_Defaults.jar
Binary files differ
diff --git a/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB30_AddToEAR_Defaults_NoBuild.jar b/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB30_AddToEAR_Defaults_NoBuild.jar
new file mode 100644
index 0000000..da70bea
--- /dev/null
+++ b/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB30_AddToEAR_Defaults_NoBuild.jar
Binary files differ
diff --git a/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB30_AddToEAR_Defaults_Source.jar b/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB30_AddToEAR_Defaults_Source.jar
new file mode 100644
index 0000000..da70bea
--- /dev/null
+++ b/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB30_AddToEAR_Defaults_Source.jar
Binary files differ
diff --git a/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB30_AddToEAR_Defaults_Source_NoBuild.jar b/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB30_AddToEAR_Defaults_Source_NoBuild.jar
new file mode 100644
index 0000000..da70bea
--- /dev/null
+++ b/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB30_AddToEAR_Defaults_Source_NoBuild.jar
Binary files differ
diff --git a/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB30_AddToEAR_DiffClientName_Defaults.jar b/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB30_AddToEAR_DiffClientName_Defaults.jar
new file mode 100644
index 0000000..0b4213a
--- /dev/null
+++ b/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB30_AddToEAR_DiffClientName_Defaults.jar
Binary files differ
diff --git a/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB30_AddToEAR_DiffClientName_DiffClientSourceFolder_Defaults.jar b/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB30_AddToEAR_DiffClientName_DiffClientSourceFolder_Defaults.jar
new file mode 100644
index 0000000..bce64a3
--- /dev/null
+++ b/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB30_AddToEAR_DiffClientName_DiffClientSourceFolder_Defaults.jar
Binary files differ
diff --git a/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB30_AddToEAR_DiffClientName_DiffClientSourceFolder_NoBuild.jar b/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB30_AddToEAR_DiffClientName_DiffClientSourceFolder_NoBuild.jar
new file mode 100644
index 0000000..bce64a3
--- /dev/null
+++ b/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB30_AddToEAR_DiffClientName_DiffClientSourceFolder_NoBuild.jar
Binary files differ
diff --git a/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB30_AddToEAR_DiffClientName_DiffClientSourceFolder_Source.jar b/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB30_AddToEAR_DiffClientName_DiffClientSourceFolder_Source.jar
new file mode 100644
index 0000000..bce64a3
--- /dev/null
+++ b/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB30_AddToEAR_DiffClientName_DiffClientSourceFolder_Source.jar
Binary files differ
diff --git a/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB30_AddToEAR_DiffClientName_DiffClientSourceFolder_Source_NoBuild.jar b/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB30_AddToEAR_DiffClientName_DiffClientSourceFolder_Source_NoBuild.jar
new file mode 100644
index 0000000..bce64a3
--- /dev/null
+++ b/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB30_AddToEAR_DiffClientName_DiffClientSourceFolder_Source_NoBuild.jar
Binary files differ
diff --git a/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB30_AddToEAR_DiffClientName_NoBuild.jar b/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB30_AddToEAR_DiffClientName_NoBuild.jar
new file mode 100644
index 0000000..0b4213a
--- /dev/null
+++ b/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB30_AddToEAR_DiffClientName_NoBuild.jar
Binary files differ
diff --git a/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB30_AddToEAR_DiffClientName_Source.jar b/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB30_AddToEAR_DiffClientName_Source.jar
new file mode 100644
index 0000000..0b4213a
--- /dev/null
+++ b/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB30_AddToEAR_DiffClientName_Source.jar
Binary files differ
diff --git a/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB30_AddToEAR_DiffClientName_Source_NoBuild.jar b/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB30_AddToEAR_DiffClientName_Source_NoBuild.jar
new file mode 100644
index 0000000..0b4213a
--- /dev/null
+++ b/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB30_AddToEAR_DiffClientName_Source_NoBuild.jar
Binary files differ
diff --git a/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB30_AddToEAR_DiffClientSourceFolder_Defaults.jar b/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB30_AddToEAR_DiffClientSourceFolder_Defaults.jar
new file mode 100644
index 0000000..7a3f0bd
--- /dev/null
+++ b/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB30_AddToEAR_DiffClientSourceFolder_Defaults.jar
Binary files differ
diff --git a/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB30_AddToEAR_DiffClientSourceFolder_NoBuild.jar b/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB30_AddToEAR_DiffClientSourceFolder_NoBuild.jar
new file mode 100644
index 0000000..7a3f0bd
--- /dev/null
+++ b/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB30_AddToEAR_DiffClientSourceFolder_NoBuild.jar
Binary files differ
diff --git a/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB30_AddToEAR_DiffClientSourceFolder_Source.jar b/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB30_AddToEAR_DiffClientSourceFolder_Source.jar
new file mode 100644
index 0000000..7a3f0bd
--- /dev/null
+++ b/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB30_AddToEAR_DiffClientSourceFolder_Source.jar
Binary files differ
diff --git a/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB30_AddToEAR_DiffClientSourceFolder_Source_NoBuild.jar b/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB30_AddToEAR_DiffClientSourceFolder_Source_NoBuild.jar
new file mode 100644
index 0000000..7a3f0bd
--- /dev/null
+++ b/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB30_AddToEAR_DiffClientSourceFolder_Source_NoBuild.jar
Binary files differ
diff --git a/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB30_AddToEAR_NoClient_Defaults.jar b/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB30_AddToEAR_NoClient_Defaults.jar
new file mode 100644
index 0000000..ee27df2
--- /dev/null
+++ b/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB30_AddToEAR_NoClient_Defaults.jar
Binary files differ
diff --git a/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB30_AddToEAR_NoClient_NoBuild.jar b/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB30_AddToEAR_NoClient_NoBuild.jar
new file mode 100644
index 0000000..ee27df2
--- /dev/null
+++ b/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB30_AddToEAR_NoClient_NoBuild.jar
Binary files differ
diff --git a/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB30_AddToEAR_NoClient_Source.jar b/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB30_AddToEAR_NoClient_Source.jar
new file mode 100644
index 0000000..ee27df2
--- /dev/null
+++ b/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB30_AddToEAR_NoClient_Source.jar
Binary files differ
diff --git a/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB30_AddToEAR_NoClient_Source_NoBuild.jar b/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB30_AddToEAR_NoClient_Source_NoBuild.jar
new file mode 100644
index 0000000..ee27df2
--- /dev/null
+++ b/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB30_AddToEAR_NoClient_Source_NoBuild.jar
Binary files differ
diff --git a/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB30_Defaults_Defaults.jar b/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB30_Defaults_Defaults.jar
new file mode 100644
index 0000000..ae70f7a
--- /dev/null
+++ b/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB30_Defaults_Defaults.jar
Binary files differ
diff --git a/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB30_Defaults_NoBuild.jar b/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB30_Defaults_NoBuild.jar
new file mode 100644
index 0000000..ae70f7a
--- /dev/null
+++ b/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB30_Defaults_NoBuild.jar
Binary files differ
diff --git a/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB30_Defaults_Source.jar b/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB30_Defaults_Source.jar
new file mode 100644
index 0000000..ae70f7a
--- /dev/null
+++ b/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB30_Defaults_Source.jar
Binary files differ
diff --git a/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB30_Defaults_Source_NoBuild.jar b/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB30_Defaults_Source_NoBuild.jar
new file mode 100644
index 0000000..ae70f7a
--- /dev/null
+++ b/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB30_Defaults_Source_NoBuild.jar
Binary files differ
diff --git a/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB31_AddToEAR_Defaults_WithDD_Defaults.jar b/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB31_AddToEAR_Defaults_WithDD_Defaults.jar
new file mode 100644
index 0000000..183137e
--- /dev/null
+++ b/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB31_AddToEAR_Defaults_WithDD_Defaults.jar
Binary files differ
diff --git a/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB31_AddToEAR_Defaults_WithDD_NoBuild.jar b/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB31_AddToEAR_Defaults_WithDD_NoBuild.jar
new file mode 100644
index 0000000..99e278a
--- /dev/null
+++ b/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB31_AddToEAR_Defaults_WithDD_NoBuild.jar
Binary files differ
diff --git a/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB31_AddToEAR_Defaults_WithDD_Source.jar b/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB31_AddToEAR_Defaults_WithDD_Source.jar
new file mode 100644
index 0000000..3fdead6
--- /dev/null
+++ b/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB31_AddToEAR_Defaults_WithDD_Source.jar
Binary files differ
diff --git a/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB31_AddToEAR_Defaults_WithDD_Source_NoBuild.jar b/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB31_AddToEAR_Defaults_WithDD_Source_NoBuild.jar
new file mode 100644
index 0000000..aa208aa
--- /dev/null
+++ b/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB31_AddToEAR_Defaults_WithDD_Source_NoBuild.jar
Binary files differ
diff --git a/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB31_AddToEAR_DiffClientName_DiffClientSourceFolder_WithDD_Defaults.jar b/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB31_AddToEAR_DiffClientName_DiffClientSourceFolder_WithDD_Defaults.jar
new file mode 100644
index 0000000..17d5b5c
--- /dev/null
+++ b/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB31_AddToEAR_DiffClientName_DiffClientSourceFolder_WithDD_Defaults.jar
Binary files differ
diff --git a/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB31_AddToEAR_DiffClientName_DiffClientSourceFolder_WithDD_NoBuild.jar b/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB31_AddToEAR_DiffClientName_DiffClientSourceFolder_WithDD_NoBuild.jar
new file mode 100644
index 0000000..0422489
--- /dev/null
+++ b/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB31_AddToEAR_DiffClientName_DiffClientSourceFolder_WithDD_NoBuild.jar
Binary files differ
diff --git a/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB31_AddToEAR_DiffClientName_DiffClientSourceFolder_WithDD_Source.jar b/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB31_AddToEAR_DiffClientName_DiffClientSourceFolder_WithDD_Source.jar
new file mode 100644
index 0000000..274aaf5
--- /dev/null
+++ b/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB31_AddToEAR_DiffClientName_DiffClientSourceFolder_WithDD_Source.jar
Binary files differ
diff --git a/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB31_AddToEAR_DiffClientName_DiffClientSourceFolder_WithDD_Source_NoBuild.jar b/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB31_AddToEAR_DiffClientName_DiffClientSourceFolder_WithDD_Source_NoBuild.jar
new file mode 100644
index 0000000..9fd3d2c
--- /dev/null
+++ b/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB31_AddToEAR_DiffClientName_DiffClientSourceFolder_WithDD_Source_NoBuild.jar
Binary files differ
diff --git a/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB31_AddToEAR_DiffClientName_WithDD_Defaults.jar b/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB31_AddToEAR_DiffClientName_WithDD_Defaults.jar
new file mode 100644
index 0000000..af93e19
--- /dev/null
+++ b/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB31_AddToEAR_DiffClientName_WithDD_Defaults.jar
Binary files differ
diff --git a/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB31_AddToEAR_DiffClientName_WithDD_NoBuild.jar b/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB31_AddToEAR_DiffClientName_WithDD_NoBuild.jar
new file mode 100644
index 0000000..8342436
--- /dev/null
+++ b/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB31_AddToEAR_DiffClientName_WithDD_NoBuild.jar
Binary files differ
diff --git a/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB31_AddToEAR_DiffClientName_WithDD_Source.jar b/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB31_AddToEAR_DiffClientName_WithDD_Source.jar
new file mode 100644
index 0000000..a88a79e
--- /dev/null
+++ b/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB31_AddToEAR_DiffClientName_WithDD_Source.jar
Binary files differ
diff --git a/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB31_AddToEAR_DiffClientName_WithDD_Source_NoBuild.jar b/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB31_AddToEAR_DiffClientName_WithDD_Source_NoBuild.jar
new file mode 100644
index 0000000..d19297e
--- /dev/null
+++ b/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB31_AddToEAR_DiffClientName_WithDD_Source_NoBuild.jar
Binary files differ
diff --git a/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB31_AddToEAR_DiffClientSourceFolder_WithDD_Defaults.jar b/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB31_AddToEAR_DiffClientSourceFolder_WithDD_Defaults.jar
new file mode 100644
index 0000000..c9f8808
--- /dev/null
+++ b/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB31_AddToEAR_DiffClientSourceFolder_WithDD_Defaults.jar
Binary files differ
diff --git a/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB31_AddToEAR_DiffClientSourceFolder_WithDD_NoBuild.jar b/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB31_AddToEAR_DiffClientSourceFolder_WithDD_NoBuild.jar
new file mode 100644
index 0000000..46f09c5
--- /dev/null
+++ b/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB31_AddToEAR_DiffClientSourceFolder_WithDD_NoBuild.jar
Binary files differ
diff --git a/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB31_AddToEAR_DiffClientSourceFolder_WithDD_Source.jar b/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB31_AddToEAR_DiffClientSourceFolder_WithDD_Source.jar
new file mode 100644
index 0000000..2346692
--- /dev/null
+++ b/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB31_AddToEAR_DiffClientSourceFolder_WithDD_Source.jar
Binary files differ
diff --git a/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB31_AddToEAR_DiffClientSourceFolder_WithDD_Source_NoBuild.jar b/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB31_AddToEAR_DiffClientSourceFolder_WithDD_Source_NoBuild.jar
new file mode 100644
index 0000000..da365c3
--- /dev/null
+++ b/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB31_AddToEAR_DiffClientSourceFolder_WithDD_Source_NoBuild.jar
Binary files differ
diff --git a/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB31_AddToEAR_NoClient_WithDD_Defaults.jar b/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB31_AddToEAR_NoClient_WithDD_Defaults.jar
new file mode 100644
index 0000000..ffcaa28
--- /dev/null
+++ b/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB31_AddToEAR_NoClient_WithDD_Defaults.jar
Binary files differ
diff --git a/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB31_AddToEAR_NoClient_WithDD_NoBuild.jar b/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB31_AddToEAR_NoClient_WithDD_NoBuild.jar
new file mode 100644
index 0000000..5f7dde6
--- /dev/null
+++ b/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB31_AddToEAR_NoClient_WithDD_NoBuild.jar
Binary files differ
diff --git a/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB31_AddToEAR_NoClient_WithDD_Source.jar b/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB31_AddToEAR_NoClient_WithDD_Source.jar
new file mode 100644
index 0000000..26cb865
--- /dev/null
+++ b/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB31_AddToEAR_NoClient_WithDD_Source.jar
Binary files differ
diff --git a/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB31_AddToEAR_NoClient_WithDD_Source_NoBuild.jar b/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB31_AddToEAR_NoClient_WithDD_Source_NoBuild.jar
new file mode 100644
index 0000000..38db407
--- /dev/null
+++ b/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB31_AddToEAR_NoClient_WithDD_Source_NoBuild.jar
Binary files differ
diff --git a/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB31_Defaults_WithDD_Defaults.jar b/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB31_Defaults_WithDD_Defaults.jar
new file mode 100644
index 0000000..dd0647d
--- /dev/null
+++ b/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB31_Defaults_WithDD_Defaults.jar
Binary files differ
diff --git a/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB31_Defaults_WithDD_NoBuild.jar b/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB31_Defaults_WithDD_NoBuild.jar
new file mode 100644
index 0000000..2592c8b
--- /dev/null
+++ b/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB31_Defaults_WithDD_NoBuild.jar
Binary files differ
diff --git a/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB31_Defaults_WithDD_Source.jar b/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB31_Defaults_WithDD_Source.jar
new file mode 100644
index 0000000..731966f
--- /dev/null
+++ b/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB31_Defaults_WithDD_Source.jar
Binary files differ
diff --git a/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB31_Defaults_WithDD_Source_NoBuild.jar b/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB31_Defaults_WithDD_Source_NoBuild.jar
new file mode 100644
index 0000000..2e2d5c3
--- /dev/null
+++ b/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB31_Defaults_WithDD_Source_NoBuild.jar
Binary files differ
diff --git a/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_Defaults_Defaults.war b/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_Defaults_Defaults.war
new file mode 100644
index 0000000..ac74c9c
--- /dev/null
+++ b/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_Defaults_Defaults.war
Binary files differ
diff --git a/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_Defaults_NoBuild.war b/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_Defaults_NoBuild.war
new file mode 100644
index 0000000..ac74c9c
--- /dev/null
+++ b/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_Defaults_NoBuild.war
Binary files differ
diff --git a/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_Defaults_Source.war b/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_Defaults_Source.war
new file mode 100644
index 0000000..ac74c9c
--- /dev/null
+++ b/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_Defaults_Source.war
Binary files differ
diff --git a/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_Defaults_Source_NoBuild.war b/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_Defaults_Source_NoBuild.war
new file mode 100644
index 0000000..ac74c9c
--- /dev/null
+++ b/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_Defaults_Source_NoBuild.war
Binary files differ
diff --git a/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_Defaults_WithEAR_Defaults.war b/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_Defaults_WithEAR_Defaults.war
new file mode 100644
index 0000000..1a24ade
--- /dev/null
+++ b/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_Defaults_WithEAR_Defaults.war
Binary files differ
diff --git a/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_Defaults_WithEAR_NoBuild.war b/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_Defaults_WithEAR_NoBuild.war
new file mode 100644
index 0000000..1a24ade
--- /dev/null
+++ b/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_Defaults_WithEAR_NoBuild.war
Binary files differ
diff --git a/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_Defaults_WithEAR_Source.war b/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_Defaults_WithEAR_Source.war
new file mode 100644
index 0000000..1a24ade
--- /dev/null
+++ b/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_Defaults_WithEAR_Source.war
Binary files differ
diff --git a/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_Defaults_WithEAR_Source_NoBuild.war b/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_Defaults_WithEAR_Source_NoBuild.war
new file mode 100644
index 0000000..1a24ade
--- /dev/null
+++ b/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_Defaults_WithEAR_Source_NoBuild.war
Binary files differ
diff --git a/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContentDir_Defaults.war b/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContentDir_Defaults.war
new file mode 100644
index 0000000..95687f8
--- /dev/null
+++ b/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContentDir_Defaults.war
Binary files differ
diff --git a/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContentDir_DiffSrcDir_Defaults.war b/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContentDir_DiffSrcDir_Defaults.war
new file mode 100644
index 0000000..2aaf30e
--- /dev/null
+++ b/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContentDir_DiffSrcDir_Defaults.war
Binary files differ
diff --git a/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContentDir_DiffSrcDir_NoBuild.war b/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContentDir_DiffSrcDir_NoBuild.war
new file mode 100644
index 0000000..2aaf30e
--- /dev/null
+++ b/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContentDir_DiffSrcDir_NoBuild.war
Binary files differ
diff --git a/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContentDir_DiffSrcDir_Source.war b/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContentDir_DiffSrcDir_Source.war
new file mode 100644
index 0000000..2aaf30e
--- /dev/null
+++ b/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContentDir_DiffSrcDir_Source.war
Binary files differ
diff --git a/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContentDir_DiffSrcDir_Source_NoBuild.war b/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContentDir_DiffSrcDir_Source_NoBuild.war
new file mode 100644
index 0000000..2aaf30e
--- /dev/null
+++ b/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContentDir_DiffSrcDir_Source_NoBuild.war
Binary files differ
diff --git a/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContentDir_DiffSrcDir_WithEAR_Defaults.war b/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContentDir_DiffSrcDir_WithEAR_Defaults.war
new file mode 100644
index 0000000..5d22dac
--- /dev/null
+++ b/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContentDir_DiffSrcDir_WithEAR_Defaults.war
Binary files differ
diff --git a/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContentDir_DiffSrcDir_WithEAR_NoBuild.war b/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContentDir_DiffSrcDir_WithEAR_NoBuild.war
new file mode 100644
index 0000000..5d22dac
--- /dev/null
+++ b/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContentDir_DiffSrcDir_WithEAR_NoBuild.war
Binary files differ
diff --git a/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContentDir_DiffSrcDir_WithEAR_Source.war b/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContentDir_DiffSrcDir_WithEAR_Source.war
new file mode 100644
index 0000000..5d22dac
--- /dev/null
+++ b/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContentDir_DiffSrcDir_WithEAR_Source.war
Binary files differ
diff --git a/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContentDir_DiffSrcDir_WithEAR_Source_NoBuild.war b/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContentDir_DiffSrcDir_WithEAR_Source_NoBuild.war
new file mode 100644
index 0000000..5d22dac
--- /dev/null
+++ b/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContentDir_DiffSrcDir_WithEAR_Source_NoBuild.war
Binary files differ
diff --git a/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContentDir_NoBuild.war b/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContentDir_NoBuild.war
new file mode 100644
index 0000000..95687f8
--- /dev/null
+++ b/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContentDir_NoBuild.war
Binary files differ
diff --git a/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContentDir_Source.war b/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContentDir_Source.war
new file mode 100644
index 0000000..95687f8
--- /dev/null
+++ b/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContentDir_Source.war
Binary files differ
diff --git a/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContentDir_Source_NoBuild.war b/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContentDir_Source_NoBuild.war
new file mode 100644
index 0000000..95687f8
--- /dev/null
+++ b/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContentDir_Source_NoBuild.war
Binary files differ
diff --git a/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContentDir_WithEAR_Defaults.war b/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContentDir_WithEAR_Defaults.war
new file mode 100644
index 0000000..5080a4b
--- /dev/null
+++ b/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContentDir_WithEAR_Defaults.war
Binary files differ
diff --git a/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContentDir_WithEAR_NoBuild.war b/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContentDir_WithEAR_NoBuild.war
new file mode 100644
index 0000000..5080a4b
--- /dev/null
+++ b/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContentDir_WithEAR_NoBuild.war
Binary files differ
diff --git a/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContentDir_WithEAR_Source.war b/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContentDir_WithEAR_Source.war
new file mode 100644
index 0000000..5080a4b
--- /dev/null
+++ b/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContentDir_WithEAR_Source.war
Binary files differ
diff --git a/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContentDir_WithEAR_Source_NoBuild.war b/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContentDir_WithEAR_Source_NoBuild.war
new file mode 100644
index 0000000..5080a4b
--- /dev/null
+++ b/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContentDir_WithEAR_Source_NoBuild.war
Binary files differ
diff --git a/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContextRoot_DiffContentDir_DiffSrcDir_WithEAR_Defaults.war b/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContextRoot_DiffContentDir_DiffSrcDir_WithEAR_Defaults.war
new file mode 100644
index 0000000..81ad6ea
--- /dev/null
+++ b/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContextRoot_DiffContentDir_DiffSrcDir_WithEAR_Defaults.war
Binary files differ
diff --git a/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContextRoot_DiffContentDir_DiffSrcDir_WithEAR_NoBuild.war b/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContextRoot_DiffContentDir_DiffSrcDir_WithEAR_NoBuild.war
new file mode 100644
index 0000000..81ad6ea
--- /dev/null
+++ b/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContextRoot_DiffContentDir_DiffSrcDir_WithEAR_NoBuild.war
Binary files differ
diff --git a/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContextRoot_DiffContentDir_DiffSrcDir_WithEAR_Source.war b/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContextRoot_DiffContentDir_DiffSrcDir_WithEAR_Source.war
new file mode 100644
index 0000000..81ad6ea
--- /dev/null
+++ b/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContextRoot_DiffContentDir_DiffSrcDir_WithEAR_Source.war
Binary files differ
diff --git a/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContextRoot_DiffContentDir_DiffSrcDir_WithEAR_Source_NoBuild.war b/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContextRoot_DiffContentDir_DiffSrcDir_WithEAR_Source_NoBuild.war
new file mode 100644
index 0000000..81ad6ea
--- /dev/null
+++ b/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContextRoot_DiffContentDir_DiffSrcDir_WithEAR_Source_NoBuild.war
Binary files differ
diff --git a/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContextRoot_DiffContentDir_WithEAR_Defaults.war b/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContextRoot_DiffContentDir_WithEAR_Defaults.war
new file mode 100644
index 0000000..5ae3c0b
--- /dev/null
+++ b/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContextRoot_DiffContentDir_WithEAR_Defaults.war
Binary files differ
diff --git a/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContextRoot_DiffContentDir_WithEAR_NoBuild.war b/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContextRoot_DiffContentDir_WithEAR_NoBuild.war
new file mode 100644
index 0000000..5ae3c0b
--- /dev/null
+++ b/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContextRoot_DiffContentDir_WithEAR_NoBuild.war
Binary files differ
diff --git a/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContextRoot_DiffContentDir_WithEAR_Source.war b/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContextRoot_DiffContentDir_WithEAR_Source.war
new file mode 100644
index 0000000..5ae3c0b
--- /dev/null
+++ b/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContextRoot_DiffContentDir_WithEAR_Source.war
Binary files differ
diff --git a/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContextRoot_DiffContentDir_WithEAR_Source_NoBuild.war b/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContextRoot_DiffContentDir_WithEAR_Source_NoBuild.war
new file mode 100644
index 0000000..5ae3c0b
--- /dev/null
+++ b/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContextRoot_DiffContentDir_WithEAR_Source_NoBuild.war
Binary files differ
diff --git a/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContextRoot_DiffSrcDir_WithEAR_Defaults.war b/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContextRoot_DiffSrcDir_WithEAR_Defaults.war
new file mode 100644
index 0000000..fb15fca
--- /dev/null
+++ b/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContextRoot_DiffSrcDir_WithEAR_Defaults.war
Binary files differ
diff --git a/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContextRoot_DiffSrcDir_WithEAR_NoBuild.war b/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContextRoot_DiffSrcDir_WithEAR_NoBuild.war
new file mode 100644
index 0000000..fb15fca
--- /dev/null
+++ b/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContextRoot_DiffSrcDir_WithEAR_NoBuild.war
Binary files differ
diff --git a/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContextRoot_DiffSrcDir_WithEAR_Source.war b/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContextRoot_DiffSrcDir_WithEAR_Source.war
new file mode 100644
index 0000000..fb15fca
--- /dev/null
+++ b/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContextRoot_DiffSrcDir_WithEAR_Source.war
Binary files differ
diff --git a/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContextRoot_DiffSrcDir_WithEAR_Source_NoBuild.war b/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContextRoot_DiffSrcDir_WithEAR_Source_NoBuild.war
new file mode 100644
index 0000000..fb15fca
--- /dev/null
+++ b/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContextRoot_DiffSrcDir_WithEAR_Source_NoBuild.war
Binary files differ
diff --git a/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContextRoot_WithEAR_Defaults.war b/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContextRoot_WithEAR_Defaults.war
new file mode 100644
index 0000000..30c1bf4
--- /dev/null
+++ b/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContextRoot_WithEAR_Defaults.war
Binary files differ
diff --git a/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContextRoot_WithEAR_NoBuild.war b/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContextRoot_WithEAR_NoBuild.war
new file mode 100644
index 0000000..30c1bf4
--- /dev/null
+++ b/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContextRoot_WithEAR_NoBuild.war
Binary files differ
diff --git a/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContextRoot_WithEAR_Source.war b/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContextRoot_WithEAR_Source.war
new file mode 100644
index 0000000..30c1bf4
--- /dev/null
+++ b/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContextRoot_WithEAR_Source.war
Binary files differ
diff --git a/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContextRoot_WithEAR_Source_NoBuild.war b/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContextRoot_WithEAR_Source_NoBuild.war
new file mode 100644
index 0000000..30c1bf4
--- /dev/null
+++ b/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContextRoot_WithEAR_Source_NoBuild.war
Binary files differ
diff --git a/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffSrcDir_Defaults.war b/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffSrcDir_Defaults.war
new file mode 100644
index 0000000..119beda
--- /dev/null
+++ b/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffSrcDir_Defaults.war
Binary files differ
diff --git a/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffSrcDir_NoBuild.war b/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffSrcDir_NoBuild.war
new file mode 100644
index 0000000..119beda
--- /dev/null
+++ b/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffSrcDir_NoBuild.war
Binary files differ
diff --git a/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffSrcDir_Source.war b/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffSrcDir_Source.war
new file mode 100644
index 0000000..119beda
--- /dev/null
+++ b/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffSrcDir_Source.war
Binary files differ
diff --git a/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffSrcDir_Source_NoBuild.war b/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffSrcDir_Source_NoBuild.war
new file mode 100644
index 0000000..119beda
--- /dev/null
+++ b/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffSrcDir_Source_NoBuild.war
Binary files differ
diff --git a/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffSrcDir_WithEAR_Defaults.war b/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffSrcDir_WithEAR_Defaults.war
new file mode 100644
index 0000000..3fad1a9
--- /dev/null
+++ b/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffSrcDir_WithEAR_Defaults.war
Binary files differ
diff --git a/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffSrcDir_WithEAR_NoBuild.war b/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffSrcDir_WithEAR_NoBuild.war
new file mode 100644
index 0000000..3fad1a9
--- /dev/null
+++ b/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffSrcDir_WithEAR_NoBuild.war
Binary files differ
diff --git a/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffSrcDir_WithEAR_Source.war b/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffSrcDir_WithEAR_Source.war
new file mode 100644
index 0000000..3fad1a9
--- /dev/null
+++ b/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffSrcDir_WithEAR_Source.war
Binary files differ
diff --git a/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffSrcDir_WithEAR_Source_NoBuild.war b/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffSrcDir_WithEAR_Source_NoBuild.war
new file mode 100644
index 0000000..3fad1a9
--- /dev/null
+++ b/tests/org.eclipse.jst.jee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffSrcDir_WithEAR_Source_NoBuild.war
Binary files differ
diff --git a/tests/org.eclipse.jst.jee.tests/about.html b/tests/org.eclipse.jst.jee.tests/about.html
new file mode 100644
index 0000000..2199df3
--- /dev/null
+++ b/tests/org.eclipse.jst.jee.tests/about.html
@@ -0,0 +1,34 @@
+<!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">
+
+<H3>About This Content</H3>
+
+<P>June, 2008</P>
+
+<H3>License</H3>
+
+<P>The Eclipse Foundation makes available all content in this plug-in 
+("Content"). Unless otherwise indicated below, the Content is provided to you 
+under the terms and conditions of the Eclipse Public License Version 1.0 
+("EPL"). A copy of the EPL is available at
+<A href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</A>. 
+For purposes of the EPL, "Program" 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 ("Redistributor") 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 
+and such source code may be obtained at
+<A href="http://www.eclipse.org/">http://www.eclipse.org/</A>.</P>
+
+</BODY>
+</HTML>
diff --git a/tests/org.eclipse.jst.jee.tests/build.properties b/tests/org.eclipse.jst.jee.tests/build.properties
new file mode 100644
index 0000000..3e78a96
--- /dev/null
+++ b/tests/org.eclipse.jst.jee.tests/build.properties
@@ -0,0 +1,27 @@
+###############################################################################
+# Copyright (c) 2005, 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
+###############################################################################
+source.jee-tests.jar = 
+output.jee-tests.jar = bin/
+bin.includes = plugin.xml,\
+               jee-tests.jar,\
+               TestData/,\
+               test.xml,\
+               about.html,\
+               DefectTestData/,\
+               META-INF/,\
+               bvt.properties
+src.includes = build.properties,\
+               test.xml,\
+               plugin.xml,\
+               TestData/,\
+               DefectTestData/,\
+               bvt.properties
+source.jee-tests.jar = jee-tests/
diff --git a/tests/org.eclipse.jst.jee.tests/bvt.properties b/tests/org.eclipse.jst.jee.tests/bvt.properties
new file mode 100644
index 0000000..8a742a0
--- /dev/null
+++ b/tests/org.eclipse.jst.jee.tests/bvt.properties
@@ -0,0 +1,20 @@
+###############################################################################
+# Copyright (c) 2010 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
+###############################################################################
+
+# To run all the buckets in the BVT, uncomment org.eclipse.jst.j2ee.tests.bvt.ALL (the rest of the
+# properties will be ignored). 
+# To run individual buckets, comment out org.eclipse.jst.2ee.tests.bvt.ALL and
+# uncomment the corresponding properties.
+
+#org.eclipse.jst.jee.tests.bvt.ALL = true
+org.eclipse.jst.jee.tests.bvt.EnterpriseBVT = true
+org.eclipse.jst.jee.tests.bvt.EJBBVT = true
+org.eclipse.jst.jee.tests.bvt.WebBVT = true
diff --git a/tests/org.eclipse.jst.jee.tests/jee-tests/org/eclipse/jst/jee/tests/bvt/AutomatedBVT.java b/tests/org.eclipse.jst.jee.tests/jee-tests/org/eclipse/jst/jee/tests/bvt/AutomatedBVT.java
new file mode 100644
index 0000000..ade654c
--- /dev/null
+++ b/tests/org.eclipse.jst.jee.tests/jee-tests/org/eclipse/jst/jee/tests/bvt/AutomatedBVT.java
@@ -0,0 +1,62 @@
+/*******************************************************************************
+ * Copyright (c) 2010 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.jee.tests.bvt;
+
+import java.net.URL;
+
+import junit.framework.Test;
+import junit.framework.TestSuite;
+import junit.textui.TestRunner;
+
+import org.eclipse.core.runtime.IPluginDescriptor;
+import org.eclipse.core.runtime.Platform;
+import org.eclipse.wtp.jee.headless.tests.plugin.AllPluginTests;
+
+
+public class AutomatedBVT extends TestSuite {
+
+    public static String baseDirectory = System.getProperty("user.dir") + java.io.File.separatorChar + "TestData" + java.io.File.separatorChar;
+    
+    static {
+        try {
+            IPluginDescriptor pluginDescriptor = Platform.getPluginRegistry().getPluginDescriptor("org.eclipse.jst.jee.tests");
+            URL url = pluginDescriptor.getInstallURL(); 
+        	AutomatedBVT.baseDirectory = Platform.asLocalURL(url).getFile() + "TestData"+ java.io.File.separatorChar;
+		} catch (Exception e) { 
+			System.err.println("Using working directory since a workspace URL could not be located.");
+		} 
+    }
+
+    public static int unimplementedMethods;
+
+    public static void main(String[] args) {
+        unimplementedMethods = 0;
+        TestRunner.run(suite());
+        if (unimplementedMethods > 0) {
+            System.out.println("\nCalls to warnUnimpl: " + unimplementedMethods);
+        }
+    }
+
+    public AutomatedBVT() {
+        super();
+        TestSuite suite = (TestSuite) AutomatedBVT.suite();
+        for (int i = 0; i < suite.testCount(); i++) {
+            addTest(suite.testAt(i));
+        }
+    }
+
+    public static Test suite() {
+        TestSuite suite = new TestSuite("Test for org.eclipse.jst.jee.test.bvt");
+        suite.addTest(AllPluginTests.suite());
+        return suite;
+    }
+}
diff --git a/tests/org.eclipse.jst.jee.tests/jee-tests/org/eclipse/jst/jee/tests/bvt/EJBBVT.java b/tests/org.eclipse.jst.jee.tests/jee-tests/org/eclipse/jst/jee/tests/bvt/EJBBVT.java
new file mode 100644
index 0000000..af25392
--- /dev/null
+++ b/tests/org.eclipse.jst.jee.tests/jee-tests/org/eclipse/jst/jee/tests/bvt/EJBBVT.java
@@ -0,0 +1,28 @@
+/*******************************************************************************
+ * Copyright (c) 2010 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.jee.tests.bvt;
+
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
+public class EJBBVT extends TestSuite {
+
+    public EJBBVT() {
+        super();
+        addTest(org.eclipse.wtp.jee.headless.tests.ejb.operations.AllTests.suite());      
+    }
+    
+    public static Test suite(){
+    	return new EJBBVT();
+    }
+    
+}
diff --git a/tests/org.eclipse.jst.jee.tests/jee-tests/org/eclipse/jst/jee/tests/bvt/EnterpriseBVT.java b/tests/org.eclipse.jst.jee.tests/jee-tests/org/eclipse/jst/jee/tests/bvt/EnterpriseBVT.java
new file mode 100644
index 0000000..e0097e3
--- /dev/null
+++ b/tests/org.eclipse.jst.jee.tests/jee-tests/org/eclipse/jst/jee/tests/bvt/EnterpriseBVT.java
@@ -0,0 +1,27 @@
+/*******************************************************************************
+ * Copyright (c) 2010 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.jee.tests.bvt;
+
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
+public class EnterpriseBVT extends TestSuite {
+
+	public EnterpriseBVT(){
+		super();
+		addTest(org.eclipse.wtp.jee.headless.tests.appclient.operations.AllTests.suite());
+	}
+	
+    public static Test suite(){
+    	return new EnterpriseBVT();
+    }
+}
diff --git a/tests/org.eclipse.jst.jee.tests/jee-tests/org/eclipse/jst/jee/tests/bvt/WebBVT.java b/tests/org.eclipse.jst.jee.tests/jee-tests/org/eclipse/jst/jee/tests/bvt/WebBVT.java
new file mode 100644
index 0000000..e524d42
--- /dev/null
+++ b/tests/org.eclipse.jst.jee.tests/jee-tests/org/eclipse/jst/jee/tests/bvt/WebBVT.java
@@ -0,0 +1,26 @@
+/*******************************************************************************
+ * Copyright (c) 2010 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.jee.tests.bvt;
+
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
+public class WebBVT extends TestSuite {
+
+	public WebBVT() {
+        super();
+        addTest(org.eclipse.wtp.jee.headless.tests.web.operations.AllTests.suite());     
+    }
+	public static Test suite(){
+		return new WebBVT();
+	}
+}
diff --git a/tests/org.eclipse.jst.jee.tests/jee-tests/org/eclipse/wtp/jee/headless/tests/appclient/operations/AllTests.java b/tests/org.eclipse.jst.jee.tests/jee-tests/org/eclipse/wtp/jee/headless/tests/appclient/operations/AllTests.java
new file mode 100644
index 0000000..1ed2bd3
--- /dev/null
+++ b/tests/org.eclipse.jst.jee.tests/jee-tests/org/eclipse/wtp/jee/headless/tests/appclient/operations/AllTests.java
@@ -0,0 +1,26 @@
+/*******************************************************************************
+ * Copyright (c) 2010 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.wtp.jee.headless.tests.appclient.operations;
+
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
+public class AllTests extends TestSuite {
+    public static Test suite(){
+        return new AllTests();
+    }
+    
+    public AllTests(){
+        super("Application Client Operation Tests");
+        addTest(AppClientImportOperationTest.suite());
+    }
+}
diff --git a/tests/org.eclipse.jst.jee.tests/jee-tests/org/eclipse/wtp/jee/headless/tests/appclient/operations/AppClientImportOperationTest.java b/tests/org.eclipse.jst.jee.tests/jee-tests/org/eclipse/wtp/jee/headless/tests/appclient/operations/AppClientImportOperationTest.java
new file mode 100644
index 0000000..9e8f339
--- /dev/null
+++ b/tests/org.eclipse.jst.jee.tests/jee-tests/org/eclipse/wtp/jee/headless/tests/appclient/operations/AppClientImportOperationTest.java
@@ -0,0 +1,102 @@
+/*******************************************************************************
+ * Copyright (c) 2010 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.wtp.jee.headless.tests.appclient.operations;
+
+import junit.framework.Test;
+
+import org.eclipse.wst.common.tests.SimpleTestSuite;
+import org.eclipse.wtp.j2ee.headless.tests.appclient.operations.AppClientImportOperationBaseTest;
+
+public class AppClientImportOperationTest extends AppClientImportOperationBaseTest {
+	
+	public AppClientImportOperationTest() {
+		super("AppClientImportOperationTests");
+	}
+	
+	public AppClientImportOperationTest(String name) {
+		super(name);
+	}
+	
+	public static Test suite() {
+		return new SimpleTestSuite(AppClientImportOperationTest.class);
+	}	
+	    
+    public void testACImport50_Defaults() throws Exception {
+    	runImportTests_All("AC50_Defaults");
+    }
+    
+    //TODO -- annotations to scan?
+    //EE6TODO 
+//    public void testACImport60_Defaults() throws Exception {
+//    	runImportTests_All("AC60_Defaults");
+//    }
+    
+    public void testACImport50_NoDefaultClass() throws Exception {
+    	runImportTests_All("AC50_NoDefaultClass");
+    }
+    
+    //TODO -- annotations to scan?
+    //EE6TODO 
+//    public void testACImport60_NoDefaultClass() throws Exception {
+//    	runImportTests_All("AC60_NoDefaultClass");
+//    }
+    
+    
+    public void testACImport50_AddToEAR() throws Exception {
+    	runImportTests_All("AC50_AddToEAR");
+    }
+
+    //TODO -- annotations to scan?
+    //EE6TODO 
+//    public void testACImport60_AddToEAR() throws Exception {
+//    	runImportTests_All("AC60_AddToEAR");
+//    }
+    
+    
+    public void testACImport50_InterestingName() throws Exception{
+    	runImportTests_All("AC50_InterestingName");
+    }
+
+    //TODO -- annotations to scan?
+    //EE6TODO 
+//    public void testACImport60_InterestingName() throws Exception{
+//    	runImportTests_All("AC60_InterestingName");
+//    }
+
+    
+    public void testACImport50_AddToEAR_InterestingName() throws Exception{
+    	runImportTests_All("AC50_AddToEAR_InterestingName");
+    }
+
+    //TODO -- annotations to scan?
+    //EE6TODO 
+//    public void testACImport60_AddToEAR_InterestingName() throws Exception{
+//    	runImportTests_All("AC60_AddToEAR_InterestingName");
+//    }
+    
+
+    public void testACImport60_WithDD() throws Exception {
+    	runImportTests_All("AC60_WithDD");
+    }
+
+    public void testACImport60_NoDefaultClass_WithDD() throws Exception {
+    	runImportTests_All("AC60_NoDefaultClass_WithDD");
+    }
+
+    public void testACImport60_AddToEAR_WithDD() throws Exception {
+    	runImportTests_All("AC60_AddToEAR_WithDD");
+    }
+    
+    public void testACImport60_AddToEAR_InterestingName_WithDD() throws Exception {
+    	runImportTests_All("AC60_AddToEAR_InterestingName_WithDD");
+    }
+}
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jee.tests/jee-tests/org/eclipse/wtp/jee/headless/tests/ejb/operations/AllTests.java b/tests/org.eclipse.jst.jee.tests/jee-tests/org/eclipse/wtp/jee/headless/tests/ejb/operations/AllTests.java
new file mode 100644
index 0000000..b3dc584
--- /dev/null
+++ b/tests/org.eclipse.jst.jee.tests/jee-tests/org/eclipse/wtp/jee/headless/tests/ejb/operations/AllTests.java
@@ -0,0 +1,30 @@
+/*******************************************************************************
+ * Copyright (c) 2010 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.wtp.jee.headless.tests.ejb.operations;
+
+
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
+
+public class AllTests extends TestSuite {
+
+    public static Test suite(){
+        return new AllTests();
+    }
+    
+    public AllTests(){
+        super("EJB Operation Tests");
+        addTest(EJBImportOperationTest.suite());
+    }
+    
+}
diff --git a/tests/org.eclipse.jst.jee.tests/jee-tests/org/eclipse/wtp/jee/headless/tests/ejb/operations/EJBImportOperationTest.java b/tests/org.eclipse.jst.jee.tests/jee-tests/org/eclipse/wtp/jee/headless/tests/ejb/operations/EJBImportOperationTest.java
new file mode 100644
index 0000000..c87b65e
--- /dev/null
+++ b/tests/org.eclipse.jst.jee.tests/jee-tests/org/eclipse/wtp/jee/headless/tests/ejb/operations/EJBImportOperationTest.java
@@ -0,0 +1,113 @@
+/*******************************************************************************
+ * Copyright (c) 2010 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.wtp.jee.headless.tests.ejb.operations;
+
+import junit.framework.Test;
+
+import org.eclipse.wst.common.tests.SimpleTestSuite;
+import org.eclipse.wtp.j2ee.headless.tests.ejb.operations.EJBImportOperationBaseTest;
+
+
+public class EJBImportOperationTest extends EJBImportOperationBaseTest {
+	public EJBImportOperationTest() {
+		super("EJBImportOperationTests");
+	}
+	
+	public EJBImportOperationTest(String name) {
+		super(name);
+	}
+	
+	public static Test suite() {
+		return new SimpleTestSuite(EJBImportOperationTest.class);
+	}
+	    
+    public void testEJBImport30_Defaults() throws Exception {
+		runImportTests_All("EJB30_Defaults");
+    }
+    //TODO -- annotations to scan?
+    //EE6TODO 
+//    public void testEJBImport31_Defaults() throws Exception {
+//		runImportTests_All("EJB31_Defaults");
+//    }
+    
+    public void testEJBImport30_AddToEAR_Defaults() throws Exception {
+		runImportTests_All("EJB30_AddToEAR_Defaults");
+    }
+    
+    public void testEJBImport31_AddToEAR_Defaults() throws Exception {
+		runImportTests_All("EJB30_AddToEAR_Defaults");
+    }
+
+    public void testEJBImport30_AddToEAR_NoClient() throws Exception {
+		runImportTests_All("EJB30_AddToEAR_NoClient");
+    }
+    
+    //TODO -- annotations to scan?
+    //EE6TODO 
+//    public void testEJBImport31_AddToEAR_NoClient() throws Exception {
+//		runImportTests_All("EJB31_AddToEAR_NoClient");
+//    }
+    
+    public void testEJBImport30_AddToEAR_DifClientName() throws Exception {
+		runImportTests_All("EJB30_AddToEAR_DiffClientName");
+    }
+    
+    //TODO -- annotations to scan?
+    //EE6TODO 
+//    public void testEJBImport31_AddToEAR_DifClientName() throws Exception {
+//		runImportTests_All("EJB31_AddToEAR_DiffClientName");
+//    }
+    
+    public void testEJBImport30_AddToEAR_DiffClientSourceFolder() throws Exception {
+		runImportTests_All("EJB30_AddToEAR_DiffClientSourceFolder");
+    }
+    
+    //TODO -- annotations to scan?
+    //EE6TODO 
+//    public void testEJBImport31_AddToEAR_DiffClientSourceFolder() throws Exception {
+//		runImportTests_All("EJB31_AddToEAR_DiffClientSourceFolder");
+//    }
+    
+    public void testEJBImport30_AddToEAR_DiffClientName_DiffClientSourceFolder() throws Exception {
+		runImportTests_All("EJB30_AddToEAR_DiffClientName_DiffClientSourceFolder");
+    }
+
+    //TODO -- annotations to scan?
+    //EE6TODO 
+//    public void testEJBImport31_AddToEAR_DiffClientName_DiffClientSourceFolder() throws Exception {
+//		runImportTests_All("EJB31_AddToEAR_DiffClientName_DiffClientSourceFolder");
+//    }
+    
+    public void testEJBImport31_Defaults_WithDD() throws Exception {
+		runImportTests_All("EJB31_Defaults_WithDD");
+    }
+    
+    public void testEJBImport31_AddToEAR_Defaults_WithDD() throws Exception {
+		runImportTests_All("EJB31_AddToEAR_Defaults_WithDD");
+    }
+
+    public void testEJBImport31_AddToEAR_NoClient_WithDD() throws Exception {
+		runImportTests_All("EJB31_AddToEAR_NoClient_WithDD");
+    }
+    
+    public void testEJBImport31_AddToEAR_DiffClientName_WithDD() throws Exception {
+		runImportTests_All("EJB31_AddToEAR_DiffClientName_WithDD");
+    }
+    
+    public void testEJBImport31_AddToEAR_DiffClientSourceFolder_WithDD() throws Exception {
+		runImportTests_All("EJB31_AddToEAR_DiffClientSourceFolder_WithDD");
+    }
+    
+    public void testEJBImport31_AddToEAR_DiffClientName_DiffClientSourceFolder_WithDD() throws Exception {
+		runImportTests_All("EJB31_AddToEAR_DiffClientName_DiffClientSourceFolder_WithDD");
+    }
+}
diff --git a/tests/org.eclipse.jst.jee.tests/jee-tests/org/eclipse/wtp/jee/headless/tests/plugin/AllPluginTests.java b/tests/org.eclipse.jst.jee.tests/jee-tests/org/eclipse/wtp/jee/headless/tests/plugin/AllPluginTests.java
new file mode 100644
index 0000000..3f72a6c
--- /dev/null
+++ b/tests/org.eclipse.jst.jee.tests/jee-tests/org/eclipse/wtp/jee/headless/tests/plugin/AllPluginTests.java
@@ -0,0 +1,55 @@
+/*******************************************************************************
+ * Copyright (c) 2010 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.wtp.jee.headless.tests.plugin;
+
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
+import org.eclipse.core.runtime.Path;
+import org.eclipse.wst.server.core.IRuntime;
+import org.eclipse.wst.server.core.IRuntimeType;
+import org.eclipse.wst.server.core.IRuntimeWorkingCopy;
+import org.eclipse.wst.server.core.ServerCore;
+
+
+public class AllPluginTests extends TestSuite {
+	
+	public static IRuntime JONAS_SERVER = createJONASRuntime();
+
+    public static Test suite() {
+        return new AllPluginTests();
+    }
+
+	public AllPluginTests() {
+		super();
+		addTest(org.eclipse.jst.jee.tests.bvt.EnterpriseBVT.suite());
+		addTest(org.eclipse.jst.jee.tests.bvt.EJBBVT.suite());
+		addTest(org.eclipse.jst.jee.tests.bvt.WebBVT.suite());
+	}
+    
+    public static IRuntime createJONASRuntime()  {
+    	String s = System.getProperty("org.eclipse.jst.server.jonas.432");
+    	if (s == null || s.length() == 0)
+    		return null;
+    	try {
+    		IRuntimeType rt = ServerCore.findRuntimeType("org.eclipse.jst.server.core.runtimeType");
+    		IRuntimeWorkingCopy wc = rt.createRuntime(null, null);
+    		wc.setLocation(new Path(s));
+    		return wc.save(true, null);
+    	} catch (Exception e) {
+    		e.printStackTrace();
+    		return null;
+    	}
+    }
+
+}
diff --git a/tests/org.eclipse.jst.jee.tests/jee-tests/org/eclipse/wtp/jee/headless/tests/plugin/HeadlessTestsPlugin.java b/tests/org.eclipse.jst.jee.tests/jee-tests/org/eclipse/wtp/jee/headless/tests/plugin/HeadlessTestsPlugin.java
new file mode 100644
index 0000000..134031f
--- /dev/null
+++ b/tests/org.eclipse.jst.jee.tests/jee-tests/org/eclipse/wtp/jee/headless/tests/plugin/HeadlessTestsPlugin.java
@@ -0,0 +1,87 @@
+/*******************************************************************************
+ * Copyright (c) 2010 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.wtp.jee.headless.tests.plugin;
+
+import java.util.MissingResourceException;
+import java.util.ResourceBundle;
+
+import org.eclipse.core.resources.IWorkspace;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.Plugin;
+import org.eclipse.wst.common.tests.DataModelVerifierFactory;
+import org.eclipse.wtp.j2ee.headless.tests.j2ee.verifiers.DataModelVerifierListGenerator;
+import org.osgi.framework.BundleContext;
+
+/**
+ * The main plugin class to be used in the desktop.
+ */
+public class HeadlessTestsPlugin extends Plugin {
+	//The shared instance.
+	private static HeadlessTestsPlugin plugin;
+	//Resource bundle.
+	private ResourceBundle resourceBundle;
+	
+	/**
+	 * The constructor.
+	 */
+	public HeadlessTestsPlugin() {
+		super();
+		plugin = this;
+		try {
+			resourceBundle= ResourceBundle.getBundle("org.eclipse.wtp.jee.wb.tests.TestsPluginResources");
+		} catch (MissingResourceException x) {
+			resourceBundle = null;
+		}
+	}
+
+	/**
+	 * Returns the shared instance.
+	 */
+	public static HeadlessTestsPlugin getDefault() {
+		return plugin;
+	}
+
+	/**
+	 * Returns the workspace instance.
+	 */
+	public static IWorkspace getWorkspace() {
+		return ResourcesPlugin.getWorkspace();
+	}
+
+	/**
+	 * Returns the string from the plugin's resource bundle,
+	 * or 'key' if not found.
+	 */
+	public static String getResourceString(String key) {
+		ResourceBundle bundle= getDefault().getResourceBundle();
+		try {
+			return (bundle!=null ? bundle.getString(key) : key);
+		} catch (MissingResourceException e) {
+			return key;
+		}
+	}
+	
+	@Override
+	public void start(BundleContext context) throws Exception {
+		super.start(context);
+		
+		//needed so that jee operation tests will verify correctly
+		DataModelVerifierFactory.getInstance().addToDataModelVerifiersMap(DataModelVerifierListGenerator.getVerifiers());
+	}
+	
+	/**
+	 * Returns the plugin's resource bundle,
+	 */
+	public ResourceBundle getResourceBundle() {
+		return resourceBundle;
+	}
+}
diff --git a/tests/org.eclipse.jst.jee.tests/jee-tests/org/eclipse/wtp/jee/headless/tests/web/operations/AllTests.java b/tests/org.eclipse.jst.jee.tests/jee-tests/org/eclipse/wtp/jee/headless/tests/web/operations/AllTests.java
new file mode 100644
index 0000000..bb6e47a
--- /dev/null
+++ b/tests/org.eclipse.jst.jee.tests/jee-tests/org/eclipse/wtp/jee/headless/tests/web/operations/AllTests.java
@@ -0,0 +1,28 @@
+/*******************************************************************************
+ * Copyright (c) 2010 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.wtp.jee.headless.tests.web.operations;
+
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
+public class AllTests extends TestSuite {
+	
+    public static Test suite(){
+        return new AllTests();
+    }
+    
+    public AllTests(){
+       super("Web Operation, Servlet, & Deploy Tests");
+       addTest(WebImportOperationTest.suite());
+    }    
+}
diff --git a/tests/org.eclipse.jst.jee.tests/jee-tests/org/eclipse/wtp/jee/headless/tests/web/operations/WebImportOperationTest.java b/tests/org.eclipse.jst.jee.tests/jee-tests/org/eclipse/wtp/jee/headless/tests/web/operations/WebImportOperationTest.java
new file mode 100644
index 0000000..fb958de
--- /dev/null
+++ b/tests/org.eclipse.jst.jee.tests/jee-tests/org/eclipse/wtp/jee/headless/tests/web/operations/WebImportOperationTest.java
@@ -0,0 +1,81 @@
+/*******************************************************************************
+ * Copyright (c) 2010 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.wtp.jee.headless.tests.web.operations;
+
+import junit.framework.Test;
+
+import org.eclipse.wst.common.tests.SimpleTestSuite;
+import org.eclipse.wtp.j2ee.headless.tests.web.operations.WebImportOperationBaseTest;
+
+public class WebImportOperationTest extends WebImportOperationBaseTest {
+
+	public WebImportOperationTest() {
+		super("WebImportOperationTests");
+	}
+	
+	public WebImportOperationTest(String name) {
+		super(name);
+	}
+	
+	public static Test suite() {
+		return new SimpleTestSuite(WebImportOperationTest.class);
+	}
+	
+	public void testWebImport25_Defaults() throws Exception {
+		runImportTests_All("Web25_Defaults");
+	}	
+	
+	public void testWebImport25_DiffContentDir() throws Exception {
+		runImportTests_All("Web25_DiffContentDir");
+	}
+		
+	public void testWebImport25_DiffSrcDir() throws Exception {
+		runImportTests_All("Web25_DiffSrcDir");
+	}
+
+	public void testWebImport25_DiffContentDir_DiffSrcDir() throws Exception {
+		runImportTests_All("Web25_DiffContentDir_DiffSrcDir");
+	}
+	
+	public void testWebImport25_Defaults_WithEAR() throws Exception {
+		runImportTests_All("Web25_Defaults_WithEAR");
+	}
+	
+	public void testWebImport25_DiffContextRoot_WithEAR() throws Exception {
+		runImportTests_All("Web25_DiffContextRoot_WithEAR");
+	}
+
+	public void testWebImport25_DiffContentDir_WithEAR() throws Exception {
+		runImportTests_All("Web25_DiffContentDir_WithEAR");
+	}
+	
+	public void testWebImport25_DiffSrcDir_WithEAR() throws Exception {
+		runImportTests_All("Web25_DiffSrcDir_WithEAR");
+	}
+	
+	public void testWebImport25_DiffContextRoot_DiffContentDir_WithEAR() throws Exception {
+		runImportTests_All("Web25_DiffContextRoot_DiffContentDir_WithEAR");
+	}
+	
+	public void testWebImport25_DiffContextRoot_DiffSrcDir_WithEAR() throws Exception {
+		runImportTests_All("Web25_DiffContextRoot_DiffSrcDir_WithEAR");
+	}
+	
+	public void testWebImport25_DiffContentDir_DiffSrcDir_WithEAR() throws Exception {
+		runImportTests_All("Web25_DiffContentDir_DiffSrcDir_WithEAR");
+	}
+
+	public void testWebImport25_DiffContextRoot_DiffContentDir_DiffSrcDir_WithEAR() throws Exception {
+		runImportTests_All("Web25_DiffContextRoot_DiffContentDir_DiffSrcDir_WithEAR");
+	}
+}
diff --git a/tests/org.eclipse.jst.jee.tests/plugin.xml b/tests/org.eclipse.jst.jee.tests/plugin.xml
new file mode 100644
index 0000000..a95eea2
--- /dev/null
+++ b/tests/org.eclipse.jst.jee.tests/plugin.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.0"?>
+<plugin>
+
+
+
+   
+   
+
+</plugin>
diff --git a/tests/org.eclipse.jst.jee.tests/test.xml b/tests/org.eclipse.jst.jee.tests/test.xml
new file mode 100644
index 0000000..be9d0b2
--- /dev/null
+++ b/tests/org.eclipse.jst.jee.tests/test.xml
@@ -0,0 +1,93 @@
+<?xml version="1.0"?>
+
+<project name="testsuite" default="run" basedir=".">
+	<!-- The property ${eclipse-home} should be passed into this script -->
+	<!-- Set a meaningful default value for when it is not. -->
+	<property name="eclipse-home" value="${basedir}\..\.." />
+
+	<!-- sets the properties eclipse-home, and library-file -->
+	<property name="plugin-name" value="org.eclipse.jst.jee.tests" />
+	<property name="library-file" value="${eclipse-home}/plugins/org.eclipse.test_3.3.0/library.xml" />
+	<property name="extraVMargs" value="-Dorg.eclipse.jst.server.jonas.432=${jonas432Dir}" />
+
+	<property name="workspace" value="${basedir}/${plugin-name}" />
+
+	<!-- Read the properties that will enable/disable the different targets below. -->
+	<property file="bvt.properties" />
+
+	<!-- This target holds all initialization code that needs to be done for -->
+	<!-- all tests that are to be run. Initialization for individual tests -->
+	<!-- should be done within the body of the suite target. -->
+	<target name="init">
+		<tstamp />
+		<delete>
+			<fileset dir="${eclipse-home}" includes="org*.xml" />
+		</delete>
+		<delete dir="${workspace}" quiet="true" />
+	</target>
+
+	<target name="AutomatedBVTSuite" if="org.eclipse.jst.jee.tests.bvt.ALL">
+		<ant target="core-test" antfile="${library-file}" dir="${eclipse-home}">
+			<property name="data-dir" value="${workspace}" />
+			<property name="plugin-name" value="${plugin-name}" />
+			<property name="classname" value="org.eclipse.jst.jee.tests.bvt.AutomatedBVT" />
+			<property name="extraVMargs" value="${extraVMargs}" />
+		</ant>
+		<antcall target="cleanup"/>
+	</target>
+
+	<target name="EnterpriseBVTSuite" if="org.eclipse.jst.jee.tests.bvt.EnterpriseBVT" unless="org.eclipse.jst.jee.tests.bvt.ALL">
+		<ant target="core-test" antfile="${library-file}" dir="${eclipse-home}">
+			<property name="data-dir" value="${workspace}" />
+			<property name="plugin-name" value="${plugin-name}" />
+			<property name="classname" value="org.eclipse.jst.jee.tests.bvt.EnterpriseBVT" />
+			<property name="extraVMargs" value="${extraVMargs}" />
+		</ant>
+		<antcall target="cleanup"/>
+	</target>
+
+	<target name="WebBVTSuite" if="org.eclipse.jst.jee.tests.bvt.WebBVT" unless="org.eclipse.jst.jee.tests.bvt.ALL">
+		<ant target="core-test" antfile="${library-file}" dir="${eclipse-home}">
+			<property name="data-dir" value="${workspace}" />
+			<property name="plugin-name" value="${plugin-name}" />
+			<property name="classname" value="org.eclipse.jst.jee.tests.bvt.WebBVT" />
+			<property name="extraVMargs" value="${extraVMargs}" />
+		</ant>
+		<antcall target="cleanup"/>
+	</target>
+
+	<target name="EJBBVTSuite" if="org.eclipse.jst.jee.tests.bvt.EJBBVT" unless="org.eclipse.jst.jee.tests.bvt.ALL">
+		<ant target="core-test" antfile="${library-file}" dir="${eclipse-home}">
+			<property name="data-dir" value="${workspace}" />
+			<property name="plugin-name" value="${plugin-name}" />
+			<property name="classname" value="org.eclipse.jst.jee.tests.bvt.EJBBVT" />
+			<property name="extraVMargs" value="${extraVMargs}" />
+		</ant>
+		<antcall target="cleanup"/>
+	</target>
+
+
+	<!-- This target defines the tests that need to be run. -->
+	<target name="suite" depends="AutomatedBVTSuite, EnterpriseBVTSuite, WebBVTSuite, EJBBVTSuite">
+	</target>
+
+	<!-- This target holds code to cleanup the testing environment after -->
+	<!-- after all of the tests have been run. You can use this target to -->
+	<!-- delete temporary files that have been created. -->
+	<target name="cleanup">
+		<delete dir="${workspace}" quiet="true" />
+	</target>
+
+	<!-- This target runs the test suite. Any actions that need to happen -->
+	<!-- after all the tests have been run should go here. -->
+	<target name="run" depends="init,suite,cleanup">
+		<ant target="collect" antfile="${library-file}" dir="${eclipse-home}">
+			<property name="includes" value="org*.xml" />
+			<property name="output-file" value="${plugin-name}.xml" />
+		</ant>
+	</target>
+
+</project>
+
+
+