diff --git a/features/org.eclipse.wst.common_core.feature.patch/.project b/features/org.eclipse.wst.common_core.feature.patch/.project
deleted file mode 100644
index eb1e1ea..0000000
--- a/features/org.eclipse.wst.common_core.feature.patch/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.wst.common_core.feature.patch</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.pde.FeatureBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.FeatureNature</nature>
-	</natures>
-</projectDescription>
diff --git a/features/org.eclipse.wst.common_core.feature.patch/description.txt b/features/org.eclipse.wst.common_core.feature.patch/description.txt
deleted file mode 100644
index a1fc6d0..0000000
--- a/features/org.eclipse.wst.common_core.feature.patch/description.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-The HEAD branch of this patch feature is intentionally empty, 
-to attempt to try and avoid confusion. 
-
-Please load the correct version from the branch of the related patch.
diff --git a/features/org.eclipse.wst.common_core.feature/feature.xml b/features/org.eclipse.wst.common_core.feature/feature.xml
index a1b7c14..a7a71ee 100644
--- a/features/org.eclipse.wst.common_core.feature/feature.xml
+++ b/features/org.eclipse.wst.common_core.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.wst.common_core.feature"
       label="%featureName"
-      version="2.1.0.qualifier"
+      version="2.0.2.qualifier"
       provider-name="%providerName">
 
    <description>
diff --git a/features/org.eclipse.wst.common_core.feature/sourceTemplateFeature/feature.xml b/features/org.eclipse.wst.common_core.feature/sourceTemplateFeature/feature.xml
index 20d6b1b..96fff6b 100644
--- a/features/org.eclipse.wst.common_core.feature/sourceTemplateFeature/feature.xml
+++ b/features/org.eclipse.wst.common_core.feature/sourceTemplateFeature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.wst.common_core.feature.source"
       label="%featureName"
-      version="2.1.0.qualifier"
+      version="2.0.2.qualifier"
       provider-name="%providerName">
 
    <description>
diff --git a/features/org.eclipse.wst.common_core.feature/sourceTemplatePlugin/about.ini b/features/org.eclipse.wst.common_core.feature/sourceTemplatePlugin/about.ini
index fda5a40..2dee36a 100644
--- a/features/org.eclipse.wst.common_core.feature/sourceTemplatePlugin/about.ini
+++ b/features/org.eclipse.wst.common_core.feature/sourceTemplatePlugin/about.ini
@@ -11,7 +11,7 @@
 # needed for primary features only
 
 # Property "featureImage" contains path to feature image (32x32)
-featureImage=wtp_prod32.png
+featureImage=eclipse32.gif
 
 # Property "aboutImage" contains path to product image (500x330 or 115x164)
 # needed for primary features only
diff --git a/features/org.eclipse.wst.common_core.feature/sourceTemplatePlugin/build.properties b/features/org.eclipse.wst.common_core.feature/sourceTemplatePlugin/build.properties
index ead512d..f95b457 100644
--- a/features/org.eclipse.wst.common_core.feature/sourceTemplatePlugin/build.properties
+++ b/features/org.eclipse.wst.common_core.feature/sourceTemplatePlugin/build.properties
@@ -1,2 +1,2 @@
-bin.includes = about.html, about.ini, about.mappings, about.properties, wtp_prod32.png, plugin.properties, plugin.xml, src/**, META-INF/
+bin.includes = about.html, about.ini, about.mappings, about.properties, eclipse32.gif, plugin.properties, plugin.xml, src/**, META-INF/
 sourcePlugin = true
diff --git a/features/org.eclipse.wst.common_core.feature/sourceTemplatePlugin/eclipse32.gif b/features/org.eclipse.wst.common_core.feature/sourceTemplatePlugin/eclipse32.gif
new file mode 100644
index 0000000..e6ad7cc
--- /dev/null
+++ b/features/org.eclipse.wst.common_core.feature/sourceTemplatePlugin/eclipse32.gif
Binary files differ
diff --git a/features/org.eclipse.wst.common_core.feature/sourceTemplatePlugin/eclipse32.png b/features/org.eclipse.wst.common_core.feature/sourceTemplatePlugin/eclipse32.png
new file mode 100644
index 0000000..50ae49d
--- /dev/null
+++ b/features/org.eclipse.wst.common_core.feature/sourceTemplatePlugin/eclipse32.png
Binary files differ
diff --git a/features/org.eclipse.wst.common_core.feature/sourceTemplatePlugin/wtp_prod32.gif b/features/org.eclipse.wst.common_core.feature/sourceTemplatePlugin/wtp_prod32.gif
deleted file mode 100644
index eefb44a..0000000
--- a/features/org.eclipse.wst.common_core.feature/sourceTemplatePlugin/wtp_prod32.gif
+++ /dev/null
Binary files differ
diff --git a/features/org.eclipse.wst.common_core.feature/sourceTemplatePlugin/wtp_prod32.png b/features/org.eclipse.wst.common_core.feature/sourceTemplatePlugin/wtp_prod32.png
deleted file mode 100644
index bfceab3..0000000
--- a/features/org.eclipse.wst.common_core.feature/sourceTemplatePlugin/wtp_prod32.png
+++ /dev/null
Binary files differ
diff --git a/features/org.eclipse.wst.common_sdk.feature/feature.xml b/features/org.eclipse.wst.common_sdk.feature/feature.xml
index a105182..e781936 100644
--- a/features/org.eclipse.wst.common_sdk.feature/feature.xml
+++ b/features/org.eclipse.wst.common_sdk.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.wst.common_sdk.feature"
       label="%featureName"
-      version="2.1.0.qualifier"
+      version="2.0.2.qualifier"
       provider-name="%providerName">
 
    <description>
@@ -24,7 +24,7 @@
    <includes
          id="org.eclipse.wst.common_ui.feature"
          version="0.0.0"/>
-         
+
    <includes
          id="org.eclipse.wst.common_ui.feature.source"
          version="0.0.0"/>
diff --git a/features/org.eclipse.wst.common_ui.feature/feature.xml b/features/org.eclipse.wst.common_ui.feature/feature.xml
index 6e5824b..c0eb5cc 100644
--- a/features/org.eclipse.wst.common_ui.feature/feature.xml
+++ b/features/org.eclipse.wst.common_ui.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.wst.common_ui.feature"
       label="%featureName"
-      version="2.1.0.qualifier"
+      version="2.0.2.qualifier"
       provider-name="%providerName">
 
    <description>
diff --git a/features/org.eclipse.wst.common_ui.feature/sourceTemplateFeature/feature.xml b/features/org.eclipse.wst.common_ui.feature/sourceTemplateFeature/feature.xml
index 4111657..d7c5f08 100644
--- a/features/org.eclipse.wst.common_ui.feature/sourceTemplateFeature/feature.xml
+++ b/features/org.eclipse.wst.common_ui.feature/sourceTemplateFeature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.wst.common_ui.feature.source"
       label="%featureName"
-      version="2.1.0.qualifier"
+      version="2.0.2.qualifier"
       provider-name="%providerName">
 
    <description>
diff --git a/features/org.eclipse.wst.common_ui.feature/sourceTemplatePlugin/about.ini b/features/org.eclipse.wst.common_ui.feature/sourceTemplatePlugin/about.ini
index fda5a40..2dee36a 100644
--- a/features/org.eclipse.wst.common_ui.feature/sourceTemplatePlugin/about.ini
+++ b/features/org.eclipse.wst.common_ui.feature/sourceTemplatePlugin/about.ini
@@ -11,7 +11,7 @@
 # needed for primary features only
 
 # Property "featureImage" contains path to feature image (32x32)
-featureImage=wtp_prod32.png
+featureImage=eclipse32.gif
 
 # Property "aboutImage" contains path to product image (500x330 or 115x164)
 # needed for primary features only
diff --git a/features/org.eclipse.wst.common_ui.feature/sourceTemplatePlugin/build.properties b/features/org.eclipse.wst.common_ui.feature/sourceTemplatePlugin/build.properties
index 30a575c..5895597 100644
--- a/features/org.eclipse.wst.common_ui.feature/sourceTemplatePlugin/build.properties
+++ b/features/org.eclipse.wst.common_ui.feature/sourceTemplatePlugin/build.properties
@@ -1,3 +1,3 @@
 
-bin.includes = about.html, about.ini, about.mappings, about.properties, wtp_prod32.png, plugin.properties, plugin.xml, src/**, META-INF/
+bin.includes = about.html, about.ini, about.mappings, about.properties, eclipse32.gif, plugin.properties, plugin.xml, src/**, META-INF/
 sourcePlugin = true
diff --git a/features/org.eclipse.wst.common_ui.feature/sourceTemplatePlugin/eclipse32.gif b/features/org.eclipse.wst.common_ui.feature/sourceTemplatePlugin/eclipse32.gif
new file mode 100644
index 0000000..e6ad7cc
--- /dev/null
+++ b/features/org.eclipse.wst.common_ui.feature/sourceTemplatePlugin/eclipse32.gif
Binary files differ
diff --git a/features/org.eclipse.wst.common_ui.feature/sourceTemplatePlugin/eclipse32.png b/features/org.eclipse.wst.common_ui.feature/sourceTemplatePlugin/eclipse32.png
new file mode 100644
index 0000000..50ae49d
--- /dev/null
+++ b/features/org.eclipse.wst.common_ui.feature/sourceTemplatePlugin/eclipse32.png
Binary files differ
diff --git a/features/org.eclipse.wst.common_ui.feature/sourceTemplatePlugin/wtp_prod32.gif b/features/org.eclipse.wst.common_ui.feature/sourceTemplatePlugin/wtp_prod32.gif
deleted file mode 100644
index eefb44a..0000000
--- a/features/org.eclipse.wst.common_ui.feature/sourceTemplatePlugin/wtp_prod32.gif
+++ /dev/null
Binary files differ
diff --git a/features/org.eclipse.wst.common_ui.feature/sourceTemplatePlugin/wtp_prod32.png b/features/org.eclipse.wst.common_ui.feature/sourceTemplatePlugin/wtp_prod32.png
deleted file mode 100644
index bfceab3..0000000
--- a/features/org.eclipse.wst.common_ui.feature/sourceTemplatePlugin/wtp_prod32.png
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jem.util/META-INF/MANIFEST.MF b/plugins/org.eclipse.jem.util/META-INF/MANIFEST.MF
index 7585a3c..c12b997 100644
--- a/plugins/org.eclipse.jem.util/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.jem.util/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.jem.util; singleton:=true
-Bundle-Version: 2.0.1.qualifier
+Bundle-Version: 2.0.2.qualifier
 Bundle-Activator: org.eclipse.jem.util.plugin.JEMUtilPlugin
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
diff --git a/plugins/org.eclipse.jem.util/jemutil/org/eclipse/jem/internal/util/emf/workbench/ProjectResourceSetImpl.java b/plugins/org.eclipse.jem.util/jemutil/org/eclipse/jem/internal/util/emf/workbench/ProjectResourceSetImpl.java
index 3e58e6f..632db27 100644
--- a/plugins/org.eclipse.jem.util/jemutil/org/eclipse/jem/internal/util/emf/workbench/ProjectResourceSetImpl.java
+++ b/plugins/org.eclipse.jem.util/jemutil/org/eclipse/jem/internal/util/emf/workbench/ProjectResourceSetImpl.java
@@ -10,7 +10,7 @@
  *******************************************************************************/
 /*
  *  $$RCSfile: ProjectResourceSetImpl.java,v $$
- *  $$Revision: 1.13 $$  $$Date: 2007/10/17 22:37:18 $$ 
+ *  $$Revision: 1.11.2.1 $$  $$Date: 2007/10/02 12:59:33 $$ 
  */
 package org.eclipse.jem.internal.util.emf.workbench;
 
@@ -24,7 +24,8 @@
 import org.eclipse.emf.common.notify.impl.NotificationImpl;
 import org.eclipse.emf.common.util.URI;
 import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.resource.*;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.emf.ecore.resource.URIConverter;
 import org.eclipse.emf.ecore.resource.Resource.Factory;
 import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
 import org.eclipse.emf.ecore.resource.impl.URIConverterImpl;
@@ -71,8 +72,7 @@
 			res = getResourceFromHandlers(uri);
 		return res;
 	}
-
-	public Resource createResource(URI uri, String contentType) {
+	public Resource createResource(URI uri) {
 		if (isReleasing) return null;
 		//Check the map first when creating the resource and do not
 		//normalize if a value is found.
@@ -97,11 +97,6 @@
 		
 		return result;
 	}
-
-	public Resource createResource(URI uri) {
-		return createResource(uri, ContentHandler.UNSPECIFIED_CONTENT_TYPE);
-	}
-
 	private boolean detectURIMapping(URI uri) {
 		return !(((URIConverterImpl.URIMap)getURIConverter().getURIMap()).getURI(uri).equals(uri));
 	}
diff --git a/plugins/org.eclipse.wst.common.core/META-INF/MANIFEST.MF b/plugins/org.eclipse.wst.common.core/META-INF/MANIFEST.MF
index 598248e..3633d68 100644
--- a/plugins/org.eclipse.wst.common.core/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.wst.common.core/META-INF/MANIFEST.MF
@@ -11,9 +11,9 @@
  org.eclipse.wst.common.core.search.pattern,
  org.eclipse.wst.common.core.search.scope,
  org.eclipse.wst.common.core.search.util
-Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.core.resources;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.core.expressions;bundle-version="[3.2.0,4.0.0)"
+Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.2.0,3.4.0)",
+ org.eclipse.core.resources;bundle-version="[3.2.0,3.4.0)",
+ org.eclipse.core.expressions;bundle-version="[3.2.0,3.4.0)"
 Eclipse-LazyStart: true
 Bundle-Vendor: %pluginProvider
 Bundle-RequiredExecutionEnvironment: J2SE-1.4
diff --git a/plugins/org.eclipse.wst.common.emf/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.wst.common.emf/.settings/org.eclipse.jdt.core.prefs
index 6c7418f..d432ddc 100644
--- a/plugins/org.eclipse.wst.common.emf/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.wst.common.emf/.settings/org.eclipse.jdt.core.prefs
@@ -1,63 +1,7 @@
 #Sat Mar 24 02:06:02 EDT 2007
 eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
 org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
 org.eclipse.jdt.core.compiler.compliance=1.4
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=ignore
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=error
-org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=ignore
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=error
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=error
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=error
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=error
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=error
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
-org.eclipse.jdt.core.compiler.problem.nullReference=ignore
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=error
-org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.rawTypeReference=ignore
-org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=error
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=error
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=ignore
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=error
-org.eclipse.jdt.core.compiler.problem.unusedLabel=error
-org.eclipse.jdt.core.compiler.problem.unusedLocal=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=ignore
 org.eclipse.jdt.core.compiler.source=1.3
diff --git a/plugins/org.eclipse.wst.common.emf/META-INF/MANIFEST.MF b/plugins/org.eclipse.wst.common.emf/META-INF/MANIFEST.MF
index 3148877..39a9ac9 100644
--- a/plugins/org.eclipse.wst.common.emf/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.wst.common.emf/META-INF/MANIFEST.MF
@@ -9,7 +9,7 @@
 Export-Package: org.eclipse.wst.common.internal.emf.plugin;x-internal:=true,
  org.eclipse.wst.common.internal.emf.resource;x-friends:="org.eclipse.wst.common.modulecore",
  org.eclipse.wst.common.internal.emf.utilities;x-internal:=true
-Require-Bundle: org.eclipse.emf.ecore.xmi;bundle-version="[2.2.0,3.0.0)",
+Require-Bundle: org.eclipse.emf.ecore.xmi;bundle-version="[2.2.0,2.4.0)",
  org.eclipse.wst.common.frameworks;bundle-version="[1.1.0,1.2.0)",
  org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
  org.eclipse.core.resources;bundle-version="[3.2.0,4.0.0)",
diff --git a/plugins/org.eclipse.wst.common.emfworkbench.integration/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.wst.common.emfworkbench.integration/.settings/org.eclipse.jdt.core.prefs
index 46468f9..0c47c16 100644
--- a/plugins/org.eclipse.wst.common.emfworkbench.integration/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.wst.common.emfworkbench.integration/.settings/org.eclipse.jdt.core.prefs
@@ -1,62 +1,7 @@
 #Sat Mar 24 02:06:45 EDT 2007
 eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
 org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
 org.eclipse.jdt.core.compiler.compliance=1.4
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=ignore
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
-org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=ignore
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=error
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=error
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=error
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=error
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=error
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
-org.eclipse.jdt.core.compiler.problem.nullReference=ignore
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=error
-org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.rawTypeReference=ignore
-org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=error
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=error
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=ignore
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=error
-org.eclipse.jdt.core.compiler.problem.unusedLabel=error
-org.eclipse.jdt.core.compiler.problem.unusedLocal=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=ignore
 org.eclipse.jdt.core.compiler.source=1.3
diff --git a/plugins/org.eclipse.wst.common.emfworkbench.integration/META-INF/MANIFEST.MF b/plugins/org.eclipse.wst.common.emfworkbench.integration/META-INF/MANIFEST.MF
index 5c28848..a77b4f9 100644
--- a/plugins/org.eclipse.wst.common.emfworkbench.integration/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.wst.common.emfworkbench.integration/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.wst.common.emfworkbench.integration; singleton:=true
-Bundle-Version: 1.1.104.qualifier
+Bundle-Version: 1.1.105.qualifier
 Bundle-Activator: org.eclipse.wst.common.internal.emfworkbench.integration.EMFWorkbenchEditPlugin
 Bundle-Vendor: %pluginVendor
 Bundle-Localization: plugin
@@ -12,8 +12,8 @@
  org.eclipse.wst.common.internal.emfworkbench.validateedit;x-internal:=true
 Require-Bundle: org.eclipse.wst.common.frameworks;bundle-version="[1.1.0,1.2.0)",
  org.eclipse.jem.util;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.emf.edit;bundle-version="[2.2.0,3.0.0)",
- org.eclipse.emf.ecore.xmi;bundle-version="[2.2.0,3.0.0)",
+ org.eclipse.emf.edit;bundle-version="[2.2.0,2.4.0)",
+ org.eclipse.emf.ecore.xmi;bundle-version="[2.2.0,2.4.0)",
  org.eclipse.wst.common.emf;bundle-version="[1.1.0,1.2.0)",
  org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
  org.eclipse.core.resources;bundle-version="[3.2.0,4.0.0)",
diff --git a/plugins/org.eclipse.wst.common.emfworkbench.integration/src/org/eclipse/wst/common/internal/emfworkbench/EditModelLeastUsedCache.java b/plugins/org.eclipse.wst.common.emfworkbench.integration/src/org/eclipse/wst/common/internal/emfworkbench/EditModelLeastUsedCache.java
index bda19dc..a53bf23 100644
--- a/plugins/org.eclipse.wst.common.emfworkbench.integration/src/org/eclipse/wst/common/internal/emfworkbench/EditModelLeastUsedCache.java
+++ b/plugins/org.eclipse.wst.common.emfworkbench.integration/src/org/eclipse/wst/common/internal/emfworkbench/EditModelLeastUsedCache.java
@@ -85,8 +85,8 @@
 			}
 		}
 		if (shouldAccess) {
-			editModel.access(this);
 			synchronized (lru) {
+				editModel.access(this);
 				lru.add(editModel);
 			}
 		}
@@ -107,9 +107,9 @@
 					lru.remove(model);	
 				}
 			}
-		}
 		if (model != null)
 			model.releaseAccess(this);
+		}
 	}
 
 	/**
diff --git a/plugins/org.eclipse.wst.common.emfworkbench.integration/src/org/eclipse/wst/common/internal/emfworkbench/integration/ProjectResourceSetEditImpl.java b/plugins/org.eclipse.wst.common.emfworkbench.integration/src/org/eclipse/wst/common/internal/emfworkbench/integration/ProjectResourceSetEditImpl.java
index 07a326e..aa8f271 100644
--- a/plugins/org.eclipse.wst.common.emfworkbench.integration/src/org/eclipse/wst/common/internal/emfworkbench/integration/ProjectResourceSetEditImpl.java
+++ b/plugins/org.eclipse.wst.common.emfworkbench.integration/src/org/eclipse/wst/common/internal/emfworkbench/integration/ProjectResourceSetEditImpl.java
@@ -18,7 +18,6 @@
 
 import org.eclipse.core.resources.IProject;
 import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.resource.ContentHandler;
 import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.jem.internal.util.emf.workbench.ProjectResourceSetImpl;
 import org.eclipse.wst.common.internal.emf.resource.ReferencedResource;
@@ -44,14 +43,11 @@
 	 * 
 	 * @see org.eclipse.jem.internal.util.emf.workbench.ProjectResourceSetImpl#createResource(org.eclipse.emf.common.util.URI)
 	 */
-	public Resource createResource(URI uri, String contentType) {
-		Resource result = super.createResource(uri, contentType);
+	public Resource createResource(URI uri) {
+		Resource result = super.createResource(uri);
 		if (result != null && WorkbenchResourceHelper.isReferencedResource(result))
 			WorkbenchResourceHelper.cacheSynchronizationStamp((ReferencedResource) result);
 		return result;
 	}
 
-	public Resource createResource(URI uri) {
-		return createResource(uri, ContentHandler.UNSPECIFIED_CONTENT_TYPE);
-	}
 }
diff --git a/plugins/org.eclipse.wst.common.emfworkbench.integration/src/org/eclipse/wst/common/internal/emfworkbench/integration/ResourceSetWorkbenchEditSynchronizer.java b/plugins/org.eclipse.wst.common.emfworkbench.integration/src/org/eclipse/wst/common/internal/emfworkbench/integration/ResourceSetWorkbenchEditSynchronizer.java
index 7ff87b1..fd9cfa2 100644
--- a/plugins/org.eclipse.wst.common.emfworkbench.integration/src/org/eclipse/wst/common/internal/emfworkbench/integration/ResourceSetWorkbenchEditSynchronizer.java
+++ b/plugins/org.eclipse.wst.common.emfworkbench.integration/src/org/eclipse/wst/common/internal/emfworkbench/integration/ResourceSetWorkbenchEditSynchronizer.java
@@ -278,9 +278,16 @@
                         }
                 } else {
                         /*Unload if found and is not modified but inconsistent.*/
-                	if (resource.isLoaded() && WorkbenchResourceHelper.isReferencedResource(resource) && !WorkbenchResourceHelper.isConsistent((ReferencedResource)resource)) {
-                        deferredUnloadResources.add(resource);
-                        didProcess = true;
+                	if (resource.isLoaded()) {
+                		if ( WorkbenchResourceHelper.isReferencedResource(resource)) {
+                			if (!WorkbenchResourceHelper.isConsistent((ReferencedResource)resource)) {
+                				deferredUnloadResources.add(resource);
+                				didProcess = true;
+                			}
+                		} else {
+                			deferredUnloadResources.add(resource);
+            				didProcess = true;
+                		}	
                 	}
                 }
         } else {                
@@ -308,8 +315,12 @@
 			
 			if (isRemove)
 				deferredRemoveResources.add(resource);
-			else if (resource.isLoaded() && WorkbenchResourceHelper.isReferencedResource(resource) && !WorkbenchResourceHelper.isConsistent((ReferencedResource)resource))
-				deferredUnloadResources.add(resource);
+			else if (resource.isLoaded()) {
+        		if ( WorkbenchResourceHelper.isReferencedResource(resource)) {
+        			if(!WorkbenchResourceHelper.isConsistent((ReferencedResource)resource)) 
+        				deferredUnloadResources.add(resource);
+        		} else deferredUnloadResources.add(resource);
+			}
 		}
 		return false;
 	}
diff --git a/plugins/org.eclipse.wst.common.frameworks.ui/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.wst.common.frameworks.ui/.settings/org.eclipse.jdt.core.prefs
index 341713a..b61fd97 100644
--- a/plugins/org.eclipse.wst.common.frameworks.ui/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.wst.common.frameworks.ui/.settings/org.eclipse.jdt.core.prefs
@@ -1,62 +1,7 @@
 #Sat Mar 31 16:58:45 EDT 2007
 eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
 org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
 org.eclipse.jdt.core.compiler.compliance=1.4
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=ignore
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
-org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=ignore
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=error
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=error
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=error
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=error
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=error
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
-org.eclipse.jdt.core.compiler.problem.nullReference=ignore
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=error
-org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.rawTypeReference=ignore
-org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=error
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=error
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=ignore
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=error
-org.eclipse.jdt.core.compiler.problem.unusedLabel=error
-org.eclipse.jdt.core.compiler.problem.unusedLocal=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=ignore
 org.eclipse.jdt.core.compiler.source=1.3
diff --git a/plugins/org.eclipse.wst.common.frameworks/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.wst.common.frameworks/.settings/org.eclipse.jdt.core.prefs
index b290b5f..7a95066 100644
--- a/plugins/org.eclipse.wst.common.frameworks/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.wst.common.frameworks/.settings/org.eclipse.jdt.core.prefs
@@ -1,62 +1,7 @@
 #Sat Mar 24 02:07:18 EDT 2007
 eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
 org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
 org.eclipse.jdt.core.compiler.compliance=1.4
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=ignore
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
-org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=ignore
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=error
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=error
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=error
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=error
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=error
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
-org.eclipse.jdt.core.compiler.problem.nullReference=ignore
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=error
-org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.rawTypeReference=ignore
-org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=error
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=error
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=ignore
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=error
-org.eclipse.jdt.core.compiler.problem.unusedLabel=error
-org.eclipse.jdt.core.compiler.problem.unusedLocal=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=ignore
 org.eclipse.jdt.core.compiler.source=1.3
diff --git a/plugins/org.eclipse.wst.common.frameworks/META-INF/MANIFEST.MF b/plugins/org.eclipse.wst.common.frameworks/META-INF/MANIFEST.MF
index 3e681c9..9032e77 100644
--- a/plugins/org.eclipse.wst.common.frameworks/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.wst.common.frameworks/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.wst.common.frameworks; singleton:=true
-Bundle-Version: 1.1.102.qualifier
+Bundle-Version: 1.1.103.qualifier
 Bundle-Activator: org.eclipse.wst.common.frameworks.internal.plugin.WTPCommonPlugin
 Bundle-Vendor: %provider
 Bundle-Localization: plugin
@@ -20,6 +20,6 @@
  org.eclipse.core.commands;bundle-version="[3.2.0,4.0.0)",
  org.eclipse.jem.util;bundle-version="[2.0.0,3.0.0)",
  org.eclipse.wst.common.environment;bundle-version="[1.0.100,1.1.0)";visibility:=reexport,
- org.eclipse.emf.ecore;bundle-version="[2.2.0,3.0.0)"
+ org.eclipse.emf.ecore;bundle-version="[2.2.0,2.4.0)"
 Eclipse-LazyStart: true
 Bundle-RequiredExecutionEnvironment: J2SE-1.4
diff --git a/plugins/org.eclipse.wst.common.modulecore/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.wst.common.modulecore/.settings/org.eclipse.jdt.core.prefs
index 31bb1e6..579a7f4 100644
--- a/plugins/org.eclipse.wst.common.modulecore/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.wst.common.modulecore/.settings/org.eclipse.jdt.core.prefs
@@ -1,62 +1,7 @@
 #Thu May 10 18:38:08 EDT 2007
 eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
 org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
 org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=ignore
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
-org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=ignore
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=error
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=error
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=error
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=error
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=error
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
-org.eclipse.jdt.core.compiler.problem.nullReference=ignore
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=error
-org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.rawTypeReference=ignore
-org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=error
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=error
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=ignore
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=error
-org.eclipse.jdt.core.compiler.problem.unusedLabel=error
-org.eclipse.jdt.core.compiler.problem.unusedLocal=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=ignore
 org.eclipse.jdt.core.compiler.source=1.5
diff --git a/plugins/org.eclipse.wst.common.modulecore/META-INF/MANIFEST.MF b/plugins/org.eclipse.wst.common.modulecore/META-INF/MANIFEST.MF
index 22eb84a..71f51bc 100644
--- a/plugins/org.eclipse.wst.common.modulecore/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.wst.common.modulecore/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@
 Bundle-Name: %Bundle-Name.0
 Bundle-Vendor: %provider
 Bundle-SymbolicName: org.eclipse.wst.common.modulecore; singleton:=true
-Bundle-Version: 1.1.103.qualifier
+Bundle-Version: 1.1.104.qualifier
 Bundle-Activator: org.eclipse.wst.common.componentcore.internal.ModulecorePlugin
 Bundle-Localization: plugin
 Export-Package: org.eclipse.wst.common.componentcore,
@@ -19,12 +19,12 @@
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
  org.eclipse.wst.common.frameworks;bundle-version="[1.1.0,1.2.0)",
  org.eclipse.core.resources;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.emf.ecore;bundle-version="[2.4.0,3.0.0)",
+ org.eclipse.emf.ecore;bundle-version="[2.2.0,2.4.0)",
  org.eclipse.wst.common.emfworkbench.integration;bundle-version="[1.1.0,1.2.0)",
  org.eclipse.wst.common.emf;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.emf.ecore.xmi;bundle-version="[2.2.0,3.0.0)",
+ org.eclipse.emf.ecore.xmi;bundle-version="[2.2.0,2.4.0)",
  org.eclipse.core.commands;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.emf.edit;bundle-version="[2.2.0,3.0.0)",
+ org.eclipse.emf.edit;bundle-version="[2.2.0,2.4.0)",
  org.eclipse.jem.util;bundle-version="[2.0.0,3.0.0)",
  org.eclipse.wst.common.uriresolver;bundle-version="[1.1.0,1.2.0)",
  org.eclipse.wst.common.project.facet.core;bundle-version="[1.1.0,2.0.0)",
diff --git a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/ModuleCoreValidator.java b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/ModuleCoreValidator.java
index 731efdf..7a212d0 100644
--- a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/ModuleCoreValidator.java
+++ b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/ModuleCoreValidator.java
@@ -16,6 +16,7 @@
 import org.eclipse.core.runtime.Status;
 import org.eclipse.core.runtime.jobs.ISchedulingRule;
 import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.emf.ecore.resource.ResourceSet;
 import org.eclipse.emf.ecore.xmi.XMIResource;
 import org.eclipse.wst.common.componentcore.ModuleCoreNature;
 import org.eclipse.wst.common.componentcore.internal.impl.WTPModulesResource;
@@ -57,12 +58,10 @@
 			return null;
 		}
 
-/* bug197531 - standardize compiler settings
 		private ResourceSet getResourceSet(IProject proj) {
 			ModuleCoreNature nature = ModuleCoreNature.getModuleCoreNature(proj);
 			return nature.getResourceSet();
 		}
-*/
 
 		public IStatus validateInJob(IValidationContext helper, IReporter reporter)
 				throws ValidationException {
diff --git a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/impl/ComponentCoreURIConverter.java b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/impl/ComponentCoreURIConverter.java
index a2722b6..4b15b5a 100644
--- a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/impl/ComponentCoreURIConverter.java
+++ b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/impl/ComponentCoreURIConverter.java
@@ -182,12 +182,7 @@
 	      uriMap = (URIMap)mappingRegistryImpl.map();
 	    }
 
-	    URIMap uriConverterImplURIMap = null;
-	    if (uriMap instanceof URIMap)
-	    {
-	    	uriConverterImplURIMap = (URIMap)uriMap;
-	    }
-	    return uriConverterImplURIMap;
+	    return uriMap;
 	  
 	}
 
diff --git a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/impl/WTPResourceFactoryRegistry.java b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/impl/WTPResourceFactoryRegistry.java
index e0698b2..eeb02b2 100644
--- a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/impl/WTPResourceFactoryRegistry.java
+++ b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/impl/WTPResourceFactoryRegistry.java
@@ -83,7 +83,7 @@
 	}
 	
 	public synchronized Resource.Factory getFactory(URI uri) {
-		return getFactory(uri, (IContentDescription)null);
+		return getFactory(uri, null);
 	}	
 
 
diff --git a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/operation/CreateReferenceComponentsOp.java b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/operation/CreateReferenceComponentsOp.java
index 4327c79..6b159fd 100644
--- a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/operation/CreateReferenceComponentsOp.java
+++ b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/operation/CreateReferenceComponentsOp.java
@@ -15,9 +15,12 @@
 import java.util.Map;
 
 import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.ResourcesPlugin;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.core.runtime.IPath;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Path;
@@ -67,6 +70,10 @@
 					sEdit.dispose();
 			}
 		}
+		
+		IFile [] files = new IFile[1];
+		files[0] = project.getFile(ProjectUtilities.DOT_PROJECT);
+		status = ResourcesPlugin.getWorkspace().validateEdit(files, null);
 		return status;
 	}
 
@@ -92,13 +99,18 @@
 		IVirtualComponent sourceComp = (IVirtualComponent) model.getProperty(ICreateReferenceComponentsDataModelProperties.SOURCE_COMPONENT);
 		List vlist = new ArrayList();
 		List modList = (List) model.getProperty(ICreateReferenceComponentsDataModelProperties.TARGET_COMPONENT_LIST);
+		String deployPathStr = model.getStringProperty(ICreateReferenceComponentsDataModelProperties.TARGET_COMPONENTS_DEPLOY_PATH);
+		IPath deployPath = null;
+		if (deployPathStr != null && deployPathStr.length() > 0){
+			deployPath = new Path(deployPathStr);
+		}
 		for (int i = 0; i < modList.size(); i++) {
 			IVirtualComponent comp = (IVirtualComponent) modList.get(i);
-			if (!srcComponentContainsReference(sourceComp, comp)) {
+			if (!srcComponentContainsReference(sourceComp, comp, deployPath)) {
 				IVirtualReference ref = ComponentCore.createReference(sourceComp, comp);
-				String deployPath = model.getStringProperty(ICreateReferenceComponentsDataModelProperties.TARGET_COMPONENTS_DEPLOY_PATH);
-				if (deployPath != null && deployPath.length() > 0)
-					ref.setRuntimePath(new Path(deployPath));
+				if(deployPath != null){
+					ref.setRuntimePath(new Path(deployPathStr));
+				}
 
 				String archiveName = getArchiveName(comp);
 				if (archiveName.length() > 0) {
@@ -119,17 +131,21 @@
 	}
 
 
-	private boolean srcComponentContainsReference(IVirtualComponent sourceComp, IVirtualComponent comp) {
+	private boolean srcComponentContainsReference(IVirtualComponent sourceComp, IVirtualComponent comp, IPath deployPath) {
 		if ((sourceComp != null && sourceComp.getProject() != null) && (comp != null && comp.getProject() != null)) {
-		
 			IVirtualReference[] existingReferences = sourceComp.getReferences();
 			IVirtualComponent referencedComponent = null;
 			if (existingReferences != null) {
 				for (int i = 0; i < existingReferences.length; i++) {
-					if (existingReferences[i] != null ) {
-						referencedComponent = existingReferences[i].getReferencedComponent();	
-						if (referencedComponent != null && referencedComponent.equals(comp)  ) 
+					IVirtualReference ref = existingReferences[i];
+					if(ref != null){
+						//also check to see if the deploy path is the same (remember that it can be null)
+						if((ref.getRuntimePath() == null && deployPath != null) || ref.getRuntimePath().equals(deployPath)){
+							referencedComponent = ref.getReferencedComponent();	
+							if (referencedComponent != null && referencedComponent.equals(comp) ){ 
 								return true;
+							}	
+						}
 					}
 				}
 			}
diff --git a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/operation/RemoveReferenceComponentOperation.java b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/operation/RemoveReferenceComponentOperation.java
index e569ba1..bb1f2c3 100644
--- a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/operation/RemoveReferenceComponentOperation.java
+++ b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/operation/RemoveReferenceComponentOperation.java
@@ -11,7 +11,6 @@
 package org.eclipse.wst.common.componentcore.internal.operation;
 
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
 
 import org.eclipse.core.commands.ExecutionException;
@@ -23,6 +22,7 @@
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Path;
 import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
+import org.eclipse.jem.util.logger.proxy.Logger;
 import org.eclipse.wst.common.componentcore.datamodel.properties.ICreateReferenceComponentsDataModelProperties;
 import org.eclipse.wst.common.componentcore.internal.resources.VirtualComponent;
 import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
@@ -48,43 +48,72 @@
 	protected void removeReferencedComponents(IProgressMonitor monitor) {
 		
 		IVirtualComponent sourceComp = (IVirtualComponent) model.getProperty(ICreateReferenceComponentsDataModelProperties.SOURCE_COMPONENT);
-		if (!sourceComp.getProject().isAccessible()) return;
+		if (sourceComp == null || !sourceComp.getProject().isAccessible() || sourceComp.isBinary()) return;
 		
-        List modList = (List) model.getProperty(ICreateReferenceComponentsDataModelProperties.TARGET_COMPONENT_LIST);
+		IVirtualReference [] existingReferencesArray = sourceComp.getReferences();
+		if(existingReferencesArray == null || existingReferencesArray.length == 0){
+			return;
+		}
+		
+		List existingReferences = new ArrayList();
+		for(int i=0;i<existingReferencesArray.length; i++){
+			existingReferences.add(existingReferencesArray[i]);
+		}
+		
+		String deployPath = model.getStringProperty( ICreateReferenceComponentsDataModelProperties.TARGET_COMPONENTS_DEPLOY_PATH );
+		IPath path = new Path( deployPath );
+		
+		List modList = (List) model.getProperty(ICreateReferenceComponentsDataModelProperties.TARGET_COMPONENT_LIST);
     
 		List targetprojectList = new ArrayList();
 
-		for (int i = 0; i < modList.size(); i++) {
+		for (int i = 0; i < modList.size() && !existingReferences.isEmpty(); i++) {
 			IVirtualComponent comp = (IVirtualComponent) modList.get(i);
-			if (comp==null || sourceComp==null)
+			if (comp==null )
 				continue;
-			IVirtualReference ref = sourceComp.getReference(comp.getName());
-			if( ref != null && ref.getReferencedComponent() != null && ref.getReferencedComponent().isBinary()){
+
+			IVirtualReference ref = findMatchingReference(existingReferences, comp, path);
+			//if a ref was found matching the specified deployPath, then remove it
+			if(ref != null){
 				removeRefereneceInComponent(sourceComp, ref);
-			}else if(ref != null){
-				if (Arrays.asList(comp.getReferencingComponents()).contains(sourceComp)) {
-					
-					String deployPath = model.getStringProperty( ICreateReferenceComponentsDataModelProperties.TARGET_COMPONENTS_DEPLOY_PATH );
-					IPath path = new Path( deployPath );
-					
-					if( ref.getRuntimePath() != null && path != null && ref.getRuntimePath().equals( path )){
-						removeRefereneceInComponent(sourceComp,sourceComp.getReference(comp.getName()));
-						IProject targetProject = comp.getProject();
-						targetprojectList.add(targetProject);
-					}
-				}					
+				existingReferences.remove(ref);
+				//after removing the ref, check to see if it was the last ref removed to that component
+				//and if it was, then also remove the project reference
+				ref = findMatchingReference(existingReferences, comp);
+				if(ref == null){
+					IProject targetProject = comp.getProject();
+					targetprojectList.add(targetProject);
+				}
 			}
 		}
 		
 		try {
 			ProjectUtilities.removeReferenceProjects(sourceComp.getProject(),targetprojectList);
 		} catch (CoreException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
+			Logger.getLogger().logError(e);
 		}		
 		
 	}
 
+	private IVirtualReference findMatchingReference(List existingReferences, IVirtualComponent comp, IPath path) {
+		for(int i=0;i<existingReferences.size(); i++){
+			IVirtualReference ref = (IVirtualReference)existingReferences.get(i);
+			IVirtualComponent c = ref.getReferencedComponent();
+			if(c != null && c.getName().equals(comp.getName())){
+				if(path == null){
+					return ref;
+				} else if(path.equals(ref.getRuntimePath())){
+					return ref;
+				}
+			}
+		}
+		return null;
+	}
+
+	private IVirtualReference findMatchingReference(List existingReferences, IVirtualComponent comp) {
+		return findMatchingReference(existingReferences, comp, null);
+	}
+
 	protected void removeRefereneceInComponent(IVirtualComponent component, IVirtualReference reference) {
 		((VirtualComponent)component.getComponent()).removeReference(reference);
 	}
diff --git a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/resources/VirtualComponent.java b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/resources/VirtualComponent.java
index 9e21ff7..6c66c10 100644
--- a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/resources/VirtualComponent.java
+++ b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/resources/VirtualComponent.java
@@ -113,7 +113,7 @@
                 	if(value == null){
                 		value = ""; //$NON-NLS-1$
                 		String message = "WARNING:  The component file in "+getProject().getName()+" has no value defined for the property: "+name;  //$NON-NLS-1$//$NON-NLS-2$
-                		ModulecorePlugin.logError(IStatus.ERROR, message, null);
+                		ModulecorePlugin.getDefault().logError(IStatus.ERROR, message, null);
                 	}
                     props.setProperty(name, value);
                 }
diff --git a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/resources/VirtualResource.java b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/resources/VirtualResource.java
index 19e3503..15ed4bb 100644
--- a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/resources/VirtualResource.java
+++ b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/resources/VirtualResource.java
@@ -124,6 +124,8 @@
 				IPath searchPath = null;
 				do {
 					searchPath = (searchPath == null) ? getRuntimePath() : searchPath.removeLastSegments(1);
+					if (searchPath.isAbsolute())
+						searchPath = searchPath.makeRelative();
 					componentResources = root.findModuleResources(searchPath, ResourceTreeNode.CREATE_NONE);
 					estimatedPaths = findBestMatches(componentResources);
 				} while (estimatedPaths.length==0 && canSearchContinue(componentResources, searchPath));
diff --git a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/util/ComponentUtilities.java b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/util/ComponentUtilities.java
index e9bd7ca..ba5afa0 100644
--- a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/util/ComponentUtilities.java
+++ b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/util/ComponentUtilities.java
@@ -314,14 +314,22 @@
 		comp.setMetaProperty(IModuleConstants.CONTEXTROOT, contextRoot);
 	}
 
+	/**
+	 * @deprecated use {@link #getDeployUriOfComponent(IVirtualReference, String)}
+	 * @param reference
+	 * @return
+	 */
 	public static String getDeployUriOfUtilComponent(IVirtualReference reference){
+		return ComponentUtilities.getDeployUriOfComponent(reference, ".jar"); //$NON-NLS-1$
+	}
+
+	public static String getDeployUriOfComponent(IVirtualReference reference, String extension) {
 		String archiveName = reference.getArchiveName();
 		String uri = null;
-		if( archiveName != null && archiveName != "" ){ //$NON-NLS-1$
+		if( archiveName != null && !archiveName.equals("") ){ //$NON-NLS-1$
 			uri = reference.getRuntimePath() + "/" + reference.getArchiveName(); //$NON-NLS-1$
 		}else{
-			uri = reference.getRuntimePath() + "/" + reference.getReferencedComponent().getProject().getName() + ".jar"; //$NON-NLS-1$ //$NON-NLS-2$
+			uri = reference.getRuntimePath() + "/" + reference.getReferencedComponent().getProject().getName() + extension; //$NON-NLS-1$
 		}
 		return uri;
-	}
-}
+	}}
diff --git a/plugins/org.eclipse.wst.common.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.wst.common.ui/META-INF/MANIFEST.MF
index 8a16f02..b97b04e 100644
--- a/plugins/org.eclipse.wst.common.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.wst.common.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.wst.common.ui; singleton:=true
-Bundle-Version: 1.1.300.qualifier
+Bundle-Version: 1.1.200.qualifier
 Bundle-Activator: org.eclipse.wst.common.ui.internal.UIPlugin
 Bundle-Vendor: %pluginProvider
 Bundle-Localization: plugin
@@ -13,14 +13,13 @@
  org.eclipse.wst.common.ui.internal.search.dialogs,
  org.eclipse.wst.common.ui.internal.viewers;x-internal:=true,
  org.eclipse.wst.common.ui.provisional.editors
-Require-Bundle: org.eclipse.ui.ide;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.ui;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.core.resources;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.search;bundle-version="[3.2.0,4.0.0)",
+Require-Bundle: org.eclipse.ui.ide;bundle-version="[3.2.0,3.4.0)",
+ org.eclipse.ui;bundle-version="[3.2.0,3.4.0)",
+ org.eclipse.core.runtime;bundle-version="[3.2.0,3.4.0)",
+ org.eclipse.core.resources;bundle-version="[3.2.0,3.4.0)",
+ org.eclipse.search;bundle-version="[3.2.0,3.4.0)",
  org.eclipse.wst.common.core;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.jface.text;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.ui.workbench.texteditor;bundle-version="[3.2.0,4.0.0)",
- com.ibm.icu;bundle-version="[3.4.4,4.0.0)"
+ org.eclipse.jface.text;bundle-version="[3.2.0,3.4.0)",
+ org.eclipse.ui.workbench.texteditor;bundle-version="[3.2.0,3.4.0)"
 Eclipse-LazyStart: true
 Bundle-RequiredExecutionEnvironment: J2SE-1.4
diff --git a/plugins/org.eclipse.wst.common.ui/icons/saveas_wiz.png b/plugins/org.eclipse.wst.common.ui/icons/saveas_wiz.png
deleted file mode 100644
index 4923d03..0000000
--- a/plugins/org.eclipse.wst.common.ui/icons/saveas_wiz.png
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.wst.common.ui/icons/tsearch_dpdn_obj.gif b/plugins/org.eclipse.wst.common.ui/icons/tsearch_dpdn_obj.gif
deleted file mode 100644
index 24a21eb..0000000
--- a/plugins/org.eclipse.wst.common.ui/icons/tsearch_dpdn_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.wst.common.ui/src-search/org/eclipse/wst/common/ui/internal/search/AbstractSearchQuery.java b/plugins/org.eclipse.wst.common.ui/src-search/org/eclipse/wst/common/ui/internal/search/AbstractSearchQuery.java
index ade97fe..db2fc2b 100644
--- a/plugins/org.eclipse.wst.common.ui/src-search/org/eclipse/wst/common/ui/internal/search/AbstractSearchQuery.java
+++ b/plugins/org.eclipse.wst.common.ui/src-search/org/eclipse/wst/common/ui/internal/search/AbstractSearchQuery.java
@@ -23,6 +23,8 @@
 import org.eclipse.core.runtime.MultiStatus;
 import org.eclipse.core.runtime.NullProgressMonitor;
 import org.eclipse.core.runtime.OperationCanceledException;
+import org.eclipse.search.internal.ui.Messages;
+import org.eclipse.search.internal.ui.SearchMessages;
 import org.eclipse.search.ui.IQueryListener;
 import org.eclipse.search.ui.ISearchQuery;
 import org.eclipse.search.ui.ISearchResult;
@@ -32,7 +34,6 @@
 import org.eclipse.wst.common.core.search.pattern.QualifiedName;
 import org.eclipse.wst.common.core.search.pattern.SearchPattern;
 import org.eclipse.wst.common.core.search.scope.SearchScope;
-import org.eclipse.wst.common.ui.internal.search.basecode.Messages;
 
 
 public abstract class AbstractSearchQuery implements ISearchQuery {
diff --git a/plugins/org.eclipse.wst.common.ui/src-search/org/eclipse/wst/common/ui/internal/search/SearchMessages.java b/plugins/org.eclipse.wst.common.ui/src-search/org/eclipse/wst/common/ui/internal/search/SearchMessages.java
index 9bfdfef..3079c3d 100644
--- a/plugins/org.eclipse.wst.common.ui/src-search/org/eclipse/wst/common/ui/internal/search/SearchMessages.java
+++ b/plugins/org.eclipse.wst.common.ui/src-search/org/eclipse/wst/common/ui/internal/search/SearchMessages.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2007 IBM Corporation and others.
+ * Copyright (c) 2000, 2005 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
@@ -14,28 +14,130 @@
 
 public final class SearchMessages extends NLS {
 
-	private static final String BUNDLE_NAME= "org.eclipse.wst.common.ui.internal.search.SearchMessages";//$NON-NLS-1$
+	private static final String BUNDLE_NAME= "org.eclipse.wst.common.search.test.ui.SearchMessages";//$NON-NLS-1$
 
 	private SearchMessages() {
 		// Do not instantiate
 	}
 
+	public static String SearchLabelProvider_exact_singular;
+	public static String SearchLabelProvider_exact_noCount;
+	public static String SearchLabelProvider_exact_and_potential_plural;
+	public static String SearchLabelProvider_potential_singular;
+	public static String SearchLabelProvider_potential_noCount;
+	public static String SearchLabelProvider_potential_plural;
+	public static String SearchLabelProvider_exact_plural;
+	public static String group_search;
+	public static String group_declarations;
 	public static String group_references;
+	public static String group_readReferences;
+	public static String group_writeReferences;
+	public static String group_implementors;
+	public static String group_occurrences;
+	public static String group_occurrences_quickMenu_noEntriesAvailable;
+	public static String Search_Error_search_title;
+	public static String Search_Error_search_message;
+	public static String Search_Error_search_notsuccessful_message;
+	public static String Search_Error_javaElementAccess_title;
+	public static String Search_Error_javaElementAccess_message;
+	public static String Search_Error_search_notsuccessful_title;
+	public static String Search_Error_openEditor_title;
+	public static String Search_Error_openEditor_message;
+	public static String Search_Error_codeResolve;
+	public static String SearchElementSelectionDialog_title;
+	public static String SearchElementSelectionDialog_message;
+	public static String SearchPage_searchFor_label;
+	public static String SearchPage_searchFor_type;
+	public static String SearchPage_searchFor_method;
+	public static String SearchPage_searchFor_field;
+	public static String SearchPage_searchFor_package;
+	public static String SearchPage_searchFor_constructor;
+	public static String SearchPage_limitTo_label;
+	public static String SearchPage_limitTo_declarations;
+	public static String SearchPage_limitTo_implementors;
+	public static String SearchPage_limitTo_references;
+	public static String SearchPage_limitTo_allOccurrences;
+	public static String SearchPage_limitTo_readReferences;
+	public static String SearchPage_limitTo_writeReferences;
+	public static String SearchPage_expression_label;
+	public static String SearchPage_expression_caseSensitive;
+	public static String SearchUtil_workingSetConcatenation;
 	public static String Search_FindDeclarationAction_label;
+	public static String Search_FindDeclarationAction_tooltip;
 	public static String Search_FindDeclarationsInProjectAction_label;
+	public static String Search_FindDeclarationsInProjectAction_tooltip;
 	public static String Search_FindDeclarationsInWorkingSetAction_label;
-	public static String FileSearchPage_limited_format;	
-	public static String FileSearchPage_error_marker;
-	public static String FileSearchPage_sort_by_label;
-	public static String OpenWithMenu_label;
-	public static String FileSearchQuery_label;
-	public static String FileSearchQuery_pluralPattern;
-	public static String FileSearchQuery_singularLabel;
-	public static String FileSearchQuery_singularLabel_fileNameSearch;
-	public static String FileSearchQuery_pluralPattern_fileNameSearch;
-	public static String TextSearchEngine_statusMessage;
-	public static String FileLabelProvider_count_format;
-	public static String FileLabelProvider_removed_resource_label;
+	public static String Search_FindDeclarationsInWorkingSetAction_tooltip;
+	public static String Search_FindHierarchyDeclarationsAction_label;
+	public static String Search_FindHierarchyDeclarationsAction_tooltip;
+	public static String Search_FindImplementorsAction_label;
+	public static String Search_FindImplementorsAction_tooltip;
+	public static String Search_FindImplementorsInProjectAction_label;
+	public static String Search_FindImplementorsInProjectAction_tooltip;
+	public static String Search_FindImplementorsInWorkingSetAction_label;
+	public static String Search_FindImplementorsInWorkingSetAction_tooltip;
+	public static String Search_FindReferencesAction_label;
+	public static String Search_FindReferencesAction_tooltip;
+	public static String Search_FindReferencesAction_BinPrimConstWarnDialog_title;
+	public static String Search_FindReferencesAction_BinPrimConstWarnDialog_message;
+	public static String Search_FindReferencesInProjectAction_label;
+	public static String Search_FindReferencesInProjectAction_tooltip;
+	public static String Search_FindReferencesInWorkingSetAction_label;
+	public static String Search_FindReferencesInWorkingSetAction_tooltip;
+	public static String Search_FindHierarchyReferencesAction_label;
+	public static String Search_FindHierarchyReferencesAction_tooltip;
+	public static String Search_FindReadReferencesAction_label;
+	public static String Search_FindReadReferencesAction_tooltip;
+	public static String Search_FindReadReferencesInProjectAction_label;
+	public static String Search_FindReadReferencesInProjectAction_tooltip;
+	public static String Search_FindReadReferencesInWorkingSetAction_label;
+	public static String Search_FindReadReferencesInWorkingSetAction_tooltip;
+	public static String Search_FindReadReferencesInHierarchyAction_label;
+	public static String Search_FindReadReferencesInHierarchyAction_tooltip;
+	public static String Search_FindWriteReferencesAction_label;
+	public static String Search_FindWriteReferencesAction_tooltip;
+	public static String Search_FindWriteReferencesInProjectAction_label;
+	public static String Search_FindWriteReferencesInProjectAction_tooltip;
+	public static String Search_FindWriteReferencesInWorkingSetAction_label;
+	public static String Search_FindWriteReferencesInWorkingSetAction_tooltip;
+	public static String Search_FindWriteReferencesInHierarchyAction_label;
+	public static String Search_FindWriteReferencesInHierarchyAction_tooltip;
+	public static String Search_FindOccurrencesInFile_shortLabel;
+	public static String Search_FindOccurrencesInFile_label;
+	public static String Search_FindOccurrencesInFile_tooltip;
+	public static String FindOccurrencesEngine_noSource_text;
+	public static String FindOccurrencesEngine_cannotParse_text;
+	public static String OccurrencesFinder_no_element;
+	public static String OccurrencesFinder_no_binding;
+	public static String OccurrencesFinder_searchfor;
+	public static String OccurrencesFinder_label_singular;
+	public static String OccurrencesFinder_label_plural;
+	public static String ExceptionOccurrencesFinder_no_exception;
+	public static String ExceptionOccurrencesFinder_searchfor;
+	public static String ExceptionOccurrencesFinder_label_singular;
+	public static String ExceptionOccurrencesFinder_label_plural;
+	public static String ImplementOccurrencesFinder_invalidTarget;
+	public static String ImplementOccurrencesFinder_searchfor;
+	public static String ImplementOccurrencesFinder_label_singular;
+	public static String ImplementOccurrencesFinder_label_plural;
+	public static String WorkspaceScope;
+	public static String WorkingSetScope;
+	public static String SelectionScope;
+	public static String EnclosingProjectsScope;
+	public static String EnclosingProjectScope;
+	public static String ProjectScope;
+	public static String HierarchyScope;
+	public static String SearchParticipant_error_noID;
+	public static String SearchParticipant_error_noNature;
+	public static String SearchParticipant_error_noClass;
+	public static String SearchParticipant_error_classCast;
+	public static String TextSearchLabelProvider_matchCountFormat;
+	public static String FiltersDialog_title;
+	public static String FiltersDialog_filters_label;
+	public static String FiltersDialog_description_label;
+	public static String FiltersDialog_limit_label;
+	public static String FiltersDialog_limit_error;
+	public static String FiltersDialogAction_label;
 
 	static {
 		NLS.initializeMessages(BUNDLE_NAME, SearchMessages.class);
diff --git a/plugins/org.eclipse.wst.common.ui/src-search/org/eclipse/wst/common/ui/internal/search/SearchMessages.properties b/plugins/org.eclipse.wst.common.ui/src-search/org/eclipse/wst/common/ui/internal/search/SearchMessages.properties
index d3e9f83..cd3fea0 100644
--- a/plugins/org.eclipse.wst.common.ui/src-search/org/eclipse/wst/common/ui/internal/search/SearchMessages.properties
+++ b/plugins/org.eclipse.wst.common.ui/src-search/org/eclipse/wst/common/ui/internal/search/SearchMessages.properties
@@ -1,5 +1,5 @@
 ###############################################################################
-# Copyright (c) 2000, 2007 IBM Corporation and others.
+# Copyright (c) 2000, 2005 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
@@ -9,27 +9,250 @@
 #     IBM Corporation - initial API and implementation
 ###############################################################################
 
+SearchLabelProvider_exact_singular={0} (1 match)
+SearchLabelProvider_exact_noCount={0}
+SearchLabelProvider_exact_and_potential_plural={0} ({1} matches: {2} exact, {3} potential)
+SearchLabelProvider_potential_singular={0} (potential match)
+SearchLabelProvider_potential_noCount={0} (potential match)
+SearchLabelProvider_potential_plural={0} ({1} potential matches)
+SearchLabelProvider_exact_plural={0} ({1} matches)
+
+group_search=S&earch
+group_declarations= Dec&larations
 group_references= Re&ferences
+group_readReferences= &Read Access
+group_writeReferences= &Write Access
+group_implementors= &Implementors
+group_occurrences= Occurre&nces in File
+group_occurrences_quickMenu_noEntriesAvailable= <no entries available>
+
+Search_Error_search_title=Search Error
+Search_Error_search_message=The search operation has reported problems
+Search_Error_search_notsuccessful_message=The search operation has reported problems
+Search_Error_javaElementAccess_title=Search Error
+Search_Error_javaElementAccess_message=An error occurred while accessing a Java element
+
+Search_Error_search_notsuccessful_title=Search
+
+Search_Error_openEditor_title=Search Error
+Search_Error_openEditor_message=Could not open the editor
+
+Search_Error_codeResolve= Code resolve error
+
+SearchElementSelectionDialog_title=Search
+SearchElementSelectionDialog_message=Select the element to search for.
+
+SearchPage_searchFor_label= Search For
+SearchPage_searchFor_type= &Type
+SearchPage_searchFor_method= &Method
+SearchPage_searchFor_field= &Field
+SearchPage_searchFor_package= &Package
+SearchPage_searchFor_constructor= Co&nstructor
+
+SearchPage_limitTo_label= Limit To
+SearchPage_limitTo_declarations= Dec&larations
+SearchPage_limitTo_implementors= &Implementors
+SearchPage_limitTo_references= &References
+SearchPage_limitTo_allOccurrences= All &Occurrences
+SearchPage_limitTo_readReferences= Read A&ccess
+SearchPage_limitTo_writeReferences= Writ&e Access
+
+SearchPage_expression_label= Se&arch string (* = any string, ? = any character):
+SearchPage_expression_caseSensitive= Case sens&itive
+
+SearchPage_searchJRE_label=Search the JRE s&ystem libraries
+
+# Concatenate two working set names e.g. "Source, Lib"
+SearchUtil_workingSetConcatenation= {0}, {1}
+
 Search_FindDeclarationAction_label= &Workspace
+Search_FindDeclarationAction_tooltip= Search for Declarations of the Selected Element in the Workspace
+
 Search_FindDeclarationsInProjectAction_label= &Project
+Search_FindDeclarationsInProjectAction_tooltip= Search for Declarations of the Selected Element in Resources in the Enclosing Project of the Selected Element
+
 Search_FindDeclarationsInWorkingSetAction_label= Working &Set...
-FileSearchPage_limited_format={0} (showing {1} of {2} files)
-FileSearchPage_error_marker=Could not create marker
-FileSearchPage_sort_by_label=Sort By
-OpenWithMenu_label= Open Wit&h
+Search_FindDeclarationsInWorkingSetAction_tooltip= Search for Declarations of the Selected Element in a Working Set
 
-FileLabelProvider_count_format={0} ({1} matches)
-FileLabelProvider_removed_resource_label=<removed resource>
+Search_FindHierarchyDeclarationsAction_label= &Hierarchy
+Search_FindHierarchyDeclarationsAction_tooltip= Search for Declarations of the Selected Element in its Hierarchy
 
-FileSearchQuery_label=File Search
+Search_FindImplementorsAction_label= &Workspace
+Search_FindImplementorsAction_tooltip= Search for Implementors of the Selected Interface
 
-# The first argument will be replaced by the pattern, the second by the count and the third by the scope
-FileSearchQuery_pluralPattern= ''{0}'' - {1} matches in {2}
+Search_FindImplementorsInProjectAction_label= &Project
+Search_FindImplementorsInProjectAction_tooltip= Search for Implementors of the Selected Interface in Resources in the Enclosing Project of the Selected Element
 
-# The first argument will be replaced by the pattern, the second by the scope
-FileSearchQuery_singularLabel= ''{0}'' - 1 match in {1}
+Search_FindImplementorsInWorkingSetAction_label= Working &Set...
+Search_FindImplementorsInWorkingSetAction_tooltip= Search for Implementors of the Selected Interface in a Working Set
 
-FileSearchQuery_singularLabel_fileNameSearch=1 file name matching ''{0}'' in {1}
-FileSearchQuery_pluralPattern_fileNameSearch={1} file names matching ''{0}'' in {2}
+Search_FindReferencesAction_label= &Workspace
+Search_FindReferencesAction_tooltip= Search for References to the Selected Element in the Workspace
 
-TextSearchEngine_statusMessage= Problems encountered during text search.
+Search_FindReferencesAction_BinPrimConstWarnDialog_title= Search for References to a Binary Constant
+Search_FindReferencesAction_BinPrimConstWarnDialog_message= Matches to this constant will only be discovered in source files and binary files where the constant value is not inlined.
+
+Search_FindReferencesInProjectAction_label= &Project
+Search_FindReferencesInProjectAction_tooltip= Search for References to the Selected Element in Resources in the Enclosing Project of the Selected Element
+
+Search_FindReferencesInWorkingSetAction_label= Working &Set...
+Search_FindReferencesInWorkingSetAction_tooltip= Search for References to the Selected Element in a Working Set
+
+Search_FindHierarchyReferencesAction_label= &Hierarchy
+Search_FindHierarchyReferencesAction_tooltip= Search for References of the Selected Element in its Hierarchy
+
+Search_FindReadReferencesAction_label= &Workspace
+Search_FindReadReferencesAction_tooltip= Search for Read References to the Selected Element in the Workspace
+
+Search_FindReadReferencesInProjectAction_label= &Project
+Search_FindReadReferencesInProjectAction_tooltip= Search for Read References to the Selected Element in Resources in the Enclosing Project of the Selected Element
+
+Search_FindReadReferencesInWorkingSetAction_label= Working &Set...
+Search_FindReadReferencesInWorkingSetAction_tooltip= Search for Read References to the Selected Element in a Working Set
+
+Search_FindReadReferencesInHierarchyAction_label= &Hierarchy
+Search_FindReadReferencesInHierarchyAction_tooltip= Search for Read References of the Selected Element in its Hierarchy
+
+Search_FindWriteReferencesAction_label= &Workspace
+Search_FindWriteReferencesAction_tooltip= Search for Write References to the Selected Element in the Workspace
+
+Search_FindWriteReferencesInProjectAction_label= &Project
+Search_FindWriteReferencesInProjectAction_tooltip= Search for Write References to the Selected Element in Resources in the Enclosing Project of the Selected Element
+
+Search_FindWriteReferencesInWorkingSetAction_label= Working &Set...
+Search_FindWriteReferencesInWorkingSetAction_tooltip= Search for Write References to the Selected Element in a Working Set
+
+Search_FindWriteReferencesInHierarchyAction_label= &Hierarchy
+Search_FindWriteReferencesInHierarchyAction_tooltip= Search for Write References of the Selected Element in its Hierarchy
+
+Search_FindOccurrencesInFile_shortLabel= &Identifier
+Search_FindOccurrencesInFile_label= I&dentifiers in File
+Search_FindOccurrencesInFile_tooltip= Find Occurrences of the Selected Element in the Editor
+
+FindOccurrencesEngine_noSource_text= No source available. To perform this operation you need to attach source.
+FindOccurrencesEngine_cannotParse_text= Cannot analyze the compilation unit or class file.
+
+OccurrencesFinder_no_element= Cannot search for the current selection. Please select a valid Java element name.
+OccurrencesFinder_no_binding= Selected Java element is unknown.
+OccurrencesFinder_searchfor=Search for Occurrences in File
+# The first argument will be replaced by the element name and the second one by the file name
+OccurrencesFinder_label_singular=''{0}'' - 1 occurrence in ''{1}''
+# The first argument will be replaced by the element name, the second by the count and the last by the file name
+OccurrencesFinder_label_plural=''{0}'' - {1} occurrences in ''{2}''
+
+ExceptionOccurrencesFinder_no_exception= Cannot search for current selection. Please select an exception.
+ExceptionOccurrencesFinder_searchfor= Search for Exception Occurrences
+
+# The first argument will be replaced by the element name and the second one by the file name
+ExceptionOccurrencesFinder_label_singular=''{0}'' - 1 exception occurrence in ''{1}''
+# The first argument will be replaced by the element name, the second by the count and the last by the file name
+ExceptionOccurrencesFinder_label_plural=''{0}'' - {1} exception occurrences in ''{2}''
+
+ImplementOccurrencesFinder_invalidTarget= Cannot search for current selection. Please select a type behind 'implements' or 'extends'.
+ImplementOccurrencesFinder_searchfor= Search for Implement Occurrences
+
+# The first argument will be replaced by the element name and the second one by the file name
+ImplementOccurrencesFinder_label_singular=''{0}'' - 1 implement occurrence in ''{1}''
+# The first argument will be replaced by the element name, the second by the count and the last by the file name
+ImplementOccurrencesFinder_label_plural=''{0}'' - {1} implement occurrences in ''{2}''
+
+
+# The first argument will be replaced by the pattern and the second by the scope
+JavaSearchOperation_singularDeclarationsPostfix=''{0}'' - 1 declaration in {1}
+JavaSearchOperation_singularReferencesPostfix=''{0}'' - 1 reference in {1}
+JavaSearchOperation_singularReadReferencesPostfix=''{0}'' - 1 read reference in {1}
+JavaSearchOperation_singularWriteReferencesPostfix=''{0}'' - 1 write reference in {1}
+JavaSearchOperation_singularImplementorsPostfix=''{0}'' - 1 implementor in {1}
+JavaSearchOperation_singularOccurrencesPostfix=''{0}'' - 1 occurrence in {1}
+
+JavaSearchOperation_pluralDeclarationsPostfix=''{0}'' - {1} declarations in {2}
+JavaSearchOperation_pluralReferencesPostfix=''{0}'' - {1} references in {2}
+JavaSearchOperation_pluralReadReferencesPostfix=''{0}'' - {1} read references in {2}
+JavaSearchOperation_pluralWriteReferencesPostfix=''{0}'' - {1} write references in {2}
+JavaSearchOperation_pluralImplementorsPostfix=''{0}'' - {1} implementors in {2}
+JavaSearchOperation_pluralOccurrencesPostfix=''{0}'' - {1} occurrences in {2}
+JavaElementAction_typeSelectionDialog_title=Search
+JavaElementAction_typeSelectionDialog_message=&Select the type to search:
+JavaElementAction_error_open_message=An exception occurred while opening the type.
+
+JavaElementAction_operationUnavailable_title= Operation Unavailable
+JavaElementAction_operationUnavailable_generic= The operation is unavailable on the current selection. Please select a valid Java element name.
+JavaElementAction_operationUnavailable_field= The operation is unavailable on the current selection. Please select the name of a field or local variable.
+JavaElementAction_operationUnavailable_interface= The operation is unavailable on the current selection. Please select the name of an interface.
+
+WorkspaceScope= workspace
+WorkingSetScope= working set ''{0}''
+SelectionScope= selection
+EnclosingProjectsScope= projects {0}, ...
+EnclosingProjectScope= project {0}
+ProjectScope= project {0}
+HierarchyScope= hierarchy of ''{0}''
+
+JavaSearchResultPage_sortByName=Name
+JavaSearchResultPage_sortByPath=Path
+JavaSearchResultPage_open_editor_error_title=Open Element
+JavaSearchResultPage_open_editor_error_message=Opening element failed.
+JavaSearchResultPage_sortByParentName=Parent Name
+JavaSearchResultPage_filtered_message={0} (Filtered)
+JavaSearchResultPage_sortBylabel=Sort By
+JavaSearchResultPage_error_marker=Could not create marker
+
+JavaSearchResultPage_groupby_project=Project
+JavaSearchResultPage_groupby_project_tooltip=Group by Project
+JavaSearchResultPage_groupby_package=Package
+JavaSearchResultPage_groupby_package_tooltip=Group by Package
+JavaSearchResultPage_filteredWithCount_message={0} ({1} matches filtered from view)
+JavaSearchResultPage_groupby_file=File
+JavaSearchResultPage_groupby_file_tooltip=Group by File
+JavaSearchResultPage_groupby_type=Type
+JavaSearchResultPage_groupby_type_tooltip=Group by Type
+
+JavaSearchQuery_task_label=Searching
+JavaSearchQuery_label=Java Search
+JavaSearchQuery_error_unsupported_pattern=Unsupported search pattern: "{0}"
+JavaSearchQuery_status_ok_message=Found {0} matches.
+
+JavaSearchQuery_error_participant_estimate=An error occurred while estimating progress data
+JavaSearchQuery_error_participant_search=An error occurred during participant search
+
+SearchParticipant_error_noID=Missing id attribute on search participant extension {0}
+SearchParticipant_error_noNature=Missing nature attribute on search participant {0}
+SearchParticipant_error_noClass=Missing class attribute on search participant {0}
+SearchParticipant_error_classCast=Search participant doesn't implement IQueryParticipant
+
+
+MatchFilter_ImportFilter_name=Imports
+MatchFilter_ImportFilter_actionLabel=Filter &Imports
+MatchFilter_ImportFilter_description=Filters matches that are in import statements
+
+
+MatchFilter_WriteFilter_name=Writes
+MatchFilter_WriteFilter_actionLabel=Filter &Writes
+MatchFilter_WriteFilter_description=Filters matches that are write accesses
+
+MatchFilter_ReadFilter_name=Reads
+MatchFilter_ReadFilter_actionLabel=Filter &Reads
+MatchFilter_ReadFilter_description=Filters matches that are not write accesses
+
+MatchFilter_JavadocFilter_name=Javadoc
+MatchFilter_JavadocFilter_actionLabel=Filter &Javadoc
+MatchFilter_JavadocFilter_description=Filters matches that are inside Javadoc comments
+
+MatchFilter_ErasureFilter_name=Incompatible type arguments
+MatchFilter_ErasureFilter_actionLabel=Filter In&compatible
+MatchFilter_ErasureFilter_description=Filters parameterized type matches that are not assignment compatible with the search pattern
+
+MatchFilter_InexactFilter_name=Inexact type arguments
+MatchFilter_InexactFilter_actionLabel=Filter Ine&xact
+MatchFilter_InexactFilter_description=Filters parameterized type matches where the type arguments don't exactly match the search pattern's type arguments
+
+MethodExitsFinder_no_return_type_selected=No return type selected
+
+TextSearchLabelProvider_matchCountFormat={0} ({1} matches)
+
+FiltersDialog_title=Java Search Filters
+FiltersDialog_filters_label=Select the &matches to exclude from the search results:
+FiltersDialog_description_label=Filter Description:
+FiltersDialog_limit_label=&Limit top level elements in Java search view to:
+FiltersDialog_limit_error=Element limit must be a positive number
+FiltersDialogAction_label=Fi&lters...
diff --git a/plugins/org.eclipse.wst.common.ui/src-search/org/eclipse/wst/common/ui/internal/search/SearchResult.java b/plugins/org.eclipse.wst.common.ui/src-search/org/eclipse/wst/common/ui/internal/search/SearchResult.java
index c2941d4..c26fb9c 100644
--- a/plugins/org.eclipse.wst.common.ui/src-search/org/eclipse/wst/common/ui/internal/search/SearchResult.java
+++ b/plugins/org.eclipse.wst.common.ui/src-search/org/eclipse/wst/common/ui/internal/search/SearchResult.java
@@ -12,6 +12,7 @@
 
 import org.eclipse.core.resources.IFile;
 import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.search.internal.ui.SearchPluginImages;
 import org.eclipse.search.ui.ISearchQuery;
 import org.eclipse.search.ui.text.AbstractTextSearchResult;
 import org.eclipse.search.ui.text.IEditorMatchAdapter;
@@ -20,7 +21,6 @@
 import org.eclipse.ui.IEditorInput;
 import org.eclipse.ui.IEditorPart;
 import org.eclipse.ui.IFileEditorInput;
-import org.eclipse.wst.common.ui.internal.UIPlugin;
 
 public class SearchResult extends AbstractTextSearchResult implements IEditorMatchAdapter, IFileMatchAdapter {
 	private final Match[] EMPTY_ARR= new Match[0];
@@ -31,7 +31,7 @@
 		fQuery= job;
 	}
 	public ImageDescriptor getImageDescriptor() {
-		return UIPlugin.getDefault().getImageDescriptor("icons/tsearch_dpdn_obj.gif");
+		return SearchPluginImages.DESC_OBJ_TSEARCH_DPDN;
 	}
 	public String getLabel() {
 		return fQuery.getResultLabel(getMatchCount());
diff --git a/plugins/org.eclipse.wst.common.ui/src-search/org/eclipse/wst/common/ui/internal/search/SearchResultPage.java b/plugins/org.eclipse.wst.common.ui/src-search/org/eclipse/wst/common/ui/internal/search/SearchResultPage.java
index 03247b5..318d06d 100644
--- a/plugins/org.eclipse.wst.common.ui/src-search/org/eclipse/wst/common/ui/internal/search/SearchResultPage.java
+++ b/plugins/org.eclipse.wst.common.ui/src-search/org/eclipse/wst/common/ui/internal/search/SearchResultPage.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2007 IBM Corporation and others.
+ * Copyright (c) 2000, 2005 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
@@ -22,7 +22,7 @@
 import org.eclipse.jface.action.IMenuManager;
 import org.eclipse.jface.action.MenuManager;
 import org.eclipse.jface.util.DelegatingDragAdapter;
-//import org.eclipse.jface.util.IPropertyChangeListener;
+import org.eclipse.jface.util.IPropertyChangeListener;
 import org.eclipse.jface.viewers.DecoratingLabelProvider;
 import org.eclipse.jface.viewers.ILabelProvider;
 import org.eclipse.jface.viewers.ISelection;
@@ -34,6 +34,12 @@
 import org.eclipse.jface.viewers.TreeViewer;
 import org.eclipse.jface.viewers.Viewer;
 import org.eclipse.jface.viewers.ViewerSorter;
+import org.eclipse.search.internal.ui.SearchMessages;
+import org.eclipse.search.internal.ui.SearchPlugin;
+import org.eclipse.search.internal.ui.text.FileLabelProvider;
+import org.eclipse.search.internal.ui.text.IFileSearchContentProvider;
+import org.eclipse.search.internal.ui.text.ResourceTransferDragAdapter;
+import org.eclipse.search.internal.ui.text.SortAction;
 import org.eclipse.search.ui.IContextMenuConstants;
 import org.eclipse.search.ui.ISearchResultViewPart;
 import org.eclipse.search.ui.NewSearchUI;
@@ -62,10 +68,6 @@
 import org.eclipse.ui.part.ResourceTransfer;
 import org.eclipse.ui.texteditor.ITextEditor;
 import org.eclipse.wst.common.ui.internal.UIPlugin;
-import org.eclipse.wst.common.ui.internal.search.basecode.FileLabelProvider;
-import org.eclipse.wst.common.ui.internal.search.basecode.IFileSearchContentProvider;
-import org.eclipse.wst.common.ui.internal.search.basecode.ResourceTransferDragAdapter;
-import org.eclipse.wst.common.ui.internal.search.basecode.SortAction;
 
 
 public class SearchResultPage extends AbstractTextSearchViewPage implements IAdaptable {
@@ -118,7 +120,7 @@
 		}
 	};
 
-	// private IPropertyChangeListener fPropertyChangeListener;
+	private IPropertyChangeListener fPropertyChangeListener;
 	
 	public SearchResultPage() {
 		// TODO
@@ -239,7 +241,7 @@
 	
 	public void dispose() {
 		fActionGroup.dispose();
-		// SearchPlugin.getDefault().getPreferenceStore().removePropertyChangeListener(fPropertyChangeListener);
+		SearchPlugin.getDefault().getPreferenceStore().removePropertyChangeListener(fPropertyChangeListener);
 		super.dispose();
 	}
 
diff --git a/plugins/org.eclipse.wst.common.ui/src-search/org/eclipse/wst/common/ui/internal/search/SearchResultTableContentProvider.java b/plugins/org.eclipse.wst.common.ui/src-search/org/eclipse/wst/common/ui/internal/search/SearchResultTableContentProvider.java
index f757d29..0e876e8 100644
--- a/plugins/org.eclipse.wst.common.ui/src-search/org/eclipse/wst/common/ui/internal/search/SearchResultTableContentProvider.java
+++ b/plugins/org.eclipse.wst.common.ui/src-search/org/eclipse/wst/common/ui/internal/search/SearchResultTableContentProvider.java
@@ -13,8 +13,8 @@
 import org.eclipse.jface.viewers.IStructuredContentProvider;
 import org.eclipse.jface.viewers.TableViewer;
 import org.eclipse.jface.viewers.Viewer;
+import org.eclipse.search.internal.ui.text.IFileSearchContentProvider;
 import org.eclipse.search.ui.text.AbstractTextSearchResult;
-import org.eclipse.wst.common.ui.internal.search.basecode.IFileSearchContentProvider;
 
 public class SearchResultTableContentProvider implements IStructuredContentProvider, IFileSearchContentProvider {
 	
diff --git a/plugins/org.eclipse.wst.common.ui/src-search/org/eclipse/wst/common/ui/internal/search/SearchResultTreeContentProvider.java b/plugins/org.eclipse.wst.common.ui/src-search/org/eclipse/wst/common/ui/internal/search/SearchResultTreeContentProvider.java
index 7c79ce9..a3ca289 100644
--- a/plugins/org.eclipse.wst.common.ui/src-search/org/eclipse/wst/common/ui/internal/search/SearchResultTreeContentProvider.java
+++ b/plugins/org.eclipse.wst.common.ui/src-search/org/eclipse/wst/common/ui/internal/search/SearchResultTreeContentProvider.java
@@ -20,8 +20,8 @@
 import org.eclipse.jface.viewers.AbstractTreeViewer;
 import org.eclipse.jface.viewers.ITreeContentProvider;
 import org.eclipse.jface.viewers.Viewer;
+import org.eclipse.search.internal.ui.text.IFileSearchContentProvider;
 import org.eclipse.search.ui.text.AbstractTextSearchResult;
-import org.eclipse.wst.common.ui.internal.search.basecode.IFileSearchContentProvider;
 
 
 public class SearchResultTreeContentProvider implements ITreeContentProvider, IFileSearchContentProvider {
diff --git a/plugins/org.eclipse.wst.common.ui/src-search/org/eclipse/wst/common/ui/internal/search/basecode/FileLabelProvider.java b/plugins/org.eclipse.wst.common.ui/src-search/org/eclipse/wst/common/ui/internal/search/basecode/FileLabelProvider.java
deleted file mode 100644
index 8c7e273..0000000
--- a/plugins/org.eclipse.wst.common.ui/src-search/org/eclipse/wst/common/ui/internal/search/basecode/FileLabelProvider.java
+++ /dev/null
@@ -1,133 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2006 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
- *
- * Derived from org.eclipse.search.internal.ui.FileLabelProvider
- *******************************************************************************/
-package org.eclipse.wst.common.ui.internal.search.basecode;
-
-import com.ibm.icu.text.MessageFormat;
-
-import org.eclipse.core.runtime.IPath;
-
-import org.eclipse.core.resources.IResource;
-
-import org.eclipse.swt.graphics.Image;
-
-import org.eclipse.jface.viewers.ILabelProviderListener;
-import org.eclipse.jface.viewers.LabelProvider;
-
-import org.eclipse.ui.model.WorkbenchLabelProvider;
-import org.eclipse.wst.common.ui.internal.search.SearchMessages;
-
-import org.eclipse.search.ui.text.AbstractTextSearchResult;
-import org.eclipse.search.ui.text.AbstractTextSearchViewPage;
-
-
-public class FileLabelProvider extends LabelProvider {
-		
-	public static final int SHOW_LABEL= 1;
-	public static final int SHOW_LABEL_PATH= 2;
-	public static final int SHOW_PATH_LABEL= 3;
-	public static final int SHOW_PATH= 4;
-	
-	private static final String fgSeparatorFormat= "{0} - {1}"; //$NON-NLS-1$
-	
-	private WorkbenchLabelProvider fLabelProvider;
-	private AbstractTextSearchViewPage fPage;
-		
-	private int fOrder;
-	private String[] fArgs= new String[2];
-
-	public FileLabelProvider(AbstractTextSearchViewPage page, int orderFlag) {
-		fLabelProvider= new WorkbenchLabelProvider();
-		fOrder= orderFlag;
-		fPage= page;
-	}
-
-	public void setOrder(int orderFlag) {
-		fOrder= orderFlag;
-	}
-	
-	public int getOrder() {
-		return fOrder;
-	}
-
-	public String getText(Object element) {
-		if (!(element instanceof IResource))
-			return null;
-
-		IResource resource= (IResource)element;
-		String text= null;
-
-		if (!resource.exists())
-			text= SearchMessages.FileLabelProvider_removed_resource_label; 
-		
-		else {
-			IPath path= resource.getFullPath().removeLastSegments(1);
-			if (path.getDevice() == null)
-				path= path.makeRelative();
-			if (fOrder == SHOW_LABEL || fOrder == SHOW_LABEL_PATH) {
-				text= fLabelProvider.getText(resource);
-				if (path != null && fOrder == SHOW_LABEL_PATH) {
-					fArgs[0]= text;
-					fArgs[1]= path.toString();
-					text= MessageFormat.format(fgSeparatorFormat, fArgs);
-				}
-			} else {
-				if (path != null)
-					text= path.toString();
-				else
-					text= ""; //$NON-NLS-1$
-				if (fOrder == SHOW_PATH_LABEL) {
-					fArgs[0]= text;
-					fArgs[1]= fLabelProvider.getText(resource);
-					text= MessageFormat.format(fgSeparatorFormat, fArgs);
-				}
-			}
-		}
-		
-		int matchCount= 0;
-		AbstractTextSearchResult result= fPage.getInput();
-		if (result != null)
-			matchCount= result.getMatchCount(element);
-		if (matchCount <= 1)
-			return text;
-		String format= SearchMessages.FileLabelProvider_count_format; 
-		return MessageFormat.format(format, new Object[] { text, new Integer(matchCount) });
-	}
-
-	public Image getImage(Object element) {
-		if (!(element instanceof IResource))
-			return null;
-
-		IResource resource= (IResource)element;
-		Image image= fLabelProvider.getImage(resource);
-		return image;
-	}
-
-	public void dispose() {
-		super.dispose();
-		fLabelProvider.dispose();
-	}
-
-	public boolean isLabelProperty(Object element, String property) {
-		return fLabelProvider.isLabelProperty(element, property);
-	}
-
-	public void removeListener(ILabelProviderListener listener) {
-		super.removeListener(listener);
-		fLabelProvider.removeListener(listener);
-	}
-
-	public void addListener(ILabelProviderListener listener) {
-		super.addListener(listener);
-		fLabelProvider.addListener(listener);
-	}
-}
diff --git a/plugins/org.eclipse.wst.common.ui/src-search/org/eclipse/wst/common/ui/internal/search/basecode/IFileSearchContentProvider.java b/plugins/org.eclipse.wst.common.ui/src-search/org/eclipse/wst/common/ui/internal/search/basecode/IFileSearchContentProvider.java
deleted file mode 100644
index 18ef416..0000000
--- a/plugins/org.eclipse.wst.common.ui/src-search/org/eclipse/wst/common/ui/internal/search/basecode/IFileSearchContentProvider.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 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 
- *
- * Derived from org.eclipse.search.internal.ui.IFileSearchContentProvider
- *******************************************************************************/
-package org.eclipse.wst.common.ui.internal.search.basecode;
-
-public interface IFileSearchContentProvider {
-
-	public abstract void elementsChanged(Object[] updatedElements);
-
-	public abstract void clear();
-
-}
diff --git a/plugins/org.eclipse.wst.common.ui/src-search/org/eclipse/wst/common/ui/internal/search/basecode/Messages.java b/plugins/org.eclipse.wst.common.ui/src-search/org/eclipse/wst/common/ui/internal/search/basecode/Messages.java
deleted file mode 100644
index 4e91dc7..0000000
--- a/plugins/org.eclipse.wst.common.ui/src-search/org/eclipse/wst/common/ui/internal/search/basecode/Messages.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006 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
- * 
- * Derived from org.eclipse.search.internal.ui.Messages
- *******************************************************************************/
-package org.eclipse.wst.common.ui.internal.search.basecode;
-
-import com.ibm.icu.text.MessageFormat;
-
-/**
- * Helper class to format message strings.
- * 
- * @since 3.1
- */
-public class Messages {
-
-	public static String format(String message, Object object) {
-		return MessageFormat.format(message, new Object[] { object});
-	}
-
-	public static String format(String message, Object[] objects) {
-		return MessageFormat.format(message, objects);
-	}
-
-	private Messages() {
-		// Not for instantiation
-	}
-}
diff --git a/plugins/org.eclipse.wst.common.ui/src-search/org/eclipse/wst/common/ui/internal/search/basecode/ResourceTransferDragAdapter.java b/plugins/org.eclipse.wst.common.ui/src-search/org/eclipse/wst/common/ui/internal/search/basecode/ResourceTransferDragAdapter.java
deleted file mode 100644
index 835281a..0000000
--- a/plugins/org.eclipse.wst.common.ui/src-search/org/eclipse/wst/common/ui/internal/search/basecode/ResourceTransferDragAdapter.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2006 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
- * 
- * Derived from org.eclipse.search.internal.ui.ResourceTransferDragAdapter
- *******************************************************************************/
-package org.eclipse.wst.common.ui.internal.search.basecode;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.core.runtime.Assert;
-
-import org.eclipse.core.resources.IResource;
-
-import org.eclipse.swt.dnd.DragSourceAdapter;
-import org.eclipse.swt.dnd.DragSourceEvent;
-import org.eclipse.swt.dnd.Transfer;
-
-import org.eclipse.jface.util.TransferDragSourceListener;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ISelectionProvider;
-import org.eclipse.jface.viewers.IStructuredSelection;
-
-import org.eclipse.ui.part.ResourceTransfer;
-
-/**
- * A drag adapter that transfers the current selection as </code>
- * IResource</code>. Only those elements in the selection are part 
- * of the transfer which can be converted into an <code>IResource
- * </code>.
- */
-public class ResourceTransferDragAdapter extends DragSourceAdapter implements TransferDragSourceListener {
-
-	private ISelectionProvider fProvider;
-
-	/**
-	 * Creates a new ResourceTransferDragAdapter for the given selection
-	 * provider.
-	 * 
-	 * @param provider the selection provider to access the viewer's selection
-	 */
-	public ResourceTransferDragAdapter(ISelectionProvider provider) {
-		fProvider= provider;
-		Assert.isNotNull(fProvider);
-	}
-	
-	public Transfer getTransfer() {
-		return ResourceTransfer.getInstance();
-	}
-	
-	public void dragStart(DragSourceEvent event) {
-		event.doit= convertSelection().size() > 0;
-	}
-	
-	public void dragSetData(DragSourceEvent event) {
-		List resources= convertSelection();
-		event.data= resources.toArray(new IResource[resources.size()]);
-	}
-	
-	public void dragFinished(DragSourceEvent event) {
-		if (!event.doit)
-			return;
-	}
-	
-	private List convertSelection() {
-		ISelection s= fProvider.getSelection();
-		if (!(s instanceof IStructuredSelection))
-			return Collections.EMPTY_LIST;
-		IStructuredSelection selection= (IStructuredSelection) s;
-		List result= new ArrayList(selection.size());
-		for (Iterator iter= selection.iterator(); iter.hasNext();) {
-			Object element= iter.next();
-			if (element instanceof IResource) {
-				result.add(element);
-			}
-		}
-		return result;
-	}
-}
diff --git a/plugins/org.eclipse.wst.common.ui/src-search/org/eclipse/wst/common/ui/internal/search/basecode/SortAction.java b/plugins/org.eclipse.wst.common.ui/src-search/org/eclipse/wst/common/ui/internal/search/basecode/SortAction.java
deleted file mode 100644
index ae91ea2..0000000
--- a/plugins/org.eclipse.wst.common.ui/src-search/org/eclipse/wst/common/ui/internal/search/basecode/SortAction.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2006 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
- * 
- * Derived from org.eclipse.search.internal.ui.SortAction
- *******************************************************************************/
-package org.eclipse.wst.common.ui.internal.search.basecode;
-
-import org.eclipse.jface.action.Action;
-import org.eclipse.wst.common.ui.internal.search.SearchResultPage;
-
-public class SortAction extends Action {
-	private int fSortOrder;
-	private SearchResultPage fPage;
-	
-	public SortAction(String label, SearchResultPage page, int sortOrder) {
-		super(label);
-		fPage= page;
-		fSortOrder= sortOrder;
-	}
-
-	public void run() {
-		fPage.setSortOrder(fSortOrder);
-	}
-
-	public int getSortOrder() {
-		return fSortOrder;
-	}
-}
diff --git a/plugins/org.eclipse.wst.common.ui/src/org/eclipse/wst/common/ui/internal/dialogs/SelectSingleFileDialog.java b/plugins/org.eclipse.wst.common.ui/src/org/eclipse/wst/common/ui/internal/dialogs/SelectSingleFileDialog.java
index 03503e8..181cebb 100644
--- a/plugins/org.eclipse.wst.common.ui/src/org/eclipse/wst/common/ui/internal/dialogs/SelectSingleFileDialog.java
+++ b/plugins/org.eclipse.wst.common.ui/src/org/eclipse/wst/common/ui/internal/dialogs/SelectSingleFileDialog.java
@@ -9,13 +9,11 @@
  *     IBM Corporation - Initial API and implementation
  *     Jens Lukowski/Innoopract - initial renaming/restructuring
  *******************************************************************************/
-package org.eclipse.wst.common.ui.internal.dialogs;
+package  org.eclipse.wst.common.ui.internal.dialogs;
 
 import org.eclipse.core.resources.IFile;
 import org.eclipse.jface.dialogs.IDialogConstants;
 import org.eclipse.jface.dialogs.TitleAreaDialog;
-import org.eclipse.jface.resource.DeviceResourceException;
-import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.swt.SWT;
@@ -26,110 +24,105 @@
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
 import org.eclipse.swt.widgets.Shell;
-import org.eclipse.wst.common.ui.internal.UIPlugin;
+import org.eclipse.ui.internal.WorkbenchImages;
+import org.eclipse.ui.internal.ide.IDEInternalWorkbenchImages;
 import org.eclipse.wst.common.ui.internal.viewers.SelectSingleFileView;
 
 
 
-public class SelectSingleFileDialog extends TitleAreaDialog {
-	protected SelectSingleFileView selectSingleFileView;
-	protected Button okButton;
-	protected Image image;
-	private ImageDescriptor imageDescriptor;
+public class SelectSingleFileDialog extends TitleAreaDialog
+{            
+  protected SelectSingleFileView selectSingleFileView; 
+  protected Button okButton;
+  protected Image image;
+ 
+  public SelectSingleFileDialog(Shell parentShell, IStructuredSelection selection, boolean isFileMandatory) 
+  {
+    super(parentShell);   
+    setShellStyle(getShellStyle() | SWT.RESIZE);
+    if (selection == null)
+    {
+      selection = new StructuredSelection();
+    }
+    selectSingleFileView = new SelectSingleFileView(selection, isFileMandatory)
+    {
+	  public void createFilterControl(Composite composite)
+	  {
+		SelectSingleFileDialog.this.createFilterControl(composite);
+	  }
+    };  
+  }
 
-	public SelectSingleFileDialog(Shell parentShell, IStructuredSelection selection, boolean isFileMandatory) {
-		super(parentShell);
-		setShellStyle(getShellStyle() | SWT.RESIZE);
-		if (selection == null) {
-			selection = new StructuredSelection();
-		}
-		selectSingleFileView = new SelectSingleFileView(selection, isFileMandatory) {
-			public void createFilterControl(Composite composite) {
-				SelectSingleFileDialog.this.createFilterControl(composite);
-			}
-		};
-	}
+  protected Control createDialogArea(Composite parent) 
+  {                                                 
+    Composite dialogArea = (Composite)super.createDialogArea(parent);
+    
+    //TODO.. enable context help
+    //WorkbenchHelp.setHelp(dialogArea, B2BGUIContextIds.BTBG_SELECT_SINGLE_FILE_DIALOG);
 
-	protected Control createDialogArea(Composite parent) {
-		Composite dialogArea = (Composite) super.createDialogArea(parent);
+    Composite composite = new Composite(dialogArea, SWT.NONE);
+    composite.setLayout(new GridLayout());
+    GridData gd = new GridData(GridData.FILL_BOTH);
+    gd.widthHint = 350;
+    gd.heightHint = 350;
+    composite.setLayoutData(gd);   
+            
+    SelectSingleFileView.Listener listener = new SelectSingleFileView.Listener()
+    {                                             
+      public void setControlComplete(boolean isComplete)
+      {                            
+        okButton.setEnabled(isComplete);
+      }
+    };
+    selectSingleFileView.setListener(listener);
+    selectSingleFileView.createControl(composite);
+    return dialogArea;
+  }  
 
-		// TODO.. enable context help
-		// WorkbenchHelp.setHelp(dialogArea,
-		// B2BGUIContextIds.BTBG_SELECT_SINGLE_FILE_DIALOG);
+  protected void createButtonsForButtonBar(Composite parent) 
+  {
+    okButton = createButton(parent, IDialogConstants.OK_ID, IDialogConstants.OK_LABEL, true);
+    okButton.setEnabled(false);
+    createButton(parent, IDialogConstants.CANCEL_ID, IDialogConstants.CANCEL_LABEL, false);
+  }  
+       
+  public void create()
+  {
+    super.create();
+    selectSingleFileView.setVisibleHelper(true);
+    image = WorkbenchImages.getImageDescriptor(IDEInternalWorkbenchImages.IMG_DLGBAN_SAVEAS_DLG).createImage();
+    setTitleImage(image);
+  }
 
-		Composite composite = new Composite(dialogArea, SWT.NONE);
-		composite.setLayout(new GridLayout());
-		GridData gd = new GridData(GridData.FILL_BOTH);
-		gd.widthHint = 350;
-		gd.heightHint = 350;
-		composite.setLayoutData(gd);
+  public void createFilterCombo(Composite composite)
+  {
+  } 
 
-		SelectSingleFileView.Listener listener = new SelectSingleFileView.Listener() {
-			public void setControlComplete(boolean isComplete) {
-				okButton.setEnabled(isComplete);
-			}
-		};
-		selectSingleFileView.setListener(listener);
-		selectSingleFileView.createControl(composite);
-		return dialogArea;
-	}
+  public IFile getFile()
+  {  
+    return selectSingleFileView.getFile();
+  }   
 
-	protected void createButtonsForButtonBar(Composite parent) {
-		okButton = createButton(parent, IDialogConstants.OK_ID, IDialogConstants.OK_LABEL, true);
-		okButton.setEnabled(false);
-		createButton(parent, IDialogConstants.CANCEL_ID, IDialogConstants.CANCEL_LABEL, false);
-	}
+  public void addFilterExtensions(String[] filterExtensions)
+  { 
+    selectSingleFileView.addFilterExtensions(filterExtensions);
+  }
 
-	public void create() {
-		super.create();
-		selectSingleFileView.setVisibleHelper(true);
-		image = getSaveAsImage();
-		setTitleImage(image);
-	}
+  public void addFilterExtensions(String[] filterExtensions, IFile [] excludedFiles)
+  {
+    selectSingleFileView.addFilterExtensions(filterExtensions, excludedFiles);
+  }
+  
+  public void createFilterControl(Composite composite)
+  { 
+  }
 
-	/**
-	 * this image was copied from org.eclipse.ui.ide/icons/full/wizban/ where
-	 * it is a non-API image, denoted by
-	 * IDEInternalWorkbenchImages.IMG_DLGBAN_SAVEAS_DLG.
-	 */
-	private Image getSaveAsImage() {
-		Image localimage = null;
-		try {
-			if (imageDescriptor == null) {
-				imageDescriptor = UIPlugin.getDefault().getImageDescriptor("icons/saveas_wiz.png");
-			}
-			localimage = (Image) imageDescriptor.createResource(getContents().getDisplay());
-		}
-		catch (DeviceResourceException e) {
-			// if image not found
-			localimage = (ImageDescriptor.getMissingImageDescriptor()).createImage();
-		}
-		return localimage;
-	}
-
-	public void createFilterCombo(Composite composite) {
-	}
-
-	public IFile getFile() {
-		return selectSingleFileView.getFile();
-	}
-
-	public void addFilterExtensions(String[] filterExtensions) {
-		selectSingleFileView.addFilterExtensions(filterExtensions);
-	}
-
-	public void addFilterExtensions(String[] filterExtensions, IFile[] excludedFiles) {
-		selectSingleFileView.addFilterExtensions(filterExtensions, excludedFiles);
-	}
-
-	public void createFilterControl(Composite composite) {
-	}
-
-	public boolean close() {
-		if (image != null && imageDescriptor != null) {
-			imageDescriptor.destroyResource(image);
-			image = null;
-		}
-		return super.close();
-	}
+  public boolean close()
+  {
+    if (image != null)
+    {
+      image.dispose();
+    }
+    return super.close();
+  }
 }
diff --git a/plugins/org.eclipse.wst.common.uriresolver/META-INF/MANIFEST.MF b/plugins/org.eclipse.wst.common.uriresolver/META-INF/MANIFEST.MF
index 202c7b5..9d5b978 100644
--- a/plugins/org.eclipse.wst.common.uriresolver/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.wst.common.uriresolver/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.wst.common.uriresolver; singleton:=true
-Bundle-Version: 1.1.201.qualifier
+Bundle-Version: 1.1.203.qualifier
 Bundle-Activator: org.eclipse.wst.common.uriresolver.internal.provisional.URIResolverPlugin
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin