diff --git a/features/org.eclipse.wst.common_core.feature.patch/buildnotes_org.eclipse.wst.common_core.feature.patch.html b/features/org.eclipse.wst.common_core.feature.patch/buildnotes_org.eclipse.wst.common_core.feature.patch.html
index 1e69e54..8c7e123 100644
--- a/features/org.eclipse.wst.common_core.feature.patch/buildnotes_org.eclipse.wst.common_core.feature.patch.html
+++ b/features/org.eclipse.wst.common_core.feature.patch/buildnotes_org.eclipse.wst.common_core.feature.patch.html
@@ -4,17 +4,16 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
 <meta name="Build" content="Build">
-<title>WTP 3.2.2 Patches</title>
+<title>WTP 3.3.1 Patches</title>
 </head>
 
 <body>
 
-<h1>WTP 3.2.2 Patches</h1>
+<h1>WTP 3.3.1 Patches</h1>
 
 <h2>org.eclipse.wst.common_core.feature</h2>
 
-<p>Bug <a href='https://bugs.eclipse.org/325988'>325988</a>. Translator framework: can't insert text into empty node</p>
-<p>Bug <a href='https://bugs.eclipse.org/325991'>325991</a>. Regression: child projects not targeted to parent project's runtime</p>
+<p>Bug <a href='https://bugs.eclipse.org/365135'>365135</a>. [modulecore] Behavior when multiple src dirs are mapped to component root</p>
 
 </body>
 </html>
\ No newline at end of file
diff --git a/features/org.eclipse.wst.common_core.feature.patch/feature.properties b/features/org.eclipse.wst.common_core.feature.patch/feature.properties
index 462bccb..c850029 100644
--- a/features/org.eclipse.wst.common_core.feature.patch/feature.properties
+++ b/features/org.eclipse.wst.common_core.feature.patch/feature.properties
@@ -18,7 +18,7 @@
 featureName=WTP Patches for org.eclipse.wst.common_core.feature
 
 # "providerName" property - name of the company that provides the feature
-providerName=Eclipse.org
+providerName=Eclipse Web Tools Platform
 
 # "updateSiteName" property - label for the update site
 updateSiteName=The Eclipse Web Tools Platform (WTP) Project update site
@@ -27,12 +27,11 @@
 description=\
 Contains fixes described in the following bugzilla(s):\n\
 \n\
-Bug https://bugs.eclipse.org/325988 Translator framework: can't insert text into empty node\n\
-Bug https://bugs.eclipse.org/325991 Regression: child projects not targeted to parent project's runtime\n\
+Bug https://bugs.eclipse.org/365135 [modulecore] Behavior when multiple src dirs are mapped to component root\n\
 \n\
 # "copyright" property - text of the "Feature Update Copyright"
 copyright=\
-Copyright (c) 2010 IBM Corporation and others.\n\
+Copyright (c) 2011 IBM Corporation and others.\n\
 All rights reserved. This program and the accompanying materials\n\
 are made available under the terms of the Eclipse Public License v1.0\n\
 which accompanies this distribution, and is available at\n\
diff --git a/features/org.eclipse.wst.common_core.feature.patch/feature.xml b/features/org.eclipse.wst.common_core.feature.patch/feature.xml
index adb6ff6..7dc7489 100644
--- a/features/org.eclipse.wst.common_core.feature.patch/feature.xml
+++ b/features/org.eclipse.wst.common_core.feature.patch/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.wst.common_core.feature.patch"
       label="%featureName"
-      version="3.2.2.qualifier"
+      version="3.3.1.qualifier"
       provider-name="%providerName">
 
    <description>
@@ -18,15 +18,9 @@
    </license>
 
    <requires>
-      <import feature="org.eclipse.wst.common_core.feature" version="3.2.2.v201008091400-7B7DFElF7RZHOZJ6W0PsNJ" patch="true"/>
+      <import feature="org.eclipse.wst.common_core.feature" version="3.3.1.v201107190400-7B7DFO5F7RZHOeJ-SxQ1NJ" patch="true"/>
    </requires>
 
-   <plugin
-         id="org.eclipse.wst.common.emf"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
 
    <plugin
          id="org.eclipse.wst.common.modulecore"
diff --git a/features/org.eclipse.wst.common_ui.feature.patch/buildnotes_org.eclipse.wst.common_ui.feature.patch.html b/features/org.eclipse.wst.common_ui.feature.patch/buildnotes_org.eclipse.wst.common_ui.feature.patch.html
index 4cbfd9a..95c27a2 100644
--- a/features/org.eclipse.wst.common_ui.feature.patch/buildnotes_org.eclipse.wst.common_ui.feature.patch.html
+++ b/features/org.eclipse.wst.common_ui.feature.patch/buildnotes_org.eclipse.wst.common_ui.feature.patch.html
@@ -4,15 +4,15 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
 <meta name="Build" content="Build">
-<title>WTP 3.2.2 Patches</title>
+<title>WTP 3.2.5 Patches</title>
 </head>
 
 <body>
 
-<h1>WTP 3.2.2 Patches</h1>
+<h1>WTP 3.2.5 Patches</h1>
 
 <h2>org.eclipse.wst.common_ui.feature</h2>
 
-<p>Bug <a href='https://bugs.eclipse.org/326417'>326417</a>. Deployment Assembly Verifier for classpath entries</p>
+<p>Bug <a href='https://bugs.eclipse.org/366065'>366065</a>. Add a new filter rule to include/exclude based on a target runtime</p>
 </body>
 </html>
\ No newline at end of file
diff --git a/features/org.eclipse.wst.common_ui.feature.patch/feature.properties b/features/org.eclipse.wst.common_ui.feature.patch/feature.properties
index bb0eaa0..df76344 100644
--- a/features/org.eclipse.wst.common_ui.feature.patch/feature.properties
+++ b/features/org.eclipse.wst.common_ui.feature.patch/feature.properties
@@ -18,7 +18,7 @@
 featureName=WTP Patches for org.eclipse.wst.common_ui.feature
 
 # "providerName" property - name of the company that provides the feature
-providerName=Eclipse.org
+providerName=Eclipse Web Tools Platform
 
 # "updateSiteName" property - label for the update site
 updateSiteName=The Eclipse Web Tools Platform (WTP) Project update site
@@ -27,7 +27,7 @@
 description=\
 Contains fixes described in the following bugzilla(s):\n\
 \n\
-Bug https://bugs.eclipse.org/326417 Deployment Assembly Verifier for classpath entries\n\
+Bug https://bugs.eclipse.org/366065 Add a new filter rule to include/exclude based on a target runtime\n\
 \n\
 # "copyright" property - text of the "Feature Update Copyright"
 copyright=\
diff --git a/features/org.eclipse.wst.common_ui.feature.patch/feature.xml b/features/org.eclipse.wst.common_ui.feature.patch/feature.xml
index 5cd83d7..3ced2ad 100644
--- a/features/org.eclipse.wst.common_ui.feature.patch/feature.xml
+++ b/features/org.eclipse.wst.common_ui.feature.patch/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.wst.common_ui.feature.patch"
       label="%featureName"
-      version="3.2.2.qualifier"
+      version="3.2.5.qualifier"
       provider-name="%providerName">
 
    <description>
@@ -18,11 +18,11 @@
    </license>
 
    <requires>
-      <import feature="org.eclipse.wst.common_ui.feature" version="3.2.2.v201008091400-7C78FPhEdhO_mXde7kbap_K7X1Qt" patch="true"/>
+      <import feature="org.eclipse.wst.common_ui.feature" version="3.2.5.v201106210700-7C78FPpEdhO_pXpe8kUjodMvUz-MxOK" patch="true"/>
    </requires>
-
+         
    <plugin
-         id="org.eclipse.wst.common.modulecore.ui"
+         id="org.eclipse.wst.validation.ui"
          download-size="0"
          install-size="0"
          version="0.0.0"
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
deleted file mode 100644
index c296c08..0000000
--- a/plugins/org.eclipse.wst.common.emf/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,95 +0,0 @@
-#Wed Jun 24 10:13:16 EDT 2009
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.comparingIdentical=error
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=error
-org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=error
-org.eclipse.jdt.core.compiler.problem.unusedLocal=error
-org.eclipse.jdt.core.compiler.problem.emptyStatement=error
-org.eclipse.jdt.core.compiler.problem.unusedLabel=error
-org.eclipse.jdt.core.compiler.problem.unusedParameter=warning
-org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
-org.eclipse.jdt.core.incompatibleJDKLevel=ignore
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=error
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=warning
-org.eclipse.jdt.core.builder.cleanOutputFolder=clean
-org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=error
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=enabled
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=error
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
-org.eclipse.jdt.core.compiler.problem.redundantNullCheck=error
-org.eclipse.jdt.core.compiler.problem.unusedImport=error
-org.eclipse.jdt.core.builder.recreateModifiedClassFileInOutputFolder=ignore
-org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=*.launch
-org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=error
-org.eclipse.jdt.core.builder.invalidClasspath=abort
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=warning
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=error
-org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=error
-org.eclipse.jdt.core.codeComplete.argumentSuffixes=
-org.eclipse.jdt.core.codeComplete.argumentPrefixes=
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
-org.eclipse.jdt.core.compiler.problem.potentialNullReference=error
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=error
-org.eclipse.jdt.core.compiler.problem.nullReference=error
-org.eclipse.jdt.core.compiler.source=1.5
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.builder.duplicateResourceTask=warning
-org.eclipse.jdt.core.compiler.problem.fieldHiding=warning
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=error
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=error
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=error
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=warning
-org.eclipse.jdt.core.classpath.exclusionPatterns=enabled
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=error
-org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=error
-eclipse.preferences.version=1
-org.eclipse.jdt.core.incompleteClasspath=error
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=error
-org.eclipse.jdt.core.compiler.problem.deadCode=error
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=enabled
-org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=error
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeUncheckedExceptions=disabled
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=warning
-org.eclipse.jdt.core.codeComplete.fieldPrefixes=
-org.eclipse.jdt.core.compiler.problem.fallthroughCase=warning
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error
-org.eclipse.jdt.core.compiler.problem.autoboxing=warning
-org.eclipse.jdt.core.circularClasspath=error
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=error
-org.eclipse.jdt.core.codeComplete.fieldSuffixes=
-org.eclipse.jdt.core.codeComplete.localSuffixes=
-org.eclipse.jdt.core.compiler.problem.parameterAssignment=error
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=error
-org.eclipse.jdt.core.codeComplete.localPrefixes=
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.maxProblemPerUnit=100
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=error
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.codeComplete.staticFieldPrefixes=
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-instance/org.eclipse.core.net/org.eclipse.core.net.hasMigrated=true
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.codeComplete.staticFieldSuffixes=
diff --git a/plugins/org.eclipse.wst.common.emf/META-INF/MANIFEST.MF b/plugins/org.eclipse.wst.common.emf/META-INF/MANIFEST.MF
deleted file mode 100644
index 0f533ca..0000000
--- a/plugins/org.eclipse.wst.common.emf/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,19 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.wst.common.emf; singleton:=true
-Bundle-Version: 1.2.2.qualifier
-Bundle-Activator: org.eclipse.wst.common.internal.emf.plugin.EcoreUtilitiesPlugin
-Bundle-Vendor: %pluginProvider
-Bundle-Localization: plugin
-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.4.0,3.0.0)",
- org.eclipse.wst.common.frameworks;bundle-version="[1.1.200,2.0.0)",
- org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.core.resources;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.wst.common.core;bundle-version="[1.1.201,2.0.0)"
-Eclipse-LazyStart: true
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Bundle-ActivationPolicy: lazy
diff --git a/plugins/org.eclipse.wst.common.emf/component.xml b/plugins/org.eclipse.wst.common.emf/component.xml
deleted file mode 100644
index 9530d33..0000000
--- a/plugins/org.eclipse.wst.common.emf/component.xml
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><component  xmlns="http://eclipse.org/wtp/releng/tools/component-model" name="org.eclipse.wst.common.emf"><component-depends unrestricted="true"></component-depends><plugin id="org.eclipse.wst.common.emf" fragment="false"/><plugin id="org.eclipse.wst.common.emfworkbench.integration" fragment="false"/></component>
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.emf/plugin.properties b/plugins/org.eclipse.wst.common.emf/plugin.properties
deleted file mode 100644
index fc83d04..0000000
--- a/plugins/org.eclipse.wst.common.emf/plugin.properties
+++ /dev/null
@@ -1,13 +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
-###############################################################################
-PackageURIMap=PackageURIMap
-pluginName=EMF Utilities
-pluginProvider=Eclipse.org
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.emf/plugin.xml b/plugins/org.eclipse.wst.common.emf/plugin.xml
deleted file mode 100644
index 5dc13a6..0000000
--- a/plugins/org.eclipse.wst.common.emf/plugin.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin>
-
-     <extension-point id="packageURIMap" name="%PackageURIMap" schema="schema/packageURIMap.exsd"/>
-     <extension-point id="translatorExtension" name="translatorExtension" schema="schema/translatorExtension.exsd"/>
-
-<!-- Need to register the Ecore specific package mappings -->
-   <extension
-         point="org.eclipse.wst.common.emf.packageURIMap">
-      <map
-            uri="http://www.eclipse.org/emf/2002/Ecore"
-            prefix="ecore">
-      </map>
-      <map
-            uri="http://www.eclipse.org/emf/2002/Mapping"
-            prefix="mapping">
-      </map>
-<!-- Trick to get Mapping.xmi for MOF5 serialization -->
-      <map
-            uri="http://www.eclipse.org/emf/2002/Mapping"
-            prefix="Mapping">
-      </map>
-   </extension>
-   
-      <extension
-         point="org.eclipse.wst.common.core.uiContextSensitiveClass">
-      <uiContextSensitiveClass
-            context="Headless"
-            key="rendererFactory"
-            className="org.eclipse.wst.common.internal.emf.resource.EMF2DOMRendererFactory">
-      </uiContextSensitiveClass>
-   </extension>
-
-</plugin>
diff --git a/plugins/org.eclipse.wst.common.emf/prepareforpii.xml b/plugins/org.eclipse.wst.common.emf/prepareforpii.xml
deleted file mode 100644
index 8007604..0000000
--- a/plugins/org.eclipse.wst.common.emf/prepareforpii.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<project name="PrepareForPII" default="main" basedir=".">
-		
-	<!-- Setup temp variables -->
-	<target name="init">
-		<property name="nlsDir" value="d:/NLS/Corona/0526"/>
-		<property name="plugin" value="com.ibm.wtp.emf"/>
-		<property name="plugindir" value="d:/workspaceCorona/${plugin}"/>
-		<property name="outputDir" value="${nlsDir}/${plugin}"/>
-		
-	
-	</target>
-
-	<!-- Create the destination dir -->
-	<target name="nlsDir" depends="init">
-		<mkdir dir="${nlsDir}"/>
-	</target>
-	
-	<!-- Create the destination dir -->
-	<target name="plugindir" depends="nlsDir">
-		<delete dir="${outputDir}"/>
-		<mkdir dir="${outputDir}"/>
-	</target>
-
-	<!-- Move the files to the correct locations in the workspace. -->
-	<target name="main" depends="plugindir">
-	
-		<messageIdGen folderPath = "${plugindir}" componentId = "E" />
-		
-		<copy todir = "${outputDir}/wtpemf" >
-			 <fileset dir="${plugindir}/wtpemf">
-           	  <include name="**/*.properties"/>
-  			 </fileset>
-  		</copy>
-  		
-  		
-	</target>
-</project>
diff --git a/plugins/org.eclipse.wst.common.emf/schema/translatorExtension.exsd b/plugins/org.eclipse.wst.common.emf/schema/translatorExtension.exsd
deleted file mode 100644
index 5aa9669..0000000
--- a/plugins/org.eclipse.wst.common.emf/schema/translatorExtension.exsd
+++ /dev/null
@@ -1,103 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.wst.common.emf">
-<annotation>
-      <appInfo>
-         <meta.schema plugin="org.eclipse.wst.common.emf" id="translatorExtension" name="translatorExtension"/>
-      </appInfo>
-      <documentation>
-         This is used to contribute child translators to the default translators in EMF2DOMAdapterImpl.
-      </documentation>
-   </annotation>
-
-   <element name="extension">
-      <complexType>
-         <sequence>
-            <element ref="translator"/>
-         </sequence>
-         <attribute name="point" type="string" use="required">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="id" type="string">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="name" type="string">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-               <appInfo>
-                  <meta.attribute translatable="true"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="translator">
-      <complexType>
-         <attribute name="className" type="string" use="required">
-            <annotation>
-               <documentation>
-                  This is the fully qualified classname of the child translator.
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="since"/>
-      </appInfo>
-      <documentation>
-         This extension point is part of an interim API that is still under development and expected to change significantly before reaching stability. It is being made available at this early stage to solicit feedback from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken (repeatedly) as the API evolves.
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="examples"/>
-      </appInfo>
-      <documentation>
-         [Enter extension point usage example here.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="apiInfo"/>
-      </appInfo>
-      <documentation>
-         [Enter API information here.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="implementation"/>
-      </appInfo>
-      <documentation>
-         [Enter information about supplied implementation of this extension point.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="copyright"/>
-      </appInfo>
-      <documentation>
-         Copyright (c) 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
-      </documentation>
-   </annotation>
-
-</schema>
diff --git a/plugins/org.eclipse.wst.common.emf/workbench/org/eclipse/wst/common/internal/emf/ResourceSynchronizedIsLoadingAdapter.java b/plugins/org.eclipse.wst.common.emf/workbench/org/eclipse/wst/common/internal/emf/ResourceSynchronizedIsLoadingAdapter.java
deleted file mode 100644
index f7c6919..0000000
--- a/plugins/org.eclipse.wst.common.emf/workbench/org/eclipse/wst/common/internal/emf/ResourceSynchronizedIsLoadingAdapter.java
+++ /dev/null
@@ -1,127 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2009 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
- *******************************************************************************/
-/*
- * Created on Oct 26, 2004
- */
-package org.eclipse.wst.common.internal.emf;
-
-import org.eclipse.core.runtime.jobs.ILock;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.Notifier;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.wst.common.internal.emf.utilities.ResourceIsLoadingAdapter;
-import org.eclipse.wst.common.internal.emf.plugin.EcoreUtilitiesPlugin;
-
-
-
-/**
- * The ResourceSynchronizedIsLoadingAdapter is used to synchronize the loading
- * of EMF resources. This is the Eclipse version of ResourceIsLoadingAdapter,
- * and uses the Eclipse ILock technology to acquire a semaphore until the
- * Resource is loaded. the waitForResourceToLoad() method will pause until
- * either (a) the Resource has loaded, the Adapter is notified, and the
- * semaphore is released or (b) the DELAY timeout is exceeded, which prevents
- * full deadlock.
- * 
- * @author mdelder
- */
-public class ResourceSynchronizedIsLoadingAdapter extends ResourceIsLoadingAdapter {
-
-	private final ILock loadingLock;
-
-	/**
-	 * The delay is default to 5 minutes. This is the upward threshhold. The
-	 * lock will wait up to DELAY milliseconds to acquire the lock, and bail
-	 * if not. It does not mean that it will wait DELAY milliseconds always.
-	 * In general, the wait should be almost instantaneous -- just as long as
-	 * document loading remains speedy.
-	 */
-	private static final long DELAY = 300000;
-
-	public ResourceSynchronizedIsLoadingAdapter() {
-		loadingLock = Job.getJobManager().newLock();
-		if (loadingLock != null)
-			loadingLock.acquire();
-	}
-
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see com.ibm.wtp.internal.emf.utilities.ResourceIsLoadingAdapter#waitForResourceToLoad()
-	 */
-	@Override
-	public void waitForResourceToLoad() {
-
-		if (loadingLock == null)
-			return;
-
-		boolean lockAcquired = false;
-		try {
-			if (loadingLock != null)
-				if (!(lockAcquired = loadingLock.acquire(DELAY)))
-					logWarning();
-		}
-		catch (InterruptedException e) {
-			// ignore, just continue
-		}
-		finally {
-			if (lockAcquired)
-				loadingLock.release();
-		}
-
-	}
-
-
-	/**
-	 * 
-	 */
-	private void logWarning() {
-		Notifier target = getTarget();
-		if (target == null || !(target instanceof Resource)) {
-			Resource resource = (Resource) target;
-			EcoreUtilitiesPlugin.logError("[WARNING] Could not acquire Semaphore Lock for Resource: \"" + resource.getURI() + "\" in " + getClass());  //$NON-NLS-1$//$NON-NLS-2$
-		}
-	}
-
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see com.ibm.wtp.internal.emf.utilities.ResourceIsLoadingAdapter#notifyChanged(org.eclipse.emf.common.notify.Notification)
-	 */
-	@Override
-	public void notifyChanged(Notification notification) {
-
-		if (notification.getNotifier() != null) {
-			// listen for the remove of the loading adapter
-			if (isSetLoadedResourceNotification(notification)) {
-				if (loadingLock != null)
-					loadingLock.release();
-				removeIsLoadingSupport();
-			}
-		}
-	}
-
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see com.ibm.wtp.internal.emf.utilities.ResourceIsLoadingAdapter#forceRelease()
-	 */
-	@Override
-	public void forceRelease() {
-		if (loadingLock != null && loadingLock.getDepth() > 0)
-			loadingLock.release();
-	}
-
-}
diff --git a/plugins/org.eclipse.wst.common.emf/workbench/org/eclipse/wst/common/internal/emf/ResourceSynchronizedIsLoadingAdapterFactory.java b/plugins/org.eclipse.wst.common.emf/workbench/org/eclipse/wst/common/internal/emf/ResourceSynchronizedIsLoadingAdapterFactory.java
deleted file mode 100644
index 901b3b6..0000000
--- a/plugins/org.eclipse.wst.common.emf/workbench/org/eclipse/wst/common/internal/emf/ResourceSynchronizedIsLoadingAdapterFactory.java
+++ /dev/null
@@ -1,33 +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
- *******************************************************************************/
-/*
- * Created on Oct 26, 2004
- */
-package org.eclipse.wst.common.internal.emf;
-
-import org.eclipse.wst.common.internal.emf.utilities.ResourceIsLoadingAdapter;
-import org.eclipse.wst.common.internal.emf.utilities.ResourceIsLoadingAdapterFactory;
-
-
-/**
- * @author mdelder
- */
-public class ResourceSynchronizedIsLoadingAdapterFactory extends ResourceIsLoadingAdapterFactory {
-
-    
-    /* (non-Javadoc)
-     * @see com.ibm.wtp.internal.emf.utilities.ResourceIsLoadingAdapterFactory#createResourceIsLoadingAdapter()
-     */
-    @Override
-	public ResourceIsLoadingAdapter createResourceIsLoadingAdapter() { 
-        return new ResourceSynchronizedIsLoadingAdapter();
-    }
-}
diff --git a/plugins/org.eclipse.wst.common.emf/workbench/org/eclipse/wst/common/internal/emf/plugin/EcoreUtilitiesPlugin.java b/plugins/org.eclipse.wst.common.emf/workbench/org/eclipse/wst/common/internal/emf/plugin/EcoreUtilitiesPlugin.java
deleted file mode 100644
index 1f19437..0000000
--- a/plugins/org.eclipse.wst.common.emf/workbench/org/eclipse/wst/common/internal/emf/plugin/EcoreUtilitiesPlugin.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 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
- *******************************************************************************/
-/*
- * Created on Jun 9, 2003
- *
- * To change the template for this generated file go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-package org.eclipse.wst.common.internal.emf.plugin;
-
-import org.eclipse.core.runtime.Plugin;
-import org.eclipse.wst.common.internal.emf.ResourceSynchronizedIsLoadingAdapterFactory;
-import org.eclipse.wst.common.internal.emf.resource.RendererFactory;
-import org.eclipse.wst.common.internal.emf.utilities.ResourceIsLoadingAdapterFactory;
-import org.osgi.framework.BundleContext;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Platform;
-import java.lang.Throwable;
-import org.eclipse.core.runtime.CoreException;
-
-/**
- * @author DABERG
- * 
- * To change the template for this generated type comment go to Window>Preferences>Java>Code
- * Generation>Code and Comments
- */
-public class EcoreUtilitiesPlugin extends Plugin {
-	//the ID for this plugin (added automatically by logging quickfix)
-	public static final String PLUGIN_ID = "org.eclipse.wst.common.emf"; //$NON-NLS-1$
-	public static final String ID = "org.eclipse.wst.common.emf"; //$NON-NLS-1$
-	public static final String TRANSLATOR_EXTENSTION_POINT = "translatorExtension"; //$NON-NLS-1$
-
-	/**
-	 * @param descriptor
-	 */
-	public EcoreUtilitiesPlugin() {
-		super();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.core.runtime.Plugin#startup()
-	 */
-	@Override
-	public void start(BundleContext context) throws Exception {
-		super.start(context);
-		RendererFactory.setDefaultHandler(PluginRendererFactoryDefaultHandler.INSTANCE);
-		PackageURIMapReader reader = new PackageURIMapReader();
-		reader.processExtensions();
-		//use a synchronized loading adapter factory
-		ResourceIsLoadingAdapterFactory.INSTANCE = new ResourceSynchronizedIsLoadingAdapterFactory();
-	}
-
-	public static IStatus createStatus(int severity, String message, Throwable exception) {
-		return new Status(severity, PLUGIN_ID, message, exception);
-	}
-
-	public static IStatus createStatus(int severity, String message) {
-		return createStatus(severity, message, null);
-	}
-
-	public static void logError(Throwable exception) {
-		Platform.getLog(Platform.getBundle(PLUGIN_ID)).log( createStatus(IStatus.ERROR, exception.getMessage(), exception));
-	}
-
-	public static void logError(CoreException exception) {
-		Platform.getLog(Platform.getBundle(PLUGIN_ID)).log( exception.getStatus() );
-	}
-
-	public static void logError(String message) {
-		Platform.getLog(Platform.getBundle(PLUGIN_ID)).log( createStatus(IStatus.ERROR, message));
-	}
-
-	public static void logWarning(String message) {
-		Platform.getLog(Platform.getBundle(PLUGIN_ID)).log(createStatus(IStatus.WARNING, message));
-	}
-	
-	public static void logWarning(Throwable exception) {
-		Platform.getLog(Platform.getBundle(PLUGIN_ID)).log( createStatus(IStatus.WARNING, exception.getMessage(), exception));
-	}
-
-}
diff --git a/plugins/org.eclipse.wst.common.emf/workbench/org/eclipse/wst/common/internal/emf/plugin/PackageURIMapReader.java b/plugins/org.eclipse.wst.common.emf/workbench/org/eclipse/wst/common/internal/emf/plugin/PackageURIMapReader.java
deleted file mode 100644
index d1c39b0..0000000
--- a/plugins/org.eclipse.wst.common.emf/workbench/org/eclipse/wst/common/internal/emf/plugin/PackageURIMapReader.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 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
- *******************************************************************************/
-package org.eclipse.wst.common.internal.emf.plugin;
-
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExtension;
-import org.eclipse.core.runtime.IExtensionPoint;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.wst.common.internal.emf.resource.CompatibilityPackageMappingRegistry;
-
-/**
- * This reader will read the packageURIMap extension point and populate the
- * CompatibilityPackageMappingRegistry.
- * 
- * The packageURIMap will have the following configuration element.
- * 
- * <map prefix="somePackagePrefix" uri="somePackageURI"/>
- *  
- */
-public class PackageURIMapReader {
-	private static final String URI_ATT_NAME = "uri"; //$NON-NLS-1$
-	private static final String PREFIX_ATT_NAME = "prefix"; //$NON-NLS-1$
-	private static final String EXTENSION_POINT_NAME = "packageURIMap"; //$NON-NLS-1$
-
-	/**
-	 *  
-	 */
-	public PackageURIMapReader() {
-		super();
-	}
-
-	private IExtensionPoint getExtensionPoint() {
-		return Platform.getExtensionRegistry().getExtensionPoint(EcoreUtilitiesPlugin.ID, EXTENSION_POINT_NAME);
-	}
-
-	/**
-	 * Call this method to read and process all of the packageURIMap extensions. *
-	 */
-	public void processExtensions() {
-		CompatibilityPackageMappingRegistry reg = CompatibilityPackageMappingRegistry.INSTANCE;
-		IExtension[] extensions = getExtensionPoint().getExtensions();
-		for (int i = 0; i < extensions.length; i++)
-			processExtension(extensions[i], reg);
-	}
-
-	/**
-	 * @param extension
-	 */
-	private void processExtension(IExtension extension, CompatibilityPackageMappingRegistry reg) {
-		IConfigurationElement[] configs = extension.getConfigurationElements();
-		for (int i = 0; i < configs.length; i++)
-			processConfiguration(configs[i], reg);
-	}
-
-	/**
-	 * @param element
-	 */
-	private void processConfiguration(IConfigurationElement element, CompatibilityPackageMappingRegistry reg) {
-		String prefix = element.getAttribute(PREFIX_ATT_NAME);
-		String uri = element.getAttribute(URI_ATT_NAME);
-		reg.registerPrefixToPackageURI(prefix, uri);
-	}
-}
diff --git a/plugins/org.eclipse.wst.common.emf/workbench/org/eclipse/wst/common/internal/emf/plugin/PluginRendererFactoryDefaultHandler.java b/plugins/org.eclipse.wst.common.emf/workbench/org/eclipse/wst/common/internal/emf/plugin/PluginRendererFactoryDefaultHandler.java
deleted file mode 100644
index 4ad9dc9..0000000
--- a/plugins/org.eclipse.wst.common.emf/workbench/org/eclipse/wst/common/internal/emf/plugin/PluginRendererFactoryDefaultHandler.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 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
- *******************************************************************************/
-package org.eclipse.wst.common.internal.emf.plugin;
-
-import org.eclipse.wst.common.core.util.UIContextDetermination;
-import org.eclipse.wst.common.internal.emf.resource.EMF2DOMRendererFactoryDefaultHandler;
-import org.eclipse.wst.common.internal.emf.resource.RendererFactory;
-
-public class PluginRendererFactoryDefaultHandler extends EMF2DOMRendererFactoryDefaultHandler {
-
-	static final PluginRendererFactoryDefaultHandler INSTANCE = new PluginRendererFactoryDefaultHandler();
-	static final String EXT_POINT_NAME = "rendererFactory"; //$NON-NLS-1$
-
-	/**
-	 *  
-	 */
-	protected PluginRendererFactoryDefaultHandler() {
-
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see com.ibm.etools.emf2xml.EMF2DOMRendererFactoryDefaultHandler#getDefaultRendererFactory()
-	 */
-	@Override
-	public RendererFactory getDefaultRendererFactory() {
-		RendererFactory aFactory = (RendererFactory) UIContextDetermination.createInstance(EXT_POINT_NAME);
-		return aFactory == null ? super.getDefaultRendererFactory() : aFactory;
-	}
-
-
-}
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/AbstractRendererImpl.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/AbstractRendererImpl.java
deleted file mode 100644
index 7a9545b..0000000
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/AbstractRendererImpl.java
+++ /dev/null
@@ -1,158 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 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
- *******************************************************************************/
-package org.eclipse.wst.common.internal.emf.resource;
-
-
-public abstract class AbstractRendererImpl implements Renderer {
-
-
-	protected TranslatorResource resource;
-	private int versionId;
-	private boolean validating = true;
-
-	/**
-	 * Constructor for AbstractRendererImpl.
-	 */
-	public AbstractRendererImpl() {
-		super();
-	}
-
-	/**
-	 * @see com.ibm.etools.emf2xml.Renderer#setResource(TranslatorResource)
-	 */
-	public void setResource(TranslatorResource aResource) {
-		resource = aResource;
-	}
-
-	/**
-	 * @see com.ibm.etools.emf2xml.Renderer#getResource()
-	 */
-	public TranslatorResource getResource() {
-		return resource;
-	}
-
-	public int getVersionId() {
-		return this.versionId;
-	}
-
-	public void setVersionId(int versionId) {
-		this.versionId = versionId;
-	}
-
-	/**
-	 * @return
-	 */
-	public boolean isValidating() {
-		return validating;
-	}
-
-	/**
-	 * @param b
-	 */
-	public void setValidating(boolean b) {
-		validating = b;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see com.ibm.etools.emf2xml.Renderer#accessForRead()
-	 */
-	public void accessForRead() {
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see com.ibm.etools.emf2xml.Renderer#accessForWrite()
-	 */
-	public void accessForWrite() {
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see com.ibm.etools.emf2xml.Renderer#isModified()
-	 */
-	public boolean isModified() {
-		return false;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see com.ibm.etools.emf2xml.Renderer#isShared()
-	 */
-	public boolean isShared() {
-		return false;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see com.ibm.etools.emf2xml.Renderer#isSharedForWrite()
-	 */
-	public boolean isSharedForWrite() {
-		return false;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see com.ibm.etools.emf2xml.Renderer#preDelete()
-	 */
-	public void preDelete() {
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see com.ibm.etools.emf2xml.Renderer#preUnload()
-	 */
-	public void preUnload() {
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see com.ibm.etools.emf2xml.Renderer#releaseFromRead()
-	 */
-	public void releaseFromRead() {
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see com.ibm.etools.emf2xml.Renderer#releaseFromWrite()
-	 */
-	public void releaseFromWrite() {
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see com.ibm.etools.emf2xml.Renderer#setBatchMode(boolean)
-	 */
-	public void setBatchMode(boolean isBatch) {
-	}
-
-	public boolean useStreamsForIO() {
-		return true;
-	}
-
-	public boolean isBatchMode() {
-		return false;
-	}
-
-	public boolean isReverting() {
-		return false;
-	}
-}
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/AttributeTranslatorFilter.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/AttributeTranslatorFilter.java
deleted file mode 100644
index 32debc9..0000000
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/AttributeTranslatorFilter.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2003, 2004 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
- **************************************************************************************************/
-/*
- * Created on Sep 21, 2003
- *  
- */
-package org.eclipse.wst.common.internal.emf.resource;
-
-
-public final class AttributeTranslatorFilter extends TranslatorFilter {
-
-	public AttributeTranslatorFilter() {
-		super(null, -1);
-	}
-
-	public AttributeTranslatorFilter(Translator trans, int version) {
-		super(trans, version);
-	}
-
-	@Override
-	public final int scanNextTranslator(Translator[] children, int start) {
-		int found = start + 1;
-		for (; found < children.length; ++found) {
-			if (children[found].isDOMAttribute())
-				break;
-		}
-		found = (found < children.length) ? found : -1;
-		return found;
-	}
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/CacheEventNode.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/CacheEventNode.java
deleted file mode 100644
index 18aebcd..0000000
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/CacheEventNode.java
+++ /dev/null
@@ -1,586 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.common.internal.emf.resource;
-
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.Notifier;
-import org.eclipse.emf.ecore.EObject;
-import org.xml.sax.Attributes;
-
-
-/**
- * CacheEventNodes (CENOs) store information collected from SAX Events. This information can then be
- * used once all necessary SAX Events have been generated to create and/or set values on EMF model
- * objects.
- * 
- * CacheEventNodes (CENOs) have a simple lifecycle: initialize, collect data, commit, discard. When
- * initialized, CENOs will attempt to find the appropriate translator for a given XML element name,
- * and also create/set any necessary EMF model values. Data is collected as SAX character() events
- * are generated. On the SAX endElement event, the CENO is committed(), which is where it will
- * complete its processing to create EMF model features. In those cases where it cannot complete its
- * processing, it will defer its processing to the updateEMF() method of its parent. Defered
- * processing is necessary to handle EMF features that require read ahead cues from the XML. CENOs
- * will add themselves to their parents as children in a tree data structure. When an CENO
- * determines it is the golden piece of information required to instantiate its parent feature, it
- * will trigger its parent CENO to process the rest of the cached CENO tree. As mentioned, the
- * building of a CENO tree will only occur for nodes with read ahead cues.
- * 
- * discard() is invoked by init() to ensure that no junk state is left from a previous use of the
- * CENO. commit() will call discard as needed. Because of the use of discard, CENOs can be pooled
- * and reused. If a CENO determines that it is contained in a pool, it will manage its own release
- * from that pool. Self- management is necessary because of the way in which CENOs might cache
- * certain children while waiting to create the parent EMF feature.
- * 
- * @author mdelder
- */
-public class CacheEventNode {
-
-	public static final String ROOT_NODE = "EMF_ROOT_NODE"; //$NON-NLS-1$
-
-	private String nodeName = null;
-	private Translator translator = null;
-	private Notifier emfOwner = null;
-	private StringBuffer buffer = null;
-	private List children = null;
-	private int versionID;
-
-	/*
-	 * The internal data structure used to store the attributes is a String[]. The choice was made
-	 * to use an array to avoid the creation of another object (probably a Hashtable) and to exploit
-	 * array-access times to get the name and value of the attributes (opposed to full fledged
-	 * method invocations).
-	 *  
-	 */
-	private String[] attributes = null;
-	private CacheEventNode parent = null;
-	private CacheEventPool containingPool = null;
-	private Boolean ignorable = null;
-
-	public CacheEventNode(CacheEventPool containingPool) {
-		this.containingPool = containingPool;
-	}
-
-	/**
-	 * Lifecycle method. init(TranslatorResource) will configure this Adapter as a ROOT node.
-	 * 
-	 * This method will invoke discard() before completing its tasks.
-	 */
-	public void init(TranslatorResource resource) {
-		this.discard();
-		this.setEmfOwner(resource);
-		this.setTranslator(resource.getRootTranslator());
-		this.setVersionID(resource.getVersionID());
-		this.nodeName = CacheEventNode.ROOT_NODE;
-	}
-
-	/**
-	 * Lifecycle method. init(CacheEventNode, String, Attributes) will configure this Adapter to be
-	 * a non-ROOT node of the Adapter data structure
-	 * 
-	 * This method will invoke discard() before completing its tasks.
-	 */
-	public void init(CacheEventNode parentArg, String nodeNameArg, Attributes attributesArg) {
-		this.discard();
-		this.nodeName = nodeNameArg;
-		init(parentArg, attributesArg);
-	}
-
-	private void init(CacheEventNode parentRecord, Attributes attributesArg) {
-		setParent(parentRecord);
-
-		setAttributes(attributesArg);
-		if (parent != null) {
-			/* I am not the root */
-
-			/*
-			 * If the parent is part of the DOM Path, then we ignore it and interact with the grand
-			 * parent
-			 */
-			if (parent.translator != null && parent.isInDOMPath()) {
-				setParent(parent.getParent());
-			}
-
-			setVersionID(parent.getVersionID());
-			if (parent.getEmfOwner() != null && parent.getTranslator() != null) {
-
-				/* My parent had enough information to create themself */
-
-				if (parent.getParent() != null) {
-					setTranslator(parent.getTranslator().findChild(nodeName, parent.getEmfOwner(), getVersionID()));
-
-				} else {
-					setTranslator(parent.getTranslator());
-				}
-
-				if (this.translator == null) {
-					/* Our translator is null! Ahh! Run! */
-					throw new IllegalStateException("Parent Translator (" + parent.getTranslator() + //$NON-NLS-1$
-								") did not find a Child Translator for \"" + //$NON-NLS-1$ 
-								nodeName + "\"."); //$NON-NLS-1$
-				}
-
-				if (this.translator.getReadAheadHelper(nodeName) == null && !this.translator.isManagedByParent()) {
-					/*
-					 * I do not require a read ahead cue, and I am not managed by my parent so I can
-					 * create an instance of my EMF object
-					 */
-
-					Notifier myEmfOwner = this.translator.createEMFObject(getNodeName(), null);
-					setEmfOwner(myEmfOwner);
-					this.translator.setMOFValue(parent.getEmfOwner(), myEmfOwner);
-				}
-				/*
-				 * Else I require a read ahead value or I am being managed by my parent, so I have
-				 * no need to create an EMF object
-				 */
-			}
-			/*
-			 * Else I am not mapped to the EMF stack (XML Elements found in the DOMPath are ignored)
-			 */
-		}
-		/* processAttributes is guarded and will not execute unless ready */
-		processAttributes();
-
-	}
-
-	/**
-	 * commit() is invoked only if the CacheEventNode (CENO) has all the information they need and
-	 * should be able to determine what to do to the EMF feature.
-	 * 
-	 * The commit() method will invoke discard() when it has completed its tasks, if needed. Thus,
-	 * after invoking this method, the CENO may have no meaningful state. If discard() is invoked,
-	 * all previously held reference will be released in order to be made eligible for Garbage
-	 * Collection.
-	 *  
-	 */
-	public void commit() {
-
-		if (parent == null || this.isIgnorable()) {
-			discard();
-			releaseFromContainingPool();
-			return;
-		}
-
-		ReadAheadHelper helper = null;
-		Translator activeTranslator = getTranslator();
-		Translator parentTranslator = getParent().getTranslator();
-
-		if (parent != null && parent.getEmfOwner() == null) {
-
-			/*
-			 * Not enough information yet, add the CacheEventNode to the DOM Cache tree
-			 */
-
-			parent.appendToBuffer(this);
-			if ((helper = getParent().getReadAheadHelper()) != null) {
-				/*
-				 * If the parentRecord's emfOwner is null, then it must not be initialized therefore
-				 * it or one of its ancestors must require read ahead clues
-				 * 
-				 * The following if statement checks if the parent is the node waiting for a
-				 * readAhead cue
-				 */
-				EObject parentOwner = null;
-				if (helper.nodeValueIsReadAheadName(getNodeName())) {
-					/* The readAheadName is the value of the qName child node */
-
-					/* We have enough information to create the EmfOwner in the parent! */
-					parentOwner = parentTranslator.createEMFObject(getParent().getNodeName(), getBuffer());
-
-					/*
-					 * Now we need to parse the cached DOM tree and update the emfOwner of the
-					 * parent
-					 */
-					getParent().updateEMF(parentOwner);
-
-				} else if (helper.nodeNameIsReadAheadName(getNodeName())) {
-					/* The readAheadName is the actual name of the child node (qName) */
-
-					/* We have enough information to create the EmfOwner in the parent! */
-					parentOwner = parentTranslator.createEMFObject(getParent().getNodeName(), getNodeName());
-
-					/*
-					 * Now we need to parse the cached DOM tree and update the emfOwner of the
-					 * parent
-					 */
-					getParent().updateEMF(parentOwner);
-				}
-
-			} /* Else an ancestor of the parent is waiting */
-
-		} else {
-			if (activeTranslator != null) {
-				if (activeTranslator.isManagedByParent()) {
-
-					Object value = activeTranslator.convertStringToValue(getNodeName(), null, getBuffer(), getParent().getEmfOwner());
-					activeTranslator.setMOFValue(getParent().getEmfOwner(), value);
-					processAttributes();
-				} else {
-
-					activeTranslator.setTextValueIfNecessary(getBuffer(), getEmfOwner(), getVersionID());
-				}
-
-			}
-			discard();
-			releaseFromContainingPool();
-		}
-	}
-
-	/**
-	 * Instruct the CacheEventNode to discard all references to make everything eligible for garbage
-	 * collection. This should ONLY be called after commit has succeeded. In the case of EMF
-	 * features that require a readAheadName, process not be completed in commit(), but rather will
-	 * be defered to the updateEMF() method. This method was made private specifically because it
-	 * could erase all information contained in the CacheEventNode before it has been processed.
-	 *  
-	 */
-	private void discard() {
-		translator = null;
-		emfOwner = null;
-		buffer = null;
-		if (children != null)
-			children.clear();
-		children = null;
-		attributes = null;
-		parent = null;
-	}
-
-	private void releaseFromContainingPool() {
-		if (containingPool != null)
-			containingPool.releaseNode(this);
-	}
-
-	public boolean isIgnorable() {
-		if (ignorable == null) {
-			boolean result = false;
-			if (this.translator != null) {
-				if (this.translator.isEmptyContentSignificant()) {
-					result = false;
-				} else {
-					String domPath = this.translator.getDOMPath();
-					result = (domPath != null) ? domPath.indexOf(this.nodeName) >= 0 : false;
-				}
-			}
-			ignorable = result ? Boolean.TRUE : Boolean.FALSE;
-		}
-		return ignorable.booleanValue();
-	}
-
-	/**
-	 * Determines if a given child has a translator.
-	 * 
-	 * @param childNodeName
-	 *            the name of the current XML child node
-	 * @return true only if the childNodeName can be ignored (e.g. it is part of the DOM Path)
-	 */
-	public boolean isChildIgnorable(String childNodeName) {
-		boolean result = false;
-
-		Translator childTranslator = null;
-		if (this.getTranslator() != null) {
-			childTranslator = this.getTranslator().findChild(childNodeName, this.getEmfOwner(), this.getVersionID());
-
-			if (childTranslator != null) {
-				if (childTranslator.isEmptyContentSignificant()) {
-					result = false;
-				} else {
-					String temp = null;
-					result = ((temp = childTranslator.getDOMPath()) != null) ? temp.indexOf(childNodeName) >= 0 : false;
-				}
-			}
-		}
-
-		return result;
-	}
-
-	public boolean isInDOMPath() {
-		boolean result = false;
-
-		if (this.getTranslator() != null) {
-
-			result = this.getNodeName().equals(this.getTranslator().getDOMPath());
-		}
-
-		return result;
-	}
-
-	@Override
-	public String toString() {
-		StringBuffer output = new StringBuffer("CacheEventNode[");//$NON-NLS-1$
-		output.append("nodeName=");//$NON-NLS-1$
-		output.append(nodeName);
-		output.append("; translator=");//$NON-NLS-1$
-		output.append(translator);
-		output.append("; emfOwner=");//$NON-NLS-1$
-		try {
-			output.append(emfOwner);
-		} catch (RuntimeException re) {
-			output.append("Could not render as string!");//$NON-NLS-1$
-		}
-		output.append("; buffer=");//$NON-NLS-1$
-		output.append(this.buffer);
-		output.append("; hasChildren=");//$NON-NLS-1$
-		output.append((children != null && children.size() > 0));
-		if (children != null) {
-			for (int i = 0; i < this.children.size(); i++) {
-				output.append("\n\tchildren(");//$NON-NLS-1$
-				output.append(i);
-				output.append("): ");//$NON-NLS-1$
-				output.append(this.children.get(i));
-			}
-		}
-		output.append("]");//$NON-NLS-1$
-		return output.toString();
-	}
-
-	/**
-	 * Updates the EMF model by creating EMF Features as necessary from the DOM Tree Cache
-	 * 
-	 * @param owner
-	 */
-	public void updateEMF(EObject owner) {
-		this.setEmfOwner(owner);
-		if (this.parent != null) {
-			this.translator.setMOFValue((EObject) this.parent.getEmfOwner(), owner);
-			this.processAttributes();
-		}
-
-		this.updateEMF();
-	}
-
-	/**
-	 * The translator and the owner of the parent CENO passed to this method should be nonnull
-	 */
-	public void updateEMF() {
-		if (this.children == null)
-			return;
-
-		CacheEventNode child = null;
-		Translator childTranslator = null;
-		Object value = null;
-		if (this.getEmfOwner() != null) {
-			Notifier parentOwner = this.getEmfOwner();
-			Translator parentTranslator = this.getTranslator();
-			for (int i = 0; i < this.children.size(); i++) {
-
-				child = (CacheEventNode) this.children.get(i); /* Create the EMF feature */
-				if (this.isChildIgnorable(child.getNodeName())) {
-					this.addChildren(child.getChildren());
-				} else {
-					childTranslator = parentTranslator.findChild(child.getNodeName(), parentOwner, child.getVersionID());
-					child.setTranslator(childTranslator);
-
-					value = childTranslator.convertStringToValue(child.getNodeName(), null, child.getBuffer(), parentOwner);
-					childTranslator.setMOFValue(parentOwner, value);
-
-					if (childTranslator.isObjectMap()) {
-						child.setEmfOwner((Notifier) value);
-						childTranslator.setTextValueIfNecessary(child.getBuffer(), child.getEmfOwner(), getVersionID());
-					}
-
-					child.processAttributes();
-					child.updateEMF(); /* update the EMF of the child */
-
-				}
-				child.discard();
-				child.releaseFromContainingPool();
-			}
-			this.children = null;
-		}
-	}
-
-	public void addChild(CacheEventNode child) {
-		if (this.children == null) {
-			this.children = new ArrayList();
-		}
-		if (parent != null && this.isIgnorable()) {
-			parent.addChild(child);
-		} else {
-			this.children.add(child);
-		}
-	}
-
-	protected void addChildren(List childrenArg) {
-		if (this.children == null) {
-			this.children = new ArrayList();
-		}
-		this.children.addAll(childrenArg);
-	}
-
-	public boolean removeChild(CacheEventNode child) {
-		if (this.children == null) {
-			return false;
-		}
-		return this.children.remove(child);
-	}
-
-	public List getChildren() {
-		return this.children;
-	}
-
-	public ReadAheadHelper getReadAheadHelper() {
-		if (this.translator != null && this.translator.hasReadAheadNames()) {
-			return translator.getReadAheadHelper(nodeName);
-		}
-		return null;
-	}
-
-
-	/* See the documentation for the attributes field for info on how it is structured */
-	public void setAttributes(Attributes attr) {
-
-		/*
-		 * The attributes returned from the parser may be stored by reference, so we must copy them
-		 * over to a local data store
-		 */
-		if (attr != null && attr.getLength() > 0) {
-
-			if (this.attributes == null) {
-				this.attributes = new String[attr.getLength() * 2];
-			}
-			for (int i = 0; i < attr.getLength(); i++) {
-				this.attributes[i] = attr.getQName(i);
-				this.attributes[i + attr.getLength()] = attr.getValue(i);
-			}
-
-		}
-	}
-
-	/**
-	 * processAttributes may be invoked multiple times. It is configured to only carry out the
-	 * processing one time. After it successfully completes the construction of Translators and
-	 * values it will discard the value of the attributes field by setting it to null.
-	 *  
-	 */
-	public void processAttributes() {
-		/* See the documentation for the attributes field for info on how it is structured */
-		if (this.attributes != null && this.attributes.length > 0) {
-
-			if (this.emfOwner != null && this.translator != null) {
-				Translator attrTranslator = null;
-				final int limit = this.attributes.length / 2;
-				Object value = null;
-				for (int i = 0; i < limit; i++) {
-
-					/* Find the attribute translator by using the attribute name (attributes[i]) */
-					attrTranslator = this.translator.findChild(this.attributes[i], this.emfOwner, this.versionID);
-
-					if (attrTranslator != null) {
-
-						/*
-						 * Convert the value of corresponding attribute value (attributes[i+limit])
-						 * to a meaningful value
-						 */
-						value = attrTranslator.convertStringToValue(this.attributes[i + limit], (EObject) this.emfOwner);
-						attrTranslator.setMOFValue((EObject) this.emfOwner, value);
-					}
-				}
-
-				/* Forget the attributes so we do not process them again */
-				this.attributes = null;
-			}
-		}
-	}
-
-	/**
-	 * Appends data to the buffer stored by this CENO. Text will be extracted from the data array
-	 * begining at positiong <i>start </i> and ending at position <i>start+length </i>.
-	 * 
-	 * @param data
-	 * @param start
-	 * @param length
-	 */
-	public void appendToBuffer(char[] data, int start, int length) {
-
-		if (parent != null && this.isIgnorable()) {
-			parent.appendToBuffer(data, start, length);
-			return;
-		}
-
-		if (buffer == null) {
-			this.buffer = new StringBuffer();
-		}
-
-		/*
-		 * acts as a more efficient form of "append". Using this method avoids the need to copy the
-		 * data into its own data structure (e.g. String) before being added to the buffer
-		 */
-		this.buffer.insert(buffer.length(), data, start, length);
-
-	}
-
-	/**
-	 * Add the given CENO as a child of this CENO.
-	 * 
-	 * @param record
-	 */
-	public void appendToBuffer(CacheEventNode record) {
-
-		this.addChild(record);
-	}
-
-	public String getBuffer() {
-		if (this.buffer == null) {
-			return null;
-		}
-		return this.buffer.toString();
-	}
-
-	public Notifier getEmfOwner() {
-		return emfOwner;
-	}
-
-	public CacheEventNode getParent() {
-		return parent;
-	}
-
-	private void setParent(CacheEventNode record) {
-		this.parent = record;
-	}
-
-	public Translator getTranslator() {
-		return this.translator;
-	}
-
-	public void setEmfOwner(Notifier notifier) {
-
-		this.emfOwner = notifier;
-	}
-
-	public void setTranslator(Translator translator) {
-		this.translator = translator;
-	}
-
-	public String getNodeName() {
-		return nodeName;
-	}
-
-	public int getVersionID() {
-
-		if (this.parent == null) {
-			try {
-				return ((TranslatorResource) this.getEmfOwner()).getVersionID();
-
-			} catch (RuntimeException re) {
-			}
-		}
-		return this.versionID;
-	}
-
-	public void setVersionID(int i) {
-		versionID = i;
-	}
-
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/CacheEventPool.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/CacheEventPool.java
deleted file mode 100644
index 55799e2..0000000
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/CacheEventPool.java
+++ /dev/null
@@ -1,149 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.common.internal.emf.resource;
-
-
-import java.util.ArrayList;
-import java.util.Collection;
-
-import org.xml.sax.Attributes;
-
-/**
- * Provides an instance pool of reusable CacheEventNodes. The pool will default to 10 live
- * instances. When its available instances reach five times its initial capacity, it will shrink
- * itself down to the initial capacity.
- * 
- * @author mdelder
- */
-public class CacheEventPool {
-
-	public static final int DEFAULT_CAPACITY = 10;
-	public static final int DEFAULT_CAPACITY_INCREMENT = 25;
-
-	private int poolCapacity = DEFAULT_CAPACITY;
-	private CacheEventStack availablePool = null;
-	private Collection inusePool = null;
-
-	public CacheEventPool() {
-		this(DEFAULT_CAPACITY);
-	}
-
-	/**
-	 * Create a CacheEventPOol with the given initial capacity
-	 * 
-	 * @param initialCapacity
-	 *            The number of available instances to create.
-	 */
-	public CacheEventPool(int initialCapacity) {
-		poolCapacity = (initialCapacity > 0) ? initialCapacity : DEFAULT_CAPACITY;
-		availablePool = new CacheEventStack();
-		inusePool = new ArrayList(poolCapacity);
-	}
-
-	/**
-	 * Create a CacheEventNode (CENO) initialized to use the given resource as its EMF Owner.
-	 * 
-	 * THIS METHOD SHOULD ONLY BE USED TO CREATE ROOT NODES.
-	 * 
-	 * @param resource
-	 *            the resource that will be populated
-	 * @return a CacheEventNode to serve as the root.
-	 */
-	public CacheEventNode createCacheEventNode(TranslatorResource resource) {
-		CacheEventNode adapter = fetchFreeNode();
-		adapter.init(resource);
-		return adapter;
-	}
-
-	/**
-	 * Create child CacheEventNodes (CENOs) that will branch from the given parent.
-	 * 
-	 * @param parent
-	 *            the containing CENO
-	 * @param nodeName
-	 *            The value of the XML element node name
-	 * @param attributes
-	 *            The attributes that were part of the given XML element
-	 * @return A CENO that has been properly initialized.
-	 */
-	public CacheEventNode createCacheEventNode(CacheEventNode parent, String nodeName, Attributes attributes) {
-		CacheEventNode adapter = fetchFreeNode();
-		adapter.init(parent, nodeName, attributes);
-		return adapter;
-	}
-
-	/**
-	 * Release the CacheEventNode CENO back to the pool of availabe instances. This method should
-	 * not be invoked directly. CENOs which are acquired from a given pool will automatically
-	 * release themselves when necessary.
-	 * 
-	 * @param adapter
-	 */
-	public void releaseNode(CacheEventNode adapter) {
-		freeNode(adapter);
-	}
-
-	/**
-	 * freezePool() should be invoked to free any unused resources. After freezePool has been
-	 * invoked, warmPool() will need to be invoked before the pool can be used again.
-	 *  
-	 */
-	public void freezePool() {
-		availablePool.clear();
-		availablePool = null;
-	}
-
-	/**
-	 * warmPool() must be invoked to notify the pool it is about to be used. This should occur only
-	 * once per document rendering. Until the pool is in use, it contains no available
-	 * CacheEventNodes (CENOs) in order to limit the size of the in-memory footprint of the
-	 * EMF2SAXWriter.
-	 *  
-	 */
-	public void warmPool() {
-		ensureMinimumCapacity();
-	}
-
-	private CacheEventNode fetchFreeNode() {
-		CacheEventNode result = null;
-
-		if (availablePool == null || availablePool.isEmpty())
-			warmPool();
-
-		result = availablePool.pop();
-		inusePool.add(result);
-
-		return result;
-	}
-
-	private void freeNode(CacheEventNode adapter) {
-		if (inusePool.remove(adapter))
-			availablePool.push(adapter);
-		//else
-		//	throw new IllegalStateException("Adapter not contained in pool!");
-		if (availablePool.size() > (5 * poolCapacity)) {
-			availablePool.clear();
-			ensureMinimumCapacity();
-		}
-	}
-
-	private void ensureMinimumCapacity() {
-		if (availablePool == null) {
-			availablePool = new CacheEventStack();
-		}
-		if (availablePool.size() < poolCapacity) {
-			final int minimumCapacity = poolCapacity - availablePool.size();
-			for (int i = 0; i < minimumCapacity; i++)
-				availablePool.push(new CacheEventNode(this));
-		}
-	}
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/CacheEventStack.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/CacheEventStack.java
deleted file mode 100644
index 0ce8c85..0000000
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/CacheEventStack.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 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
- *******************************************************************************/
-/*
- * Created on Sep 24, 2003
- *
- */
-package org.eclipse.wst.common.internal.emf.resource;
-
-import java.util.ArrayList;
-import java.util.EmptyStackException;
-
-/**
- * An unsynchronized implementation of a Stack (LIFO) data structure. No casting is required when
- * using this data structure.
- * 
- * @author mdelder
- */
-public class CacheEventStack extends ArrayList {
-
-	/**
-	 * 
-	 */
-	private static final long serialVersionUID = 1208895320149054103L;
-
-	/**
-	 * 
-	 * @return the top of the stack without removing it
-	 */
-	public CacheEventNode peek() {
-		if (size() == 0)
-			throw new EmptyStackException();
-
-		return (CacheEventNode) get(size() - 1);
-	}
-
-	/**
-	 * 
-	 * @return the top of the stack and removing it
-	 */
-	public CacheEventNode pop() {
-		if (size() == 0)
-			throw new EmptyStackException();
-
-		return (CacheEventNode) remove(size() - 1);
-	}
-
-	/**
-	 * 
-	 * @param adapter
-	 *            A CENO to push onto the top of the stack
-	 */
-	public void push(CacheEventNode adapter) {
-		add(adapter);
-	}
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/CompatibilityPackageMappingRegistry.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/CompatibilityPackageMappingRegistry.java
deleted file mode 100644
index 25367c8..0000000
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/CompatibilityPackageMappingRegistry.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.common.internal.emf.resource;
-
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * This class is used to register mappings for a package prefix to its current namespace URI. Also,
- * this registry is used to map the package
- */
-public class CompatibilityPackageMappingRegistry {
-	public static CompatibilityPackageMappingRegistry INSTANCE = new CompatibilityPackageMappingRegistry();
-	private Map prefixToPackageURIs = new HashMap();
-	private Map packageURIsToPrefixes = new HashMap();
-
-	/**
-	 *  
-	 */
-	private CompatibilityPackageMappingRegistry() {
-		super();
-	}
-
-	/**
-	 * @return
-	 */
-	public Map getPackageURIsToPrefixes() {
-		return packageURIsToPrefixes;
-	}
-
-	/**
-	 * @return
-	 */
-	public Map getPrefixToPackageURIs() {
-		return prefixToPackageURIs;
-	}
-
-	public void registerPrefixToPackageURI(String prefix, String uri) {
-		if (prefix != null && uri != null) {
-			prefixToPackageURIs.put(prefix, uri);
-			packageURIsToPrefixes.put(uri, prefix);
-		}
-	}
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/CompatibilityResourceFactory.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/CompatibilityResourceFactory.java
deleted file mode 100644
index 6ac4bba..0000000
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/CompatibilityResourceFactory.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 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
- *******************************************************************************/
-/*
- * Created on Apr 23, 2003
- *
- * To change the template for this generated file go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-package org.eclipse.wst.common.internal.emf.resource;
-
-import java.util.Map;
-
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.xmi.impl.XMIResourceFactoryImpl;
-
-/**
- * @author DABERG
- * 
- * To change the template for this generated type comment go to Window>Preferences>Java>Code
- * Generation>Code and Comments
- */
-public class CompatibilityResourceFactory extends XMIResourceFactoryImpl {
-	/**
-	 *  
-	 */
-	public CompatibilityResourceFactory() {
-		super();
-	}
-
-	protected Map prefixToPackageURIs;
-
-	protected Map packageURIsToPrefixes;
-
-	public Map getPrefixToPackageURI() {
-		return CompatibilityPackageMappingRegistry.INSTANCE.getPrefixToPackageURIs();
-	}
-
-	public Map getPackageURIsToPrefixes() {
-		return CompatibilityPackageMappingRegistry.INSTANCE.getPackageURIsToPrefixes();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.emf.ecore.xmi.impl.XMIResourceFactoryImpl#createResource(org.eclipse.emf.common.util.URI)
-	 */
-	@Override
-	public Resource createResource(URI uri) {
-		return new CompatibilityXMIResourceImpl(uri);
-	}
-
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/CompatibilitySAXXMIHandler.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/CompatibilitySAXXMIHandler.java
deleted file mode 100644
index f26ca8e..0000000
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/CompatibilitySAXXMIHandler.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 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
- *******************************************************************************/
-/*
- * Created on Apr 30, 2003
- *
- * To change the template for this generated file go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-package org.eclipse.wst.common.internal.emf.resource;
-
-import java.util.Map;
-
-import org.eclipse.emf.ecore.xmi.XMLHelper;
-import org.eclipse.emf.ecore.xmi.XMLResource;
-import org.eclipse.emf.ecore.xmi.impl.SAXXMIHandler;
-
-/**
- * @author DABERG
- * 
- * To change the template for this generated type comment go to Window>Preferences>Java>Code
- * Generation>Code and Comments
- */
-public class CompatibilitySAXXMIHandler extends SAXXMIHandler {
-	protected final static String NULL_ATTRIB = XMLResource.XSI_NS + ":null"; //$NON-NLS-1$
-
-	/**
-	 * @param xmiResource
-	 * @param helper
-	 * @param options
-	 */
-	public CompatibilitySAXXMIHandler(XMLResource xmiResource, XMLHelper helper, Map options) {
-		super(xmiResource, helper, options);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.emf.ecore.xmi.impl.XMLHandler#isNull()
-	 */
-	@Override
-	protected boolean isNull() {
-		boolean isnull = super.isNull();
-		if (!isnull)
-			isnull = attribs.getValue(NULL_ATTRIB) != null;
-		return isnull;
-	}
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/CompatibilityURIConverter.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/CompatibilityURIConverter.java
deleted file mode 100644
index ba135f5..0000000
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/CompatibilityURIConverter.java
+++ /dev/null
@@ -1,17 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors: IBM Corporation - initial API and implementation
- **************************************************************************************************/
-package org.eclipse.wst.common.internal.emf.resource;
-
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.resource.URIConverter;
-
-public interface CompatibilityURIConverter extends URIConverter {
-	URI deNormalize(URI uri);
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/CompatibilityXMILoadImpl.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/CompatibilityXMILoadImpl.java
deleted file mode 100644
index 26ebff7..0000000
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/CompatibilityXMILoadImpl.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 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
- *******************************************************************************/
-/*
- * Created on Apr 30, 2003
- *
- * To change the template for this generated file go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-package org.eclipse.wst.common.internal.emf.resource;
-
-import org.eclipse.emf.ecore.xmi.XMLHelper;
-import org.eclipse.emf.ecore.xmi.impl.SAXWrapper;
-import org.eclipse.emf.ecore.xmi.impl.XMILoadImpl;
-import org.xml.sax.helpers.DefaultHandler;
-
-/**
- * @author DABERG
- * 
- * To change the template for this generated type comment go to Window>Preferences>Java>Code
- * Generation>Code and Comments
- */
-public class CompatibilityXMILoadImpl extends XMILoadImpl {
-
-	/**
-	 * @param helper
-	 */
-	public CompatibilityXMILoadImpl(XMLHelper helper) {
-		super(helper);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.emf.ecore.xmi.impl.XMLLoadImpl#makeDefaultHandler()
-	 */
-	@Override
-	protected DefaultHandler makeDefaultHandler() {
-		return new SAXWrapper(new CompatibilitySAXXMIHandler(resource, helper, options));
-	}
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/CompatibilityXMIResource.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/CompatibilityXMIResource.java
deleted file mode 100644
index a954f5f..0000000
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/CompatibilityXMIResource.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors: IBM Corporation - initial API and implementation
- **************************************************************************************************/
-package org.eclipse.wst.common.internal.emf.resource;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.xmi.XMIResource;
-
-public interface CompatibilityXMIResource extends XMIResource {
-	int FORMAT_EMF1 = 0;
-	/**
-	 * format for MOF5 compatibility; note that this can NOT be used with resources usings the
-	 * "platform:/plugin" protocol"
-	 */
-	int FORMAT_MOF5 = 1;
-
-	void addOriginalPackageURI(String packageUri, String originalUri);
-
-	int getFormat();
-
-	/**
-	 * Set the serialization format. By default it is FORMAT_EMF1.
-	 * 
-	 * @see CompatibilityXMIResource#FORMAT_EMF1
-	 * @see CompatibilityXMIResource#FORMAT_MOF5
-	 */
-	void setFormat(int format);
-
-	boolean usesDefaultFormat();
-
-	/**
-	 * @param rootObject
-	 */
-	void removePreservingIds(EObject rootObject);
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/CompatibilityXMIResourceImpl.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/CompatibilityXMIResourceImpl.java
deleted file mode 100644
index bb95f96..0000000
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/CompatibilityXMIResourceImpl.java
+++ /dev/null
@@ -1,387 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 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
- *******************************************************************************/
-package org.eclipse.wst.common.internal.emf.resource;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.xmi.XMLHelper;
-import org.eclipse.emf.ecore.xmi.XMLLoad;
-import org.eclipse.emf.ecore.xmi.XMLSave;
-import org.eclipse.emf.ecore.xmi.impl.XMIResourceImpl;
-import org.eclipse.wst.common.internal.emf.utilities.IDUtil;
-import org.eclipse.wst.common.internal.emf.utilities.ResourceIsLoadingAdapter;
-import org.eclipse.wst.common.internal.emf.utilities.ResourceIsLoadingAdapterFactory;
-
-
-public class CompatibilityXMIResourceImpl extends XMIResourceImpl implements CompatibilityXMIResource {
-	protected static final String DEFAULT_ENCODING = "UTF-8"; //$NON-NLS-1$
-	protected int format = FORMAT_EMF1;
-	protected Map originalPackageURIs = new HashMap();
-	private boolean preserveIDs = false;
-
-	private static final String PLATFORM_PROTOCOL = "platform"; //$NON-NLS-1$
-	private static final String PLATFORM_PLUGIN = "plugin"; //$NON-NLS-1$
-
-	/**
-	 * Constructor for MappableXMIResourceImpl.
-	 */
-	public CompatibilityXMIResourceImpl() {
-		super();
-		initDefaultSaveOptions();
-	}
-
-	public CompatibilityXMIResourceImpl(URI uri) {
-		super(uri);
-		initDefaultSaveOptions();
-	}
-
-	/**
-	 * @see org.eclipse.emf.ecore.xmi.impl.XMIResourceImpl#createXMLHelper()
-	 */
-	@Override
-	protected final XMLHelper createXMLHelper() {
-		MappedXMIHelper helper = doCreateXMLHelper();
-		helper.setPackageURIsToPrefixes(getPackageURIsToPrefixes());
-		return helper;
-	}
-
-	protected MappedXMIHelper doCreateXMLHelper() {
-		return new MappedXMIHelper(this, getPrefixToPackageURIs());
-	}
-
-	/**
-	 * Subclasses should not need to override this method.
-	 * 
-	 * @see CompatibilityPackageMappingRegistry#getPrefixToPackageURIs()
-	 */
-	protected Map getPrefixToPackageURIs() {
-		return CompatibilityPackageMappingRegistry.INSTANCE.getPrefixToPackageURIs();
-	}
-
-	/**
-	 * Subclasses should not need to override this method.
-	 * 
-	 * @see CompatibilityPackageMappingRegistry#getPrefixToPackageURIs()
-	 */
-	protected Map getPackageURIsToPrefixes() {
-		return CompatibilityPackageMappingRegistry.INSTANCE.getPackageURIsToPrefixes();
-	}
-
-	public void addOriginalPackageURI(String packageUri, String originalUri) {
-		originalPackageURIs.put(packageUri, originalUri);
-	}
-
-	public int getFormat() {
-		return format;
-	}
-
-	public void setFormat(int format) {
-		if (!isPlatformPluginResourceURI())
-			this.format = format;
-	}
-
-	private boolean isPlatformPluginResourceURI() {
-		URI aURI = getURI();
-
-		return aURI != null && PLATFORM_PROTOCOL.equals(uri.scheme()) && PLATFORM_PLUGIN.equals(uri.segment(0));
-	}
-
-	/**
-	 * @see org.eclipse.emf.ecore.resource.Resource#getURIFragment(EObject)
-	 */
-	@Override
-	public String getURIFragment(EObject eObject) {
-		if (usesDefaultFormat())
-			return super.getURIFragment(eObject);
-		return IDUtil.getOrAssignID(eObject, this);
-	}
-
-	public boolean usesDefaultFormat() {
-		return format == CompatibilityXMIResource.FORMAT_EMF1;
-	}
-
-	/**
-	 * @see org.eclipse.emf.ecore.xmi.impl.XMIResourceImpl#createXMLSave()
-	 */
-	@Override
-	protected XMLSave createXMLSave() {
-		if (usesDefaultFormat())
-			return super.createXMLSave();
-		return new CompatibilityXMISaveImpl(createXMLHelper());
-	}
-
-	/**
-	 * @see org.eclipse.emf.ecore.xmi.impl.XMLResourceImpl#doSave(OutputStream, Map)
-	 */
-	@Override
-	public void doSave(OutputStream outputStream, Map options) throws IOException {
-		super.doSave(outputStream, options);
-	}
-
-	/**
-	 * Method initDefaultOptions.
-	 */
-	protected void initDefaultSaveOptions() {
-		if (defaultSaveOptions == null) {
-			getDefaultSaveOptions();
-		}
-	}
-
-	/**
-	 * @see org.eclipse.emf.ecore.resource.impl.ResourceImpl#getEObjectByID(String)
-	 */
-	@Override
-	protected EObject getEObjectByID(String id) {
-		if (idToEObjectMap != null) {
-			EObject eObject = idToEObjectMap.get(id);
-			if (eObject != null) {
-				return eObject;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Called when the object is unloaded. This implementation
-	 * {@link InternalEObject#eSetProxyURI sets}the object to be a proxy and clears the
-	 * {@link #eAdapters adapters}.
-	 */
-	@Override
-	protected void unloaded(InternalEObject internalEObject) {
-		//overridden from the super class; call super.getURIFragment instead of the implementation
-		//at this level, to avoid ID generation during unload
-		//internalEObject.eSetProxyURI(uri.appendFragment(getURIFragment(internalEObject)));
-		internalEObject.eSetProxyURI(uri.appendFragment(super.getURIFragment(internalEObject)));
-		internalEObject.eAdapters().clear();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.emf.ecore.xmi.impl.XMLResourceImpl#doLoad(java.io.InputStream,
-	 *      java.util.Map)
-	 */
-	@Override
-	public final void doLoad(InputStream inputStream, Map options) throws IOException {
-		basicDoLoad(inputStream, options);
-	}
-
-	/**
-	 * @deprecated Use {@link #doLoad(InputStream, Map)} instead.
-	 */
-	protected void basicDoLoad(InputStream inputStream, Map options) throws IOException {
-		super.doLoad(inputStream, options);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.emf.ecore.xmi.impl.XMLResourceImpl#init()
-	 */
-	@Override
-	protected void init() {
-		super.init();
-		setEncoding(DEFAULT_ENCODING);
-	}
-
-	@Override
-	protected XMLLoad createXMLLoad() {
-		return new CompatibilityXMILoadImpl(createXMLHelper());
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.wst.common.internal.emf.resource.CompatibilityXMIResource#removePreservingIds(org.eclipse.emf.ecore.EObject)
-	 */
-	public void removePreservingIds(EObject rootObject) {
-		setPreserveIDs(true);
-		getContents().remove(rootObject);
-	}
-
-	/**
-	 * @return Returns the preserveIDs.
-	 */
-	public boolean isPreserveIDs() {
-		return preserveIDs;
-	}
-
-	/**
-	 * @param preserveIDs
-	 *            The preserveIDs to set.
-	 */
-	public void setPreserveIDs(boolean preserveIDs) {
-		this.preserveIDs = preserveIDs;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.emf.ecore.xmi.impl.XMLResourceImpl#detachedHelper(org.eclipse.emf.ecore.EObject)
-	 */
-	@Override
-	protected void detachedHelper(EObject eObject) {
-		if (modificationTrackingAdapter != null) {
-			eObject.eAdapters().remove(modificationTrackingAdapter);
-		}
-
-		if (useUUIDs()) {
-			DETACHED_EOBJECT_TO_ID_MAP.put(eObject, getID(eObject));
-		}
-
-		if (!isPreserveIDs() && idToEObjectMap != null && eObjectToIDMap != null) {
-			idToEObjectMap.remove(eObjectToIDMap.remove(eObject));
-		}
-	}
-	
-	@Override
-	public void load(Map options) throws IOException {
-
-        ResourceIsLoadingAdapter adapter = null;
-        if (isLoaded) {
-            adapter = ResourceIsLoadingAdapter.findAdapter(this);
-            if (adapter != null) 
-                adapter.waitForResourceToLoad();
-            return;
-        }
-        synchronized (this) {            
-            adapter = ResourceIsLoadingAdapter.findAdapter(this);
-            if (adapter == null && !isLoaded) 
-                addSynchronizationLoadingAdapter();
-        }
-        if(adapter != null)
-            adapter.waitForResourceToLoad();
-        else {
-            try {
-                super.load(options);
-            } catch(IOException ioe) {
-                removeLoadingSynchronizationAdapter();
-                throw ioe;
-            } catch(RuntimeException re) {
-                removeLoadingSynchronizationAdapter();
-                throw re;
-            } catch(Error e) {
-                removeLoadingSynchronizationAdapter();
-                throw e;
-            }
-        }
-    }
-	public void loadExisting(Map options) throws IOException {
-
-		
-        ResourceIsLoadingAdapter adapter = null;
-        if (isLoaded) {
-            adapter = ResourceIsLoadingAdapter.findAdapter(this);
-            if (adapter != null) 
-                adapter.waitForResourceToLoad();
-            return;
-        }
-        synchronized (this) {            
-            adapter = ResourceIsLoadingAdapter.findAdapter(this);
-            if (adapter == null && !isLoaded) 
-                addSynchronizationLoadingAdapter();
-        }
-        if(adapter != null)
-            adapter.waitForResourceToLoad();
-        else {
-            try {
-                load((InputStream) null, options);
-            } catch(IOException ioe) {
-                removeLoadingSynchronizationAdapter();
-                throw ioe;
-            } catch(RuntimeException re) {
-                removeLoadingSynchronizationAdapter();
-                throw re;
-            } catch(Error e) {
-                removeLoadingSynchronizationAdapter();
-                throw e;
-            }
-        }
-    }
-	
-	  /**
-     * 
-     */
-    protected void addSynchronizationLoadingAdapter() {
-    	synchronized (eAdapters()) {
-        if (ResourceIsLoadingAdapter.findAdapter(this) == null)
-            eAdapters().add(ResourceIsLoadingAdapterFactory.INSTANCE.createResourceIsLoadingAdapter());
-    	}
-    }
-
-    /**
-     * 
-     */
-    protected void removeLoadingSynchronizationAdapter() {
-        ResourceIsLoadingAdapter adapter = ResourceIsLoadingAdapter.findAdapter(this);
-        if (adapter != null) {
-            adapter.forceRelease();
-            eAdapters().remove(adapter);
-        }
-    }
-
-    /**
-     * Case 1: LOAD RESOURCE FROM DISK this.isLoaded == false AND isLoaded ==
-     * true (which means we entered the load() method, but have not completed
-     * the load), and we're loading from a resource on disk, then we add the
-     * adapter Case 2: RESOURCE CREATION (NOT A LOAD) Case 4: RESOURCE CREATION,
-     * UNLOADED, NEW CONTENTS (NOT A LOAD) Resource is created but not from a
-     * resource on disk, so contents is null AND not empty, so no adapter: THIS
-     * IS NOT A LOAD Case 3: RESOURCE HAS BEEN UNLOADED, BEING RELOADED FROM
-     * DISK Contents is NOT null, but it is Empty and the resource is being
-     * loaded from disk. We must add the adapter.
-     * 
-     */
-    public boolean isResourceBeingLoaded(boolean isLoaded) {
-        return (!this.isLoaded && isLoaded) && (contents == null || contents.isEmpty());
-    }
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.eclipse.emf.ecore.resource.Resource#getContents()
-     */
-    @Override
-	public EList getContents() {
-        waitForResourceToLoadIfNecessary();
-        return super.getContents();
-    }
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.eclipse.emf.ecore.resource.impl.ResourceImpl#isLoaded()
-     */
-    @Override
-	public boolean isLoaded() {
-        waitForResourceToLoadIfNecessary();
-        return super.isLoaded();
-    }
-
-    /**
-     * 
-     */
-    protected final void waitForResourceToLoadIfNecessary() {
-        ResourceIsLoadingAdapter loadingAdapter = ResourceIsLoadingAdapter.findAdapter(this);
-        if (loadingAdapter != null) loadingAdapter.waitForResourceToLoad();
-    }
-
-
-
-}
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/CompatibilityXMISaveImpl.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/CompatibilityXMISaveImpl.java
deleted file mode 100644
index 2af74c3..0000000
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/CompatibilityXMISaveImpl.java
+++ /dev/null
@@ -1,130 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors: IBM Corporation - initial API and implementation
- **************************************************************************************************/
-package org.eclipse.wst.common.internal.emf.resource;
-
-import java.util.Map;
-
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.emf.ecore.xmi.XMIResource;
-import org.eclipse.emf.ecore.xmi.XMLHelper;
-import org.eclipse.emf.ecore.xmi.XMLResource;
-import org.eclipse.emf.ecore.xmi.impl.XMISaveImpl;
-
-public class CompatibilityXMISaveImpl extends XMISaveImpl {
-
-	/**
-	 * Constructor for CompatibilityXMISaveImpl.
-	 * 
-	 * @param helper
-	 */
-	public CompatibilityXMISaveImpl(XMLHelper helper) {
-		super(helper);
-	}
-
-	/**
-	 * Constructor for CompatibilityXMISaveImpl.
-	 * 
-	 * @param options
-	 * @param helper
-	 * @param encoding
-	 */
-	public CompatibilityXMISaveImpl(Map options, XMLHelper helper, String encoding) {
-		super(options, helper, encoding);
-	}
-
-	/**
-	 * @see org.eclipse.emf.ecore.xmi.impl.XMISaveImpl#init(XMLResource, Map)
-	 */
-	@Override
-	protected void init(XMLResource resource, Map options) {
-		super.init(resource, options);
-		xmiType = true;
-	}
-
-	/**
-	 * @see org.eclipse.emf.ecore.xmi.impl.XMISaveImpl#addNamespaceDeclarations()
-	 */
-	@Override
-	public void addNamespaceDeclarations() {
-		doc.addAttribute(XMI_VER_NS, XMIResource.VERSION_VALUE);
-		doc.addAttribute(XMI_XMLNS, XMIResource.XMI_URI);
-		EPackage[] packages = helper.packages();
-		StringBuffer xsiSchemaLocation = null;
-		if (declareSchemaLocation) {
-			for (int i = 0; i < packages.length; i++) {
-				EPackage ePackage = packages[i];
-
-				EObject root = EcoreUtil.getRootContainer(ePackage);
-				if (root instanceof EPackage) {
-					EPackage rootEPackage = (EPackage) root;
-					Resource resource = rootEPackage.eResource();
-					if (resource != null) {
-						URI uri = resource.getURI();
-						String rootNsURI = rootEPackage.getNsURI();
-						if (uri == null ? rootNsURI != null : !uri.toString().equals(rootNsURI)) {
-							declareXSI = true;
-							if (xsiSchemaLocation == null) {
-								xsiSchemaLocation = new StringBuffer();
-							} else {
-								xsiSchemaLocation.append(' ');
-							}
-							xsiSchemaLocation.append(rootNsURI);
-							xsiSchemaLocation.append(' ');
-							xsiSchemaLocation.append(helper.getHREF(rootEPackage));
-						}
-					}
-				}
-			}
-		}
-
-		if (declareXSI) {
-			doc.addAttribute(XSI_XMLNS, XMLResource.XSI_URI);
-		}
-
-		for (int i = 0; i < packages.length; i++) {
-			EPackage ePackage = packages[i];
-			//Modified from superclass - dispatch back to helper for compatibility
-			//String nsURI = ePackage.getNsURI();
-			//String nsPrefix = ePackage.getNsPrefix();
-			String[] nsInfo = ((MappedXMIHelper) helper).getNSInfo(ePackage);
-			doc.addAttributeNS(XMLResource.XML_NS, nsInfo[0], nsInfo[1]);
-		}
-
-		if (xsiSchemaLocation != null) {
-			doc.addAttribute(XSI_SCHEMA_LOCATION, xsiSchemaLocation.toString());
-		}
-	}
-
-	@Override
-	protected void saveHref(EObject remote, EStructuralFeature f) {
-		String name = helper.getQName(f);
-		String href = helper.getHREF(remote);
-		if (href != null) {
-			doc.startElement(name);
-			EClass eClass = remote.eClass();
-
-			EClass expectedType = (EClass) f.getEType();
-			//Changed next line to always write type if expectedType
-			//is different from eClass
-			if (eClass != expectedType) {
-				saveTypeAttribute(eClass);
-			}
-
-			doc.addAttribute(XMLResource.HREF, href);
-			doc.endEmptyElement();
-		}
-	}
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/ConstantAttributeTranslator.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/ConstantAttributeTranslator.java
deleted file mode 100644
index ceaa9f8..0000000
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/ConstantAttributeTranslator.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 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
- *******************************************************************************/
-/*
- * Created on Apr 15, 2003
- *
- */
-package org.eclipse.wst.common.internal.emf.resource;
-
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * @author schacher
- */
-public class ConstantAttributeTranslator extends Translator {
-
-	protected String attributeValue;
-
-	/**
-	 * @param domNameAndPath
-	 * @param eClass
-	 */
-	public ConstantAttributeTranslator(String domNameAndPath, String attributeValue) {
-		super(domNameAndPath, null, DOM_ATTRIBUTE);
-		this.attributeValue = attributeValue;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see com.ibm.etools.emf2xml.impl.Translator#getMOFValue(org.eclipse.emf.ecore.EObject)
-	 */
-	@Override
-	public Object getMOFValue(EObject mofObject) {
-		return attributeValue;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see com.ibm.etools.emf2xml.impl.Translator#isSetMOFValue(org.eclipse.emf.ecore.EObject)
-	 */
-	@Override
-	public boolean isSetMOFValue(EObject emfObject) {
-		return true;
-	}
-
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/DefaultTranslatorFactory.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/DefaultTranslatorFactory.java
deleted file mode 100644
index 06abce5..0000000
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/DefaultTranslatorFactory.java
+++ /dev/null
@@ -1,101 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 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
- *******************************************************************************/
-/*
- * Created on Aug 20, 2003
- *
- */
-package org.eclipse.wst.common.internal.emf.resource;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.Notifier;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.wst.common.internal.emf.utilities.Namespace;
-import org.eclipse.wst.common.internal.emf.utilities.NamespaceAdapter;
-
-
-/**
- * @author schacher
- */
-public class DefaultTranslatorFactory implements VariableTranslatorFactory {
-
-	public static final String XMLNS = "xmlns:"; //$NON-NLS-1$
-	public static final DefaultTranslatorFactory INSTANCE = new DefaultTranslatorFactory();
-
-	public DefaultTranslatorFactory() {
-		super();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see com.ibm.etools.emf2xml.impl.VariableTranslatorFactory#accepts(java.lang.String)
-	 */
-	public boolean accepts(String domName) {
-		return domName != null && domName.startsWith(XMLNS);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see com.ibm.etools.emf2xml.impl.VariableTranslatorFactory#accepts(org.eclipse.emf.common.notify.Notification)
-	 */
-	public boolean accepts(Notification notif) {
-		return notif.getFeature() == NamespaceAdapter.NOTIFICATION_FEATURE;
-	}
-
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see com.ibm.etools.emf2xml.impl.VariableTranslatorFactory#create(java.lang.String)
-	 */
-	public Translator create(String domName) {
-		return new NamespaceTranslator(domName);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see com.ibm.etools.emf2xml.impl.VariableTranslatorFactory#create(org.eclipse.emf.ecore.EObject)
-	 */
-	public List create(Notifier target) {
-		if (!(target instanceof EObject))
-			return null;
-		List namespaces = NamespaceAdapter.getNamespaces((EObject) target);
-		if (namespaces == null || namespaces.isEmpty())
-			return null;
-		List result = new ArrayList(namespaces.size());
-		for (int i = 0; i < namespaces.size(); i++) {
-			result.add(create((Namespace) namespaces.get(i)));
-		}
-		return result;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see com.ibm.etools.emf2xml.impl.VariableTranslatorFactory#create(org.eclipse.emf.common.notify.Notification)
-	 */
-	public Translator create(Notification notif) {
-		Namespace ns = (Namespace) notif.getNewValue();
-		return create(ns);
-	}
-
-	private Translator create(Namespace ns) {
-		return new NamespaceTranslator(XMLNS + ns.getPrefix());
-	}
-
-
-
-}
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/DependencyTranslator.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/DependencyTranslator.java
deleted file mode 100644
index 3f48221..0000000
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/DependencyTranslator.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 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
- *******************************************************************************/
-/*
- * Created on Mar 25, 2003
- *
- */
-package org.eclipse.wst.common.internal.emf.resource;
-
-import java.util.List;
-
-import org.eclipse.emf.common.notify.Notifier;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-
-/**
- * @author schacher
- */
-public class DependencyTranslator extends Translator {
-
-	/**
-	 * @param domNameAndPath
-	 * @param aFeature
-	 */
-	public DependencyTranslator(String domNameAndPath, EStructuralFeature aFeature, EStructuralFeature aDependentFeature) {
-		super(domNameAndPath, aFeature);
-		dependencyFeature = aDependentFeature;
-	}
-
-	public EObject getChild(EObject parent) {
-		EObject child = basicGetDependencyObject(parent);
-		if (child == null)
-			return createChild(parent);
-		return child;
-	}
-
-
-	protected EObject createChild(EObject parent) {
-		EObject child = createEMFObject(dependencyFeature);
-		parent.eSet(dependencyFeature, child);
-		return child;
-	}
-
-	@Override
-	public List getMOFChildren(EObject mofObject) {
-		//return super.getMOFChildren(getChild(mofObject));
-		return super.getMOFChildren(mofObject);
-	}
-
-	@Override
-	public Object getMOFValue(EObject mofObject) {
-		return super.getMOFValue(getChild(mofObject));
-	}
-
-	@Override
-	public void setMOFValue(EObject emfObject, Object value) {
-		//super.setMOFValue(getChild(emfObject), value);
-		super.setMOFValue(getChild(emfObject), value, -1);
-	}
-
-	@Override
-	public void setMOFValue(Notifier owner, Object value, int newIndex) {
-		super.setMOFValue(getChild((EObject) owner), value, newIndex);
-	}
-
-	@Override
-	public void removeMOFValue(Notifier owner, Object value) {
-		super.removeMOFValue(getChild((EObject) owner), value);
-	}
-
-	@Override
-	public boolean isSetMOFValue(EObject emfObject) {
-		return super.isSetMOFValue(getChild(emfObject));
-	}
-
-	@Override
-	public void unSetMOFValue(EObject emfObject) {
-		super.unSetMOFValue(getChild(emfObject));
-	}
-
-
-	@Override
-	public boolean isDependencyChild() {
-		return true;
-	}
-
-	@Override
-	public boolean featureExists(EObject emfObject) {
-		return super.featureExists(getChild(emfObject));
-	}
-
-	@Override
-	public void clearList(EObject mofObject) {
-		super.clearList(getChild(mofObject));
-	}
-
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/EMF2DOMAdapter.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/EMF2DOMAdapter.java
deleted file mode 100644
index 9782ea1..0000000
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/EMF2DOMAdapter.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors: IBM Corporation - initial API and implementation
- **************************************************************************************************/
-package org.eclipse.wst.common.internal.emf.resource;
-
-
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.ecore.EObject;
-import org.w3c.dom.Node;
-
-public interface EMF2DOMAdapter extends Adapter {
-
-
-	Class ADAPTER_CLASS = EMF2DOMAdapter.class;
-
-	/**
-	 * Return the DOM node that the target of this adapter maps to. If the target MOF object maps to
-	 * more than one DOM node, this node is the top-most node.
-	 */
-	Node getNode();
-
-	void setNode(Node aNode);
-
-	/**
-	 * Set to false and notification of changes from both the DOM node and the MOF object will be
-	 * ignored.
-	 */
-	boolean isNotificationEnabled();
-
-	/**
-	 * Set to false and notification of changes from both the DOM node and the MOF object will be
-	 * ignored.
-	 */
-	void setNotificationEnabled(boolean isEnabled);
-
-	/**
-	 * Updates the DOM tree for this adapter from the current values of the MOF Object. This method
-	 * updates ALL the DOM nodes from all the MOF attributes.
-	 */
-	void updateDOM();
-
-	/**
-	 * Updates the MOF Object from the DOM tree. All the children of the DOM tree are updated into
-	 * the MOF object.
-	 */
-	void updateMOF();
-
-	public void updateDOMFeature(Translator map, Node node, EObject mofObject);
-
-	public void updateMOFFeature(Translator map, Node node, EObject mofObject);
-
-	EObject getEObject();
-
-	/**
-	 * Return true if MOF object is a proxy.
-	 */
-	boolean isMOFProxy();
-
-	/**
-	 * Remove the DOM adapters from the node AND all its child nodes, recursively.
-	 */
-	void removeAdapters(Node node);
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/EMF2DOMAdapterImpl.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/EMF2DOMAdapterImpl.java
deleted file mode 100644
index 3fa734c..0000000
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/EMF2DOMAdapterImpl.java
+++ /dev/null
@@ -1,1870 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.common.internal.emf.resource;
-
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.Notifier;
-import org.eclipse.emf.common.notify.impl.AdapterImpl;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.wst.common.internal.emf.plugin.EcoreUtilitiesPlugin;
-import org.eclipse.wst.common.internal.emf.utilities.Assert;
-import org.eclipse.wst.common.internal.emf.utilities.DOMUtilities;
-import org.eclipse.wst.common.internal.emf.utilities.EtoolsCopySession;
-import org.eclipse.wst.common.internal.emf.utilities.ExtendedEcoreUtil;
-import org.eclipse.wst.common.internal.emf.utilities.FeatureValueConversionException;
-import org.eclipse.wst.common.internal.emf.utilities.Revisit;
-import org.eclipse.wst.common.internal.emf.utilities.StringUtil;
-import org.eclipse.wst.common.internal.emf.utilities.TranslatorService;
-import org.eclipse.wst.common.internal.emf.utilities.WFTUtilsResourceHandler;
-import org.w3c.dom.Attr;
-import org.w3c.dom.Document;
-import org.w3c.dom.DocumentType;
-import org.w3c.dom.Element;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import org.w3c.dom.Text;
-
-
-public class EMF2DOMAdapterImpl extends AdapterImpl implements EMF2DOMAdapter {
-
-	final protected static boolean fDebug = false;
-
-	protected boolean fNotificationEnabled = true;
-
-	protected Node fNode;
-
-	protected Translator fTranslator;
-
-	protected EMF2DOMRenderer fRenderer;
-
-	protected Translator[] childTranslators;
-
-	protected boolean isRoot = false;
-	
-	private static final String PLATFORM = "org.eclipse.core.runtime.Platform"; //$NON-NLS-1$
-	private static final String ISRUNNING = "isRunning"; //$NON-NLS-1$
-
-	private class DependencyAdapter extends org.eclipse.emf.common.notify.impl.AdapterImpl {
-
-		static final String KEY = "EMF2DOMDependencyAdapter"; //$NON-NLS-1$
-
-		@Override
-		public void notifyChanged(Notification msg) {
-			EMF2DOMAdapterImpl.this.notifyChanged(msg);
-		}
-
-		/**
-		 * @see org.eclipse.emf.common.notify.impl.AdapterImpl#isAdapterForType(Object)
-		 */
-		@Override
-		public boolean isAdapterForType(Object type) {
-			return KEY.equals(type);
-		}
-	}
-
-	/**
-	 * Constructor for root adapters.
-	 */
-	public EMF2DOMAdapterImpl(TranslatorResource resource, Document document, EMF2DOMRenderer renderer, Translator translator) {
-		this((Notifier) resource, (Node) document, renderer, translator);
-		isRoot = true;
-	}
-
-	/**
-	 * Construct an Adapter given an EObject and a node
-	 */
-	public EMF2DOMAdapterImpl(Notifier object, Node node, EMF2DOMRenderer renderer, Translator translator) {
-		super();
-		setTarget(object);
-		fNode = node;
-		fRenderer = renderer;
-		fTranslator = translator;
-		initChildTranslators();
-		addEMFAdapter();
-		addDOMAdapter();
-		addDependencyAdapterIfNecessary();
-	}
-
-	/**
-	 * Construct an adapter from a DOM Node. The EObject will be created
-	 */
-	public EMF2DOMAdapterImpl(Node node, EMF2DOMRenderer renderer, Translator translator) {
-		fNode = node;
-		fRenderer = renderer;
-		fTranslator = translator;
-		setTargetFromNode();
-		initChildTranslators();
-		addEMFAdapter();
-		addDOMAdapter();
-		addDependencyAdapterIfNecessary();
-
-	}
-
-	protected void addDependencyAdapterIfNecessary() {
-		if (!fTranslator.isDependencyParent())
-			return;
-		EObject child = fTranslator.basicGetDependencyObject(getEObject());
-		if (child != null)
-			addDependencyAdapter(child);
-	}
-
-	protected void initChildTranslators() {
-		List children = new ArrayList();
-		boolean isRunning = false; //is the OSGI platform running ?
-		try {
-			// If the Platform class can be found, then continue to check if the OSGI platform is running
-			Class clazz = Class.forName(PLATFORM);
-			Method m = clazz.getMethod(ISRUNNING);
-			isRunning = ((Boolean)m.invoke(clazz)).booleanValue();
-		} catch (ClassNotFoundException e) {
-		     // Ignore because this must be in a non_OSGI environment
-		} catch (SecurityException e) {
-			 // Ignore because this must be in a non_OSGI environment
-		} catch (NoSuchMethodException e) {
-			 // Ignore because this must be in a non_OSGI environment
-		} catch (IllegalArgumentException e) {
-			 // Ignore because this must be in a non_OSGI environment
-		} catch (IllegalAccessException e) {
-			 // Ignore because this must be in a non_OSGI environment
-		} catch (InvocationTargetException e) {
-			 // Ignore because this must be in a non_OSGI environment
-		}	
-		//Check for extended child translators because we are in OSGI mode
-		if (isRunning) {
-			Translator[] extendedChildren = TranslatorService.getInstance().getTranslators();
-	        for (int i = 0; i < extendedChildren.length; i++) {
-	        	if (extendedChildren[i] != null)
-	            	children.add(extendedChildren[i]);
-	        }
-		}
-		
-		
-		children.addAll(Arrays.asList(fTranslator.getChildren(getTarget(), fRenderer.getVersionID())));
-
-		VariableTranslatorFactory factory = fTranslator.getVariableTranslatorFactory();
-		if (factory != null) {
-			String domName = null;
-			NamedNodeMap map = fNode.getAttributes();
-
-			if (map != null) {
-				int length = map.getLength();
-				for (int i = 0; i < length; i++) {
-					Node attrNode = map.item(i);
-					domName = attrNode.getNodeName();
-					//Handle variable translators
-					Translator t = fTranslator.findChild(domName, getTarget(), fRenderer.getVersionID());
-					if (t != null && !children.contains(t))
-						children.add(t);
-				}
-			}
-			List childrenFromEMF = factory.create(getTarget());
-			if (childrenFromEMF != null)
-				children.addAll(childrenFromEMF);
-		}
-
-		childTranslators = (Translator[]) children.toArray(new Translator[children.size()]);
-	}
-
-	/**
-	 * Set to false and notification of changes from both the DOM node and the MOF object will be
-	 * ignored.
-	 */
-	public boolean isNotificationEnabled() {
-		return fNotificationEnabled;
-	}
-
-	/**
-	 * Set to false and notification of changes from both the DOM node and the MOF object will be
-	 * ignored.
-	 */
-	public void setNotificationEnabled(boolean isEnabled) {
-		fNotificationEnabled = isEnabled;
-	}
-
-	@Override
-	public boolean isAdapterForType(Object type) {
-		return EMF2DOMAdapter.ADAPTER_CLASS == type;
-	}
-
-	protected void addEMFAdapter() {
-		target.eAdapters().add(this);
-	}
-
-	@Override
-	public String toString() {
-		StringBuffer sb = new StringBuffer();
-		sb.append(shortClassName(this));
-		sb.append('(');
-		sb.append(getNode().getNodeName());
-		sb.append(',');
-		sb.append(shortClassName(getTarget()));
-		sb.append(')');
-		return sb.toString();
-	}
-
-	protected String shortClassName(Object o) {
-		if (o != null) {
-			String cn = o.getClass().getName();
-			int i = cn.lastIndexOf('.');
-			return cn.substring(i + 1, cn.length());
-		}
-		return null;
-	}
-
-	/*
-	 * Prints out a MOF notification for debugging
-	 */
-	protected void debugMOFNotify(Notification msg) {
-		if (fDebug) {
-			String notifType = ""; //$NON-NLS-1$
-			switch (msg.getEventType()) {
-				case Notification.ADD :
-					notifType = "ADD"; //$NON-NLS-1$
-					break;
-				case Notification.REMOVE :
-					notifType = "REMOVE"; //$NON-NLS-1$
-					break;
-				case Notification.ADD_MANY :
-					notifType = "ADD_MANY"; //$NON-NLS-1$
-					break;
-				case Notification.REMOVE_MANY :
-					notifType = "REMOVE_MANY"; //$NON-NLS-1$
-					break;
-				case Notification.SET : {
-					if (msg.getPosition() == Notification.NO_INDEX)
-						notifType = "REPLACE"; //$NON-NLS-1$
-					else
-						notifType = "SET"; //$NON-NLS-1$
-					break;
-				}
-				case Notification.UNSET :
-					notifType = "UNSET"; //$NON-NLS-1$
-					break;
-			}
-
-			EcoreUtilitiesPlugin.logError("MOF Change: " + notifType); //$NON-NLS-1$
-			EcoreUtilitiesPlugin.logError("\tnotifier      : " + msg.getNotifier()); //$NON-NLS-1$
-			EcoreUtilitiesPlugin.logError("\tchangedFeature: " + msg.getFeature()); //$NON-NLS-1$
-			EcoreUtilitiesPlugin.logError("\toldValue      : " + msg.getOldValue()); //$NON-NLS-1$
-			EcoreUtilitiesPlugin.logError("\tnewValue      : " + msg.getNewValue()); //$NON-NLS-1$
-		}
-	}
-
-	/*
-	 * Override this method to create the feature maps for the adapter.
-	 */
-	protected Translator[] getChildTranslators() {
-		return childTranslators;
-	}
-
-	protected Translator findTranslator(Notification not) {
-		if (not.getFeature() == null)
-			return null;
-		Translator[] maps = getChildTranslators();
-		for (int i = 0; i < maps.length; i++) {
-			if (maps[i].isMapFor(not.getFeature(), not.getOldValue(), not.getNewValue()))
-				return maps[i];
-		}
-		return null;
-	}
-	
-	/**
-	 * Checks to ensure that only one MOF node has been removed and will remove the dom equivalent.
-	 * If multiple differences are found, will return the index of the first difference.
-	 * 
-	 * @param parent
-	 * @param mofChildren
-	 * @param domChildren
-	 * @return
-	 */
-	private int updateDOMSingleRemove(Node parent, List mofChildren, List domChildren){
-		int domIndex = 0;
-		int firstDifference = -1;
-		for (Object mofChild : mofChildren){
-			if (mofChild instanceof EObject)
-			{
-				EMF2DOMAdapter adapter = getExistingAdapter((EObject)mofChild);
-				if(adapter.getNode() != domChildren.get(domIndex)){
-					if(firstDifference != -1){
-						//second difference; return
-						return firstDifference;
-					}
-					//we found something that is different
-					firstDifference = domIndex;
-					//skip over one index and check against next
-					domIndex ++;
-					if(adapter.getNode() != domChildren.get(domIndex)){
-						//if these are different then there are multiple changes
-						return firstDifference;
-					}
-				}
-				domIndex++;
-			}
-		}
-		if(firstDifference != -1){
-			removeDOMChild(parent, (Element) domChildren.get(firstDifference));
-			//if we are here, and firstDifference is not -1, that means we have iterated
-			//through the entire mof list, and all elements have been processed. Return
-			//domchildren.size, so that no more processing is done in calling method.
-			return domChildren.size();
-		}
-		//if we are here, then firstDifference was -1. Our algo has failed. Let original algo run.
-		return 0;
-	}
-
-	
-
-	/**
-	 * Update all the children of the target MOF object in the relationship described by
-	 * 
-	 * @map.
-	 * 
-	 * @param map
-	 *            com.ibm.etools.mof2dom.AttributeTranslator Describes the mapping from the MOF
-	 *            attribute name to the DOM node name
-	 */
-	protected void primUpdateDOMMultiFeature(Translator map, Node node, List mofChildren, List domChildren, Notifier owner) {
-
-		int i = 0;
-		Node parent = findDOMPath(node, map, false);
-		if(domChildren.size() - mofChildren.size() == 1){
-			//an emf object has been deleted. Remove it from the dom as well
-			i = updateDOMSingleRemove(parent, mofChildren, domChildren);
-		}
-		//Used for inserting primitives
-		List inorderDOMChildren = null;
-		if(i < mofChildren.size()){
-			if (!map.isObjectMap() || map.isManagedByParent()) {
-				inorderDOMChildren = new ArrayList();
-				inorderDOMChildren.addAll(domChildren);
-			}
-		}
-		// Go though the MOF children checking to see if the corresponding
-		// MOF Adapter children exists. If not, create the adapter.
-		// Also handles reordering children that have moved.
-		for (; i < mofChildren.size(); i++) {
-			Object child = mofChildren.get(i);
-			EObject mofChild = null;
-
-			EMF2DOMAdapter adapter = null;
-
-			// Check to see if the child is a MOF Object.
-			if (!map.isManagedByParent() && child instanceof EObject) {
-				mofChild = (EObject) mofChildren.get(i);
-				adapter = getExistingAdapter(mofChild);
-			}
-
-			if (adapter != null && i < domChildren.size() && domChildren.get(i) == adapter.getNode())
-				continue;
-			if (adapter != null) {
-				if (domChildren.isEmpty())
-					continue;
-				// A node has been reordered in the list
-				Node reorderNode = adapter.getNode();
-				Node insertBeforeNode = reorderNode;
-				if (i < domChildren.size() && domChildren.get(i) != reorderNode) {
-					insertBeforeNode = (Node) domChildren.get(i);
-				}
-				domChildren.remove(reorderNode);
-				domChildren.add(i, reorderNode);
-				if (reorderNode != insertBeforeNode) {
-					reorderDOMChild(parent, reorderNode, insertBeforeNode, map);
-				}
-			} else {
-				// A new node has been added, create it
-				parent = createDOMPath(node, map);
-				if (mofChild != null) {
-					adapter = createAdapter(mofChild, map);
-					Node newNode = adapter.getNode();
-					Node insertBeforeNode = findInsertBeforeNode(parent, map, mofChildren, i, domChildren);
-					DOMUtilities.insertBeforeNodeAndWhitespace(parent, newNode, insertBeforeNode);
-					domChildren.add(i, newNode);
-					boolean notificationFlag = adapter.isNotificationEnabled();
-					adapter.setNotificationEnabled(false);
-					try {
-						indent(newNode, map);
-					} finally {
-						adapter.setNotificationEnabled(notificationFlag);
-					}
-					adapter.updateDOM();
-				} else {
-					// The mof feature is a collection of primitives.
-					// create a new dom node and listen to it.
-					Element newNode = createNewNode(null, map);
-					Node insertBeforeNode = findInsertBeforeNode(parent, map, mofChildren, i, inorderDOMChildren);
-					DOMUtilities.insertBeforeNodeAndWhitespace(parent, newNode, insertBeforeNode);
-					indent(newNode, map);
-					addDOMAdapter(newNode); // Hook up listeners
-					domChildren.add(i, newNode);
-					if(inorderDOMChildren != null){
-						inorderDOMChildren.add(newNode);
-					}
-					Text newText = parent.getOwnerDocument().createTextNode(map.convertValueToString(child, (EObject) owner));
-					DOMUtilities.insertBeforeNode(newNode, newText, null);
-				}
-			}
-		}
-
-		// Remove any remaining adapters.
-		for (; i < domChildren.size(); i++) {
-			removeDOMChild(parent, (Element) domChildren.get(i));
-		}
-
-		// If there are no MOF children, remove any unnecessary DOM node paths
-		if (mofChildren.size() == 0 && map.hasDOMPath()) {
-			if (map.shouldRenderEmptyDOMPath((EObject) owner))
-				createDOMPath(node, map);
-			else
-				removeDOMPath(node, map);
-		}
-
-	}
-
-	/**
-	 * Update all the children of the target MOF object in the relationship described by
-	 * 
-	 * @map.
-	 * 
-	 * @param map
-	 *            com.ibm.etools.mof2dom.AttributeTranslator Describes the mapping from the MOF
-	 *            attribute name to the DOM node name
-	 */
-	protected void primUpdateMOFMultiFeature(Translator map, Node node, List mofChildren, List domChilren) {
-
-		Hashtable nodeToAdapter = new Hashtable();
-
-		for (int i = 0; i < mofChildren.size(); i++) {
-			EMF2DOMAdapter adapter = getExistingAdapter((EObject) mofChildren.get(i));
-			if (adapter != null)
-				nodeToAdapter.put(adapter.getNode(), adapter);
-		}
-
-		// Go though the DOM children checking to see if the corresponding
-		// MOF Adapter children exists. If not, create the adapter.
-		// Also handles reordering children that have moved.
-		int i = 0;
-		int mofIndex = 0;
-		List adaptersToUpdate = new ArrayList();
-		for (; i < domChilren.size(); i++) {
-			Element childNode = (Element) domChilren.get(i);
-			EMF2DOMAdapter adapter = i < mofChildren.size() ? getExistingAdapter((EObject) mofChildren.get(i)) : null;
-			if (adapter != null && !adapter.isMOFProxy() && adapter.getNode() == childNode) {
-				// Because the adapter is processing STRUCTURE_CHANGED from the
-				// DOM, we
-				// must update all the way down the tree since anything under
-				// the notifying
-				// DOM node could have changed.
-				adapter.updateMOF();
-				mofIndex++;
-				continue;
-			}
-
-			adapter = (EMF2DOMAdapter) nodeToAdapter.get(childNode);
-			if (adapter != null) {
-				reorderIfNecessary((EList) mofChildren, adapter.getEObject(), mofIndex);
-				mofIndex++;
-			} else {
-				adapter = createAdapter(childNode, map);
-				if (adapter != null) {
-					try {
-						//We don't want to push anything back to the child dom
-						adapter.setNotificationEnabled(false);
-						map.setMOFValue(getTarget(), adapter.getTarget(), mofIndex);
-					} finally {
-						adapter.setNotificationEnabled(true);
-					}
-
-					adaptersToUpdate.add(adapter);
-					mofIndex++;
-				}
-			}
-		}
-
-		// Remove any remaining adapters.
-		//make a copy so we remove all items - bug 192468 
-				Object[] childrenArray = mofChildren.toArray();
-				for (; i < childrenArray.length; i++) {
-					removeMOFValue((EObject) childrenArray[i], map);
-		 		}
-
-		// The adapters cannot be updated as they created. We must wait until
-		// all of the adapters are created and removed before updating,
-		// otherwise
-		// we can get in a state where there are adapters fighting with
-		// eachother
-		// (one for the old node and one for the new node).
-		for (int j = 0; j < adaptersToUpdate.size(); j++) {
-			((EMF2DOMAdapter) adaptersToUpdate.get(j)).updateMOF();
-		}
-	}
-
-	/**
-	 * Removes a feature's value.
-	 * 
-	 * @param childAdapter
-	 *            com.ibm.etools.mof2dom.EMF2DOMAdapter The child to remove
-	 * @param mofAttributeName
-	 *            String The name of the mofAttribute to remove the child from.
-	 */
-	protected void removeMOFValue(EObject value, Translator translator) {
-
-		if (value == null)
-			return;
-
-		EMF2DOMAdapter adapter = (EMF2DOMAdapter) EcoreUtil.getExistingAdapter(value, EMF2DOMAdapter.ADAPTER_CLASS);
-		if (adapter != null) {
-			// Remove the adapter from BOTH the MOF Object and the DOM Nodes
-			removeAdapters(adapter.getNode());
-			value.eAdapters().remove(adapter);
-		}
-
-		EStructuralFeature feature = translator.getFeature();
-		boolean doUnload = feature == null || (translator.isObjectMap() && ((EReference) feature).isContainment());
-
-		// translator.removeMOFValue() was here originally
-
-		// Unload the objects.
-		if (doUnload)
-			ExtendedEcoreUtil.unload(value);
-
-		// Remove the MOF value
-		translator.removeMOFValue(getTarget(), value);
-	}
-
-	protected void reorderIfNecessary(EList emfChildren, EObject eObj, int emfIndex) {
-		int currIndex = emfChildren.indexOf(eObj);
-		if (currIndex > -1 && currIndex != emfIndex)
-			emfChildren.move(emfIndex, eObj);
-	}
-
-	/**
-	 * default is to do nothing; subclasses can override
-	 */
-	protected void indent(Node newNode, Translator map) {
-
-	}
-
-	protected Node findInsertBeforeNode(Node parentNode, Translator map, List mofList, int mofInx, List domList) {
-		Node insertBeforeNode = null;
-
-		// If there are no current dom children for this map, find the initial
-		// insert pos.
-		if (domList.size() == 0)
-			return findInitialInsertBeforeNode(parentNode, map);
-
-		// If some dom nodes then find the correct one to insert before.
-		int i = mofInx + 1;
-		while (i < mofList.size() && insertBeforeNode == null) {
-			// Start at the mofInx passed in and look forward for the first
-			// adapted
-			// MOF object. Use that node as the insert before node.
-			Object o = mofList.get(i);
-			if (!map.isObjectMap() || map.isManagedByParent())
-				break;
-			EObject tMOFObject = (EObject) o;
-			EMF2DOMAdapter tAdapter = (EMF2DOMAdapter) EcoreUtil.getExistingAdapter(tMOFObject, EMF2DOMAdapter.ADAPTER_CLASS);
-			if (tAdapter != null) {
-				insertBeforeNode = tAdapter.getNode();
-			}
-			i++;
-		}
-
-		// Handle inserting at the end of the list
-		if (insertBeforeNode == null)
-			insertBeforeNode = DOMUtilities.getNextNodeSibling((Node) domList.get(domList.size() - 1));
-		if (insertBeforeNode == null)
-			insertBeforeNode = ((Node) domList.get(domList.size() - 1)).getNextSibling();
-
-		return insertBeforeNode;
-	}
-
-	protected Node findInitialInsertBeforeNode(Node parentNode, Translator mapNode) {
-		Translator[] maps = getChildTranslators();
-
-		// First, skip past all the maps in the ordered collection
-		// of maps. We want to begin the search with this node.
-		int i = 0;
-		for (; i < maps.length; i++) {
-			if (maps[i] == mapNode)
-				break;
-		}
-
-		// Now search go through each map node until a child node matching
-		// its DOM name is found.
-		Node insertBeforeNode = null;
-		for (int j = i; j < maps.length && insertBeforeNode == null; j++) {
-			NodeList childNodes = parentNode.getChildNodes();
-			Translator nodeToFindMap = maps[j];
-			for (int k = 0; k < childNodes.getLength(); k++) {
-				Node node = childNodes.item(k);
-				if (nodeToFindMap.isMapFor(node.getNodeName())) {
-					insertBeforeNode = node;
-					break;
-				}
-			}
-		}
-		return insertBeforeNode;
-	}
-
-	/*
-	 * Traverses the path that <map> specifies. Returns the last node of the path that was able to
-	 * be traversed or null if the path could not be traversed. The <addAdapters> boolean is used to
-	 * determine if the receiver is added as an adapter to every node found on the path.
-	 */
-	protected Node findDOMPath(Node parent, Translator map, boolean addAdapters) {
-
-		String path = map.getDOMPath();
-		Node curNode = parent;
-		Iterator iter = DOMUtilities.createPathIterator(path);
-
-		while (curNode != null && iter.hasNext()) {
-			String nodeName = (String) iter.next();
-			curNode = DOMUtilities.getNodeChild(curNode, nodeName);
-			if (addAdapters && curNode != null) {
-				addDOMAdapter(curNode);
-			}
-		}
-		return curNode;
-	}
-
-	/**
-	 * Return the list of DOM node children that currently exist with the specified tagname.
-	 */
-	protected List getDOMChildren(Node node, Translator map) {
-		Node parent = findDOMPath(node, map, true);
-		if (parent != null)
-			return DOMUtilities.getNodeChildren(parent, map.getDOMNames());
-		return new ArrayList();
-	}
-
-	protected EMF2DOMAdapter getExistingAdapter(EObject refObject) {
-		EMF2DOMAdapter adapter = (EMF2DOMAdapter) EcoreUtil.getExistingAdapter(refObject, EMF2DOMAdapter.ADAPTER_CLASS);
-		if (adapter != null && adapter.isMOFProxy()) {
-			removeDOMAdapter(adapter.getNode(), adapter);
-			refObject.eAdapters().remove(adapter);
-			adapter = null;
-		}
-		return adapter;
-	}
-
-	protected void primAddDOMAdapter(Node aNode, EMF2DOMAdapter anAdapter) {
-		fRenderer.registerDOMAdapter(aNode, anAdapter);
-	}
-
-	protected EMF2DOMAdapter primGetExistingAdapter(Node aNode) {
-		return fRenderer.getExistingDOMAdapter(aNode);
-	}
-
-	protected void removeDOMAdapter(Node aNode, EMF2DOMAdapter anAdapter) {
-		fRenderer.removeDOMAdapter(aNode, anAdapter);
-	}
-
-	protected void addDOMAdapter(Node childNode) {
-
-		// Only add the adapter if this is an child node that will not be
-		// adapted. For instance a subtree that maps to a MOF attribute
-		// setting.
-		if (childNode.getNodeType() == Node.ELEMENT_NODE) {
-			EMF2DOMAdapter attrAdapter = primGetExistingAdapter(childNode);
-
-			if (attrAdapter == null || attrAdapter.getNode() != getNode()) {
-				// If the node is adapted, but not by this adapter then remove
-				// it. This happens to non-object children when the parent tag
-				// name is changed.
-				removeDOMAdapter(childNode, attrAdapter);
-
-				if (fDebug) {
-					EcoreUtilitiesPlugin.logError("\tCHILD: Adding DOM adapter: " + this); //$NON-NLS-1$
-					EcoreUtilitiesPlugin.logError("\t\tto: " + childNode); //$NON-NLS-1$
-				}
-				primAddDOMAdapter(childNode, this);
-			}
-		}
-	}
-
-	/**
-	 * Reorder a child before a given node
-	 */
-	protected void reorderDOMChild(Node parentNode, Node childNode, Node insertBeforeNode, Translator map) {
-		try {
-			removeDOMChild(parentNode, childNode, false);
-			parentNode.insertBefore(childNode, insertBeforeNode);
-		} catch (Exception e) {
-			EcoreUtilitiesPlugin.logError(e);
-		}
-	}
-
-	protected String getNewlineString(Node node) {
-		return DOMUtilities.NEWLINE_STRING;
-	}
-
-	protected String primGetIndentString(Node node) {
-		return DOMUtilities.getIndentString(node);
-	}
-
-	/**
-	 * Remove a child node
-	 */
-	protected void removeDOMChild(Node parentNode, Node childNode) {
-		removeDOMChild(parentNode, childNode, true);
-	}
-
-	/**
-	 * Remove a child node
-	 */
-	protected void removeDOMChild(Node parentNode, Node childNode, boolean removeAdapter) {
-		try {
-			if (childNode == null)
-				return;
-			// Look for any whitespace preceeding the node being
-			// removed and remove it as well.
-			Text prevText = DOMUtilities.getPreviousTextSibling(childNode);
-			if (prevText != null && DOMUtilities.isWhitespace(prevText)) {
-				parentNode.removeChild(prevText);
-			}
-			// Remove the node.
-			if (removeAdapter)
-				removeAdapters(childNode);
-			parentNode.removeChild(childNode);
-		} catch (Exception e) { 
-			EcoreUtilitiesPlugin.logError(e);
-		}
-	}
-
-	/**
-	 * Remove the DOM adapters from the node AND all its child nodes, recursively.
-	 */
-	public void removeAdapters(Node node) {
-		EMF2DOMAdapter adapter = primGetExistingAdapter(node);
-		if (adapter != null) {
-			// Remove the adapter from both the DOM node and the MOF Object.
-			removeDOMAdapter(node, adapter);
-			if (adapter.getNode() == node) {
-				Notifier localTarget = adapter.getTarget();
-				if (localTarget != null)
-					localTarget.eAdapters().remove(adapter);
-			}
-		}
-		NodeList nl = node.getChildNodes();
-		for (int i = 0; i < nl.getLength(); i++) {
-			Node n = nl.item(i);
-			removeAdapters(n);
-		}
-	}
-
-	/**
-	 * Creates the path specified by <map>under <node>. Only the portion of the path that does not
-	 * exist (if any) is created
-	 * 
-	 * @param node
-	 *            org.w3c.dom.Node
-	 * @param map
-	 *            com.ibm.etools.mof2dom.Translator
-	 */
-	protected Node createDOMPath(Node node, Translator map) {
-		Iterator i = DOMUtilities.createPathIterator(map.getDOMPath());
-		Node curNode = node;
-		while (i.hasNext()) {
-			String nodeName = (String) i.next();
-			curNode = findOrCreateNode(node, map, nodeName);
-		}
-		return curNode;
-	}
-
-	protected Element findOrCreateNode(Node parent, Translator map, String segment) {
-		Node node = DOMUtilities.getNodeChild(parent, segment);
-		if (node == null) {
-			// The node did not already exist, create it.
-			Document doc = parent.getOwnerDocument();
-			node = doc.createElement(segment);
-			if (map.isEmptyTag())
-				setEmptyTag((Element) node);
-
-			Node insertBeforeNode = findInitialInsertBeforeNode(parent, map);
-			DOMUtilities.insertBeforeNodeAndWhitespace(parent, node, insertBeforeNode);
-			indent(node, map);
-			addDOMAdapter(node); // Hook up listeners
-		}
-		return (Element) node;
-	}
-
-	/**
-	 * Remove the node passed in if it has only whitespace nodes as children
-	 * 
-	 * @param node
-	 *            org.w3c.dom.Node The node to check
-	 */
-	protected void removeIfEmpty(Node node) {
-		NodeList nl = node.getChildNodes();
-
-		// Run through all the nodes children. If a non-whitespace node
-		// pis found, bail.
-		for (int i = 0; i < nl.getLength(); i++) {
-			Node childNode = nl.item(i);
-			if (!DOMUtilities.isWhitespace(childNode))
-				return;
-		}
-
-		// We only get here if there are no non-whitespace chars, so
-		// simply remove the node.
-		removeDOMChild(node.getParentNode(), node);
-	}
-
-	/**
-	 * Remove the DOM path specified by <map>from <node>
-	 */
-	protected void removeDOMPath(Node node, Translator map) {
-		Node childNode = findDOMPath(node, map, false);
-		while (childNode != null && childNode != node) {
-			removeIfEmpty(childNode);
-			childNode = childNode.getParentNode();
-		}
-	}
-
-	/**
-	 * Create an adapter for a child DOM node
-	 * 
-	 * @param node
-	 *            org.w3c.dom.Node The node to create the adapter for.
-	 */
-	protected EMF2DOMAdapter createAdapter(EObject mofObject, Translator childMap) {
-		//	Assert.isNotNull(childMap.getChildAdapterClass());
-		Assert.isNotNull(mofObject);
-
-		EMF2DOMAdapter adapter = (EMF2DOMAdapter) EcoreUtil.getAdapter(mofObject.eAdapters(), EMF2DOMAdapter.ADAPTER_CLASS);
-
-		if (adapter != null && adapter.isMOFProxy()) {
-			removeAdapters(adapter.getNode());
-			mofObject.eAdapters().remove(adapter);
-			adapter = null;
-		}
-		if (adapter == null)
-			adapter = primCreateAdapter(mofObject, childMap);
-		return adapter;
-	}
-
-	/**
-	 * Create an adapter for a child DOM node
-	 * 
-	 * @param node
-	 *            org.w3c.dom.Node The node to create the adapter for.
-	 */
-	protected EMF2DOMAdapter primCreateAdapter(EObject mofObject, Translator childMap) {
-
-		Element newNode = createNewNode(mofObject, childMap);
-		return new EMF2DOMAdapterImpl(mofObject, newNode, fRenderer, childMap);
-	}
-
-	/**
-	 * Create an adapter for a child DOM node
-	 * 
-	 * @param node
-	 *            org.w3c.dom.Node The node to create the adapter for.
-	 */
-	protected EMF2DOMAdapter primCreateAdapter(Node node, Translator childMap) {
-		return new EMF2DOMAdapterImpl(node, fRenderer, childMap);
-	}
-
-	/**
-	 * Create an adapter for a child DOM node
-	 * 
-	 * @param node
-	 *            org.w3c.dom.Node The node to create the adapter for.
-	 */
-	protected EMF2DOMAdapter createAdapter(Node node, Translator childMap) {
-
-		//Assert.isNotNull(childMap.getChildAdapterClass());
-		Assert.isNotNull(node);
-
-		EMF2DOMAdapter adapter = primGetExistingAdapter(node);
-
-		if (adapter != null) {
-			if (adapter.isMOFProxy() || adapter.getTarget() == null) {
-				removeDOMAdapter(node, adapter);
-				if (adapter.getTarget() != null) {
-					adapter.getTarget().eAdapters().remove(adapter);
-				}
-				adapter = null;
-			}
-		} else {
-			adapter = primCreateAdapter(node, childMap);
-		}
-		return adapter;
-	}
-
-	protected Element createNewNode(EObject mofObject, Translator childMap) {
-		Node node = getNode();
-		Document doc = (node instanceof Document) ? (Document) node : node.getOwnerDocument();
-
-		Element element = doc.createElement(childMap.getDOMName(mofObject));
-		if (childMap.isEmptyTag())
-			setEmptyTag(element);
-
-		return element;
-	}
-
-	protected void setEmptyTag(Element element) {
-		Revisit.toDo();
-		//Need to figure out how to do this with pure DOM apis, if it is
-		// possible
-	}
-
-	/*
-	 * Return true if MOF object is a proxy.
-	 */
-	public boolean isMOFProxy() {
-		if (isRoot || target == null)
-			return false;
-		return ((InternalEObject) target).eIsProxy();
-	}
-
-	public EObject getEObject() {
-		if (isRoot)
-			return null;
-		return (EObject) target;
-	}
-
-	/**
-	 * Return the DOM node that the target of this adapter maps to. If the target MOF object maps to
-	 * more than one DOM node, this node is the top-most node.
-	 */
-	public Node getNode() {
-		return fNode;
-	}
-
-	public void setNode(Node aNode) {
-		fNode = aNode;
-	}
-
-	public void updateDOM() {
-		if (!isNotificationEnabled())
-			return;
-		primUpdateDOM();
-	}
-
-	public void updateMOF() {
-		if (!isNotificationEnabled())
-			return;
-		primUpdateMOF();
-	}
-
-	protected void primUpdateDOM() {
-		if (isRoot)
-			updateDOMRootFeature();
-		else {
-			Translator[] maps = getChildTranslators();
-			for (int i = 0; i < maps.length; i++) {
-				updateDOMFeature(maps[i], getNode(), getEObject());
-			}
-		}
-	}
-
-	public void primUpdateMOF() {
-		if (isRoot)
-			updateMOFRootFeature();
-		else {
-			Translator[] maps = getChildTranslators();
-			for (int i = 0; i < maps.length; i++) {
-				updateMOFFeature(maps[i], getNode(), getEObject());
-			}
-		}
-	}
-
-	protected void updateDOMRootFeature() {
-		boolean notificationFlag = isNotificationEnabled();
-		try {
-			setNotificationEnabled(false);
-			primUpdateDOMMultiFeature(fTranslator, fNode, getResourceContents(), getDOMChildren(fNode, fTranslator), null);
-			updateDOMDocumentType();
-		} finally {
-			setNotificationEnabled(notificationFlag);
-		}
-	}
-
-	protected void updateMOFRootFeature() {
-		boolean notificationFlag = isNotificationEnabled();
-		try {
-			setNotificationEnabled(false);
-			updateMOFDocumentType();
-			primUpdateMOFMultiFeature(fTranslator, fNode, getResourceContents(), getDOMChildren(fNode, fTranslator));
-		} finally {
-			setNotificationEnabled(notificationFlag);
-		}
-	}
-
-	protected DocumentType getDocumentType() {
-		return ((Document) fNode).getDoctype();
-	}
-
-	protected TranslatorResource getResource() {
-		return (TranslatorResource) getTarget();
-	}
-
-	protected EList getResourceContents() {
-		if (!isRoot)
-			throw new IllegalStateException();
-		return ((Resource) getTarget()).getContents();
-	}
-
-	protected void updateDOMDocumentType() {
-
-		DocumentType docType = getDocumentType();
-		String publicId = null, systemId = null, oldPublicId, oldSystemId;
-		oldPublicId = docType == null ? null : docType.getPublicId();
-		oldSystemId = docType == null ? null : docType.getSystemId();
-		TranslatorResource resource = getResource();
-		if (resource != null) {
-			publicId = resource.getPublicId();
-			systemId = resource.getSystemId();
-			if (!(StringUtil.stringsEqual(publicId, oldPublicId) && StringUtil.stringsEqual(systemId, oldSystemId)))
-				fRenderer.replaceDocumentType(resource.getDoctype(), publicId, systemId);
-		}
-	}
-
-	protected void updateDOMDocumentType(Notification msg) {
-		if (msg.getFeature() == TranslatorResource.DOC_TYPE_FEATURE)
-			updateDOMDocumentType();
-	}
-
-	protected void updateMOFDocumentType() {
-
-		TranslatorResource resource = getResource();
-		if (resource == null)
-			return;
-
-		String publicId = null, systemId = null;
-		DocumentType docType = getDocumentType();
-
-		if (docType != null) {
-			publicId = docType.getPublicId();
-			systemId = docType.getSystemId();
-		}
-		if ((!(StringUtil.stringsEqual(publicId, resource.getPublicId()) && StringUtil.stringsEqual(systemId, resource.getSystemId()))) || 
-				((resource.getPublicId() == null) || resource.getSystemId() == null))
-			resource.setDoctypeValues(publicId, systemId);
-	}
-
-	@Override
-	public void notifyChanged(Notification msg) {
-
-		if (isRoot) {
-			notifyChangedForRoot(msg);
-			return;
-		}
-		if (isDependencyFeature(msg))
-			handleDependencyFeature(msg);
-
-		if (!isNotificationEnabled())
-			return;
-
-		debugMOFNotify(msg);
-
-		switch (msg.getEventType()) {
-			case Notification.ADD :
-			case Notification.REMOVE :
-			case Notification.ADD_MANY :
-			case Notification.REMOVE_MANY :
-			case Notification.SET :
-			case Notification.UNSET :
-			case Notification.MOVE :
-				Translator translator = findTranslator(msg);
-				if (translator == null)
-					translator = addVariableTranslatorIfNecessary(msg);
-				if (translator != null)
-					updateDOMFeature(translator, getNode(), getEObject());
-				break;
-		}
-	}
-
-	protected void notifyChangedForRoot(Notification msg) {
-		if (!isNotificationEnabled())
-			return;
-
-		debugMOFNotify(msg);
-
-		switch (msg.getEventType()) {
-			case Notification.ADD :
-			case Notification.REMOVE :
-			case Notification.ADD_MANY :
-			case Notification.REMOVE_MANY :
-				primUpdateDOM();
-				break;
-			case Notification.SET :
-				updateDOMDocumentType(msg);
-				break;
-			case EtoolsCopySession.RESOURCE_COPIED :
-				updateDOM();
-				break;
-		}
-	}
-
-	protected void addDependencyAdapter(EObject child) {
-		Adapter existing = EcoreUtil.getExistingAdapter(child, DependencyAdapter.KEY);
-		if (existing != null)
-			return;
-		DependencyAdapter forwarder = new DependencyAdapter();
-		child.eAdapters().add(forwarder);
-		forwarder.setTarget(child);
-	}
-
-	protected void addDOMAdapter() {
-
-		primAddDOMAdapter(fNode, this);
-		if (fDebug) {
-			EcoreUtilitiesPlugin.logError("Adding DOM adapter: " + this); //$NON-NLS-1$
-			EcoreUtilitiesPlugin.logError("\tto: " + fNode); //$NON-NLS-1$
-		}
-
-		// Go through the maps. All of the DOM nodes that are not listened
-		// to by another DOM Node adapter, must be listened to by this adapter.
-		NodeList childNodes = fNode.getChildNodes();
-		for (int j = 0; j < childNodes.getLength(); j++) {
-			Node childNode = childNodes.item(j);
-			int nodeType = childNode.getNodeType();
-			if (!DOMUtilities.isTextNode(childNode) && nodeType != Node.COMMENT_NODE) {
-				Translator map = findTranslator(childNode.getNodeName(), false);
-				if (map != null && map.isManagedByParent())
-					addDOMAdapter(childNode);
-			}
-		}
-	}
-
-	protected Translator addVariableTranslatorIfNecessary(Notification msg) {
-		VariableTranslatorFactory fact = fTranslator.getVariableTranslatorFactory();
-		Translator trans = null;
-		if (fact != null && fact.accepts(msg)) {
-			trans = fact.create(msg);
-			if (trans != null)
-				childTranslators = (Translator[]) Translator.concat(childTranslators, trans);
-		}
-		return trans;
-	}
-
-	protected Text createTextNode(Document doc, Translator map, String text) {
-		String nonnulltext = (text != null) ? text : ""; //$NON-NLS-1$
-		return map.isCDATAContent() ? doc.createCDATASection(nonnulltext) : doc.createTextNode(nonnulltext);
-	}
-
-	protected String extractReadAheadName() {
-		if (!fTranslator.hasReadAheadNames())
-			return null;
-		String readAheadName = null;
-
-		ReadAheadHelper helper = fTranslator.getReadAheadHelper(fNode.getNodeName());
-		if (helper == null)
-			return null;
-
-		Node child = null;
-		String[] names = helper.getValues();
-		if (helper.getChildDOMName() == null) {
-			for (int i = 0; i < names.length; i++) {
-				child = DOMUtilities.getNodeChild(fNode, names[i]);
-				if (child != null) {
-					readAheadName = names[i];
-					break;
-				}
-			}
-		} else {
-			child = DOMUtilities.getNodeChild(fNode, helper.getChildDOMName());
-			if (child != null)
-				readAheadName = DOMUtilities.getChildText(child);
-		}
-		if (readAheadName == null)
-			readAheadName = names[0];
-		return readAheadName;
-	}
-
-	/**
-	 * Extracts the text from <node>and converts it to an object suitable for setting into <feature>
-	 */
-	protected Object extractValue(Node node, Translator map, EObject emfObject) {
-
-		// Extract the value from the text child
-		Node textNode = DOMUtilities.getChildTextNode(node);
-		String trimmedValue = null;
-		if (textNode != null)
-			trimmedValue = textNode.getNodeValue();
-		try {
-			return map.convertStringToValue(trimmedValue, emfObject);
-		} catch (FeatureValueConversionException ex) {
-			handleFeatureValueConversionException(ex);
-			return null;
-		}
-	}
-
-	/**
-	 * @param ex
-	 */
-	protected void handleFeatureValueConversionException(FeatureValueConversionException ex) {
-		throw ex;
-
-	}
-
-	/*
-	 * Finds the child node that <map> specifies. If there is more than one child that satisfies
-	 * <map> then the first one is returned.
-	 * 
-	 * This method traverses past the domPath if one is specified in the <map>.
-	 */
-	protected Node findDOMNode(Node parent, Translator map) {
-		return findDOMNode(parent, map, false);
-	}
-
-	/*
-	 * Finds the child node that <map> specifies. If there is more than one child that satisfies
-	 * <map> then the first one is returned. The <addAdapters> boolean is used to determine if the
-	 * receiver is added as an adapter to every node found on the path.
-	 * 
-	 * This method traverses past the domPath if one is specified in the <map>.
-	 */
-	protected Node findDOMNode(Node parent, Translator map, boolean addAdapters) {
-
-		// First, trace down the path
-		Node curNode = findDOMPath(parent, map, addAdapters);
-		if (map.isDOMTextValue() || map.isDOMAttribute() || curNode == null)
-			return curNode;
-
-		// Now look for the first DOM name we can find
-		String[] domNames = map.getDOMNames();
-		Node node = null;
-		for (int i = 0; i < domNames.length; i++) {
-			String nodeName = domNames[i];
-			List nodes = DOMUtilities.getNodeChildren(curNode, nodeName);
-			if (nodes != null && !nodes.isEmpty()) {
-				if (nodes.size() > 1)
-					handleInvalidMultiNodes(nodeName);
-				node = (Node) nodes.get(0);
-				if (node != null) {
-					if (addAdapters)
-						addDOMAdapter(curNode);
-					break;
-				}
-			}
-		}
-		return node;
-	}
-
-	protected void handleInvalidMultiNodes(String nodeName) {
-		throw new IllegalStateException(WFTUtilsResourceHandler.getString(WFTUtilsResourceHandler.EMF2DOMAdapterImpl_ERROR_0, new Object[]{nodeName}));
-	}
-
-	/**
-	 * Creates the path specified by <map>under <node>. Only the portion of the path that does not
-	 * exist (if any) is created
-	 * 
-	 * @param node
-	 *            org.w3c.dom.Node
-	 * @param map
-	 *            com.ibm.etools.mof2dom.Translator
-	 */
-	protected Text findOrCreateTextNode(Node parent, Translator map, String text) {
-		Text textNode = DOMUtilities.getChildTextNode(parent);
-		if (textNode != null) {
-			textNode.setData(text);
-		} else {
-			textNode = createTextNode(parent.getOwnerDocument(), map, text);
-			if (!isEmptyTag((Element) parent)) {
-				DOMUtilities.insertBeforeNode(parent, textNode, null);
-			}
-			else
-			{
-				parent.appendChild(textNode);
-			}
-		}
-		return textNode;
-	}
-
-	protected Translator findTranslator(String tagName, boolean attributeMap) {
-		Translator[] maps = getChildTranslators();
-		for (int i = 0; i < maps.length; i++) {
-			Translator map = maps[i];
-			if (map.isMapFor(tagName) && attributeMap == map.isDOMAttribute())
-				return maps[i];
-		}
-
-		return null;
-	}
-
-	protected EMF2DOMAdapter getExistingAdapter(Node aNode) {
-		EMF2DOMAdapter adapter = primGetExistingAdapter(aNode);
-		if (adapter != null && adapter.isMOFProxy()) {
-			removeDOMAdapter(aNode, adapter);
-			adapter.getTarget().eAdapters().remove(adapter);
-			adapter = null;
-		}
-		return adapter;
-	}
-
-	protected void handleDependencyFeature(Notification msg) {
-		if (msg.getOldValue() != null)
-			removeDependencyAdapter((EObject) msg.getOldValue());
-		if (msg.getNewValue() != null)
-			addDependencyAdapter((EObject) msg.getNewValue());
-	}
-
-	protected boolean isDependencyFeature(Notification msg) {
-		switch (msg.getEventType()) {
-			case Notification.SET :
-				return fTranslator.isDependencyParent() && fTranslator.getDependencyFeature() == msg.getFeature();
-			default :
-				return false;
-		}
-	}
-
-	protected boolean isEmptyTag(Element parent) {
-		Revisit.toDo();
-		//Determine how to implement this with pure DOM apis, if possible.
-		return false;
-	}
-
-	protected void postUpdateDOMFeature(Translator map, Node node, EObject mofObject) {
-	}
-
-	protected void preUpdateDOMFeature(Translator map, Node node, EObject mofObject) {
-	}
-
-	/**
-	 * Update an attribute of the target DOM object from with the values currently stored in the MOF
-	 * object. The
-	 * 
-	 * @map specifies the name of the MOF attribute to update and the name of the DOM node.
-	 * 
-	 * @param map
-	 *            com.ibm.etools.mof2dom.AttributeTranslator
-	 */
-	protected void primUpdateDOMFeature(Translator map, Node node, EObject mofObject) {
-		Object attrValue = null;
-		boolean isSet = false;
-		if (map.isIDMap()) {
-			try {
-				attrValue = map.getMOFValue(mofObject);
-			} catch (IDTranslator.NoResourceException ex) {
-				//If the object has been removed from the resource,
-				//No need to update
-				return;
-			}
-			isSet = attrValue != null;
-		} else {
-			attrValue = map.getMOFValue(mofObject);
-			isSet = map.isSetMOFValue(mofObject);
-		}
-
-		if (map.isDOMAttribute()) {
-			// An attribute of the MOF object maps to an attribute of the
-			// DOM node. Get the value of the MOF attribute and set it
-			// into DOM node.
-			Element e = (Element) createDOMPath(node, map);
-			if (attrValue != null && isSet)
-				e.setAttribute(map.getDOMName(mofObject), map.convertValueToString(attrValue, mofObject));
-			else
-				e.removeAttribute(map.getDOMName(mofObject));
-		} else {
-			updateDOMSubtree(map, node, mofObject, attrValue);
-		}
-	}
-
-	/**
-	 * Update an attribute of the target DOM object from with the values currently stored in the MOF
-	 * object. The
-	 * 
-	 * @map specifies the name of the MOF attribute to update and the name of the DOM node.
-	 */
-	protected void primUpdateDOMLinkFeature(Translator map, Node node, EObject mofObject) {
-		LinkUpdaterTarget.INSTANCE.updateDOM(map, node, mofObject);
-
-	}
-
-	/**
-	 * Update all the children of the target MOF object in the relationship described by
-	 * 
-	 * @map.
-	 */
-	protected void primUpdateDOMMultiFeature(Translator map, Node node, EObject mofObject) {
-
-		List mofChildren = map.getMOFChildren(mofObject);
-		List domChildren = getDOMChildren(node, map);
-
-		primUpdateDOMMultiFeature(map, node, mofChildren, domChildren, mofObject);
-	}
-
-	/**
-	 * Update an attribute of the target MOF object from the DOM node subtree. The
-	 * 
-	 * @map specifies the name of the MOF attribute to update and the name of the DOM node.
-	 */
-	protected boolean primUpdateMOFFeature(Translator map, Node node, EObject mofObject) {
-		if (!map.featureExists(mofObject))
-			return false;
-		Object domValue = null;
-		boolean updateMOFAttAdapter = false;
-		boolean isUnset = false;
-		EMF2DOMAdapter attrAdapter = null;
-
-		Node child = findDOMNode(node, map, true);
-
-		if (map.isDOMAttribute() && child != null) {
-			// An attribute of the MOF object maps to an attribute of the
-			// DOM node. Get the value of the DOM attribute and set it
-			// into the MOF object.
-
-			Attr domAttr = (Attr) child.getAttributes().getNamedItem(map.getDOMName(mofObject));
-			if (domAttr != null) {
-				domValue = domAttr.getValue();
-				try {
-					domValue = map.convertStringToValue((String) domValue, mofObject);
-				} catch (FeatureValueConversionException e) {
-					handleFeatureValueConversionException(e);
-					domValue = null;
-				}
-
-			} else
-				isUnset = true;
-		} else {
-			// An attribute of the MOF object is actually a sub-element
-			// of the DOM node. Search for the first sub-element with
-			// the correct name to use as an attribute.
-			if (child != null) {
-				// Check to see if this is a single valued attribute that has
-				// a MOF object as its value
-				if (!map.isManagedByParent()) {
-					attrAdapter = createAdapter(child, map);
-					updateMOFAttAdapter = true;
-					domValue = attrAdapter.getTarget();
-				} else {
-					// Check to make sure the child is adapted. If not, adapt
-					// it.
-					addDOMAdapter(child);
-
-					// Extract the value from the text child
-					domValue = extractValue(child, map, mofObject);
-				}
-			} else
-				isUnset = true;
-		}
-
-		// Set the attribute extracted from the DOM to the MOF object.
-		boolean hasChanged = true;
-		try {
-			if (map.isIDMap())
-				map.setMOFValue(mofObject, domValue);
-			else {
-				Object oldValue = null;
-				oldValue = map.getMOFValue(mofObject);
-				boolean isSet = map.isSetMOFValue(mofObject);
-				//In the case of enums with default values, we need to trip
-				// the attribute from
-				//default to a set value
-				if (oldValue == domValue) {
-					if (oldValue == null || isSet)
-						hasChanged = false;
-				} else if (domValue == null && !isSet)
-					//If the domValue is null and the feature is not set, then
-					// we don't need
-					//to do anything
-					hasChanged = false;
-				else if (oldValue != null && oldValue.equals(domValue) && isSet)
-					hasChanged = false;
-				if (oldValue == null && domValue == null && map.isSetMOFValue(mofObject) == isUnset)
-					hasChanged = true;
-				if (hasChanged) {
-					if (!(map.isDataType()) && !map.isShared())
-						removeMOFValue((EObject) oldValue, map);
-					if (domValue == null)
-						map.unSetMOFValue(mofObject);
-					else
-						map.setMOFValue(mofObject, domValue);
-
-					if ((domValue == null && !(map.isEnumFeature())) || isUnset)
-						map.unSetMOFValue(mofObject); //unset
-					// null
-					// for
-					// non
-					// enum
-					// features
-
-					if (updateMOFAttAdapter && attrAdapter != null)
-						attrAdapter.updateMOF();
-				}
-			}
-		} catch (FeatureValueConversionException ex) {
-			handleFeatureValueConversionException(ex);
-			map.unSetMOFValue(mofObject);
-		}
-		return hasChanged;
-	}
-
-	/**
-	 * Update an attribute of the target MOF object from the DOM node subtree. This method is only
-	 * called if the DOM node changes and the map is an object link map. The
-	 * 
-	 * @map specifies the name of the MOF attribute to update and the name of the DOM node.
-	 * 
-	 * @param map
-	 *            com.ibm.etools.mof2dom.AttributeTranslator
-	 * @return Return true if the MOF feature was updated, false if no update was done.
-	 */
-	protected void primUpdateMOFLinkFeature(Translator map, Node node, EObject mofObject) {
-		LinkUpdaterTarget.INSTANCE.updateMOF(map, node, mofObject);
-	}
-
-	/**
-	 * Update all the children of the target MOF object in the relationship described by
-	 * 
-	 * @map.
-	 * 
-	 * @param map
-	 *            com.ibm.etools.mof2dom.AttributeTranslator Describes the mapping from the MOF
-	 *            attribute name to the DOM node name
-	 */
-	protected void primUpdateMOFMultiFeature(Translator map, Node node, EObject mofObject) {
-		// If the feature is a collection of strings or ints, call a special
-		// method
-		// that handles this.
-		if (map.isManagedByParent()) {
-			updateMOFMultiPrimitiveFeature(map, node, mofObject);
-			return;
-		}
-
-		List nodeChildren = getDOMChildren(node, map);
-		List mofChildren = map.getMOFChildren(mofObject);
-
-		primUpdateMOFMultiFeature(map, node, mofChildren, nodeChildren);
-	}
-
-	protected void removeDependencyAdapter(EObject obj) {
-		Adapter existing = EcoreUtil.getExistingAdapter(obj, DependencyAdapter.KEY);
-		if (existing != null)
-			obj.eAdapters().remove(existing);
-	}
-
-	/**
-	 * Removes all the DOM children from <parent>that are represented by <map>.
-	 */
-	protected void removeDOMChildren(Node parent, Translator map) {
-		String[] domNames = map.getDOMNames();
-		HashSet domNamesSet = new HashSet(domNames.length);
-		for (int i = 0; i < domNames.length; i++)
-			domNamesSet.add(domNames[i]);
-
-		// Walk through all the children and find any that match the map.
-		NodeList nl = parent.getChildNodes();
-		List toRemove = new ArrayList();
-		for (int i = 0; i < nl.getLength(); i++) {
-			Node childNode = nl.item(i);
-			if (domNamesSet.contains(childNode.getNodeName()))
-				toRemove.add(childNode);
-		}
-
-		// Remove any children that were found.
-		for (int i = 0; i < toRemove.size(); i++) {
-			Node childNode = (Node) toRemove.get(i);
-			removeDOMChild(parent, childNode, true);
-		}
-	}
-
-	protected void setTargetFromNode() {
-		setTarget(fTranslator.createEMFObject(fNode.getNodeName(), extractReadAheadName()));
-	}
-
-	/**
-	 * Update an attribute of the target DOM object from with the values currently stored in the MOF
-	 * object. The
-	 * 
-	 * @map specifies the name of the MOF attribute to update and the name of the DOM node.
-	 * 
-	 * @param map
-	 *            com.ibm.etools.mof2dom.AttributeTranslator
-	 */
-	final public void updateDOMFeature(Translator map, Node node, EObject mofObject) {
-		if (!isNotificationEnabled())
-			return;
-		try {
-			preUpdateDOMFeature(map, node, mofObject);
-			if (map.isMultiValued()) {
-				updateDOMMultiFeature(map, node, mofObject);
-				return;
-			}
-
-			if (fDebug) {
-				EcoreUtilitiesPlugin.logError("Updating DOM Node: " + node); //$NON-NLS-1$
-				EcoreUtilitiesPlugin.logError("\tfrom: " + mofObject); //$NON-NLS-1$
-				EcoreUtilitiesPlugin.logError("\tmap : " + map); //$NON-NLS-1$
-			}
-			boolean notificationFlag = isNotificationEnabled();
-			try {
-				setNotificationEnabled(false);
-				primUpdateDOMFeature(map, node, mofObject);
-			} finally {
-				setNotificationEnabled(notificationFlag);
-			}
-
-			if (map.isTargetLinkMap()) {
-				updateDOMLinkFeature(map, node, mofObject);
-			}
-		} finally {
-			postUpdateDOMFeature(map, node, mofObject);
-		}
-	}
-
-	/**
-	 * Update an attribute of the target DOM object from the values currently stored in the MOF
-	 * object. The
-	 * 
-	 * @map specifies the name of the MOF attribute to update and the name of the DOM node.
-	 * 
-	 * @param map
-	 *            com.ibm.etools.mof2dom.AttributeTranslator
-	 */
-	final protected void updateDOMLinkFeature(Translator map, Node node, EObject mofObject) {
-		if (fDebug) {
-			EcoreUtilitiesPlugin.logError("Updating DOM Node (link): " + node); //$NON-NLS-1$
-			EcoreUtilitiesPlugin.logError("\tfrom: " + mofObject); //$NON-NLS-1$
-			EcoreUtilitiesPlugin.logError("\tmap : " + map); //$NON-NLS-1$
-		}
-		primUpdateDOMLinkFeature(map, node, mofObject);
-	}
-
-	/**
-	 * Update all the children of the target MOF object in the relationship described by
-	 * 
-	 * @map.
-	 * 
-	 * @param map
-	 *            com.ibm.etools.mof2dom.AttributeTranslator Describes the mapping from the MOF
-	 *            attribute name to the DOM node name
-	 */
-	final protected void updateDOMMultiFeature(Translator map, Node node, EObject mofObject) {
-		if (fDebug) {
-			EcoreUtilitiesPlugin.logError("Updating DOM Node (multi): " + node); //$NON-NLS-1$
-			EcoreUtilitiesPlugin.logError("\tfrom: " + mofObject); //$NON-NLS-1$
-			EcoreUtilitiesPlugin.logError("\tmap : " + map); //$NON-NLS-1$
-		}
-		boolean notificationFlag = isNotificationEnabled();
-		try {
-			setNotificationEnabled(false);
-			primUpdateDOMMultiFeature(map, node, mofObject);
-		} finally {
-			setNotificationEnabled(notificationFlag);
-		}
-	}
-
-	/**
-	 * Update a DOM subtree to reflect the mofObject and map passed in. The subtree is of <node>is
-	 * updated.
-	 */
-	protected void updateDOMSubtree(Translator map, Node node, EObject mofObject, Object attrValue) {
-		Object innerAttrValue = attrValue;
-		if (map.featureExists(mofObject)) {
-			if ((map.isEnumFeature() || map.isBooleanFeature()) && (map.isUnsettable() && !map.isSetMOFValue(mofObject)))
-				innerAttrValue = null;
-		} else
-			innerAttrValue = map.extractStringValue(mofObject);
-
-		// Create and/or update the DOM subtree
-		if (innerAttrValue != null) {
-			Node parent = createDOMPath(node, map);
-			if (map.isManagedByParent()) {
-				// Handle the case where the mof value is not another
-				// mof object (primitive)
-				if (map.getDOMName(mofObject) != null && map.getDOMName(mofObject).startsWith("#")) //$NON-NLS-1$
-					return;
-
-				Element child = map.isDOMTextValue() ? (Element) parent : findOrCreateNode(parent, map, map.getDOMName(mofObject));
-
-				findOrCreateTextNode(child, map, map.convertValueToString(innerAttrValue, mofObject));
-			} else {
-				// Handle the case were the mof value is a mof object.
-				EObject mofValue = (EObject) innerAttrValue;
-				EMF2DOMAdapter valueAdapter = (EMF2DOMAdapter) EcoreUtil.getExistingAdapter(mofValue, EMF2DOMAdapter.ADAPTER_CLASS);
-				if (valueAdapter != null)
-					valueAdapter.updateDOM();
-				else {
-					removeDOMChildren(parent, map);
-					EMF2DOMAdapter adapter = createAdapter(mofValue, map);
-					List mofChildren = map.getMOFChildren(mofObject);
-					List domChildren = getDOMChildren(parent, map);
-
-					Node insertBeforeNode = findInsertBeforeNode(parent, map, mofChildren, 0, domChildren);
-					DOMUtilities.insertBeforeNodeAndWhitespace(parent, adapter.getNode(), insertBeforeNode);
-					boolean notificationFlag = adapter.isNotificationEnabled();
-					adapter.setNotificationEnabled(false);
-					try {
-						indent(adapter.getNode(), map);
-					} finally {
-						adapter.setNotificationEnabled(notificationFlag);
-					}
-					adapter.updateDOM();
-				}
-			}
-		} else {
-			// The attribute value was set to null or unset. Remove any
-			// existing DOM nodes.
-			Node child = findDOMNode(node, map);
-			if (child != null)
-				removeDOMChild(child.getParentNode(), child);
-		}
-	}
-
-	/**
-	 * Update a feature that is set by linking to another existing object. This method is called
-	 * when the MOF object is updated in order to update DOM nodes.
-	 */
-	final protected void updateMOFLinkFeature(Translator map, Node node, EObject mofObject) {
-		if (fDebug) {
-			EcoreUtilitiesPlugin.logError("Updating MOFObject (link): " + mofObject); //$NON-NLS-1$
-			EcoreUtilitiesPlugin.logError("\tfrom: " + node); //$NON-NLS-1$
-			EcoreUtilitiesPlugin.logError("\tmap : " + map); //$NON-NLS-1$
-		}
-		boolean notificationFlag = isNotificationEnabled();
-		try {
-			setNotificationEnabled(false);
-			primUpdateMOFLinkFeature(map, node, mofObject);
-		} finally {
-			setNotificationEnabled(notificationFlag);
-		}
-	}
-
-	/**
-	 * Update all the children of the target MOF object in the relationship described by
-	 * 
-	 * @map.
-	 * 
-	 * @param map
-	 *            com.ibm.etools.mof2dom.AttributeTranslator Describes the mapping from the MOF
-	 *            attribute name to the DOM node name
-	 */
-	final protected void updateMOFMultiFeature(Translator map, Node node, EObject mofObject) {
-		if (fDebug) {
-			EcoreUtilitiesPlugin.logError("Updating MOFObject (multi): " + mofObject); //$NON-NLS-1$
-			EcoreUtilitiesPlugin.logError("\tfrom: " + node); //$NON-NLS-1$
-			EcoreUtilitiesPlugin.logError("\tmap : " + map); //$NON-NLS-1$
-		}
-		boolean notificationFlag = isNotificationEnabled();
-		try {
-			setNotificationEnabled(false);
-			primUpdateMOFMultiFeature(map, node, mofObject);
-		} finally {
-			setNotificationEnabled(notificationFlag);
-		}
-	}
-
-	/**
-	 * Update all the children of the target MOF object in the relationship described by
-	 * 
-	 * @map. The relationship MUST BE a collection of string for this method to work.
-	 */
-	protected void updateMOFMultiPrimitiveFeature(Translator map, Node node, EObject mofObject) {
-		List nodeChildren = getDOMChildren(node, map);
-
-		map.clearList(mofObject);
-
-		// Go through the list of nodes and update the MOF collection
-		int addIndex = 0;
-		for (int i = 0; i < nodeChildren.size(); i++) {
-			Node child = (Node) nodeChildren.get(i);
-			Object attributeValue = extractValue(child, map, mofObject);
-			boolean advanceAddIndex = true;
-			if (attributeValue != null){
-				if(map.getFeature() != null && map.getFeature().isUnique() && mofObject.eGet(map.getFeature()) != null && mofObject.eGet(map.getFeature()) instanceof List && ((List) mofObject.eGet(map.getFeature())).contains(attributeValue)){
-					advanceAddIndex = false;
-					String domName = map.domNameAndPath != null ? map.domNameAndPath : "attribute"; //$NON-NLS-1$
-					EcoreUtilitiesPlugin.logError(new IllegalArgumentException("The 'no duplicates' constraint is violated by "+domName+" = "+attributeValue)); //$NON-NLS-1$ //$NON-NLS-2$
-					handleInvalidMultiNodes(child.getNodeName());
-				} else {
-					map.setMOFValue(mofObject, attributeValue, addIndex);
-				}
-				if(advanceAddIndex){
-					addIndex ++;
-				}
-			}
-			
-			// Adapt the node so update will occur.
-			addDOMAdapter(child);
-		}
-		if (map.hasDOMPath() && nodeChildren.isEmpty() && findDOMPath(node, map, false) != null)
-			map.setMOFValueFromEmptyDOMPath(mofObject);
-	}
-
-	/**
-	 * Update an attribute of the target MOF object from the DOM node subtree. The
-	 * 
-	 * @map specifies the name of the MOF attribute to update and the name of the DOM node.
-	 * 
-	 * @param map
-	 *            com.ibm.etools.mof2dom.AttributeTranslator
-	 */
-	public void updateMOFFeature(Translator map, Node node, EObject mofObject) {
-		if (!isNotificationEnabled())
-			return;
-		if (map.isMultiValued()) {
-			updateMOFMultiFeature(map, node, mofObject);
-			return;
-		} else if (map.isComment()) {
-			updateMOFCommentFeature(map, node, mofObject);
-			return;
-		}
-
-		// TODO MDE Add a map.isComment() and updateMOFCommentFeature(map, node, mofObject);
-
-		if (fDebug) {
-			EcoreUtilitiesPlugin.logError("Updating MOFObject: " + mofObject); //$NON-NLS-1$
-			EcoreUtilitiesPlugin.logError("\tfrom: " + node); //$NON-NLS-1$
-			EcoreUtilitiesPlugin.logError("\tmap : " + map); //$NON-NLS-1$
-		}
-		boolean notificationFlag = isNotificationEnabled();
-		boolean hasChanged = false;
-		try {
-			setNotificationEnabled(false);
-			hasChanged = primUpdateMOFFeature(map, node, mofObject);
-		} finally {
-			setNotificationEnabled(notificationFlag);
-		}
-
-		if (map.isTargetLinkMap() && hasChanged)
-			updateMOFLinkFeature(map, node, mofObject);
-	}
-
-	/**
-	 * @param map
-	 * @param node
-	 * @param mofObject
-	 */
-	public void updateMOFCommentFeature(Translator map, Node node, EObject mofObject) {
-		Node commentNode = node;
-		/* scan up the dom to find the first comment node before this node */
-		while ((commentNode = commentNode.getPreviousSibling()) != null && commentNode.getNodeType() != Node.COMMENT_NODE) {
-			/* no comment available */
-			if (commentNode.getNodeType() == Node.ELEMENT_NODE)
-				return;
-		}
-		if (commentNode != null)
-			map.setMOFValue(mofObject, commentNode.getNodeValue());
-
-	}
-
-}
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/EMF2DOMRenderer.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/EMF2DOMRenderer.java
deleted file mode 100644
index d07e3c4..0000000
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/EMF2DOMRenderer.java
+++ /dev/null
@@ -1,267 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 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
- *******************************************************************************/
-package org.eclipse.wst.common.internal.emf.resource;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.util.HashMap;
-import java.util.Map;
-
-import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.transform.OutputKeys;
-import javax.xml.transform.Transformer;
-import javax.xml.transform.TransformerConfigurationException;
-import javax.xml.transform.TransformerException;
-import javax.xml.transform.TransformerFactory;
-import javax.xml.transform.TransformerFactoryConfigurationError;
-import javax.xml.transform.dom.DOMSource;
-import javax.xml.transform.stream.StreamResult;
-
-import org.eclipse.emf.common.util.WrappedException;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.wst.common.internal.emf.plugin.EcoreUtilitiesPlugin;
-import org.eclipse.wst.common.internal.emf.utilities.DOMLoadOptions;
-import org.eclipse.wst.common.internal.emf.utilities.DOMUtilities;
-import org.eclipse.wst.common.internal.emf.utilities.Revisit;
-import org.w3c.dom.Document;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import org.xml.sax.SAXException;
-
-
-
-public class EMF2DOMRenderer extends AbstractRendererImpl {
-
-	protected Map domAdapterRegistry;
-	protected boolean needsToCreateDOM = true;
-	protected Document document;
-
-	/**
-	 * Constructor for DOMRendererImpl.
-	 */
-	public EMF2DOMRenderer() {
-		super();
-		if (managesDOMAdapters())
-			initDOMAdapterRegistry();
-	}
-
-	/**
-	 * @see com.ibm.etools.emf2xml.Renderer#doLoad(InputStream, Map)
-	 */
-	public void doLoad(InputStream in, Map options) throws IOException {
-		if ((in != null) || !useStreamsForIO()) {
-			loadDocument(in, options);
-			EMF2DOMAdapter adapter = createRootDOMAdapter();
-			adapter.updateMOF();
-		}
-	}
-
-	protected void loadDocument(InputStream in, Map options) throws IOException {
-		try {
-			DOMLoadOptions domOpts = new DOMLoadOptions();
-			domOpts.setAllowJavaEncodings(true);
-			domOpts.setExpandEntityRefererences(true);
-			domOpts.setValidate(isValidating());
-			document = DOMUtilities.loadDocument(in, domOpts, getResource().getEntityResolver());
-			needsToCreateDOM = false;
-		} catch (RuntimeException t_rex) {
-			throw t_rex;
-		} catch (IOException iox) {
-			throw iox;
-		} catch (Exception ex) {
-			throw new WrappedException(ex);
-		}
-	}
-
-
-	/**
-	 * @see com.ibm.etools.emf2xml.Renderer#doSave(OutputStream, Map)
-	 */
-	public void doSave(OutputStream outputStream, Map options) throws IOException {
-		createDOMTreeIfNecessary();
-		serializeDocument(outputStream);
-	}
-
-	/**
-	 * Subclasses should override if adapters are not cached within this renderer, e.g., they are
-	 * stored in notifying Nodes
-	 */
-	protected boolean managesDOMAdapters() {
-		return true;
-	}
-
-	protected void initDOMAdapterRegistry() {
-		if (domAdapterRegistry == null)
-			domAdapterRegistry = new HashMap();
-	}
-
-	public void registerDOMAdapter(Node node, EMF2DOMAdapter adapter) {
-		domAdapterRegistry.put(node, adapter);
-	}
-
-	public EMF2DOMAdapter getExistingDOMAdapter(Node node) {
-		return (EMF2DOMAdapter) domAdapterRegistry.get(node);
-	}
-
-	public void removeDOMAdapter(Node aNode, EMF2DOMAdapter anAdapter) {
-		domAdapterRegistry.remove(aNode);
-	}
-
-	/**
-	 * @see com.ibm.etools.emf2xml.Renderer#prepareToAddContents()
-	 */
-	public void prepareToAddContents() {
-		// createDOMTreeIfNecessary();
-	}
-
-	protected Node createDOMTree() {
-		createDocument();
-		EMF2DOMAdapter adapter = createRootDOMAdapter();
-		adapter.updateDOM();
-		needsToCreateDOM = false;
-		return document;
-	}
-
-
-	protected EMF2DOMAdapter createRootDOMAdapter() {
-		EMF2DOMAdapter root = new EMF2DOMAdapterImpl(getResource(), document, this, getResource().getRootTranslator());
-		registerDOMAdapter(document, root);
-		return root;
-	}
-
-
-	protected void createDOMTreeIfNecessary() {
-		if (needsToCreateDOM)
-			createDOMTree();
-	}
-
-	/**
-	 * Create a new Document given
-	 * 
-	 * @aResource.
-	 */
-	protected void createDocument() {
-		TranslatorResource res = getResource();
-		res.setDefaults();
-		try {
-			document = DOMUtilities.createNewDocument(res.getDoctype(), res.getPublicId(), res.getSystemId());
-		} catch (ParserConfigurationException e) {
-			throw new WrappedException(e);
-		} catch (SAXException e) {
-			throw new WrappedException(e);
-		} catch (IOException e) {
-			throw new WrappedException(e);
-		}
-	}
-
-	public void serializeDocument(OutputStream out) throws IOException {
-		/*
-		 * OutputFormat format = createOutputFormat(); Serializer serializer =
-		 * SerializerFactory.getSerializerFactory(Method.XML).makeSerializer(out, format);
-		 * serializer.asDOMSerializer().serialize(document);
-		 */
-		try {
-			TransformerFactory factory = TransformerFactory.newInstance();
-			/*
-			 * try { factory.setAttribute(JAXP_SCHEMA_LANGUAGE, W3C_XML_SCHEMA); } catch
-			 * (IllegalArgumentException x) { }
-			 */
-			Transformer transformer = factory.newTransformer();
-
-			transformer.setOutputProperty(OutputKeys.ENCODING, getResource().getEncoding());
-			transformer.setOutputProperty(OutputKeys.VERSION, getResource().getXMLVersion());
-			transformer.setOutputProperty(OutputKeys.METHOD, "xml"); //$NON-NLS-1$
-			transformer.setOutputProperty(OutputKeys.OMIT_XML_DECLARATION, "no"); //$NON-NLS-1$
-			if (getResource().getPublicId() != null)
-				transformer.setOutputProperty(OutputKeys.DOCTYPE_PUBLIC, getResource().getPublicId());
-			if (getResource().getSystemId() != null)
-				transformer.setOutputProperty(OutputKeys.DOCTYPE_SYSTEM, getResource().getSystemId());
-			transformer.setOutputProperty(OutputKeys.INDENT, "yes"); //$NON-NLS-1$            
-			transformer.setOutputProperty("{http://xml.apache.org/xslt}indent-amount", "4"); //$NON-NLS-1$ //$NON-NLS-2$
-			DOMSource source = new DOMSource(document.getDocumentElement());
-			/* source.setSystemId(getResource().getSystemId()); */
-			transformer.transform(source, new StreamResult(out));
-		} catch (TransformerConfigurationException e) {
-			EcoreUtilitiesPlugin.logError(e);
-		} catch (TransformerFactoryConfigurationError e) {
-			EcoreUtilitiesPlugin.logError(e);
-		} catch (TransformerException e) {
-			EcoreUtilitiesPlugin.logError(e);
-		} finally {
-		}
-	}
-
-	/*
-	 * protected OutputFormat createOutputFormat() { OutputFormat format = new OutputFormat();
-	 * format.setIndenting(true); format.setLineSeparator(DOMUtilities.NEWLINE_STRING);
-	 * //$NON-NLS-1$ format.setEncoding(getResource().getEncoding());
-	 * format.setVersion(getResource().getXMLVersion()); return format; }
-	 */
-
-	public void replaceDocumentType(String docTypeName, String publicId, String systemId) {
-		Revisit.revisit();
-		Document newDoc = null;
-		// Need be able to update the doctype directly on the existing document; right now can't
-		// because
-		// of limitations on parser neutral apis
-
-		try {
-			newDoc = DOMUtilities.createNewDocument(docTypeName, publicId, systemId);
-		} catch (ParserConfigurationException e) {
-			throw new WrappedException(e);
-		} catch (SAXException e) {
-			throw new WrappedException(e);
-		} catch (IOException e) {
-			throw new WrappedException(e);
-		}
-
-
-		replaceNode(document.getDocumentElement(), newDoc, newDoc);
-		readapt(document, newDoc);
-		document = newDoc;
-	}
-
-	protected void replaceNode(Node oldChild, Node newParent, Document newDoc) {
-		Node newChild = newDoc.importNode(oldChild, false);
-		newParent.appendChild(newChild);
-		readapt(oldChild, newChild);
-		NodeList children = oldChild.getChildNodes();
-		int length = children.getLength();
-		for (int i = 0; i < length; i++) {
-			replaceNode(children.item(i), newChild, newDoc);
-		}
-	}
-
-	@Override
-	public void preUnload() {
-		EMF2DOMAdapter adapter = (EMF2DOMAdapter) EcoreUtil.getAdapter(resource.eAdapters(), EMF2DOMAdapter.ADAPTER_CLASS);
-		if (adapter != null) {
-			adapter.removeAdapters(adapter.getNode());
-		}
-	}
-
-	protected void readapt(Node oldChild, Node newChild) {
-		EMF2DOMAdapter adapter = getExistingDOMAdapter(oldChild);
-		if (adapter != null) {
-			registerDOMAdapter(newChild, adapter);
-			// Some nodes are managed by the parent and thus the
-			// node should not be set on the parent adapter
-			if (adapter.getNode() == oldChild)
-				adapter.setNode(newChild);
-		}
-	}
-
-	public int getVersionID() {
-		return getResource().getVersionID();
-	}
-
-}
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/EMF2DOMRendererFactory.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/EMF2DOMRendererFactory.java
deleted file mode 100644
index ff4fbbb..0000000
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/EMF2DOMRendererFactory.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors: IBM Corporation - initial API and implementation
- **************************************************************************************************/
-package org.eclipse.wst.common.internal.emf.resource;
-
-
-public class EMF2DOMRendererFactory extends RendererFactory {
-
-	public static final EMF2DOMRendererFactory INSTANCE = new EMF2DOMRendererFactory();
-
-	public EMF2DOMRendererFactory() {
-		super();
-	}
-
-	/**
-	 * @see com.ibm.etools.emf2xml.RendererFactory#createRenderer()
-	 */
-	@Override
-	public Renderer createRenderer() {
-		EMF2DOMRenderer renderer = new EMF2DOMRenderer();
-		renderer.setValidating(isValidating());
-		return renderer;
-	}
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/EMF2DOMRendererFactoryDefaultHandler.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/EMF2DOMRendererFactoryDefaultHandler.java
deleted file mode 100644
index 1257a06..0000000
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/EMF2DOMRendererFactoryDefaultHandler.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 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
- *******************************************************************************/
-/*
- * Created on Dec 1, 2003
- *
- * To change the template for this generated file go to
- * Window&gt;Preferences&gt;Java&gt;Code Generation&gt;Code and Comments
- */
-package org.eclipse.wst.common.internal.emf.resource;
-
-
-/**
- * @author schacher
- * 
- * To change the template for this generated type comment go to
- * Window&gt;Preferences&gt;Java&gt;Code Generation&gt;Code and Comments
- */
-public class EMF2DOMRendererFactoryDefaultHandler implements RendererFactoryDefaultHandler {
-
-	public static final EMF2DOMRendererFactoryDefaultHandler INSTANCE = new EMF2DOMRendererFactoryDefaultHandler();
-
-	/**
-	 *  
-	 */
-	protected EMF2DOMRendererFactoryDefaultHandler() {
-		super();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see com.ibm.etools.emf2xml.RendererFactoryDefaultHandler#getDefaultRendererFactory()
-	 */
-	public RendererFactory getDefaultRendererFactory() {
-		return EMF2DOMRendererFactory.INSTANCE;
-	}
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/EMF2SAXDocumentHandler.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/EMF2SAXDocumentHandler.java
deleted file mode 100644
index 540c2af..0000000
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/EMF2SAXDocumentHandler.java
+++ /dev/null
@@ -1,219 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 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
- *******************************************************************************/
-package org.eclipse.wst.common.internal.emf.resource;
-
-
-import java.io.IOException;
-
-import org.eclipse.wst.common.internal.emf.plugin.EcoreUtilitiesPlugin;
-import org.xml.sax.Attributes;
-import org.xml.sax.EntityResolver;
-import org.xml.sax.InputSource;
-import org.xml.sax.SAXException;
-import org.xml.sax.SAXParseException;
-import org.xml.sax.helpers.DefaultHandler;
-
-/**
- * The EMF2SAXDocumentHandler is utilized by the SAX parser to announce XML Events, such as
- * beginning and end of XML elements and the contents of those elements.
- * 
- * @author mdelder
- */
-public class EMF2SAXDocumentHandler extends DefaultHandler {
-
-	private TranslatorResource resource = null;
-	private final CacheEventStack eventStack = new CacheEventStack();
-	private CacheEventPool availableEventPool = new CacheEventPool();
-
-	/**
-	 * Create an EMF2SAXDocumentHandler to populate the given resource.
-	 *  
-	 */
-	public EMF2SAXDocumentHandler(TranslatorResource resource) {
-		this.resource = resource;
-	}
-
-	/**
-	 * @see org.xml.sax.helpers.DefaultHandler#resolveEntity(java.lang.String, java.lang.String)
-	 */
-	@Override
-	public InputSource resolveEntity(String publicId, String systemId) throws SAXException {
-		InputSource result = null;
-		this.resource.setDoctypeValues(publicId, systemId);
-
-		try {
-			EntityResolver entityResolver = this.resource.getEntityResolver();
-
-			if (entityResolver != null)
-				result = entityResolver.resolveEntity(publicId, systemId);
-			else
-				result = super.resolveEntity(publicId, systemId);
-		} catch (IOException ioe) {
-			throw new SAXException(ioe);
-		}
-
-		return result;
-	}
-
-	/**
-	 * @see org.xml.sax.ContentHandler#startDocument()
-	 */
-	@Override
-	public void startDocument() throws SAXException {
-		/*
-		 * The endDocument() method should have frozen the pool, or it may not be warmed yet. In
-		 * either case, this method call will do as little work as necessary
-		 */
-		availableEventPool.warmPool();
-
-		/* This line should not be necessary, but is left for safty */
-		eventStack.clear();
-		this.createRoot(this.resource);
-
-	}
-
-	/**
-	 * @see org.xml.sax.ContentHandler#startElement(java.lang.String, java.lang.String,
-	 *      java.lang.String, org.xml.sax.Attributes)
-	 */
-	@Override
-	public void startElement(String uri, String localName, String qName, Attributes attributes) throws SAXException {
-		addToStack(qName, attributes);
-	}
-
-	/**
-	 * @see org.xml.sax.ContentHandler#characters(char[], int, int)
-	 */
-	@Override
-	public void characters(char[] data, int start, int length) throws SAXException {
-
-		CacheEventNode currentRecord = getCurrentRecord();
-		if (currentRecord != null) {
-			currentRecord.appendToBuffer(data, start, length);
-		}
-	}
-
-	/**
-	 * @see org.xml.sax.ContentHandler#endElement(java.lang.String, java.lang.String,
-	 *      java.lang.String)
-	 */
-	@Override
-	public void endElement(String uri, String localName, String qName) throws SAXException {
-
-		CacheEventNode currentRecord = null;
-
-		/*
-		 * This should only happen in the case where the DOMPath was ignored so the stack does not
-		 * quite match with the XML data structure. In this case we do nothing
-		 */
-		if (qName.equals(this.getCurrentRecord().getNodeName())) {
-			currentRecord = this.removeCurrentRecord();
-			if (currentRecord != null) {
-				currentRecord.commit();
-			}
-		}
-	}
-
-	/**
-	 * @see org.xml.sax.ContentHandler#endDocument()
-	 */
-	@Override
-	public void endDocument() throws SAXException {
-		CacheEventNode lastRecord = this.removeCurrentRecord();
-		lastRecord.commit();
-		availableEventPool.freezePool();
-	}
-
-	/**
-	 * @see org.xml.sax.ErrorHandler#error(org.xml.sax.SAXParseException)
-	 */
-	@Override
-	public void error(SAXParseException ex) throws SAXException {
-		throw ex;
-	}
-
-	/**
-	 * @see org.xml.sax.ErrorHandler#fatalError(org.xml.sax.SAXParseException)
-	 */
-	@Override
-	public void fatalError(SAXParseException ex) throws SAXException {
-		throw ex;
-	}
-
-	/**
-	 * @see org.xml.sax.ErrorHandler#warning(org.xml.sax.SAXParseException)
-	 */
-	@Override
-	public void warning(SAXParseException ex) throws SAXException {
-		EcoreUtilitiesPlugin.logWarning(ex);
-	}
-
-	/**
-	 * @return
-	 */
-	public TranslatorResource getResource() {
-		return resource;
-	}
-
-	protected void createRoot(TranslatorResource resourceArg) {
-		this.eventStack.push(availableEventPool.createCacheEventNode(resourceArg));
-	}
-
-	protected void addToStack(String nodeName, Attributes attributes) {
-		CacheEventNode parent = this.getCurrentRecord();
-		if (!parent.isChildIgnorable(nodeName)) {
-			this.eventStack.push(availableEventPool.createCacheEventNode(parent, nodeName, attributes));
-		}
-	}
-
-	/**
-	 * Return the current CENO without removing it from the event stack.
-	 * 
-	 * @return the current CENO without removing it
-	 */
-	protected CacheEventNode getCurrentRecord() {
-		CacheEventNode result = null;
-		if (!this.eventStack.isEmpty()) {
-			result = this.eventStack.peek();
-		}
-		return result;
-	}
-
-	/**
-	 * Return the current CENO and remove it from the event stack.
-	 * 
-	 * @return the current CENO and remove it
-	 */
-	protected CacheEventNode removeCurrentRecord() {
-		CacheEventNode result = null;
-		if (!this.eventStack.isEmpty()) {
-			result = this.eventStack.pop();
-		}
-		return result;
-	}
-
-	//	private final void printStack() {
-	//		// System.out.println("Printing stack ...");
-	//		// for (int i = 0; i < this.eventStack.size(); i++) {
-	//		// debug("stack[" + i + "]: " + eventStack.get(i));
-	//		// }
-	//		// System.out.println("... Printed stack");
-	//	}
-	//
-	//	private final static void debug(Object obj) {
-	//		// System.out.println(obj);
-	//	}
-	//
-	//	private final static void warn(Object obj) {
-	//		//System.err.println(obj);
-	//	}
-
-}
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/EMF2SAXRenderer.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/EMF2SAXRenderer.java
deleted file mode 100644
index 0913c14..0000000
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/EMF2SAXRenderer.java
+++ /dev/null
@@ -1,180 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 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
- *******************************************************************************/
-package org.eclipse.wst.common.internal.emf.resource;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.util.Map;
-
-import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.parsers.SAXParser;
-import javax.xml.parsers.SAXParserFactory;
-import javax.xml.transform.OutputKeys;
-import javax.xml.transform.Transformer;
-import javax.xml.transform.TransformerConfigurationException;
-import javax.xml.transform.TransformerFactory;
-import javax.xml.transform.TransformerFactoryConfigurationError;
-import javax.xml.transform.sax.SAXTransformerFactory;
-import javax.xml.transform.sax.TransformerHandler;
-import javax.xml.transform.stream.StreamResult;
-
-import org.eclipse.emf.common.util.WrappedException;
-import org.eclipse.wst.common.internal.emf.plugin.EcoreUtilitiesPlugin;
-import org.xml.sax.InputSource;
-import org.xml.sax.SAXException;
-import org.xml.sax.SAXNotRecognizedException;
-import org.xml.sax.XMLReader;
-
-/**
- * @author mdelder
- */
-public class EMF2SAXRenderer extends AbstractRendererImpl {
-
-	/**
-	 *  
-	 */
-	public EMF2SAXRenderer() {
-		super();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see com.ibm.etools.emf2xml.Renderer#doLoad(java.io.InputStream, java.util.Map)
-	 */
-	public void doLoad(InputStream in, Map options) throws IOException {
-		try {
-			SAXParserFactory factory = SAXParserFactory.newInstance();
-			factory.setValidating(isValidating());
-			factory.setNamespaceAware(true);
-			/*
-			 * Causes errors in IBM JDK try { factory.setAttribute(JAXP_SCHEMA_LANGUAGE,
-			 * W3C_XML_SCHEMA); } catch (IllegalArgumentException x) { }
-			 */
-			SAXParser parser = factory.newSAXParser();
-			XMLReader reader = parser.getXMLReader();
-			EMF2SAXDocumentHandler handler = new EMF2SAXDocumentHandler(this.getResource());
-			try {
-				reader.setFeature("http://xml.org/sax/features/validation", isValidating()); //$NON-NLS-1$
-			} catch (SAXNotRecognizedException snre) {
-                // ignore exception
-			}
-			try {
-				reader.setFeature("http://xml.org/sax/features/namespace-prefixes", true); //$NON-NLS-1$
-			} catch (SAXNotRecognizedException snre) {
-                // ignore exception
-            }
-			try {
-				reader.setFeature("http://apache.org/xml/features/validation/schema", isValidating()); //$NON-NLS-1$
-			} catch (SAXNotRecognizedException e) {
-				reader.setFeature("http://xml.org/sax/features/validation", false); //$NON-NLS-1$
-				EcoreUtilitiesPlugin.logWarning("Warning: Parser does not support \"http://apache.org/xml/features/validation/schema\". Validation will be disabled."); //$NON-NLS-1$
-			}
-			try {
-				reader.setFeature("http://apache.org/xml/features/allow-java-encodings", true); //$NON-NLS-1$
-			} catch (SAXNotRecognizedException e) {
-				EcoreUtilitiesPlugin.logWarning("Warning: Parser does not support \"http://apache.org/xml/features/allow-java-encodings\"."); //$NON-NLS-1$
-			}
-			/*
-			 * try { reader.setProperty("http://xml.org/sax/properties/lexical-handler", handler); }
-			 * catch (SAXNotRecognizedException e) { }
-			 */
-			reader.setContentHandler(handler);
-			reader.setErrorHandler(handler);
-			//reader.setDTDHandler(handler);
-			reader.setEntityResolver(handler);
-			InputSource testsource = new InputSource(in);
-			reader.parse(testsource);
-		} catch (RuntimeException t_rex) {
-			throw t_rex;
-		} catch (SAXException se) {
-		    throw new WrappedException(se);
-        } catch (ParserConfigurationException e) {
-            throw new WrappedException(e);
-        }
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see com.ibm.etools.emf2xml.Renderer#doSave(java.io.OutputStream, java.util.Map)
-	 */
-	public void doSave(OutputStream outputStream, Map options) throws IOException {
-
-		/*
-		 * try { Serializer serializer =
-		 * SerializerFactory.getSerializerFactory(Method.XML).makeSerializer(outputStream,
-		 * createOutputFormat()); serializer.setOutputByteStream(outputStream); ContentHandler
-		 * handler = serializer.asContentHandler();
-		 */
-
-		TransformerHandler handler = null;
-		try {
-			try {
-				SAXTransformerFactory factory = (SAXTransformerFactory) TransformerFactory.newInstance();
-				handler = factory.newTransformerHandler();
-
-				handler.setResult(new StreamResult(outputStream));
-				Transformer transformer = handler.getTransformer();
-				transformer.setOutputProperty(OutputKeys.INDENT, "yes"); //$NON-NLS-1$
-				transformer.setOutputProperty(OutputKeys.ENCODING, getResource().getEncoding());
-				transformer.setOutputProperty(OutputKeys.VERSION, getResource().getXMLVersion());
-				transformer.setOutputProperty(OutputKeys.METHOD, "xml"); //$NON-NLS-1$
-				transformer.setOutputProperty(OutputKeys.OMIT_XML_DECLARATION, "no"); //$NON-NLS-1$                
-				transformer.setOutputProperty("{http://xml.apache.org/xslt}indent-amount", "4"); //$NON-NLS-1$ //$NON-NLS-2$
-
-				if (getResource().getPublicId() != null)
-					transformer.setOutputProperty(OutputKeys.DOCTYPE_PUBLIC, getResource().getPublicId());
-				if (getResource().getSystemId() != null)
-					transformer.setOutputProperty(OutputKeys.DOCTYPE_SYSTEM, getResource().getSystemId());
-
-			} catch (TransformerConfigurationException e) {
-				EcoreUtilitiesPlugin.logError(e);
-			} catch (TransformerFactoryConfigurationError e) {
-				EcoreUtilitiesPlugin.logError(e);
-			}
-			if (handler == null) {
-				EcoreUtilitiesPlugin.logError("SAX Writer is null"); //$NON-NLS-1$
-				return;
-			}
-			EMF2SAXWriter writer = new EMF2SAXWriter();
-			writer.serialize(this.resource, handler);
-		} catch (SAXException saxe) {
-			throw new WrappedException(saxe);
-		}
-	}
-
-	/*
-	 * protected OutputFormat createOutputFormat() { OutputFormat format = new OutputFormat();
-	 * format.setIndenting(true); format.setLineSeparator(DOMUtilities.NEWLINE_STRING);
-	 * //$NON-NLS-1$ format.setEncoding(getResource().getEncoding());
-	 * format.setVersion(getResource().getXMLVersion()); if (this.resource != null)
-	 * format.setDoctype(this.resource.getPublicId(), this.resource.getSystemId()); return format; }
-	 */
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see com.ibm.etools.emf2xml.Renderer#prepareToAddContents()
-	 */
-	public void prepareToAddContents() {
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see com.ibm.etools.emf2xml.Renderer#getVersionID()
-	 */
-	public int getVersionID() {
-		return getResource().getVersionID();
-	}
-}
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/EMF2SAXRendererFactory.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/EMF2SAXRendererFactory.java
deleted file mode 100644
index a2544d6..0000000
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/EMF2SAXRendererFactory.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 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
- *******************************************************************************/
-/*
- * Created on Aug 19, 2003
- *
- */
-package org.eclipse.wst.common.internal.emf.resource;
-
-
-/**
- * Used to create instances of the EMF2SAXRenderer
- * 
- * @author mdelder
- */
-public class EMF2SAXRendererFactory extends RendererFactory {
-
-	public static final EMF2SAXRendererFactory INSTANCE = new EMF2SAXRendererFactory();
-
-	protected EMF2SAXRendererFactory() {
-		super();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see com.ibm.etools.emf2xml.RendererFactory#createRenderer()
-	 */
-	@Override
-	public Renderer createRenderer() {
-		EMF2SAXRenderer renderer = new EMF2SAXRenderer();
-		renderer.setValidating(isValidating());
-		return renderer;
-	}
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/EMF2SAXWriter.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/EMF2SAXWriter.java
deleted file mode 100644
index 6955734..0000000
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/EMF2SAXWriter.java
+++ /dev/null
@@ -1,387 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.common.internal.emf.resource;
-
-
-import java.util.List;
-import java.util.Stack;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EObject;
-import org.xml.sax.Attributes;
-import org.xml.sax.ContentHandler;
-import org.xml.sax.SAXException;
-import org.xml.sax.helpers.AttributesImpl;
-
-/**
- * The EMF2SAXWriter handles the serialization of EMF Resources using SAX events. SAX events are
- * triggered to the content handler as the tree is being parsed. These events can then be written
- * into any stream wrapped by the ContentHandler.
- * 
- * @author mdelder
- */
-public class EMF2SAXWriter {
-
-	public static final String NAMESPACE = "";//"http://java.sun.com/xml/ns/j2ee"; //$NON-NLS-1$
-
-	/* Used in those cases where no Attributes are necessary */
-	private static final Attributes EMPTY_ATTRIBUTES = new AttributesImpl();
-
-	/**
-	 * Serialize an EMF resource into an XML Stream using the given ContentHandler. Note that this
-	 * method can also be used to copy a given EMF Resource if the EMF2SAXDocumentHandler is used as
-	 * the given ContentHandler.
-	 * 
-	 * @param resource
-	 * @param handler
-	 */
-	public void serialize(TranslatorResource resource, ContentHandler handler) throws SAXException {
-
-		Translator rootTranslator = resource.getRootTranslator();
-		EList contents = resource.getContents();
-
-		if (contents.size() != 1) {
-			throw new IllegalStateException("The contents of a resource may only contain one EMF Model Object."); //$NON-NLS-1$
-		}
-		handler.startDocument();
-		EObject element = (EObject) contents.get(0);
-		serialize(handler, element, rootTranslator, new WriterHints(resource));
-		handler.endDocument();
-
-	}
-
-	private void serialize(ContentHandler handler, EObject target, Translator translator, WriterHints hints) throws SAXException {
-
-		List mofChildren = null;
-		Object rawValue = null;
-		EObject newTarget = null;
-		Translator currentChildTranslator = null;
-		Translator nextTranslator = null;
-		char[] characterData = null;
-		String convertedValue = null;
-		Attributes attributes = null;
-		String childDomName = null;
-		final int version = hints.getVersion();
-
-		/*
-		 * Processing hints are used to remember where are in the iteration of the translator's
-		 * children. see the TranslatorFilter for more information on how this array is used.
-		 */
-		int[] processingHints = TranslatorFilter.createProcessingHints();
-
-		String targetDomName = translator.getDOMName(target);
-
-		attributes = getAttributes(translator, target, hints);
-
-		handler.startElement(NAMESPACE, targetDomName, targetDomName, attributes);
-
-		currentChildTranslator = TranslatorFilter.getNextObjectTranslator(translator, processingHints[TranslatorFilter.NEXT_START_HINT_INDX], processingHints, target, version);
-		while (currentChildTranslator != null) {
-			/* For each Child Translator of the Translator parameter passed into the method */
-
-			/* Does the Translator have any MOF Children? */
-			mofChildren = currentChildTranslator.getMOFChildren(target);
-			openDomPathIfNecessary(handler, hints, currentChildTranslator, target, mofChildren);
-
-			if (currentChildTranslator.isManagedByParent()) {
-				/*
-				 * Translators which are managed by their parents require less processing -- just
-				 * convert their value to a string and write it out as the content of an XML element
-				 */
-				childDomName = currentChildTranslator.getDOMName(target);
-				if (!currentChildTranslator.isEmptyTag()) {
-					/* The Translator is not an Empty tag. Its text content is significant */
-
-					if (mofChildren.size() > 0) {
-						for (int j = 0; j < mofChildren.size(); j++) {
-
-							/* Text only translators will not have open and close XML elements */
-							if (!currentChildTranslator.isDOMTextValue())
-								handler.startElement(NAMESPACE, childDomName, childDomName, EMPTY_ATTRIBUTES);
-
-							rawValue = mofChildren.get(j);
-							/* convertValueToString should always return a non-null String */
-							convertedValue = currentChildTranslator.convertValueToString(rawValue, target);
-							characterData = XMLEncoderDecoder.escape(convertedValue).toCharArray();
-							handler.characters(characterData, 0, characterData.length);
-
-							if (!currentChildTranslator.isDOMTextValue())
-								handler.endElement(NAMESPACE, childDomName, childDomName);
-						}
-					}
-				} else {
-					/*
-					 * The Translator is an Empty Element (its mere presence has significance) (e.g.
-					 * <cascade-delete/>
-					 */
-
-					if (currentChildTranslator.isBooleanFeature()) {
-						/* Boolean features may or may not be rendered */
-						rawValue = mofChildren.get(0);
-						if (rawValue != null && ((Boolean) rawValue).booleanValue()) {
-							handler.startElement(NAMESPACE, childDomName, childDomName, EMPTY_ATTRIBUTES);
-							handler.endElement(NAMESPACE, childDomName, childDomName);
-						}
-
-					} else {
-						/* Always render any other Empty elements */
-						handler.startElement(NAMESPACE, childDomName, childDomName, EMPTY_ATTRIBUTES);
-						handler.endElement(NAMESPACE, childDomName, childDomName);
-					}
-				}
-			} else {
-
-				/* The Translator is a more complex feature, handle its processing recursively */
-				for (int j = 0; j < mofChildren.size(); j++) {
-					newTarget = (EObject) mofChildren.get(j);
-					serialize(handler, newTarget, currentChildTranslator, hints);
-				}
-			}
-
-			/* Fetch the next peer translator */
-			nextTranslator = TranslatorFilter.getNextObjectTranslator(translator, processingHints[TranslatorFilter.NEXT_START_HINT_INDX], processingHints, target, version);
-
-			closeDomPathIfNecessary(handler, hints, currentChildTranslator, nextTranslator, target, mofChildren);
-
-			/*
-			 * We needed to invoke closeDomPathIfNecessary() with the peer, now we move on to
-			 * process that peer
-			 */
-			currentChildTranslator = nextTranslator;
-
-		}
-		handler.endElement(NAMESPACE, targetDomName, targetDomName);
-	}
-
-	/**
-	 * Determines whether or not a DOM Path should be rendered. This method is particularly useful
-	 * for determining whether Empty XML elements are relevant and should be written to the XML
-	 * stream.
-	 * 
-	 * @param target
-	 *            The EMF Target of the Translation
-	 * @param currentChildTranslator
-	 *            The current Translator
-	 * @param mofChildren
-	 *            The mofChildren that were found for the Translator on the Target
-	 * @return
-	 */
-	private boolean shouldRenderDomPath(EObject target, Translator currentChildTranslator, List mofChildren) {
-		return  (currentChildTranslator.shouldRenderEmptyDOMPath(target) || mofChildren.size() > 0);
-	}
-
-	/**
-	 * openDomPathIfNecessary will write the current DOM Path to the serialization stream if it has
-	 * not been written by a previous peer translator. The processing results in the collapse of
-	 * Peer Translators with matching DOM Paths into a single XML parent element.
-	 * 
-	 * @param handler
-	 *            The ContentHandler which is writing the XML result
-	 * @param hints
-	 *            A Global container for information specific to a single XML document
-	 * @param currentChildTranslator
-	 *            The active Translator being processed
-	 * @param target
-	 *            The EMF Target of the Translation
-	 * @throws SAXException
-	 */
-	private void openDomPathIfNecessary(ContentHandler handler, WriterHints hints, Translator currentChildTranslator, EObject target, List mofChildren) throws SAXException {
-
-		/* If the translator does not have a DOM Path, then we do nothing */
-		if (currentChildTranslator.hasDOMPath() && shouldRenderDomPath(target, currentChildTranslator, mofChildren)) {
-
-			String childDomPath = currentChildTranslator.getDOMPath();
-
-			/*
-			 * IsDomPathActive() will verify whether this DOM Path has already been written to the
-			 * XML stream
-			 */
-			if (!hints.isDomPathActive(childDomPath)) {
-
-				/*
-				 * Write an open element for the DOM Path and "remember" that we have written it
-				 */
-				handler.startElement(NAMESPACE, childDomPath, childDomPath, EMPTY_ATTRIBUTES);
-				hints.pushDomPath(childDomPath);
-			}
-
-		}
-	}
-
-	/**
-	 * closeDomPathIfNecessary will determine whether the next peer Translator shares the active DOM
-	 * Path of the current Translator. If the next peer Translator has the same DOM Path, no action
-	 * will be taken (hence condensing the elements into a single XML parent). However, if the DOM
-	 * Path differs (including the Next Peer Translator has no DOM Path) then the current DOM Path
-	 * will be closed (a close XML element is generated.
-	 * 
-	 * @param handler
-	 *            The ContentHandler which is writing the XML result
-	 * @param hints
-	 *            A Global container for information specific to a single XML document
-	 * @param currentChildTranslator
-	 *            The last Translator to have completed processing
-	 * @param nextTranslator
-	 *            The next peer Translator that will become active
-	 * @param target
-	 *            The EMF Target of the Translation
-	 * @throws SAXException
-	 */
-	private void closeDomPathIfNecessary(ContentHandler handler, WriterHints hints, Translator currentChildTranslator, Translator nextTranslator, EObject target, List mofChildren) throws SAXException {
-
-		if (currentChildTranslator.hasDOMPath() && shouldRenderDomPath(target, currentChildTranslator, mofChildren)) {
-			String childDomPath = currentChildTranslator.getDOMPath();
-			if (nextTranslator != null) { /*
-										   * There are more peers after this element, we can peek
-										   * ahead
-										   */
-				String nextPeerDomPath = nextTranslator.getDOMPath();
-				if (nextPeerDomPath == null || !nextPeerDomPath.equals(childDomPath)) {
-					handler.endElement(NAMESPACE, childDomPath, childDomPath);
-					hints.popDomPath();
-				}
-
-			} else { /* This was the last child element, we must close the dompath */
-				handler.endElement(NAMESPACE, childDomPath, childDomPath);
-				hints.popDomPath();
-			}
-		}
-	}
-
-	/**
-	 * Aggregate the Attribute translator children from a given translator. This method will request
-	 * the AttributesImpl object from the WriterHints object. The WriterHints maintains this
-	 * reusable collection to limit the requirement for new object creation.
-	 * 
-	 * @param translator
-	 * @param target
-	 * @param hints
-	 * @return an initialized set of Attributes for the given Translator and EMF Target
-	 */
-	private Attributes getAttributes(Translator translator, EObject target, WriterHints hints) {
-
-		AttributesImpl attributes = hints.getAttributeHolder();
-		int version = hints.getVersion();
-		Object rawValue = null;
-		String convertedValue = null;
-		String childDomName = null;
-		Translator attributeTranslator = null;
-		int[] processingHints = TranslatorFilter.createProcessingHints();
-
-		while ((attributeTranslator = TranslatorFilter.getNextAttributeTranslator(translator, processingHints[TranslatorFilter.NEXT_START_HINT_INDX], processingHints, target, version)) != null) {
-
-			List mofChildren = attributeTranslator.getMOFChildren(target);
-			if (mofChildren.size() > 0) {
-				for (int j = 0; j < mofChildren.size(); j++) {
-
-					childDomName = attributeTranslator.getDOMName(target);
-					rawValue = mofChildren.get(j);
-					convertedValue = attributeTranslator.convertValueToString(rawValue, target);
-					convertedValue = XMLEncoderDecoder.escape(convertedValue);
-					attributes.addAttribute(NAMESPACE, childDomName, childDomName, "String", convertedValue); //$NON-NLS-1$
-				}
-
-			} else {
-				childDomName = attributeTranslator.getDOMName(target);
-				convertedValue = (String) attributeTranslator.getMOFValue(target);
-				if (convertedValue != null)
-					attributes.addAttribute(NAMESPACE, childDomName, childDomName, "String", convertedValue); //$NON-NLS-1$
-			}
-		}
-		return attributes;
-	}
-
-	/**
-	 * WriterHints is used to "remember" certain pieces of information while the writer is
-	 * processing. Of particular interest are the version and the state of the DOM Path output.
-	 * Consecutive elements with consistent (identical) DOM Paths are collapsed under a single XML
-	 * element.
-	 * 
-	 * The WriterHints provides global state between recursive invocations of serialize(). It should
-	 * be not be used to store local data (e.g. data that is only relevant to a single Translator in
-	 * a given context).
-	 * 
-	 * The WriterHints also stores an AttributesImpl object that is re-used to store attributes. The
-	 * getAttributes() method will request the Attributes Holder.
-	 * 
-	 * @author mdelder
-	 */
-	public final class WriterHints {
-		private final TranslatorResource resource;
-		private final Stack domStack = new Stack();
-		private final AttributesImpl attributesImpl = new AttributesImpl();
-
-		public WriterHints(TranslatorResource res) {
-			this.resource = res;
-		}
-
-		/**
-		 * Push a new domPath onto the stack
-		 * 
-		 * @param domPath
-		 *            a DOMPath which has been written to the XML stream
-		 */
-		public void pushDomPath(String domPath) {
-
-			if (domPath != null && domPath.length() > 0)
-				domStack.push(domPath);
-		}
-
-		/**
-		 * Pop the current domPath from the Array
-		 */
-		public void popDomPath() {
-
-			if (!domStack.isEmpty())
-				domStack.pop();
-		}
-
-		/**
-		 * Determines if the given DOMPath has already been written to the XML stream
-		 * 
-		 * @param domPath
-		 * @return true if the given DOMPath has already been written to the XML stream
-		 */
-		public boolean isDomPathActive(String domPath) {
-			boolean result = false;
-			if (!domStack.isEmpty()) {
-
-				String currentDomPath = (String) domStack.peek();
-				if (currentDomPath != null && domPath != null)
-					result = currentDomPath.equals(domPath);
-				else if (!(currentDomPath == null ^ domPath == null))
-					result = true;
-			}
-
-			return result;
-		}
-
-		/**
-		 * @return the version of the EMF Resource
-		 */
-		public int getVersion() {
-			return this.resource.getVersionID();
-		}
-
-		/**
-		 * Returns an empty AttributesImpl object to store attributes. Within the context of a given
-		 * WriterHints object (and hence single XML document), the object returned is a singleton.
-		 * The same AttributesImpl object is cleared and reused for each invocation.
-		 * 
-		 * @return an empty AttributesImpl object to store attributes
-		 */
-		public AttributesImpl getAttributeHolder() {
-			this.attributesImpl.clear();
-			return this.attributesImpl;
-		}
-
-	}
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/FileNameResourceFactoryRegistry.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/FileNameResourceFactoryRegistry.java
deleted file mode 100644
index ff7b3a2..0000000
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/FileNameResourceFactoryRegistry.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.common.internal.emf.resource;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.Resource.Factory;
-import org.eclipse.wst.common.internal.emf.utilities.DefaultOverridableResourceFactoryRegistry;
-
-
-public abstract class FileNameResourceFactoryRegistry extends DefaultOverridableResourceFactoryRegistry {
-
-	private Map/*<String shortName, ResourceFactoryDescriptor>*/ descriptors = new HashMap(); 
-	private Map/*<ResourceFactoryDescriptor, Resource.Factory>*/ factories = new HashMap();
-	
-	public FileNameResourceFactoryRegistry() {
-		super();
-	}
-
-	/**
-	 * Return a Resource.Factory that is registered with the last segment of the URI's file name.
-	 * 
-	 * @see org.eclipse.emf.ecore.resource.impl.ResourceFactoryRegistryImpl#getFactory(URI)
-	 */
-	protected Object getFileNameFactory(URI uri) {
-
-		if(uri != null) {
-			ResourceFactoryDescriptor descriptor = getDescriptor(uri);
-			
-			if(descriptor != null) {
-				return getFactory(descriptor);	
-			}	
-		}
-		return null;
-		
-	}
-
-	@Override
-	public synchronized Resource.Factory getFactory(URI uri) {
-		return getFactory(uri, null);
-	}
-
-	@Override
-	public Resource.Factory getFactory(URI uri, String contentType)
-	{
-		Resource.Factory resourceFactory = null;
-		if(uri != null && uri.lastSegment() != null) {
-			ResourceFactoryDescriptor descriptor = getDescriptor(uri);
-			
-			if(descriptor != null) {
-				resourceFactory = getFactory(descriptor);	
-			}	
-		}
-		if(resourceFactory == null)
-			resourceFactory = super.getFactory(uri, contentType);
-		return resourceFactory; 
-	}
-
-	/**
-	 * Register a file name representing the last segment of a URI with the corresponding
-	 * Resource.Factory.
-	 */
-	public synchronized void registerLastFileSegment(String aSimpleFileName, Resource.Factory aFactory) {
-		URI uri = URI.createURI(aSimpleFileName);
-		String lastSegment = uri.lastSegment(); 
-		addDescriptor(new StaticResourceFactoryDescriptor(lastSegment, aFactory));		
-	} 
-
-	protected synchronized ResourceFactoryDescriptor getDescriptor(URI uri) {
-		return (ResourceFactoryDescriptor) descriptors.get(uri.lastSegment());
-	}
-	protected synchronized Map getDescriptors() {
-		return descriptors;
-	}
-
-	protected final synchronized Resource.Factory getFactory(ResourceFactoryDescriptor descriptor) {  
-		Resource.Factory factory = (Factory) factories.get(descriptor);
-		if(factory == null) {
-			factories.put(descriptor, (factory = descriptor.createFactory()));
-		}
-		return factory;
-	}
-
-	protected void addDescriptor(ResourceFactoryDescriptor descriptor) { 
-		descriptors.put(descriptor.getShortSegment(), descriptor);
-	}
- 
-}
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/GenericTranslator.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/GenericTranslator.java
deleted file mode 100644
index c714f23..0000000
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/GenericTranslator.java
+++ /dev/null
@@ -1,111 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 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
- *******************************************************************************/
-/*
- * Created on Mar 20, 2003
- *
- */
-package org.eclipse.wst.common.internal.emf.resource;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-
-/**
- * Specialized translator for objects that contain simple mappings with no specialized behavior.
- */
-public class GenericTranslator extends Translator {
-
-	protected Translator[] children;
-
-	/**
-	 * @param domNameAndPath
-	 * @param eClass
-	 */
-	public GenericTranslator(String domNameAndPath, EClass eClass) {
-		super(domNameAndPath, eClass);
-	}
-
-	/**
-	 * @param domNameAndPath
-	 * @param aFeature
-	 */
-	public GenericTranslator(String domNameAndPath, EStructuralFeature aFeature) {
-		super(domNameAndPath, aFeature);
-	}
-
-	/**
-	 * @param domNameAndPath
-	 * @param aFeature
-	 * @param path
-	 */
-	public GenericTranslator(String domNameAndPath, EStructuralFeature aFeature, TranslatorPath path) {
-		super(domNameAndPath, aFeature, path);
-	}
-
-	/**
-	 * @param domNameAndPath
-	 * @param aFeature
-	 * @param paths
-	 */
-	public GenericTranslator(String domNameAndPath, EStructuralFeature aFeature, TranslatorPath[] paths) {
-		super(domNameAndPath, aFeature, paths);
-	}
-
-	/**
-	 * @param domNameAndPath
-	 * @param aFeature
-	 * @param eClass
-	 */
-	public GenericTranslator(String domNameAndPath, EStructuralFeature aFeature, EClass eClass) {
-		super(domNameAndPath, aFeature, eClass);
-	}
-
-	/**
-	 * @param domNameAndPath
-	 * @param aFeature
-	 * @param style
-	 */
-	public GenericTranslator(String domNameAndPath, EStructuralFeature aFeature, int style) {
-		super(domNameAndPath, aFeature, style);
-	}
-
-	/**
-	 * @return Translator[]
-	 */
-	@Override
-	public Translator[] getChildren() {
-		return children;
-	}
-
-	/**
-	 * Sets the children.
-	 * 
-	 * @param children
-	 *            The children to set
-	 */
-	public void setChildren(Translator[] children) {
-		this.children = children;
-	}
-
-
-	public static Translator appendChildren(GenericTranslator tran, Translator[] child) {
-		Translator[] orgChild = tran.getChildren();
-		Translator[] newChildren = (Translator[]) concat(orgChild, child);
-		tran.setChildren(newChildren);
-		return tran;
-	}
-
-	public static Translator appendChild(GenericTranslator tran, Translator child) {
-		Object[] orgChild = tran.getChildren();
-		Translator[] newChildren = (Translator[]) concat(orgChild, child);
-		tran.setChildren(newChildren);
-		return tran;
-	}
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/IDTranslator.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/IDTranslator.java
deleted file mode 100644
index 520f7f0..0000000
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/IDTranslator.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 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
- *******************************************************************************/
-/*
- * Created on Mar 19, 2003
- *
- */
-package org.eclipse.wst.common.internal.emf.resource;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.EcorePackage;
-import org.eclipse.emf.ecore.xmi.XMIResource;
-
-/**
- * @author schacher
- */
-public class IDTranslator extends Translator {
-	public class NoResourceException extends RuntimeException {
-
-		/**
-		 * 
-		 */
-		private static final long serialVersionUID = 8633201291288237530L;
-
-		public NoResourceException() {
-			super();
-		}
-
-		public NoResourceException(String s) {
-			super(s);
-		}
-	}
-
-	static final public EStructuralFeature ID_FEATURE = EcorePackage.eINSTANCE.getEClass_EIDAttribute();
-	static final public IDTranslator INSTANCE = new IDTranslator();
-
-	public IDTranslator() {
-		super("id", ID_FEATURE, DOM_ATTRIBUTE); //$NON-NLS-1$
-	}
-
-	@Override
-	public void setMOFValue(EObject emfObject, Object value) {
-		XMIResource res = (XMIResource) emfObject.eResource();
-		if (res == null)
-			throw new NoResourceException();
-		String id = res.getID(emfObject);
-		if (id == null && value == null)
-			return;
-		if ((id != null && !id.equals(value)) || (value != null && !value.equals(id)))
-			res.setID(emfObject, (String) value);
-	}
-
-	@Override
-	public Object getMOFValue(EObject emfObject) {
-		if (emfObject == null)
-			throw new NoResourceException();
-		XMIResource res = (XMIResource) emfObject.eResource();
-		if (res == null)
-			throw new NoResourceException();
-		return res.getID(emfObject);
-	}
-
-
-	@Override
-	public boolean featureExists(EObject emfObject) {
-		return true;
-	}
-
-	@Override
-	public boolean isIDMap() {
-		return true;
-	}
-
-
-
-}
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/LinkUpdaterTarget.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/LinkUpdaterTarget.java
deleted file mode 100644
index f5cd1f9..0000000
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/LinkUpdaterTarget.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors: IBM Corporation - initial API and implementation
- **************************************************************************************************/
-package org.eclipse.wst.common.internal.emf.resource;
-
-
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.w3c.dom.Node;
-
-
-public class LinkUpdaterTarget extends Object {
-
-	public static final LinkUpdaterTarget INSTANCE = new LinkUpdaterTarget();
-
-	/**
-	 * Constructor for LinkUpdaterMultiTarget.
-	 * 
-	 * @param adapter
-	 */
-	private LinkUpdaterTarget() {
-		super();
-	}
-
-
-	public void updateDOM(Translator map, Node node, EObject mofObject) {
-		refreshSourceObjects(map, node, mofObject, true);
-	}
-
-	public void updateMOF(Translator map, Node node, EObject mofObject) {
-		refreshSourceObjects(map, node, mofObject, false);
-	}
-
-	protected void refreshSourceObjects(Translator map, Node node, EObject mofObject, boolean domUpdate) {
-		TranslatorPath[] paths = map.getTranslatorPaths();
-		for (int i = 0; i < paths.length; i++) {
-			TranslatorPath path = paths[i];
-			List allSourceObjects = path.findObjects(mofObject);
-			for (Iterator iter = allSourceObjects.iterator(); iter.hasNext();) {
-				EObject curObject = (EObject) iter.next();
-				EMF2DOMAdapter curAdapter = (EMF2DOMAdapter) EcoreUtil.getAdapter(curObject.eAdapters(), EMF2DOMAdapter.class);
-				if (curAdapter != null) {
-					if (domUpdate)
-						curAdapter.updateDOM();
-					else
-						curAdapter.updateMOF();
-				}
-			}
-		}
-	}
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/MappedXMIHelper.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/MappedXMIHelper.java
deleted file mode 100644
index f146af1..0000000
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/MappedXMIHelper.java
+++ /dev/null
@@ -1,306 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 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
- *******************************************************************************/
-package org.eclipse.wst.common.internal.emf.resource;
-
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Set;
-
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.emf.ecore.resource.URIConverter;
-import org.eclipse.emf.ecore.resource.impl.URIConverterImpl;
-import org.eclipse.emf.ecore.xmi.XMLHelper;
-import org.eclipse.emf.ecore.xmi.XMLResource;
-import org.eclipse.emf.ecore.xmi.impl.XMLHelperImpl;
-import org.eclipse.wst.common.internal.emf.utilities.IDUtil;
-
-public class MappedXMIHelper extends XMLHelperImpl {
-
-	private static final String WORKSPACE_PROTOCOL = "workspace:/"; //$NON-NLS-1$
-	private static final String PLATFORM_RESOURCE_PROTOCOL = "platform:/resource/"; //$NON-NLS-1$
-	private static final EStructuralFeature NULL_FEATURE = new UnsupportedFeature();
-	protected boolean usingMaps = true;
-	protected Map cachedRelativeURIs;
-	protected Map packageURIsToPrefixes;
-
-	/**
-	 * Constructor for MappedXMLHelper.
-	 * 
-	 * @param resource
-	 */
-	public MappedXMIHelper(XMLResource resource, Map prefixesToURIs) {
-		super(resource);
-		this.prefixesToURIs.putAll(prefixesToURIs);
-		pushContext(); //Needed to initialize the context to zero
-		Set keys = prefixesToURIs.keySet();
-		for (Iterator iter = keys.iterator(); iter.hasNext();) {
-			String prefix = (String) iter.next();
-			String uri = (String) prefixesToURIs.get(prefix);
-			namespaceSupport.declarePrefix(prefix, uri);
-		}
-
-	}
-
-	@Override
-	public URI resolve(URI relative, URI base) {
-		URI resolved = null;
-		boolean isMapped = false;
-		ResourceSet set = getResource().getResourceSet();
-		if (set != null) {
-			URI localresourceURI = null;
-			if (relative.hasFragment())
-				localresourceURI = relative.trimFragment();
-			else
-				localresourceURI = relative;
-			isMapped = !(((URIConverterImpl.URIMap) set.getURIConverter().getURIMap()).getURI(localresourceURI).equals(localresourceURI));
-		}
-		if (!isMapped) {
-			if (isUsingContainerRelativePaths() && set != null)
-				resolved = set.getURIConverter().normalize(relative);
-		} else {
-			resolved = relative;
-		}
-		return resolved == null ? super.resolve(relative, base) : resolved;
-	}
-
-	/**
-	 * Method isUsingContainerRelativePaths.
-	 * 
-	 * @return boolean
-	 */
-	private boolean isUsingContainerRelativePaths() {
-		return ((CompatibilityXMIResource) resource).getFormat() == CompatibilityXMIResource.FORMAT_MOF5 || usingMaps;
-	}
-
-	@Override
-	public void addPrefix(String prefix, String uri) {
-		/*
-		 * problem - the incoming key value pair is ejbbnd->ejbbnd.xmi; however, the map already has
-		 * a key value pair of ejbbnd->http:///ejbbnd.ecore
-		 */
-		if (uri.endsWith(".ecore")) { //$NON-NLS-1$
-			usingMaps = false;
-		}
-		String existing = prefixesToURIs.get(prefix);
-		if (existing == null) {
-			prefixesToURIs.put(prefix, uri);
-			namespaceSupport.declarePrefix(prefix, uri);
-		} else if (!existing.equals(uri)) {
-			getCompatibilityResource().addOriginalPackageURI(existing, uri);
-			getCompatibilityResource().setFormat(CompatibilityXMIResource.FORMAT_MOF5);
-		}
-	}
-
-	protected CompatibilityXMIResource getCompatibilityResource() {
-		return (CompatibilityXMIResource) getResource();
-	}
-
-	/**
-	 * @see org.eclipse.emf.ecore.xmi.impl.XMLHelperImpl#getHREF(EObject)
-	 */
-	@Override
-	public String getHREF(EObject obj) {
-		if (!getCompatibilityResource().usesDefaultFormat()) {
-			URIConverter conv = getURIConverter();
-			if (conv != null && conv instanceof CompatibilityURIConverter) {
-				String href = getCompatibliltyHREF(obj, (CompatibilityURIConverter) conv);
-				return useWorkspaceProtocolIfNecessary(href);
-			}
-		}
-		return super.getHREF(obj);
-	}
-
-
-	/**
-	 * @param href
-	 * @return
-	 */
-	protected String useWorkspaceProtocolIfNecessary(String href) {
-		if (href != null && href.startsWith(PLATFORM_RESOURCE_PROTOCOL))
-			return WORKSPACE_PROTOCOL + href.substring(19);
-		return href;
-	}
-
-	private String getCompatibliltyHREF(EObject obj, CompatibilityURIConverter conv) {
-		//Implementation copied from super.getHREF(EObject)
-		InternalEObject o = (InternalEObject) obj;
-
-		URI objectURI = o.eProxyURI();
-		if (objectURI == null) {
-			Resource otherResource = obj.eResource();
-			if (otherResource == null) {
-				objectURI = handleDanglingHREF(obj);
-				if (objectURI == null) {
-					return null;
-				}
-			} else
-				objectURI = otherResource.getURI().appendFragment(otherResource.getURIFragment(obj));
-		}
-
-		//Modified to dispatch back to URI Converter
-		if (!objectURI.isRelative()) {
-			objectURI = makeRelative(objectURI, conv);
-		}
-		return objectURI.toString();
-	}
-
-	protected URI makeRelative(URI objectURI, CompatibilityURIConverter conv) {
-		URI innerObjectURI = objectURI;
-		String fragment = innerObjectURI.fragment();
-		innerObjectURI = innerObjectURI.trimFragment();
-		URI relative = (URI) getCachedRelativeURIs().get(innerObjectURI);
-		if (relative == null) {
-			relative = conv.deNormalize(innerObjectURI);
-			if (relative.isRelative())
-				cachedRelativeURIs.put(innerObjectURI, relative);
-		}
-		return relative.appendFragment(fragment);
-	}
-
-	protected URIConverter getURIConverter() {
-		ResourceSet set = getResource().getResourceSet();
-		if (set != null)
-			return set.getURIConverter();
-		return null;
-	}
-
-	protected Map getCachedRelativeURIs() {
-		if (cachedRelativeURIs == null)
-			cachedRelativeURIs = new HashMap();
-		return cachedRelativeURIs;
-	}
-
-	/**
-	 * @see org.eclipse.emf.ecore.xmi.impl.XMLHelperImpl#getID(EObject)
-	 */
-	@Override
-	public String getID(EObject obj) {
-		if (getCompatibilityResource().usesDefaultFormat())
-			return super.getID(obj);
-		return IDUtil.getOrAssignID(obj, resource);
-	}
-
-	public String[] getNSInfo(EPackage pkg) {
-		String prefix = getMappedPrefix(pkg);
-		if (prefix == null)
-			return new String[]{pkg.getNsPrefix(), pkg.getNsURI()};
-		return new String[]{prefix, prefix + ".xmi"}; //$NON-NLS-1$
-	}
-
-	protected String getMappedPrefix(EPackage pkg) {
-		String nsURI = pkg.getNsURI();
-		if (usingMaps || !getCompatibilityResource().usesDefaultFormat())
-			return (String) packageURIsToPrefixes.get(nsURI);
-		return null;
-	}
-
-	protected String getMappedPrefixOrDefault(EPackage pkg) {
-		String prefix = getMappedPrefix(pkg);
-		return prefix == null ? pkg.getNsPrefix() : prefix;
-	}
-
-
-	/**
-	 * Returns the packageURIsToPrefixes.
-	 * 
-	 * @return Map
-	 */
-	public Map getPackageURIsToPrefixes() {
-		return packageURIsToPrefixes;
-	}
-
-	/**
-	 * Sets the packageURIsToPrefixes.
-	 * 
-	 * @param packageURIsToPrefixes
-	 *            The packageURIsToPrefixes to set
-	 */
-	public void setPackageURIsToPrefixes(Map packageURIsToPrefixes) {
-		this.packageURIsToPrefixes = packageURIsToPrefixes;
-	}
-
-	@Override
-	public String getQName(EClass c) {
-		String name = getName(c);
-
-		if (xmlMap != null) {
-			XMLResource.XMLInfo clsInfo = xmlMap.getInfo(c);
-
-			if (clsInfo != null) {
-				String targetNamespace = clsInfo.getTargetNamespace();
-				return getQName(targetNamespace, name);
-			}
-		}
-
-		EPackage p = c.getEPackage();
-		packages.put(p, null);
-
-		if (p.getNsPrefix().equals("")) //$NON-NLS-1$ 
-			return name;
-
-		//Modified from superclass
-		//return p.getNsPrefix() + ":" + name;
-		return getMappedPrefixOrDefault(p) + ":" + name; //$NON-NLS-1$ 
-	}
-
-	/**
-	 * @see org.eclipse.emf.ecore.xmi.impl.XMLHelperImpl#setValue(EObject, EStructuralFeature,
-	 *      Object, int)
-	 */
-	@Override
-	public void setValue(EObject object, EStructuralFeature feature, Object value, int position) {
-		if (feature == NULL_FEATURE)
-			return;
-		if (!feature.isTransient()) {
-			if (value == null && feature.getEType().getInstanceClass() != null && feature.getEType().getInstanceClass().isPrimitive())
-				//For compatibility with MOF5 where types like Integer might have been set
-				//and serialized as "xsi:nil"
-				return;
-
-			super.setValue(object, feature, value, position);
-		}
-	}
-
-
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.emf.ecore.xmi.XMLHelper#getFeature(org.eclipse.emf.ecore.EClass,
-	 *      java.lang.String, java.lang.String, boolean)
-	 */
-	@Override
-	public EStructuralFeature getFeature(EClass eClass, String namespaceURI, String name, boolean isElement) {
-		if (UnsupportedFeature.isUnsupported(eClass, name))
-			return NULL_FEATURE;
-		return super.getFeature(eClass, namespaceURI, name, isElement);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.emf.ecore.xmi.XMLHelper#getFeatureKind(org.eclipse.emf.ecore.EStructuralFeature)
-	 */
-	@Override
-	public int getFeatureKind(EStructuralFeature feature) {
-		if (feature == NULL_FEATURE)
-			return XMLHelper.DATATYPE_SINGLE;
-		return super.getFeatureKind(feature);
-	}
-}
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/MultiObjectTranslator.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/MultiObjectTranslator.java
deleted file mode 100644
index 79226f6..0000000
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/MultiObjectTranslator.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 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
- *******************************************************************************/
-/*
- * Created on Mar 31, 2003
- *
- */
-package org.eclipse.wst.common.internal.emf.resource;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.w3c.dom.Node;
-
-/**
- * @author schacher
- */
-public abstract class MultiObjectTranslator extends Translator {
-	private static final Translator[] EMPTY_TRANSLATORS = new Translator[]{};
-
-	/**
-	 * @param domNameAndPath
-	 * @param aFeature
-	 * @param style
-	 */
-	public MultiObjectTranslator(String domNameAndPath, EStructuralFeature aFeature) {
-		super(domNameAndPath, aFeature);
-	}
-
-	public abstract Translator getDelegateFor(EObject o);
-
-	public abstract Translator getDelegateFor(String domName, String readAheadName);
-
-
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see com.ibm.etools.emf2xml.impl.Translator#createEMFObject(java.lang.String,
-	 *      java.lang.String)
-	 */
-	@Override
-	public EObject createEMFObject(String nodeName, String readAheadName) {
-		return getDelegateFor(nodeName, readAheadName).createEMFObject(nodeName, readAheadName);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see com.ibm.etools.emf2xml.impl.Translator#getChildren(java.lang.Object)
-	 */
-	@Override
-	public Translator[] getChildren(Object o, int version) {
-		if (o == null)
-			return EMPTY_TRANSLATORS;
-		return getDelegateFor((EObject) o).getChildren(o, version);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see com.ibm.etools.emf2xml.impl.Translator#getDOMName(java.lang.Object)
-	 */
-	@Override
-	public String getDOMName(Object value) {
-		return getDelegateFor((EObject) value).getDOMName(value);
-	}
-
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see com.ibm.etools.emf2xml.impl.Translator#isManagedByParent()
-	 */
-	@Override
-	public boolean isManagedByParent() {
-		return false;
-	}
-
-	@Override
-	public boolean shouldIndentEndTag(Node node) {
-		if (node.getNodeName().equals(getDOMPath())) {
-			return super.shouldIndentEndTag(node);
-		}
-		Translator delegate = getDelegateFor(node.getNodeName(), null);
-		if (delegate != null) {
-			return delegate.shouldIndentEndTag(node);
-		}
-		return super.shouldIndentEndTag(node);
-	}
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/NamespaceTranslator.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/NamespaceTranslator.java
deleted file mode 100644
index ea4cc38..0000000
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/NamespaceTranslator.java
+++ /dev/null
@@ -1,119 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 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
- *******************************************************************************/
-/*
- * Created on Aug 14, 2003
- *
- */
-package org.eclipse.wst.common.internal.emf.resource;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.wst.common.internal.emf.utilities.Namespace;
-import org.eclipse.wst.common.internal.emf.utilities.NamespaceAdapter;
-
-
-/**
- * @author schacher
- */
-public class NamespaceTranslator extends Translator {
-
-	protected String prefix;
-
-	/**
-	 * @param domNameAndPath
-	 * @param aFeature
-	 */
-	public NamespaceTranslator(String domName) {
-		super(domName, NamespaceAdapter.NOTIFICATION_FEATURE, DOM_ATTRIBUTE);
-		initPrefix();
-	}
-
-	private void initPrefix() {
-		String dName = getDOMName(null);
-		prefix = dName.substring(DefaultTranslatorFactory.XMLNS.length());
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see com.ibm.etools.emf2xml.impl.Translator#setMOFValue(org.eclipse.emf.ecore.EObject,
-	 *      java.lang.Object)
-	 */
-	@Override
-	public void setMOFValue(EObject emfObject, Object value) {
-		NamespaceAdapter.addNamespace(prefix, (String) value, emfObject);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see com.ibm.etools.emf2xml.impl.Translator#isSetMOFValue(org.eclipse.emf.ecore.EObject)
-	 */
-	@Override
-	public boolean isSetMOFValue(EObject emfObject) {
-		return getMOFValue(emfObject) != null;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see com.ibm.etools.emf2xml.impl.Translator#getMOFValue(org.eclipse.emf.ecore.EObject)
-	 */
-	@Override
-	public Object getMOFValue(EObject mofObject) {
-		return NamespaceAdapter.getNamespaceURIAtThisLevel(prefix, mofObject);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see com.ibm.etools.emf2xml.impl.Translator#unSetMOFValue(org.eclipse.emf.ecore.EObject)
-	 */
-	@Override
-	public void unSetMOFValue(EObject emfObject) {
-		NamespaceAdapter.removeNamespace(prefix, emfObject);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see com.ibm.etools.emf2xml.impl.Translator#featureExists(org.eclipse.emf.ecore.EObject)
-	 */
-	@Override
-	public boolean featureExists(EObject emfObject) {
-		return true;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see com.ibm.etools.emf2xml.impl.Translator#isDataType()
-	 */
-	@Override
-	public boolean isDataType() {
-		return true;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see com.ibm.etools.emf2xml.impl.Translator#isMapFor(java.lang.Object, java.lang.Object,
-	 *      java.lang.Object)
-	 */
-	@Override
-	public boolean isMapFor(Object aFeature, Object oldValue, Object newValue) {
-		if (aFeature == feature) {
-			Namespace namespace = (Namespace) (oldValue == null ? newValue : oldValue);
-			if (namespace != null)
-				return prefix.equals(namespace.getPrefix());
-		}
-		return false;
-	}
-}
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/ObjectTranslatorFilter.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/ObjectTranslatorFilter.java
deleted file mode 100644
index 3e479f5..0000000
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/ObjectTranslatorFilter.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2003, 2004 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
- **************************************************************************************************/
-/*
- * Created on Sep 21, 2003
- *  
- */
-package org.eclipse.wst.common.internal.emf.resource;
-
-
-public final class ObjectTranslatorFilter extends TranslatorFilter {
-
-	public ObjectTranslatorFilter() {
-		super(null, -1);
-	}
-
-	public ObjectTranslatorFilter(Translator trans, int version) {
-		super(trans, version);
-	}
-
-	@Override
-	public final int scanNextTranslator(Translator[] children, int start) {
-		int found = start + 1;
-		for (; found < children.length; ++found) {
-			if (!children[found].isDOMAttribute())
-				break;
-		}
-		found = (found < children.length) ? found : -1;
-		return found;
-	}
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/ReadAheadHelper.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/ReadAheadHelper.java
deleted file mode 100644
index a7d1a23..0000000
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/ReadAheadHelper.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 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
- *******************************************************************************/
-/*
- * Created on Apr 2, 2003
- *
- */
-package org.eclipse.wst.common.internal.emf.resource;
-
-/**
- * @author schacher
- */
-public class ReadAheadHelper {
-
-	protected String parentDOMName;
-	protected String[] values;
-	protected String childDOMName;
-
-	public ReadAheadHelper(String parentDOMName, String[] values, String childDOMName) {
-		super();
-		this.parentDOMName = parentDOMName;
-		this.values = values;
-		this.childDOMName = childDOMName;
-	}
-
-	/**
-	 * @return
-	 */
-	public String getChildDOMName() {
-		return childDOMName;
-	}
-
-	/**
-	 * @return
-	 */
-	public String getParentDOMName() {
-		return parentDOMName;
-	}
-
-	/**
-	 * @return
-	 */
-	public String[] getValues() {
-		return values;
-	}
-
-	/**
-	 * @param string
-	 */
-	public void setChildDOMName(String string) {
-		childDOMName = string;
-	}
-
-	/**
-	 * @param string
-	 */
-	public void setParentDOMName(String string) {
-		parentDOMName = string;
-	}
-
-	/**
-	 * @param strings
-	 */
-	public void setValues(String[] strings) {
-		values = strings;
-	}
-
-
-	public boolean nodeValueIsReadAheadName(String nodeName) {
-
-		return (childDOMName != null) ? childDOMName.equals(nodeName) : false;
-	}
-
-	public boolean nodeNameIsReadAheadName(String nodeName) {
-		boolean result = false;
-		for (int i = 0; i < values.length; i++) {
-			if (nodeName.equals(values[i])) {
-				result = true;
-				break;
-			}
-		}
-		return result;
-	}
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/ReferencedResource.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/ReferencedResource.java
deleted file mode 100644
index 0a4818a..0000000
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/ReferencedResource.java
+++ /dev/null
@@ -1,129 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 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
- *******************************************************************************/
-package org.eclipse.wst.common.internal.emf.resource;
-
-
-
-
-public interface ReferencedResource extends CompatibilityXMIResource {
-	//TODO - rename packaged
-
-	public static final String DELETED_ERROR_MSG = "This resource has been deleted and can no longer be used."; //$NON-NLS-1$
-
-	public static final int RESOURCE_WAS_SAVED = 601;
-	
-	/**
-	 * A flag used to indicate a ReferencedResource is about
-	 * to save.
-	 */
-	public static final int RESOURCE_ABOUT_TO_SAVE = 602;
-	
-	/**
-	 * A flag used to indicate a ReferencedResource has failed
-	 * to save.
-	 */
-	public static final int RESOURCE_SAVE_FAILED = 603;
-
-	/**
-	 * Access this resource for read only. This call increments the use read count of this resource.
-	 * Clients should call this method before they use the resource. They should call
-	 * releaseFromRead() after they are done modifying this resource.
-	 */
-	void accessForRead();
-
-	/**
-	 * Access this resource for write only. This call increments the use write count of this
-	 * resource. Clients should call this method before they modify the resource. They should call
-	 * releaseFromWrite() after they are done modifying this resource.
-	 */
-	void accessForWrite();
-
-	/**
-	 * Return true if this resource has just been loaded and not yet accessed for read or write.
-	 */
-	boolean isNew();
-
-	/**
-	 * Return true if this resource does not have any write references.
-	 */
-	boolean isReadOnly();
-
-	/**
-	 * Return true if this resource is shared for read or write by more than one accessor.
-	 */
-	boolean isShared();
-
-	/**
-	 * Return true if this resource is shared for write by more than one accessor.
-	 */
-	boolean isSharedForWrite();
-
-	/**
-	 * Release read the access to this resource. This call decrements the use count of this resource
-	 * and will remove the resource from its resource set if the use count goes to 0. Clients should
-	 * call this method when they are done accessing the resource and only after they have called
-	 * accessForRead() to obtain access.
-	 */
-	void releaseFromRead();
-
-	/**
-	 * Release write the access to this resource. This call decrements the write count of this
-	 * resource and will remove the resource from its resource set if the use count goes to 0.
-	 * Clients should call this method when they are done accessing the resource and only after they
-	 * have called accessForWrite() to obtain access.
-	 */
-	void releaseFromWrite();
-
-	/**
-	 * Saves this resource only if the write count is equal to 1.
-	 */
-	void saveIfNecessary() throws Exception;
-
-	/**
-	 * Return true if this resource is dirty and is not shared for write.
-	 */
-	boolean needsToSave();
-
-
-
-	/**
-	 * Set whether we should allow a refresh to take place even when this resource is dirty.
-	 * 
-	 * @param b
-	 */
-	void setForceRefresh(boolean b);
-
-	/**
-	 * Return whether we should allow a refresh to take place even when this resource is dirty.
-	 */
-	boolean shouldForceRefresh();
-
-	boolean wasReverted();
-
-	/**
-	 * Returns the number of open read accesses on this resource
-	 * 
-	 * @return
-	 */
-	int getReadCount();
-
-	/**
-	 * Returns the number of open write accesses on this resource
-	 * 
-	 * @return
-	 */
-	int getWriteCount();
-
-	/**
-	 * If the resource is no longer being accessed, then remove it from the resource set.
-	 */
-	void unloadIfNecessary();
-}
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/ReferencedXMIFactoryImpl.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/ReferencedXMIFactoryImpl.java
deleted file mode 100644
index 2a9fe76..0000000
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/ReferencedXMIFactoryImpl.java
+++ /dev/null
@@ -1,101 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors: IBM Corporation - initial API and implementation
- **************************************************************************************************/
-package org.eclipse.wst.common.internal.emf.resource;
-
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.impl.ResourceFactoryImpl;
-
-public class ReferencedXMIFactoryImpl extends ResourceFactoryImpl {
-
-	protected static List globalAdapterFactories;
-	protected List localAdapterFactories;
-
-	/**
-	 * ReferencedXMIFactoryImpl constructor comment.
-	 */
-	public ReferencedXMIFactoryImpl() {
-		super();
-	}
-
-	/**
-	 * This is the method that subclasses can override to actually instantiate a new Resource
-	 * 
-	 * @param uri
-	 * @return
-	 */
-	protected Resource doCreateResource(URI uri) {
-		return new ReferencedXMIResourceImpl(uri);
-	}
-
-	/**
-	 * @see org.eclipse.emf.ecore.resource.impl.ResourceFactoryImpl#createResource(URI)
-	 */
-	@Override
-	public final Resource createResource(URI uri) {
-		Resource res = doCreateResource(uri);
-		adaptNew(res);
-		return res;
-	}
-
-	protected void adaptNew(Resource res) {
-		if (globalAdapterFactories != null) {
-			for (int i = 0; i < globalAdapterFactories.size(); i++) {
-				AdapterFactory factory = (AdapterFactory) globalAdapterFactories.get(i);
-				factory.adaptAllNew(res);
-			}
-		}
-		if (localAdapterFactories != null) {
-			for (int i = 0; i < localAdapterFactories.size(); i++) {
-				AdapterFactory factory = (AdapterFactory) localAdapterFactories.get(i);
-				factory.adaptAllNew(res);
-			}
-		}
-	}
-
-	/**
-	 * The local adapter factory is an adapter factory that you use to only adapt the resource
-	 * specific to the ResourceFactory instance.
-	 * 
-	 * @param factory
-	 */
-	public void addLocalAdapterFactory(AdapterFactory factory) {
-		if (localAdapterFactories == null)
-			localAdapterFactories = new ArrayList(3);
-		localAdapterFactories.add(factory);
-	}
-
-	public void removeLocalAdapterFactory(AdapterFactory factory) {
-		if (localAdapterFactories != null)
-			localAdapterFactories.remove(factory);
-	}
-
-	/**
-	 * A global adapter factory will be used to adapt any resource created by any ResourceFactory
-	 * instance.
-	 * 
-	 * @param factory
-	 */
-	public static void addGlobalAdapterFactory(AdapterFactory factory) {
-		if (globalAdapterFactories == null)
-			globalAdapterFactories = new ArrayList(3);
-		globalAdapterFactories.add(factory);
-	}
-
-	public static void removeGlobalAdapterFactory(AdapterFactory factory) {
-		if (globalAdapterFactories != null)
-			globalAdapterFactories.remove(factory);
-	}
-}
-
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/ReferencedXMIResourceImpl.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/ReferencedXMIResourceImpl.java
deleted file mode 100644
index 33de28d..0000000
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/ReferencedXMIResourceImpl.java
+++ /dev/null
@@ -1,437 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 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
- *******************************************************************************/
-package org.eclipse.wst.common.internal.emf.resource;
-
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.Notifier;
-import org.eclipse.emf.common.notify.impl.NotificationImpl;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.wst.common.internal.emf.plugin.EcoreUtilitiesPlugin;
-import org.eclipse.wst.common.internal.emf.utilities.IDUtil;
-
-public class ReferencedXMIResourceImpl extends CompatibilityXMIResourceImpl implements ReferencedResource {
-	//TODO Add toString hook
-	private static final String TO_STRING = "ReferencedXMIResource, file = "; //$NON-NLS-1$
-	private static final String READ_COUNT_TO_STRING = " R= "; //$NON-NLS-1$
-	private static final String WRITE_COUNT_TO_STRING = " W= "; //$NON-NLS-1$
-
-	private int readReferenceCount = 1;
-	private int editReferenceCount = 0;
-	protected boolean isNew = true;
-	protected boolean forceRefresh;
-	
-	  public static class ESynchronizedAdapterList extends EAdapterList
-	  {
-
-	    /**
-		 * 
-		 */
-		private static final long serialVersionUID = 7855438339187540718L;
-
-		public ESynchronizedAdapterList(Notifier notifier) {
-			super(notifier);
-		}
-
-		@Override
-		public synchronized boolean add(Object object)
-	    {
-	    return super.add(object);
-	    }
-
-	    @Override
-		public synchronized void add(int index, Object object)
-	    {
-	    super.add(index, object);
-	    }
-
-	    @Override
-		public synchronized boolean addAll(Collection collection)
-	    {
-	    return super.addAll(collection);
-	    }
-
-	    @Override
-		public synchronized boolean remove(Object object)
-	    {
-	    return super.remove(object);
-	    }
-
-	    @Override
-		public synchronized Object remove(int index)
-	    {
-	    return super.remove(index);
-	    }
-
-	    @Override
-		public synchronized boolean removeAll(Collection collection)
-	    {
-	    return super.removeAll(collection);
-	    }
-
-	    @Override
-		public synchronized void clear()
-	    {
-	     super.clear();
-	    }
-
-
-	    @Override
-		public synchronized Object set(int index, Object object)
-	    {
-	    return super.set(index, object);
-	    }
-
-	    @Override
-		public synchronized void move(int newPosition, Object object)
-	    {
-	    super.move(newPosition, object);
-	    }
-
-	    @Override
-		public synchronized Object move(int newPosition, int oldPosition)
-	    {
-	    return super.move(newPosition, oldPosition);
-	    }
-	  }
-
-	 
-	/**
-	 * ReferencableXMIResourceImpl constructor comment.
-	 */
-	public ReferencedXMIResourceImpl() {
-		super();
-	}
-
-	public ReferencedXMIResourceImpl(URI uri) {
-		super(uri);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.wst.common.internal.emf.resource.ReferencedResource#getReadCount()
-	 */
-	public int getReadCount() {
-		return readReferenceCount;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.wst.common.internal.emf.resource.ReferencedResource#getWriteCount()
-	 */
-	public int getWriteCount() {
-		return editReferenceCount;
-	}
-
-
-
-	/*
-	 * @see ReferencedResource#accessForRead
-	 */
-	public void accessForRead() {
-		checkDeleted();
-		if (!isNew())
-			readReferenceCount++;
-		isNew = false;
-	}
-
-	/*
-	 * @see ReferencedResource#accessForWrite
-	 */
-	public void accessForWrite() {
-		checkDeleted();
-		editReferenceCount++;
-		if (isNew)
-			releaseFromRead();
-		isNew = false;
-		if (!isTrackingModification())
-			setTrackingModification(true);
-	}
-
-	/*
-	 * Check if this resource has been removed and throw an exception if it does not have a
-	 * ResourceSet.
-	 */
-	protected void checkDeleted() {
-		if (getResourceSet() == null)
-			throw new RuntimeException(DELETED_ERROR_MSG);
-	}
-
-	/**
-	 *  
-	 */
-	public void collectContainedObjects(java.util.List collecting, EObject parentObject) {
-
-		java.util.Iterator children = parentObject.eContents().iterator();
-		while (children.hasNext()) {
-			EObject child = (EObject) children.next();
-			collecting.add(child);
-			collectContainedObjects(collecting, child);
-		}
-	}
-
-	/**
-	 *  
-	 */
-	public void ensureFullIDHydration() {
-		List allRefObjects = new ArrayList();
-		Iterator rootObjects = getContents().iterator();
-		while (rootObjects.hasNext()) {
-			EObject child = (EObject) rootObjects.next();
-			allRefObjects.add(child);
-			collectContainedObjects(allRefObjects, child);
-		}
-
-		Iterator iter = allRefObjects.iterator();
-		while (iter.hasNext())
-			IDUtil.assignID((EObject) iter.next(), this);
-	}
-
-	/**
-	 * If the resource is no longer being accessed, then remove it from the resource set.
-	 */
-	public void unloadIfNecessary() {
-		if ((getTotalReferenceCount() <= 0) || (editReferenceCount <= 0 && isModified()))
-			unload();
-	}
-
-	/**
-	 * Return the number of write accesses to this resource.
-	 * 
-	 * @return int The number of references.
-	 */
-	protected int getTotalReferenceCount() {
-		return editReferenceCount + readReferenceCount;
-	}
-
-	/*
-	 * @see ReferencedResource#isNew
-	 */
-	public boolean isNew() {
-		return isNew;
-	}
-
-	/*
-	 * @see ReferencedResource#isReadOnly
-	 */
-	public boolean isReadOnly() {
-		return editReferenceCount <= 0;
-	}
-
-	/*
-	 * @see ReferencedResource#isShared
-	 */
-	public boolean isShared() {
-		return getTotalReferenceCount() > 1;
-	}
-
-	/*
-	 * @see ReferencedResource#isSharedForWrite
-	 */
-	public boolean isSharedForWrite() {
-		return editReferenceCount > 1;
-	}
-
-	/**
-	 * @see ReferencedResource#preDelete
-	 */
-	public void preDelete() {
-	}
-
-	/*
-	 * @see ReferencedResource#releaseFromRead
-	 */
-	public void releaseFromRead() {
-		readReferenceCount--;
-		if (readReferenceCount < 0)
-			throw new RuntimeException("Read reference count error:  " + this.toString()); //$NON-NLS-1$
-		unloadIfNecessary();
-	}
-
-	/*
-	 * @see ReferencedResource#releaseFromWrite
-	 */
-	public void releaseFromWrite() {
-		editReferenceCount--;
-		if (editReferenceCount < 0)
-			throw new RuntimeException("Write reference count error:  " + this.toString()); //$NON-NLS-1$
-		unloadIfNecessary();
-	}
-
-	/*
-	 * @see ReferencedResource#saveIfNecessary
-	 */
-	public void saveIfNecessary() throws Exception {
-		if (!isSharedForWrite()) // caller is the only referencer
-			save(Collections.EMPTY_MAP);
-	}
-
-	@Override
-	public String toString() {
-		return TO_STRING + getURI().toString() + READ_COUNT_TO_STRING + new Integer(readReferenceCount) + WRITE_COUNT_TO_STRING + new Integer(editReferenceCount);
-	}
-
-	/*
-	 * @see ReferencedResource#needsToSave()
-	 */
-	public boolean needsToSave() {
-		return isModified() && !isSharedForWrite();
-	}
-
-
-	/**
-	 * @see ReferencedResource#setForceRefresh(boolean)
-	 */
-	public void setForceRefresh(boolean b) {
-		forceRefresh = b;
-	}
-
-	/**
-	 * @see ReferencedResource#shouldForceRefresh()
-	 */
-	public boolean shouldForceRefresh() {
-		return forceRefresh;
-	}
-
-	@Override
-	protected void basicDoLoad(InputStream arg0, Map arg1) throws IOException {
-		boolean isTrackingMods = isTrackingModification();
-		try {
-			if (isTrackingMods)
-				setTrackingModification(false);
-			super.basicDoLoad(arg0, arg1);
-		} finally {
-			if (isTrackingMods)
-				setTrackingModification(true);
-		}
-	}
-
-	/**
-	 * @see org.eclipse.emf.ecore.xmi.impl.XMLResourceImpl#doUnload()
-	 */
-	@Override
-	protected void doUnload() {
-		
-		try {
-			// Using load lock to ensure no other threads will attempt a load during the unload process
-			addSynchronizationLoadingAdapter();
-			waitForResourceToLoadIfNecessary();
-			
-			if (isTrackingModification() && editReferenceCount < 1) //do not turn off modification if
-				// we still have a write count
-				setTrackingModification(false);
-			super.doUnload();
-			setForceRefresh(false);
-			setModified(false); //dcb - this is required to ensure that resources without files are
-			// marked as not modified.
-			if (readReferenceCount == 0 && editReferenceCount == 0 && getResourceSet() != null) {
-				getResourceSet().getResources().remove(this);
-			}
-		
-		} finally {
-			//Removing the load lock
-			removeLoadingSynchronizationAdapter();
-		}
-			
-	}
-
-
-	/**
-	 * The resource has been unloaded, and there are no references. Treat the resource like a new
-	 * Resource
-	 */
-	// never used
-//	private void resetAsNew() {
-//		readReferenceCount = 1;
-//		isNew = true;
-//	}
-
-	/**
-	 * @see org.eclipse.emf.ecore.resource.Resource#save(Object)
-	 */
-	@Override
-	public void save(Map options) throws IOException {
-		notifyAboutToSave();
-        try {
-            super.save(options);
-        } catch (Exception e) {
-            notifySaveFailed();
-            if (e instanceof IOException)
-                throw (IOException) e;
-            EcoreUtilitiesPlugin.logError(e);
-        }
-        notifySaved();
-	}
-
-	protected void notifySaved() {
-		notifySaveEvent(RESOURCE_WAS_SAVED);
-	}
-	
-	protected void notifyAboutToSave() {
-        notifySaveEvent(RESOURCE_ABOUT_TO_SAVE);
-    }
-	
-	protected void notifySaveFailed() {
-        notifySaveEvent(RESOURCE_SAVE_FAILED);
-    }
-	
-	private void notifySaveEvent(int eventType) {
-		if (eNotificationRequired()) {
-		  Notification notification =
-			new NotificationImpl(eventType, this, this)
-			{
-			  @Override
-			public Object getNotifier()
-			  {
-				return ReferencedXMIResourceImpl.this;
-			  }
-			  @Override
-			public int getFeatureID(Class expectedClass)
-			  {
-				return eventType;
-			  }
-			};
-			eNotify(notification);
-		}
-	}	
-
-	/**
-	 * @see com.ibm.etools.emf.workbench.ReferencedResource#wasReverted()
-	 */
-	public boolean wasReverted() {
-		return false;
-	}
-	
-	@Override
-	public EList eAdapters()
-	  {
-	    if (eAdapters == null)
-	    {
-	      eAdapters =  new ESynchronizedAdapterList(this);
-	    }
-	    return eAdapters;
-	  }
-
-
-}
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/Renderer.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/Renderer.java
deleted file mode 100644
index 4a9c37d..0000000
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/Renderer.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 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
- *******************************************************************************/
-package org.eclipse.wst.common.internal.emf.resource;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.util.Map;
-
-/**
- * Interface that defines the api for rendering an EMF object to XML and vice versa
- */
-public interface Renderer {
-
-	public static final String JAXP_SCHEMA_LANGUAGE = "http://java.sun.com/xml/jaxp/properties/schemaLanguage"; //$NON-NLS-1$
-
-	public static final String W3C_XML_SCHEMA = "http://www.w3.org/2001/XMLSchema"; //$NON-NLS-1$
-
-	void setResource(TranslatorResource aResource);
-
-	TranslatorResource getResource();
-
-	void doLoad(InputStream in, Map options) throws IOException;
-
-	void doSave(OutputStream outputStream, Map options) throws IOException;
-
-	boolean useStreamsForIO();
-
-	void prepareToAddContents();
-
-	int getVersionID();
-
-	boolean isModified();
-
-	void accessForWrite();
-
-	void accessForRead();
-
-	void releaseFromRead();
-
-	void releaseFromWrite();
-
-	void preDelete();
-
-	void preUnload();
-
-	boolean isShared();
-
-	boolean isSharedForWrite();
-
-	void setBatchMode(boolean isBatch);
-	
-	boolean isBatchMode();
-}
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/RendererFactory.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/RendererFactory.java
deleted file mode 100644
index 356c05f..0000000
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/RendererFactory.java
+++ /dev/null
@@ -1,136 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors: IBM Corporation - initial API and implementation
- **************************************************************************************************/
-package org.eclipse.wst.common.internal.emf.resource;
-
-import java.util.Iterator;
-import java.util.Map;
-import java.util.WeakHashMap;
-
-
-public abstract class RendererFactory {
-
-	public abstract Renderer createRenderer();
-
-	private static RendererFactory defaultRendererFactory;
-
-	private static RendererFactoryDefaultHandler defaultHandler;
-
-	private boolean validating = true;
-
-	/**
-	 * Interested parties can use the
-	 */
-	public final static Notifier NotificationEngine = Notifier.INSTANCE;
-
-	/**
-	 * @return
-	 */
-	public static RendererFactory getDefaultRendererFactory() {
-		if (defaultRendererFactory == null)
-			defaultRendererFactory = getDefaultHandler().getDefaultRendererFactory();
-		return defaultRendererFactory;
-	}
-
-	/**
-	 * @param factory
-	 */
-	public static void setDefaultRendererFactory(RendererFactory factory) {
-
-		//System.out.println("\n\n***Setting factory: " + factory);
-		NotificationEngine.notifyListeners(factory);
-		defaultRendererFactory = factory;
-	}
-
-	@Override
-	public String toString() {
-		return "RendererFactory instance: " + getClass().getName(); //$NON-NLS-1$
-	}
-
-	public static class Notifier {
-
-		private static final Notifier INSTANCE = new Notifier();
-
-		// use a WeakHashMap for a weak HashSet
-		private final Map resourceFactoryListeners = new WeakHashMap();
-
-		private Notifier() {
-		}
-
-		public void notifyListeners(RendererFactory rendererFactory) {
-
-			final int length = resourceFactoryListeners.size();
-			//System.out.println("Notifying " + length + " listeners");
-
-			if (length > 0) {
-				/*
-				 * Since the renderer factories are singletons, this reference check should always
-				 * work
-				 */
-				if (rendererFactory != RendererFactory.getDefaultRendererFactory()) {
-					synchronized (resourceFactoryListeners) {
-						for (Iterator i = resourceFactoryListeners.keySet().iterator(); i.hasNext();) {
-							Listener listener = (Listener) i.next();
-							//System.out.println("Notifying Listener: " + listener);
-							listener.updateRendererFactory(rendererFactory);
-						}
-					}
-				}
-			}
-		}
-
-		public void addListener(Listener l) {
-			//System.out.println("Adding listener: " + l);
-			synchronized (resourceFactoryListeners) {
-				resourceFactoryListeners.put(l, null);
-			}
-		}
-
-		public void removeListener(Listener listenerToRemove) {
-			synchronized (resourceFactoryListeners) {
-				resourceFactoryListeners.remove(listenerToRemove);
-			}
-		}
-
-	}
-
-	public interface Listener {
-		void updateRendererFactory(RendererFactory newRendererFactory);
-	}
-
-	/**
-	 * @return
-	 */
-	public boolean isValidating() {
-		return validating;
-	}
-
-	/**
-	 * @param b
-	 */
-	public void setValidating(boolean b) {
-		validating = b;
-	}
-
-	/**
-	 * @return
-	 */
-	public static RendererFactoryDefaultHandler getDefaultHandler() {
-		if (defaultHandler == null)
-			defaultHandler = EMF2DOMRendererFactoryDefaultHandler.INSTANCE;
-		return defaultHandler;
-	}
-
-	/**
-	 * @param handler
-	 */
-	public static void setDefaultHandler(RendererFactoryDefaultHandler handler) {
-		defaultHandler = handler;
-	}
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/RendererFactoryDefaultHandler.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/RendererFactoryDefaultHandler.java
deleted file mode 100644
index 575df4f..0000000
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/RendererFactoryDefaultHandler.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 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
- *******************************************************************************/
-/*
- * Created on Dec 1, 2003
- *
- * To change the template for this generated file go to
- * Window&gt;Preferences&gt;Java&gt;Code Generation&gt;Code and Comments
- */
-package org.eclipse.wst.common.internal.emf.resource;
-
-
-/**
- * @author schacher
- * 
- * To change the template for this generated type comment go to
- * Window&gt;Preferences&gt;Java&gt;Code Generation&gt;Code and Comments
- */
-public interface RendererFactoryDefaultHandler {
-
-	RendererFactory getDefaultRendererFactory();
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/ResourceFactoryDescriptor.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/ResourceFactoryDescriptor.java
deleted file mode 100644
index 697b516..0000000
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/ResourceFactoryDescriptor.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.common.internal.emf.resource;
-
-import org.eclipse.core.runtime.content.IContentType;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.resource.Resource;
-
-public abstract class ResourceFactoryDescriptor {
-	
-	
-	/**
-	 * Returns true if the current descriptor is applicable to the given fileURI.
-	 * 
-	 * @param fileURI The URI of the file to be loaded
-	 * @return True if the current descriptor declares a resource factory applicable to the given URI.
-	 */
-	public abstract boolean isEnabledFor(URI fileURI);
-	
-	/**
-	 * The contentType is one optional way that a ResourceFactory
-	 * might apply to a URI. Clients should call {@link isEnabledFor} 
-	 * instead of comparing the content Types when searching for an
-	 * applicable descriptor from a set.  
-	 * 
-	 * <p><b>Subclasses may return null.(optional)</b></p>
-	 *  
-	 * @return The content type that this descriptor is applicable to.
-	 */
-	public IContentType getContentType(){
-		return null;
-	}
-	
-	/**
-	 * In the case where more than one factory is defined for the same fileName, 
-	 * and creation is passed a uri only a default factory is needed
-	 * 
-	 *  
-	 * @return The boolean describing the default factory
-	 */
-	public boolean isDefault(){
-		return true;
-	}
-	
-	/**
-	 * The short segment is one possible way that a ResourceFactory
-	 * might apply to a URI. Clients should call {@link isEnabledFor} 
-	 * instead of comparing the short segments when searching for an
-	 * applicable descriptor from a set.  
-	 * 
-	 * <p><b>Subclasses may NOT return null unless they also override
-	 * {@link #hashCode()} and {@link #equals(Object)}.</b></p>
-	 *  
-	 * @return The short segment that this descriptor is applicable to.
-	 */
-	public abstract String getShortSegment();
-	
-	
-	/**
-	 * The correct instance of Resource.Factory. The instance returned
-	 * may or may not be unique, so if you require the same instance 
-	 * for each call, you should cache the value returned the first
-	 * time from this method. 
-	 * 
-	 * @return An instance of Resource.Factory.
-	 */
-	public abstract Resource.Factory createFactory();
-	
-	@Override
-	public int hashCode() {
-		return getShortSegment().hashCode();
-	}
-	
-	@Override
-	public boolean equals(Object o) {
-		if(o instanceof ResourceFactoryDescriptor)
-			return getShortSegment().equals(((ResourceFactoryDescriptor)o).getShortSegment());
-		return false;
-	}
-}
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/RootTranslator.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/RootTranslator.java
deleted file mode 100644
index bbba2f3..0000000
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/RootTranslator.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 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
- *******************************************************************************/
-package org.eclipse.wst.common.internal.emf.resource;
-
-import org.eclipse.emf.common.notify.Notifier;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.resource.Resource;
-
-public class RootTranslator extends Translator {
-
-	/**
-	 * Constructor for RootTranslator.
-	 * 
-	 * @param domNameAndPath
-	 * @param eClass
-	 */
-	public RootTranslator(String domNameAndPath, EClass eClass) {
-		super(domNameAndPath, eClass);
-	}
-
-	/**
-	 * @see com.ibm.etools.emf2xml.impl.Translator#setMOFValue(Notifier, Object, int)
-	 */
-	@Override
-	public void setMOFValue(Notifier owner, Object value, int newIndex) {
-		((Resource) owner).getContents().add(newIndex, (EObject)value);
-	}
-
-	/**
-	 * @see com.ibm.etools.emf2xml.impl.Translator#removeMOFValue(Notifier, Object)
-	 */
-	@Override
-	public void removeMOFValue(Notifier owner, Object value) {
-		((Resource) owner).getContents().remove(value);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see com.ibm.etools.emf2xml.impl.Translator#setMOFValue(org.eclipse.emf.ecore.EObject,
-	 *      java.lang.Object)
-	 */
-	@Override
-	public void setMOFValue(Resource res, Object value) {
-		if (res != null && value != null)
-			res.getContents().add((EObject)value);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see com.ibm.etools.emf2xml.impl.Translator#isMultiValued()
-	 */
-	@Override
-	public boolean isMultiValued() {
-		return true;
-	}
-
-
-}
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/SourceLinkTranslator.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/SourceLinkTranslator.java
deleted file mode 100644
index 371e0d8..0000000
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/SourceLinkTranslator.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 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
- *******************************************************************************/
-/*
- * Created on Apr 1, 2003
- *
- */
-package org.eclipse.wst.common.internal.emf.resource;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-
-/**
- * @author schacher
- */
-public class SourceLinkTranslator extends Translator {
-
-
-	/**
-	 * @param domNameAndPath
-	 * @param aFeature
-	 * @param path
-	 */
-	public SourceLinkTranslator(String domNameAndPath, EStructuralFeature aFeature, TranslatorPath path) {
-		super(domNameAndPath, aFeature, path);
-	}
-
-	/**
-	 * @param domNameAndPath
-	 * @param aFeature
-	 * @param path
-	 */
-	public SourceLinkTranslator(String domNameAndPath, EStructuralFeature aFeature, TranslatorPath path, int style) {
-		super(domNameAndPath, aFeature, path);
-		fStyle |= style;
-	}
-
-	/**
-	 * @param domNameAndPath
-	 * @param aFeature
-	 * @param style
-	 */
-	public SourceLinkTranslator(String domNameAndPath, EStructuralFeature aFeature, int style) {
-		super(domNameAndPath, aFeature, style);
-	}
-
-	@Override
-	public Object convertStringToValue(String strValue, EObject owner) {
-
-		Object value = null;
-		if (strValue != null)
-			// Find the object with the name that matches matchName
-			value = fTranslatorPaths[0].findObject(owner, strValue.trim());
-		if ((fStyle & Translator.STRING_RESULT_OK) != 0)
-			return ((value != null) ? value : strValue);
-		return value;
-	}
-
-	@Override
-	public String convertValueToString(Object value, EObject owner) {
-		TranslatorPath path = fTranslatorPaths[0];
-		Object attrValue = path.getLastMap().getMOFValue((EObject) value);
-		return path.getLastMap().convertValueToString(attrValue, owner);
-	}
-
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/StaticResourceFactoryDescriptor.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/StaticResourceFactoryDescriptor.java
deleted file mode 100644
index e2f46fc..0000000
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/StaticResourceFactoryDescriptor.java
+++ /dev/null
@@ -1,55 +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
- *******************************************************************************/
-package org.eclipse.wst.common.internal.emf.resource;
-
-import org.eclipse.core.runtime.Assert;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.resource.Resource;
-
-/**
- * Declares a subclass to create Resource.Factory(ies) from an extension. 
- */
-class StaticResourceFactoryDescriptor extends ResourceFactoryDescriptor {
-	
-	private final String shortSegment;
-	private final Resource.Factory factory;
-	
-	/**
-	 * 
-	 * @param shortSegment A non-null name of the file associated with the given factory
-	 * @param factory A non-null Resource.Factory that can load files of the given name
-	 */
-	public StaticResourceFactoryDescriptor(String shortSegment, Resource.Factory factory) {
-		Assert.isNotNull(shortSegment);
-		Assert.isNotNull(factory);
-		this.shortSegment = shortSegment;
-		this.factory = factory;
-	}  
-
-	@Override
-	public boolean isEnabledFor(URI fileURI) {
-		/* shortSegment must be non-null for the descriptor to be created, 
-		 * a validation check in init() verifies this requirement */
-		if(fileURI != null && fileURI.lastSegment() != null)
-			return shortSegment.equals(fileURI.lastSegment());
-		return false;
-	} 
-	
-	@Override
-	public Resource.Factory createFactory() {
-		 return factory;			
-	}
-
-	@Override
-	public String getShortSegment() {
-		return shortSegment;
-	}  
-}
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/Translator.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/Translator.java
deleted file mode 100644
index 0cee91f..0000000
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/Translator.java
+++ /dev/null
@@ -1,807 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 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
- *******************************************************************************/
-package org.eclipse.wst.common.internal.emf.resource;
-
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.emf.common.notify.Notifier;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EDataType;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.EcorePackage;
-import org.eclipse.emf.ecore.impl.EStructuralFeatureImpl;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.wst.common.internal.emf.utilities.ExtendedEcoreUtil;
-import org.eclipse.wst.common.internal.emf.utilities.FeatureValueConverter;
-import org.w3c.dom.Node;
-
-
-public class Translator {
-
-	public final static int NO_STYLE = 0;
-	public final static int DOM_ATTRIBUTE = 1;
-	public final static int EMPTY_TAG = 1 << 1;
-	public final static int CDATA_CONTENT = 1 << 2;
-	/**
-	 * Style bit that indicates that the end tag should NOT be indented; by default it is.
-	 */
-	public final static int END_TAG_NO_INDENT = 1 << 3;
-	/**
-	 * Style bit that indicates that booleans should NOT be converted as "True" and "False"; default
-	 * is that they are
-	 */
-	public final static int BOOLEAN_LOWERCASE = 1 << 4;
-	/**
-	 * Style bit that indicates an enum value contains hyphens If this is true, then internally the
-	 * hyphens are replaced with underscores
-	 */
-	public final static int ENUM_FEATURE_WITH_HYPHENS = 1 << 5;
-
-	protected final static int OBJECT_MAP = 1 << 6;
-	protected final static int BOOLEAN_FEATURE = 1 << 7;
-
-	protected final static int SHARED_REFERENCE = 1 << 8;
-
-	/**
-	 * Indicates that the feature may be significant even if it is empty
-	 */
-	public final static int EMPTY_CONTENT_IS_SIGNIFICANT = 1 << 9;
-
-	/**
-	 * Used to indicate that feature is associated with a comment node
-	 */
-	protected final static int COMMENT_FEATURE = 1 << 10;
-
-	/**
-	 * If the value is null, then an eUnset() will be invoked on the feature
-	 */
-	public final static int UNSET_IF_NULL = 1 << 11;
-
-	/**
-	 * Return the element contents as a String if the feature is unresolveable (Used by the
-	 * SourceLinkTranslator)
-	 */
-	public final static int STRING_RESULT_OK = 1 << 12;
-
-	protected String[] fDOMNames;
-	protected String fDOMPath = ""; //$NON-NLS-1$
-	protected Map readAheadNames;
-	protected int fStyle = NO_STYLE;
-	protected EStructuralFeature feature;
-	protected TranslatorPath[] fTranslatorPaths;
-	protected EClass emfClass;
-	protected String fNameSpace = ""; //$NON-NLS-1$
-	// added by MDE
-	protected String domNameAndPath = null;
-
-	/**
-	 * Indicates if any of the children of this Translator are themselves DependencyTranslators
-	 */
-	protected Boolean isDependencyParent;
-	protected EStructuralFeature dependencyFeature;
-	protected static EcorePackage ECORE_PACKAGE = EcorePackage.eINSTANCE;
-
-	// Use this identifier for the DOMName when the attribute
-	// value is to be extracted directly from the text of the node.
-	// This is rare, but occurs in the web.xml in the case of a
-	// WelcomeFile.
-	static final public String TEXT_ATTRIBUTE_VALUE = "$TEXT_ATTRIBUTE_VALUE"; //$NON-NLS-1$
-
-	static final public EStructuralFeature CONTAINER_FEATURE = new ContainerFeature();
-
-	static final public EStructuralFeature ROOT_FEATURE = new RootFeature();
-
-	protected static class ContainerFeature extends EStructuralFeatureImpl {
-		protected ContainerFeature() {
-			super();
-		}
-	}
-
-	protected static class RootFeature extends EStructuralFeatureImpl {
-		protected RootFeature() {
-			super();
-		}
-	}
-
-	public Translator findChild(String tagName, Object target, int versionID) {
-
-		Translator result = null;
-		Translator[] maps = getChildren(target, versionID);
-
-		if (maps != null) {
-			for (int i = 0; i < maps.length; i++) {
-				Translator map = maps[i];
-				if (map.isMapFor(tagName)) {
-					result = map;
-					break;
-				}
-			}
-		}
-		if (result == null) {
-			VariableTranslatorFactory factory = getVariableTranslatorFactory();
-			if (factory != null && factory.accepts(tagName)) {
-				result = factory.create(tagName);
-			}
-		}
-		return result;
-	}
-
-	/**
-	 * Utility method to string together arrays of children
-	 */
-	public static Object[] concat(Object[] array1, Object[] array2) {
-		Object[] result = (Object[]) java.lang.reflect.Array.newInstance(array1.getClass().getComponentType(), array1.length + array2.length);
-		System.arraycopy(array1, 0, result, 0, array1.length);
-		System.arraycopy(array2, 0, result, array1.length, array2.length);
-		return result;
-	}
-
-	public static Object[] concat(Object[] array1, Object object2) {
-		Object[] newArray = new Object[]{object2};
-		return concat(array1, newArray);
-	}
-
-	public static Translator createParentAndTextAttributeTranslator(String domName, EStructuralFeature parentFeature, EStructuralFeature childFeature) {
-		GenericTranslator parent = new GenericTranslator(domName, parentFeature, END_TAG_NO_INDENT);
-		parent.setChildren(new Translator[]{new Translator(TEXT_ATTRIBUTE_VALUE, childFeature)});
-		return parent;
-	}
-
-	public Translator(String domNameAndPath, EClass eClass) {
-		initializeDOMNameAndPath(domNameAndPath);
-		setEMFClass(eClass);
-	}
-
-	public Translator(String domNameAndPath, EStructuralFeature aFeature) {
-		initializeDOMNameAndPath(domNameAndPath);
-		setFeature(aFeature);
-	}
-
-	public Translator(String domNameAndPath, EStructuralFeature aFeature, EClass eClass) {
-		this(domNameAndPath, aFeature);
-		setEMFClass(eClass);
-	}
-
-	public Translator(String domNameAndPath, EStructuralFeature aFeature, TranslatorPath path) {
-		this(domNameAndPath, aFeature, new TranslatorPath[]{path});
-	}
-
-	public Translator(String domNameAndPath, EStructuralFeature aFeature, TranslatorPath[] paths) {
-		initializeDOMNameAndPath(domNameAndPath);
-		fTranslatorPaths = paths;
-		setFeature(aFeature);
-	}
-
-	public Translator(String domNameAndPath, EStructuralFeature aFeature, int style) {
-		initializeDOMNameAndPath(domNameAndPath);
-		fStyle = style;
-		setFeature(aFeature);
-	}
-
-	public static EcorePackage getEcorePackage() {
-		return EcorePackage.eINSTANCE;
-	}
-
-	public String getDOMName(Object value) {
-		return fDOMNames[0];
-	}
-
-	public String[] getDOMNames() {
-		return fDOMNames;
-	}
-
-	public String getDOMPath() {
-		return fDOMPath;
-	}
-
-	public boolean hasDOMPath() {
-		return fDOMPath != null && fDOMPath.length() != 0;
-	}
-
-	public EStructuralFeature getFeature() {
-		return feature;
-	}
-
-	/**
-	 * Parse the DOM names and path out of <domNameAndPath>and set the appropriate fields.
-	 */
-	protected void initializeDOMNameAndPath(String domNameAndPathArg) {
-		if (domNameAndPathArg == null)
-			return;
-		int inx = domNameAndPathArg.lastIndexOf('/');
-		if (inx != -1) {
-			fDOMNames = parseDOMNames(domNameAndPathArg.substring(inx + 1));
-			fDOMPath = domNameAndPathArg.substring(0, inx);
-		} else {
-			fDOMNames = parseDOMNames(domNameAndPathArg);
-			fDOMPath = ""; //$NON-NLS-1$
-		}
-		// added by MDE
-		this.domNameAndPath = domNameAndPathArg;
-
-	}
-
-	/**
-	 * Indicates whether the node should be written as an empty tag; eg, <distributable/>
-	 */
-	public boolean isCDATAContent() {
-		return (fStyle & CDATA_CONTENT) != 0;
-	}
-
-	/**
-	 * Indicates whether the DOMName represents a sub element name or an attribute name
-	 * 
-	 * @return boolean True if the DOMName is an attribute name.
-	 */
-	public boolean isDOMAttribute() {
-		return (fStyle & DOM_ATTRIBUTE) != 0;
-	}
-
-	/**
-	 * Indicates whether the node should be written as an empty tag; eg, <distributable/>
-	 */
-	public boolean isEmptyTag() {
-		return (fStyle & EMPTY_TAG) != 0;
-	}
-
-	public boolean isBooleanUppercase() {
-		return (fStyle & BOOLEAN_FEATURE) != 0 && (fStyle & BOOLEAN_LOWERCASE) == 0;
-	}
-
-	public boolean isBooleanFeature() {
-		return (fStyle & BOOLEAN_FEATURE) != 0;
-	}
-
-	public boolean shouldIndentEndTag() {
-		return (fStyle & END_TAG_NO_INDENT) == 0;
-	}
-
-	public boolean shouldIndentEndTag(Node node) {
-		return shouldIndentEndTag();
-	}
-
-	public boolean isEmptyContentSignificant() {
-		return ((fStyle & EMPTY_TAG) != 0) || ((fStyle & EMPTY_CONTENT_IS_SIGNIFICANT) != 0);
-	}
-
-	/**
-	 * Returns true if this map is to another MOF object (not a primitive)
-	 */
-	public boolean isObjectMap() {
-		return (fStyle & OBJECT_MAP) != 0;
-	}
-
-	/**
-	 * Returns true if this map is for a shared reference
-	 */
-	public boolean isShared() {
-		return (fStyle & SHARED_REFERENCE) != 0;
-	}
-
-	public boolean isEnumWithHyphens() {
-		return (fStyle & ENUM_FEATURE_WITH_HYPHENS) != 0;
-	}
-
-	/**
-	 * Indicates whether the map represents a case where the text of the DOMNode represents the
-	 * objects one and only attribute value. An example of this case is a <welcome-file>file.txt
-	 * </welcome-file>.
-	 */
-	public boolean isDOMTextValue() {
-		return fDOMNames[0] == TEXT_ATTRIBUTE_VALUE;
-	}
-
-	/**
-	 * Indicates whether the id is the mof attribute that should be set.
-	 */
-	public boolean isIDMap() {
-		return false;
-	}
-
-	/**
-	 * Indicates whether the id is the mof attribute that should be set.
-	 */
-	public boolean isLinkMap() {
-		return fTranslatorPaths != null;
-	}
-
-	public boolean isTargetLinkMap() {
-		return isLinkMap() && !isObjectMap();
-	}
-
-	/**
-	 * Return true if this map is the one representing a node with the name <domName>. By default
-	 * this method simply compares the DOM name of the map against the <domName>parameter
-	 * 
-	 * @return boolean
-	 * @param domName
-	 *            java.lang.String
-	 */
-	public boolean isMapFor(String domName) {
-		if (domName.equals(getDOMPath()))
-			return true;
-		for (int i = 0; i < fDOMNames.length; i++) {
-			if (domName.equals(fDOMNames[i]))
-				return true;
-		}
-		return false;
-	}
-
-	public boolean isMapFor(Object aFeature, Object oldValue, Object newValue) {
-		return feature == aFeature;
-	}
-
-	/**
-	 * Indicates whether feature being mapped is a collection.
-	 * 
-	 * @return boolean True if the feature is multi valued.
-	 */
-	public boolean isMultiValued() {
-		if (feature != null)
-			return feature.isMany();
-		return false;
-	}
-
-	/**
-	 * Parses comma separated names from <domNamesString>. Returns an array containing the names.
-	 * 
-	 * @return java.lang.String[]
-	 * @param domNamesString
-	 *            java.lang.String
-	 */
-	protected String[] parseDOMNames(String domNamesString) {
-		int startInx = 0;
-		int inx = domNamesString.indexOf(',');
-		ArrayList results = new ArrayList(1);
-		while (inx != -1) {
-			results.add(domNamesString.substring(startInx, inx));
-			startInx = inx + 1;
-			inx = domNamesString.indexOf(',', startInx);
-		}
-		if (startInx == 0)
-			results.add(domNamesString);
-		else
-			results.add(domNamesString.substring(startInx));
-		return (String[]) results.toArray(new String[results.size()]);
-	}
-
-	@Override
-	public String toString() {
-		StringBuffer sb = new StringBuffer();
-		String cn = getClass().getName();
-		int i = cn.lastIndexOf('.');
-		cn = cn.substring(++i, cn.length());
-		sb.append(cn);
-		sb.append('(');
-		sb.append(fDOMNames[0]);
-		for (int j = 1; j < fDOMNames.length; j++) {
-			sb.append('|');
-			sb.append(fDOMNames[j]);
-		}
-		sb.append(',');
-		sb.append(hashCode());
-		sb.append(')');
-		return sb.toString();
-	}
-
-	/**
-	 * Gets the TranslatorPath.
-	 * 
-	 * @return Returns a TranslatorPath
-	 */
-	public TranslatorPath[] getTranslatorPaths() {
-		return fTranslatorPaths;
-	}
-
-	/*
-	 * @see Object#equals(Object)
-	 */
-	@Override
-	public boolean equals(Object object) {
-		if (!(object instanceof Translator))
-			return false;
-		Translator mapInfo = (Translator) object;
-		return fDOMNames.equals(mapInfo.getDOMNames()) && (feature == null && mapInfo.getFeature() == null || feature.equals(mapInfo.getFeature()));
-	}
-	
-	@Override
-	public int hashCode() {
-		return super.hashCode() +fDOMNames.hashCode();
-	}
-
-	/**
-	 * Returns the isManagedByParent.
-	 * 
-	 * @return boolean
-	 */
-	public boolean isManagedByParent() {
-		return getChildren(null, -1) == null;
-	}
-
-	/*
-	 * In the 99% case there is only one node name to be concerned with, but subclasses can override
-	 * for the cases where multiple dom names map to one feature
-	 */
-	public EObject createEMFObject(String nodeName, String readAheadName) {
-		if (emfClass == null) {
-			if (feature == null)
-				return null;
-			if (isObjectMap())
-				return createEMFObject(feature);
-		}
-		return createEMFObject(emfClass);
-	}
-
-	public static EObject createEMFObject(EStructuralFeature aFeature) {
-		if (aFeature == null)
-			return null;
-
-		return createEMFObject(((EReference) aFeature).getEReferenceType());
-	}
-
-	public static EObject createEMFObject(EClass anEClass) {
-		if (anEClass == null)
-			return null;
-		return anEClass.getEPackage().getEFactoryInstance().create(anEClass);
-	}
-
-	public void setTextValueIfNecessary(String textValue, Notifier owner, int versionId) {
-		Translator textTranslator = this.findChild(Translator.TEXT_ATTRIBUTE_VALUE, owner, versionId);
-		if (textTranslator != null) {
-			Object objectValue = textTranslator.convertStringToValue(textValue, (EObject) owner);
-			textTranslator.setMOFValue(owner, objectValue);
-		}
-	}
-
-	/**
-	 * Check to see if feature is valid on a particular mofObject.
-	 * 
-	 * @return boolean Return true if the feature specified exists on the MOF object.
-	 * @param emfObject
-	 *            org.eclipse.emf.ecore.EObject
-	 */
-	public boolean featureExists(EObject emfObject) {
-		if (feature == null)
-			return false;
-
-		return emfObject.eClass().getEStructuralFeature(feature.getName()) != null;
-	}
-
-	/**
-	 * Translators which do not have a feature should override this method with custom behavior.
-	 */
-	public String extractStringValue(EObject emfObject) {
-		if (isEmptyTag() && feature == null)
-			return ""; //Fake it out with a value //$NON-NLS-1$
-		return null;
-	}
-
-	public Object convertStringToValue(String nodeName, String readAheadName, String value, Notifier owner) {
-		Object result = null;
-		try {
-
-			if (!this.isManagedByParent()) {
-				result = createEMFObject(nodeName, readAheadName);
-			} else {
-				result = convertStringToValue(value, (EObject) owner);
-			}
-
-		} catch (ClassCastException cce) {
-
-		}
-		return result;
-	}
-
-	/**
-	 * Converts a string value to the appropriate type.
-	 * 
-	 * @return java.lang.Object The converted value
-	 * @param strValue
-	 *            java.lang.String The string to convert.
-	 */
-	public Object convertStringToValue(String strValue, EObject owner) {
-		if (feature == null)
-			return strValue;
-		String innerStrValue = strValue;
-		if (innerStrValue != null) {
-			if (isEnumWithHyphens())
-				innerStrValue = innerStrValue.replace('-', '_');
-			if (!isCDATAContent()) {
-				innerStrValue = innerStrValue.trim();
-			}
-		}
-		Object value = FeatureValueConverter.DEFAULT.convertValue(innerStrValue, feature);
-		if (value == null) {
-			if (isEmptyTag() && !isDOMAttribute() && !isDOMTextValue() && isBooleanFeature())
-				return Boolean.TRUE;
-			EObject convertToType = feature.getEType();
-			if (convertToType == null)
-				value = innerStrValue;
-			else if (convertToType.equals(getEcorePackage().getEString())) {
-				value = ""; //$NON-NLS-1$
-			}
-		}
-		return value;
-	}
-
-	/**
-	 * Converts a value of a specified type to a string value. Subclasses may override for special
-	 * cases where special conversion needs to occur based on the feature and or object type.
-	 * 
-	 * @return String The converted value
-	 * @param value
-	 *            java.lang.Object The object to convert.
-	 */
-	public String convertValueToString(Object value, EObject owner) {
-		if (isEmptyTag() || value == null)
-			return null;
-		else if (isEnumWithHyphens())
-			return value.toString().replace('_', '-');
-		else if (isBooleanUppercase())
-			return ((Boolean) value).booleanValue() ? "True" : "False"; //$NON-NLS-1$ //$NON-NLS-2$
-
-		return value.toString();
-	}
-
-	public Translator[] getVariableChildren(Notifier target, int version) {
-		Translator[] results = null;
-		VariableTranslatorFactory factory = getVariableTranslatorFactory();
-		if (factory != null) {
-			List variableTranslators = factory.create(target);
-			if (variableTranslators != null && variableTranslators.size() > 0) {
-				Object[] vtoa = variableTranslators.toArray();
-
-				results = new Translator[vtoa.length];
-				for (int i = 0; i < results.length; i++)
-					results[i] = (Translator) vtoa[i];
-			}
-
-		}
-		if (results == null)
-			results = new Translator[0];
-		return results;
-	}
-
-	/**
-	 * Returns null by default; subclasses should override to return specific children
-	 */
-	public Translator[] getChildren(Object target, int versionID) {
-		return getChildren();
-	}
-
-	protected Translator[] getChildren() {
-		return null;
-	}
-
-	/**
-	 * Return the list of MOF children that currently exist for the values of an attribute.
-	 */
-	public List getMOFChildren(EObject mofObject) {
-		if (feature == null)
-			return Collections.EMPTY_LIST;
-		Object value = getMOFValue(mofObject);
-		List result = Collections.EMPTY_LIST;
-		if (isMultiValued())
-			result = (List) value;
-		else if (value != null)
-			result = Collections.singletonList(value);
-		return result;
-	}
-
-	public Object getMOFValue(EObject mofObject) {
-		if (feature == null)
-			return null;
-		return mofObject.eGet(feature);
-	}
-
-	/**
-	 * Sets a value of a feature in a mof object.
-	 */
-	public void setMOFValue(Notifier owner, Object value, int newIndex) {
-		if (feature != null) {
-			if ((fStyle & UNSET_IF_NULL) != 0 && value == null)
-				ExtendedEcoreUtil.eUnsetOrRemove((EObject) owner, feature, value);
-			else
-				ExtendedEcoreUtil.eSetOrAdd((EObject) owner, feature, value, newIndex);
-		}
-	}
-
-	public void setMOFValue(Notifier owner, Object value) {
-		if (owner instanceof EObject) {
-			setMOFValue((EObject) owner, value);
-		} else if (owner instanceof Resource) {
-			setMOFValue((Resource) owner, value);
-		}
-	}
-
-	public void setMOFValue(EObject emfObject, Object value) {
-		//		if (feature != null)
-		//			emfObject.eSet(feature, value);
-		setMOFValue(emfObject, value, -1);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see com.ibm.etools.emf2xml.impl.Translator#setMOFValue(org.eclipse.emf.ecore.EObject,
-	 *      java.lang.Object)
-	 */
-	public void setMOFValue(Resource res, Object value) {
-		if (res != null && value != null)
-			res.getContents().add((EObject)value);
-	}
-
-	public void removeMOFValue(Notifier owner, Object value) {
-		if (feature != null)
-			ExtendedEcoreUtil.eUnsetOrRemove((EObject) owner, feature, value);
-	}
-
-	public boolean isSetMOFValue(EObject emfObject) {
-		boolean isSet = feature != null && emfObject.eIsSet(feature);
-		if (isEmptyTag())
-			return isSet && ((Boolean) emfObject.eGet(feature)).booleanValue();
-		return isSet;
-	}
-
-	public void unSetMOFValue(EObject emfObject) {
-		if (feature != null)
-			emfObject.eUnset(feature);
-	}
-
-	public void clearList(EObject mofObject) {
-		if (feature != null)
-			((List) mofObject.eGet(feature)).clear();
-	}
-
-	protected void setFeature(EStructuralFeature aFeature) {
-		this.feature = aFeature;
-		if (feature == null)
-			return;
-		//This way an instance check happens only once
-		if (aFeature instanceof EReference) {
-			fStyle |= OBJECT_MAP;
-			if (!((EReference) aFeature).isContainment())
-				fStyle |= SHARED_REFERENCE;
-		}
-
-		if (getEcorePackage().getEBoolean() == feature.getEType())
-			fStyle |= BOOLEAN_FEATURE;
-	}
-
-	protected void setEMFClass(EClass anEClass) {
-		this.emfClass = anEClass;
-		if (anEClass != null)
-			fStyle |= OBJECT_MAP;
-
-	}
-
-	public boolean hasReadAheadNames() {
-		return readAheadNames != null && !readAheadNames.isEmpty();
-	}
-
-	/**
-	 * Return the read ahead names, if they are defined, for a given parent node name. This is used
-	 * when creation of a specific EMF object is dependent on the value of a child node.
-	 */
-	public ReadAheadHelper getReadAheadHelper(String parentName) {
-		if (readAheadNames == null)
-			return null;
-		return (ReadAheadHelper) readAheadNames.get(parentName);
-	}
-
-	public void addReadAheadHelper(ReadAheadHelper helper) {
-		if (readAheadNames == null)
-			readAheadNames = new HashMap(3);
-		readAheadNames.put(helper.getParentDOMName(), helper);
-	}
-
-	public boolean isDependencyChild() {
-		return false;
-	}
-
-	/**
-	 * @return
-	 */
-	public boolean isDependencyParent() {
-		if (isDependencyParent == null) {
-			isDependencyParent = Boolean.FALSE;
-			Translator[] theChildren = getChildren(null, -1);
-			if (theChildren != null) {
-				for (int i = 0; i < theChildren.length; i++) {
-					//For now we assume one
-					if (theChildren[i].isDependencyChild()) {
-						isDependencyParent = Boolean.TRUE;
-						dependencyFeature = theChildren[i].getDependencyFeature();
-					}
-				}
-			}
-		}
-		return isDependencyParent.booleanValue();
-	}
-
-	/**
-	 * @return
-	 */
-	public EStructuralFeature getDependencyFeature() {
-		return dependencyFeature;
-	}
-
-	public EObject basicGetDependencyObject(EObject parent) {
-		return (EObject) parent.eGet(dependencyFeature);
-	}
-
-	/**
-	 * Use when the DOM path is not null, and there are no children. Default is false, but
-	 * subclasses may wish to override
-	 */
-	public boolean shouldRenderEmptyDOMPath(EObject eObject) {
-		return isEmptyContentSignificant();
-	}
-
-	/**
-	 * Use when the translator tolerates parent nodes that relate to the DOM path, and no children;
-	 * default is do nothing
-	 */
-	public void setMOFValueFromEmptyDOMPath(EObject eObject) {
-
-	}
-
-	/**
-	 * Namespace for the attributes
-	 * 
-	 * @return
-	 */
-	public String getNameSpace() {
-		return fNameSpace;
-	}
-
-	/**
-	 * Set the namespace for the dom attribute
-	 * 
-	 * @param string
-	 */
-	public void setNameSpace(String string) {
-		fNameSpace = string;
-	}
-
-	public VariableTranslatorFactory getVariableTranslatorFactory() {
-		if (isObjectMap())
-			return DefaultTranslatorFactory.INSTANCE;
-		return null;
-	}
-
-	public boolean isEnumFeature() {
-		return feature != null && ECORE_PACKAGE.getEEnum().isInstance(feature.getEType());
-	}
-
-	public boolean isUnsettable() {
-		return feature != null && feature.isUnsettable();
-	}
-
-	public boolean isDataType() {
-		return feature != null && feature.getEType() instanceof EDataType;
-	}
-
-	/**
-	 * @return
-	 */
-	public boolean isComment() {
-		return (fStyle & COMMENT_FEATURE) != 0;
-	}
-
-}
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/TranslatorFilter.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/TranslatorFilter.java
deleted file mode 100644
index a38b83b..0000000
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/TranslatorFilter.java
+++ /dev/null
@@ -1,223 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2003, 2004 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
- **************************************************************************************************/
-/*
- * Created on Sep 21, 2003
- *  
- */
-package org.eclipse.wst.common.internal.emf.resource;
-
-import org.eclipse.emf.ecore.EObject;
-
-
-/*
- * Translator filters can be used to differentiate between Object and Attribute Translators without
- * breaking them out into seperate data structures. The Filter will rely on the underlying data
- * structure used to store the children of the given Translator.
- * 
- * getNextChild() will return null when no other translators of the given genre are available.
- * 
- * The processing hints which are created and then passed to getNext*Translator() store information
- * that needs to be persisted between calls. The createProcessingHints() will create a properly
- * initialized array. The constants NEXT_START_HINT_INDX and MODE_HINT_INDX provide pointers into
- * the array for the NEXT_START position and the proper mode to operate in
- * (STANDARD_TRANSLATORS_MODE or
- *  
- */
-public abstract class TranslatorFilter {
-
-	protected final Translator translator;
-	protected final int version;
-
-	public static final int NEXT_START_HINT_INDX = 0;
-	public static final int MODE_HINT_INDX = 1;
-
-	public static final int STANDARD_TRANSLATORS_MODE = 0;
-	public static final int VARIABLE_TRANSLATORS_MODE = 1;
-
-	/*
-	 * These TranslatorFilters are used in a stateless mode. Only their scanNextTranslator() methods
-	 * will be invoked
-	 */
-	private static final TranslatorFilter objectTranslatorFilter = new ObjectTranslatorFilter(null, -1);
-	private static final TranslatorFilter attributeTranslatorFilter = new AttributeTranslatorFilter(null, -1);
-
-
-	protected int mode = STANDARD_TRANSLATORS_MODE;
-	protected int index = -1;
-
-	protected Translator cachedPeekAheadTranslator = null;
-
-	public TranslatorFilter(Translator trans, int version) {
-		this.translator = trans;
-		this.version = version;
-	}
-
-	/**
-	 * Calling peek twice will advance the current child
-	 */
-	public Translator peekNextChild(EObject target) {
-		cachedPeekAheadTranslator = getNextChild(target);
-		return cachedPeekAheadTranslator;
-	}
-
-	/**
-	 * getNextChild() will return null when no other translators of the given genre are available.
-	 */
-	public Translator getNextChild(EObject target) {
-
-		Translator result = null;
-		if (cachedPeekAheadTranslator != null) {
-			result = cachedPeekAheadTranslator;
-			cachedPeekAheadTranslator = null;
-			return result;
-		}
-
-		int found = 0;
-		Translator children[] = null;
-		switch (mode) {
-			case STANDARD_TRANSLATORS_MODE :
-				children = this.translator.getChildren(target, this.version);
-
-				/* Look for the next Attribute Translator */
-				found = scanNextTranslator(children, this.index);
-
-				if (found >= 0) {
-					/*
-					 * If found, (1) update the result, (2) update the index so we can skip ahead on
-					 * the next invocation (3) escape the VARIABLE_TRANSLATORS processing
-					 */
-					result = children[found];
-					this.index = found;
-					break;
-				}
-				/*
-				 * Reset the index. DO NOT BREAK. Allow entry into VARIABLE_TRANSLATORS case
-				 */
-				this.index = -1;
-				/*
-				 * update the mode to VARIABLE_TRANSLATORS so we can skip to it directly next time
-				 */
-				this.mode = VARIABLE_TRANSLATORS_MODE;
-			//$FALL-THROUGH$
-			case VARIABLE_TRANSLATORS_MODE :
-				children = this.translator.getVariableChildren(target, this.version);
-				found = scanNextTranslator(children, this.index);
-				if (found >= 0) {
-					/*
-					 * If found, (1) update the result, (2) update the index so we can skip ahead on
-					 * the next invocation
-					 */
-					result = children[found];
-					this.index = found;
-				}
-
-		}
-
-		return result;
-	}
-
-	public static final int[] createProcessingHints() {
-		return new int[]{-1, STANDARD_TRANSLATORS_MODE};
-	}
-
-	public static final Translator getNextAttributeTranslator(Translator translator, int startHint, int[] nextHint, EObject target, int version) {
-
-		return TranslatorFilter.getNextChild(translator, startHint, nextHint, target, version, attributeTranslatorFilter);
-	}
-
-	public static final Translator getNextObjectTranslator(Translator translator, int startHint, int[] nextHint, EObject target, int version) {
-
-		return TranslatorFilter.getNextChild(translator, startHint, nextHint, target, version, objectTranslatorFilter);
-	}
-
-	/**
-	 * getNextChild() takes hints on where to begin in the children array of the given Translator.
-	 * When it finds the translator, it will update the hints array with the start hint for the next
-	 * invocation(hints[0]) and when necessary it will use update the mode (hints[1]) to either
-	 * STANDARD_TRANSLATORS or VARIABLE_TRANSLATORS.
-	 * 
-	 * @param translator
-	 * @param startHint
-	 * @param hints
-	 *            a two-element array: hints[0] will be updated with the next startHint and hints[1]
-	 *            will be used to store the mode.
-	 * @param target
-	 * @param version
-	 * @param translatorFilter
-	 * @return
-	 */
-	public static final Translator getNextChild(Translator translator, int startHint, int[] hints, EObject target, int version, TranslatorFilter translatorFilter) {
-
-		Translator result = null;
-		
-		int innerStartHint = startHint;
-		int index = innerStartHint;
-		Translator children[] = null;
-
-		switch (hints[MODE_HINT_INDX]) {
-			case STANDARD_TRANSLATORS_MODE :
-				children = translator.getChildren(target, version);
-				if (children != null && innerStartHint < children.length) {
-
-					/* Look for the next Attribute Translator */
-					index = translatorFilter.scanNextTranslator(children, index);
-
-					if (index >= 0) {
-						/*
-						 * If found, (1) update the result, (2) update the index so we can skip
-						 * ahead on the next invocation (3) escape the VARIABLE_TRANSLATORS
-						 * processing
-						 */
-						result = children[index];
-						break;
-					}
-					/*
-					 * DO NOT BREAK we will default to VARIABLE TRANSLATORS MODE so we must reset
-					 * the startHint appropriately
-					 */
-					innerStartHint = -1;
-				}
-
-			//$FALL-THROUGH$
-			case VARIABLE_TRANSLATORS_MODE :
-				hints[MODE_HINT_INDX] = VARIABLE_TRANSLATORS_MODE;
-				/*
-				 * Reset the index.
-				 */
-				index = innerStartHint;
-				children = translator.getVariableChildren(target, version);
-				if (children != null && children.length > 0 && innerStartHint < children.length) {
-					index = translatorFilter.scanNextTranslator(children, index);
-					result = (index >= 0) ? children[index] : null;
-				}
-		}
-
-		hints[NEXT_START_HINT_INDX] = (result == null && children != null) ? children.length : index;
-
-		return result;
-	}
-
-
-	public abstract int scanNextTranslator(Translator[] children, int start);
-
-	/**
-	 * @return
-	 */
-	public int getIndex() {
-		return index;
-	}
-
-	/**
-	 * @return
-	 */
-	public int getMode() {
-		return mode;
-	}
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/TranslatorPath.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/TranslatorPath.java
deleted file mode 100644
index 6678b51..0000000
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/TranslatorPath.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors: IBM Corporation - initial API and implementation
- **************************************************************************************************/
-package org.eclipse.wst.common.internal.emf.resource;
-
-
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-
-
-public class TranslatorPath {
-	protected Translator[] mapInfoPath;
-
-	/**
-	 * Construct with an array of Translator that specifies the path to follow from an object to
-	 * another object
-	 */
-	public TranslatorPath(Translator[] path) {
-		mapInfoPath = path;
-	}
-
-	public List findObjects(EObject startObject) {
-		Object cur = startObject;
-		for (int i = 0; i < mapInfoPath.length; i++) {
-			Translator curMap = mapInfoPath[i];
-			if (cur instanceof EObject) {
-				EStructuralFeature curAttr = curMap.getFeature();
-				if (curAttr == Translator.CONTAINER_FEATURE) {
-					curAttr = ((EObject) cur).eContainmentFeature();
-					cur = ((EObject) cur).eContainer();
-				} else if (curAttr == Translator.ROOT_FEATURE) {
-					cur = ((TranslatorResource) startObject.eResource()).getRootObject();
-				} else {
-					cur = ((EObject) cur).eGet(curAttr);
-				}
-				if (curMap.isMultiValued()) {
-					return (List) cur;
-				}
-			}
-		}
-		return null;
-	}
-
-	public Object findObject(EObject startObject, Object matchValue) {
-		List objects = findObjects(startObject);
-		if (objects == null)
-			return null;
-		return findObject(objects, getLastMap(), matchValue);
-	}
-
-	private Object findObject(List objectList, Translator map, Object matchValue) {
-		for (Iterator iter = objectList.iterator(); iter.hasNext();) {
-			EObject mofObject = (EObject) iter.next();
-			Object curMatchValue = mofObject.eGet(map.getFeature());
-			if (matchValue.equals(curMatchValue))
-				return mofObject;
-		}
-		return null;
-	}
-
-	public Translator getLastMap() {
-		return mapInfoPath[mapInfoPath.length - 1];
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see java.lang.Object#toString()
-	 */
-	@Override
-	public String toString() {
-		StringBuffer sb = new StringBuffer();
-		String cn = getClass().getName();
-		int i = cn.lastIndexOf('.');
-		cn = cn.substring(++i, cn.length());
-		sb.append(cn);
-		sb.append('(');
-		sb.append(mapInfoPath[0]);
-		for (int j = 1; j < mapInfoPath.length; j++) {
-			sb.append('\n');
-			sb.append(mapInfoPath[j]);
-		}
-		sb.append(')');
-		return sb.toString();
-	}
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/TranslatorResource.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/TranslatorResource.java
deleted file mode 100644
index 32c9c47..0000000
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/TranslatorResource.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors: IBM Corporation - initial API and implementation
- **************************************************************************************************/
-package org.eclipse.wst.common.internal.emf.resource;
-
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.impl.EStructuralFeatureImpl;
-import org.xml.sax.EntityResolver;
-
-public interface TranslatorResource extends ReferencedResource {
-	/*
-	 * must make a subclass because the constructor for EStructuralFeature is protected
-	 */
-	static class DocTypeFeature extends EStructuralFeatureImpl {
-		protected DocTypeFeature() {
-			super();
-		}
-	}
-
-
-	EStructuralFeature DOC_TYPE_FEATURE = new DocTypeFeature();
-
-	/**
-	 * The public id of the XML document, if specified.
-	 */
-	String getPublicId();
-
-	/**
-	 * Return the first element in the EList.
-	 */
-	EObject getRootObject();
-
-	/**
-	 * The system id of the XML document, if specified.
-	 */
-	String getSystemId();
-
-	/**
-	 * Sets the public id and system id of the XML document.
-	 */
-	void setDoctypeValues(String publicId, String systemId);
-
-	/**
-	 * Sets the default public/system ids if necessary
-	 */
-	void setDefaults();
-
-	/**
-	 * Returns the name that will be in the document type header of the serialized xml file
-	 */
-	String getDoctype();
-
-	/**
-	 * Returns the XML version of this document
-	 */
-	String getXMLVersion();
-
-	Translator getRootTranslator();
-
-	/**
-	 * Entity resolver that can be used when using standard parsers to read the resource
-	 */
-	EntityResolver getEntityResolver();
-
-	boolean usesDTD();
-
-	public int getVersionID();
-
-	void setVersionID(int i);
-
-	Renderer getRenderer();
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/TranslatorResourceFactory.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/TranslatorResourceFactory.java
deleted file mode 100644
index 9427fb7..0000000
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/TranslatorResourceFactory.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors: IBM Corporation - initial API and implementation
- **************************************************************************************************/
-package org.eclipse.wst.common.internal.emf.resource;
-
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.resource.Resource;
-
-public abstract class TranslatorResourceFactory extends ReferencedXMIFactoryImpl implements RendererFactory.Listener {
-
-	protected RendererFactory rendererFactory;
-	private boolean listeningForUpdates = false;
-
-	/**
-	 * Constructor for TranslatorResourceFactory.
-	 */
-	public TranslatorResourceFactory(RendererFactory aRendererFactory, boolean listeningForUpdates) {
-		super();
-		rendererFactory = aRendererFactory;
-		setListeningForUpdates(listeningForUpdates);
-	}
-
-	/**
-	 * Constructor for TranslatorResourceFactory.
-	 */
-	public TranslatorResourceFactory(RendererFactory aRendererFactory) {
-		this(aRendererFactory, true);
-	}
-
-	public void setListeningForUpdates(boolean shouldBeListeningForUpdates) {
-
-		if (this.listeningForUpdates ^ shouldBeListeningForUpdates) {
-			if (!shouldBeListeningForUpdates)
-				RendererFactory.NotificationEngine.removeListener(this);
-			else
-				RendererFactory.NotificationEngine.addListener(this);
-
-			this.listeningForUpdates = shouldBeListeningForUpdates;
-		}
-	}
-
-	public boolean isListeningForUpdates() {
-		return this.listeningForUpdates;
-	}
-
-	@Override
-	public Resource doCreateResource(URI uri) {
-		Renderer aRenderer = rendererFactory.createRenderer();
-		return createResource(uri, aRenderer);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see com.ibm.etools.emf2xml.RendererFactory.Listener#updateRendererFactory(com.ibm.etools.emf2xml.RendererFactory)
-	 */
-	public void updateRendererFactory(RendererFactory newRendererFactory) {
-		//System.out.println("Updating renderer factory");
-		rendererFactory = newRendererFactory;
-	}
-
-	protected abstract TranslatorResource createResource(URI uri, Renderer aRenderer);
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/TranslatorResourceImpl.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/TranslatorResourceImpl.java
deleted file mode 100644
index 78fbce0..0000000
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/TranslatorResourceImpl.java
+++ /dev/null
@@ -1,444 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.common.internal.emf.resource;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.util.Collection;
-import java.util.Map;
-
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.impl.NotificationImpl;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.EcorePackage;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.resource.impl.ResourceImpl;
-import org.eclipse.wst.common.internal.emf.plugin.EcoreUtilitiesPlugin;
-import org.eclipse.wst.common.internal.emf.utilities.StringUtil;
-import org.xml.sax.EntityResolver;
-
-public abstract class TranslatorResourceImpl extends ReferencedXMIResourceImpl implements TranslatorResource, IRootObjectResource{
-	static final public EStructuralFeature ID_FEATURE = EcorePackage.eINSTANCE.getEClass_EIDAttribute();
-	protected static final String DEFAULT_ENCODING = "UTF-8"; //$NON-NLS-1$
-	protected static final String DEFAULT_VERSION = "1.0"; //$NON-NLS-1$
-	protected Renderer renderer;
-	/**
-	 * The public Id to use at the head of the document.
-	 */
-	protected String publicId;
-	/**
-	 * The system Id to use at the head of the document.
-	 */
-	protected String systemId;
-	protected String xmlVersion;
-	// Default the resources to J2EE 1.4
-	protected int versionID;
-
-	/**
-	 * @deprecated since 4/29/2003 - used for compatibility Subclasses should
-	 *             be using the Renderers and translator framework
-	 */
-	public TranslatorResourceImpl() {
-		super();
-	}
-
-	/**
-	 * @deprecated since 4/29/2003 - used for compatibility Subclasses should
-	 *             be using the Renderers and translator framework
-	 */
-	public TranslatorResourceImpl(URI uri) {
-		super(uri);
-	}
-
-	public TranslatorResourceImpl(URI uri, Renderer aRenderer) {
-		super(uri);
-		setRenderer(aRenderer);
-		versionID = getDefaultVersionID();
-	}
-
-	public TranslatorResourceImpl(Renderer aRenderer) {
-		super();
-		setRenderer(aRenderer);
-	}
-
-	@Override
-	public java.lang.String getEncoding() {
-		if (super.getEncoding() == null)
-			setEncoding(DEFAULT_ENCODING);
-		return super.getEncoding();
-	}
-
-	@Override
-	public String getPublicId() {
-		return publicId;
-	}
-	
-	/**
-	 * Return the first element in the EList.
-	 */
-	public EObject getRootObject() {
-		if (contents == null || contents.isEmpty())
-			return null;
-		return (EObject) getContents().get(0);
-	}
-
-	@Override
-	public String getSystemId() {
-		return systemId;
-	}
-
-	public void setDoctypeValues(String aPublicId, String aSystemId) {
-		boolean changed = !(StringUtil.stringsEqual(publicId, aPublicId) && StringUtil.stringsEqual(systemId, aSystemId));
-		publicId = aPublicId;
-		systemId = aSystemId;
-		if (changed) {
-			eNotify(new NotificationImpl(Notification.SET, null, null) {
-				@Override
-				public Object getFeature() {
-					return DOC_TYPE_FEATURE;
-				}
-
-				@Override
-				public Object getNotifier() {
-					return TranslatorResourceImpl.this;
-				}
-			});
-		}
-	}
-
-	/**
-	 * Returns the xmlVersion.
-	 * 
-	 * @return String
-	 */
-	@Override
-	public String getXMLVersion() {
-		if (xmlVersion == null)
-			xmlVersion = DEFAULT_VERSION;
-		return xmlVersion;
-	}
-
-	/**
-	 * Sets the xmlVersion.
-	 * 
-	 * @param xmlVersion
-	 *            The xmlVersion to set
-	 */
-	@Override
-	public void setXMLVersion(String xmlVersion) {
-		this.xmlVersion = xmlVersion;
-	}
-
-	@Override
-	protected void basicDoLoad(InputStream inputStream, Map options) throws IOException {
-		// long start = System.currentTimeMillis();
-		boolean isTrackingMods = isTrackingModification();
-		try {
-			if (isTrackingMods)
-				setTrackingModification(false);
-			renderer.doLoad(inputStream, options);
-		}
-		finally {
-			if (isTrackingMods)
-				setTrackingModification(true);
-		}
-		// long end = System.currentTimeMillis();
-		// recordTime("Load", start, end);
-	}
-
-	@Override
-	public void save(Map options) throws IOException {
-        if (renderer.useStreamsForIO()) {
-            super.save(options);
-        } else {
-            notifyAboutToSave();
-            try {
-                doSave((OutputStream)null, options);
-                notifySaved();
-            } catch (Exception e) {
-                 notifySaveFailed();
-                if (e instanceof IOException)
-                    throw (IOException) e;
-                EcoreUtilitiesPlugin.logError(e);
-            }
-            notifySaved();
-        }
-    }
-
-
-	/**
-	 * @see com.ibm.etools.xmi.helpers.CompatibilityXMIResourceImpl#doSave(OutputStream,
-	 *      Map)
-	 */
-	@Override
-	public void doSave(OutputStream outputStream, Map options) throws IOException {
-		// long start = System.currentTimeMillis();
-		renderer.doSave(outputStream, options);
-		setModified(false);
-		// long end = System.currentTimeMillis();
-		// recordTime("Save", start, end);
-	}
-
-	// private void recordTime(String type, long start, long end) {
-	// System.out.println(renderer.getClass().getName() + "\t" + type + "\t" +
-	// (end - start) +
-	// "\t\t\tms" + "\t" + (( this.getVersionID()) / 10.0) + "\t" + this);
-	// //$NON-NLS-1$
-	// //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
-	// }
-
-	/**
-	 * @see org.eclipse.emf.ecore.xmi.impl.XMLResourceImpl#doUnload()
-	 */
-	@Override
-	protected void doUnload() {
-		renderer.preUnload();
-		super.doUnload();
-	}
-
-	@Override
-	public String toString() {
-		return getClass().getName() + getURI().toString();
-	}
-
-	/**
-	 * Returns the renderer.
-	 * 
-	 * @return Renderer
-	 */
-	public Renderer getRenderer() {
-		return renderer;
-	}
-
-	/**
-	 * Sets the renderer.
-	 * 
-	 * @param renderer
-	 *            The renderer to set
-	 */
-	public void setRenderer(Renderer renderer) {
-		this.renderer = renderer;
-		if (renderer.getResource() != this)
-			renderer.setResource(this);
-	}
-
-	/**
-	 * For compatibility of old subtype resources, returns the super
-	 * implementation
-	 * 
-	 * @return
-	 */
-	protected EList primGetContents() {
-		return super.getContents();
-	}
-
-	@Override
-	public EList getContents() {
-		waitForResourceToLoadIfNecessary();
-		if (contents == null) {
-			initializeContents();
-		}
-		return contents;
-	}
-
-	protected void initializeContents() {
-		contents = new ResourceImpl.ContentsEList() {
-			/**
-			 * 
-			 */
-			private static final long serialVersionUID = 1L;
-
-			@Override
-			public boolean add(Object object) {
-				renderer.prepareToAddContents();
-				return super.add(object);
-			}
-
-			@Override
-			public boolean addAll(Collection collection) {
-				renderer.prepareToAddContents();
-				return super.addAll(collection);
-			}
-		};
-	}
-
-	public void setDefaults() {
-		if (systemId != null && publicId != null)
-			return;
-		String pubId = publicId == null ? getDefaultPublicId() : publicId;
-		String sysId = systemId == null ? getDefaultSystemId() : systemId;
-		setDoctypeValues(pubId, sysId);
-	}
-
-	/**
-	 * @see org.eclipse.emf.ecore.xmi.impl.XMLResourceImpl#init()
-	 */
-	@Override
-	protected void init() {
-		super.init();
-		setEncoding(DEFAULT_ENCODING);
-	}
-
-	/**
-	 * Returns null by default; subclasses can override
-	 * 
-	 * @see com.ibm.etools.emf2xml.TranslatorResource#createEntityResolver()
-	 */
-	public EntityResolver getEntityResolver() {
-		return null;
-	}
-
-	protected abstract String getDefaultPublicId();
-
-	protected abstract String getDefaultSystemId();
-
-	protected abstract int getDefaultVersionID();
-
-	/**
-	 * @return
-	 */
-	public int getVersionID() {
-		return versionID;
-	}
-
-	/**
-	 * @param i
-	 */
-	public void setVersionID(int i) {
-		versionID = i;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see com.ibm.etools.emf2xml.TranslatorResource#usesDTD()
-	 */
-	public boolean usesDTD() {
-		return getPublicId() != null && getSystemId() != null;
-	}
-
-	/**
-	 * Overridden to notify when the ID gets set; need this to push it into
-	 * the resource
-	 * 
-	 * @see org.eclipse.emf.ecore.xmi.XMLResource#setID(EObject, String)
-	 */
-	@Override
-	public void setID(EObject eObject, String id) {
-		String oldId = getID(eObject);
-		super.setID(eObject, id);
-		eObject.eNotify(new ENotificationImpl((InternalEObject) eObject, Notification.SET, ID_FEATURE, oldId, id));
-	}
-
-	/**
-	 * This method indicates whether or not the extent associated with the
-	 * resource has been modified since the last time it was loaded or saved.
-	 * 
-	 * @return boolean
-	 */
-	@Override
-	public boolean isModified() {
-		return super.isModified() || renderer.isModified();
-	}
-	public boolean isReverting() {
-		return ((AbstractRendererImpl)renderer).isReverting();
-	}
-
-	/*
-	 * Overriden to give the renderer a hook
-	 * 
-	 * @see org.eclipse.wst.common.internal.emf.resource.ReferencedResource#accessForWrite()
-	 */
-	@Override
-	public void accessForWrite() {
-		renderer.accessForWrite();
-		super.accessForWrite();
-	}
-
-	/*
-	 * Overriden to give the renderer a hook
-	 * 
-	 * @see org.eclipse.wst.common.internal.emf.resource.ReferencedResource#accessForRead()
-	 */
-	@Override
-	public void accessForRead() {
-		renderer.accessForRead();
-		super.accessForRead();
-	}
-
-	@Override
-	public void releaseFromRead() {
-		renderer.releaseFromRead();
-		super.releaseFromRead();
-	}
-
-	@Override
-	public void releaseFromWrite() {
-		renderer.releaseFromWrite();
-		super.releaseFromWrite();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see com.ibm.etools.emf.workbench.ReferencedXMIResourceImpl#preDelete()
-	 */
-	@Override
-	public void preDelete() {
-		super.preDelete();
-		renderer.preDelete();
-	}
-
-	@Override
-	public boolean isShared() {
-		return super.isShared() || renderer.isShared();
-	}
-
-	@Override
-	public boolean isSharedForWrite() {
-		return super.isSharedForWrite() || renderer.isSharedForWrite();
-	}
-
-	@Override
-	public void load(Map options) throws IOException {
-		
-			if (isLoaded())
-				return;
-			
-			if (renderer.useStreamsForIO()) {
-				super.load(options);
-			}
-			else if (!isLoaded()) {
-				isShared();
-				loadExisting(options);
-			}
-	}
-
-	@Override
-	public void eNotify(Notification notification) {
-	    Adapter[] eAdapters = eBasicAdapterArray();
-	    if (eAdapters != null && eDeliver())
-	    {
-	      for (int i = 0, size = eAdapters.length; i < size; ++i)
-	      {
-	      	Adapter temp;
-	    	  if ((temp = eAdapters[i]) != null)
-	    		  temp.notifyChanged(notification);
-	      }
-	    }
-	  }
-}
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/UnsupportedFeature.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/UnsupportedFeature.java
deleted file mode 100644
index 424241c..0000000
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/UnsupportedFeature.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 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
- *******************************************************************************/
-/*
- * Created on Apr 13, 2004
- */
-package org.eclipse.wst.common.internal.emf.resource;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.impl.EAttributeImpl;
-
-/**
- * @author cbridgha
- */
-public class UnsupportedFeature extends EAttributeImpl {
-	/**
-	 * This is used to capture features that are no longer supported
-	 */
-	public static boolean isUnsupported(EClass anEClass, String featureName) {
-
-		if (featureName.equals("isZeroParams") && anEClass.getName().equals("MethodElement")) //$NON-NLS-1$ //$NON-NLS-2$
-			return true;
-		return false;
-	}
-
-	public UnsupportedFeature() {
-		super();
-	}
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/VariableTranslatorFactory.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/VariableTranslatorFactory.java
deleted file mode 100644
index 1a4eef9..0000000
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/VariableTranslatorFactory.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 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
- *******************************************************************************/
-/*
- * Created on Aug 20, 2003
- *
- */
-package org.eclipse.wst.common.internal.emf.resource;
-
-import java.util.List;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.Notifier;
-
-
-/**
- * @author schacher
- */
-public interface VariableTranslatorFactory {
-	/** Returns whether a Translator should be created for the given DOM name */
-	boolean accepts(String domName);
-
-	/** Returns whether a Translator should be created for the given feature */
-	boolean accepts(Notification notif);
-
-	Translator create(Notification notif);
-
-	/** Creates a new Translator for the DOM name */
-	Translator create(String domName);
-
-	/** Creates variable translators for an EMF object to be rendered */
-	List create(Notifier target);
-
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/XMLEncoderDecoder.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/XMLEncoderDecoder.java
deleted file mode 100644
index d7b7f3b..0000000
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/XMLEncoderDecoder.java
+++ /dev/null
@@ -1,170 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 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
- *******************************************************************************/
-/*
- * Created on May 20, 2004
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Generation - Code and Comments
- */
-package org.eclipse.wst.common.internal.emf.resource;
-
-/**
- * @author mdelder
- *  
- */
-public class XMLEncoderDecoder {
-
-	/**
-	 *  
-	 */
-	public XMLEncoderDecoder() {
-		super();
-	}
-
-	/**
-	 * Identifies the last printable character in the Unicode range that is supported by the
-	 * encoding used with this serializer. For 8-bit encodings this will be either 0x7E or 0xFF. For
-	 * 16-bit encodings this will be 0xFFFF. Characters that are not printable will be escaped using
-	 * character references.
-	 */
-	private int _lastPrintable = 0xFFFE;
-
-	protected static XMLEncoderDecoder _singleton;
-
-
-	/**
-	 * Returns a decoded version of the value.
-	 */
-	public String decode(String value) {
-		// NOT_IMPLEMENTED
-		return value;
-	}
-
-
-	/**
-	 * Escapes a string so it may be printed as text content or attribute value. Non printable
-	 * characters are escaped using character references. Where the format specifies a deault entity
-	 * reference, that reference is used (e.g. <tt>&amp;lt;</tt>).
-	 * 
-	 * @param source
-	 *            The string to escape
-	 */
-	public char[] encode(char[] value) {
-		boolean unmodified = true;
-		StringBuffer sbuf = new StringBuffer(value.length);
-		String charRef = null;
-		char ch;
-		for (int i = 0; i < value.length; ++i) {
-			ch = value[i];
-			// If there is a suitable entity reference for this
-			// character, print it. The list of available entity
-			// references is almost but not identical between
-			// XML and HTML.
-			charRef = getEntityRef(ch);
-			if (charRef != null) {
-				sbuf.append('&');
-				sbuf.append(charRef);
-				sbuf.append(';');
-				unmodified = false;
-			} else if ((ch >= ' ' && ch <= _lastPrintable && ch != 0xF7) || ch == '\n' || ch == '\r' || ch == '\t') {
-				// If the character is not printable, print as character
-				// reference.
-				// Non printables are below ASCII space but not tab or line
-				// terminator, ASCII delete, or above a certain Unicode
-				// threshold.
-				sbuf.append(ch);
-			} else {
-				sbuf.append("&#");//$NON-NLS-1$
-				sbuf.append(Integer.toString(ch));
-				sbuf.append(';');
-				unmodified = false;
-			}
-		}
-		if (unmodified)
-			return value;
-		char[] result = new char[sbuf.length()];
-		sbuf.getChars(0, sbuf.length(), result, 0);
-		return result;
-	}
-
-	/**
-	 * Escapes a string so it may be printed as text content or attribute value. Non printable
-	 * characters are escaped using character references. Where the format specifies a deault entity
-	 * reference, that reference is used (e.g. <tt>&amp;lt;</tt>).
-	 * 
-	 * @param source
-	 *            The string to escape
-	 */
-	public String encode(String value) {
-		StringBuffer sbuf = new StringBuffer(value.length());
-		String charRef = null;
-		char ch;
-		for (int i = 0; i < value.length(); ++i) {
-			ch = value.charAt(i);
-			// If there is a suitable entity reference for this
-			// character, print it. The list of available entity
-			// references is almost but not identical between
-			// XML and HTML.
-			charRef = getEntityRef(ch);
-			if (charRef != null) {
-				sbuf.append('&');
-				sbuf.append(charRef);
-				sbuf.append(';');
-			} else if ((ch >= ' ' && ch <= _lastPrintable && ch != 0xF7) || ch == '\n' || ch == '\r' || ch == '\t') {
-				// If the character is not printable, print as character
-				// reference.
-				// Non printables are below ASCII space but not tab or line
-				// terminator, ASCII delete, or above a certain Unicode
-				// threshold.
-				sbuf.append(ch);
-			} else {
-				sbuf.append("&#");//$NON-NLS-1$
-				sbuf.append(Integer.toString(ch));
-				sbuf.append(';');
-			}
-		}
-		return sbuf.toString();
-	}
-
-	public static String escape(String value) {
-		if (_singleton == null) {
-			_singleton = new XMLEncoderDecoder();
-		}
-		return _singleton.encode(value);
-	}
-
-	/**
-	 * Returns the suitable entity reference for this character value, or null if no such entity
-	 * exists. Calling this method with <tt>'&amp;'</tt> will return <tt>"&amp;amp;"</tt>.
-	 * 
-	 * @param ch
-	 *            Character value
-	 * @return Character entity name, or null
-	 */
-	protected String getEntityRef(char ch) {
-		// Encode special XML characters into the equivalent character
-		// references.
-		// These five are defined by default for all XML documents.
-		switch (ch) {
-			case '<' :
-				return "lt";//$NON-NLS-1$
-			case '>' :
-				return "gt";//$NON-NLS-1$
-			case '"' :
-				return "quot";//$NON-NLS-1$
-			case '\'' :
-				return "apos";//$NON-NLS-1$
-			case '&' :
-				return "amp";//$NON-NLS-1$
-		}
-		return null;
-	}
-}
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/AdapterFactoryDescriptor.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/AdapterFactoryDescriptor.java
deleted file mode 100644
index e6e559b..0000000
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/AdapterFactoryDescriptor.java
+++ /dev/null
@@ -1,19 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 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
- *******************************************************************************/
-package org.eclipse.wst.common.internal.emf.utilities;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-
-public interface AdapterFactoryDescriptor {
-
-	public AdapterFactory createAdapterFactory();
-
-}
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/AdapterFactoryUtil.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/AdapterFactoryUtil.java
deleted file mode 100644
index 36d9173..0000000
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/AdapterFactoryUtil.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 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
- *******************************************************************************/
-package org.eclipse.wst.common.internal.emf.utilities;
-
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notifier;
-
-public class AdapterFactoryUtil {
-
-	/**
-	 * Constructor for AdapterFactoryUtil.
-	 */
-	public AdapterFactoryUtil() {
-		super();
-	}
-
-	public static void adaptNew(Notifier newObject, List factories) {
-		AdapterFactory fact;
-		for (int i = 0; i < factories.size(); i++) {
-			fact = (AdapterFactory) factories.get(i);
-			fact.adaptNew(newObject, null);
-		}
-	}
-
-	public static void createAdapterFactories(List descriptors, List factories) {
-		AdapterFactoryDescriptor desc;
-		AdapterFactory adapterFact;
-		for (int i = 0; i < descriptors.size(); i++) {
-			desc = (AdapterFactoryDescriptor) descriptors.get(i);
-			adapterFact = desc.createAdapterFactory();
-			if (adapterFact != null)
-				factories.add(adapterFact);
-		}
-		descriptors.clear();
-	}
-
-}
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/ArrayUtil.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/ArrayUtil.java
deleted file mode 100644
index 847b88d..0000000
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/ArrayUtil.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors: IBM Corporation - initial API and implementation
- **************************************************************************************************/
-package org.eclipse.wst.common.internal.emf.utilities;
-
-
-
-public class ArrayUtil {
-
-	public static Object[] concat(Object[] array1, Object[] array2) {
-		Class componentType = null;
-		if (array1.getClass().getComponentType() == array2.getClass().getComponentType())
-			componentType = array1.getClass().getComponentType();
-		else
-			componentType = Object.class;
-
-		return concat(array1, array2, componentType);
-	}
-
-	public static Object[] concat(Object[] array1, Object[] array2, Class componentType) {
-		Object[] result = (Object[]) java.lang.reflect.Array.newInstance(componentType, array1.length + array2.length);
-		System.arraycopy(array1, 0, result, 0, array1.length);
-		System.arraycopy(array2, 0, result, array1.length, array2.length);
-		return result;
-	}
-
-	public static Object[] concatAll(java.util.List arrays, Class componentType) {
-		int resultLength = 0;
-		for (int i = 0; i < arrays.size(); i++) {
-			resultLength += ((Object[]) arrays.get(i)).length;
-		}
-		Object[] result = (Object[]) java.lang.reflect.Array.newInstance(componentType, resultLength);
-		int pos = 0;
-		for (int i = 0; i < arrays.size(); i++) {
-			Object[] array = (Object[]) arrays.get(i);
-			System.arraycopy(array, 0, result, pos, array.length);
-			pos += array.length;
-		}
-		return result;
-	}
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/Assert.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/Assert.java
deleted file mode 100644
index f6635a7..0000000
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/Assert.java
+++ /dev/null
@@ -1,131 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 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
- *******************************************************************************/
-package org.eclipse.wst.common.internal.emf.utilities;
-
-import org.eclipse.wst.common.internal.emf.plugin.EcoreUtilitiesPlugin;
-
-
-
-/**
- * <code>Assert</code> is useful for for embedding runtime sanity checks in code. The predicate
- * methods all test a condition and throw some type of unchecked exception if the condition does not
- * hold.
- * <p>
- * Assertion failure exceptions, like most runtime exceptions, are thrown when something is
- * misbehaving. Assertion failures are invariably unspecified behavior; consequently, clients should
- * never rely on these being thrown (and certainly should not being catching them specifically).
- * </p>
- */
-// This class was, originally, copied directly from com.ibm.itp.common.
-// It was copied to our own package just to minimize minor dependencies
-// on other packages and internal APIs.
-public final class Assert {
-	/* This class is not intended to be instantiated. */
-
-	private Assert() {
-	}
-
-	/**
-	 * Asserts that an argument is legal. If the given boolean is not <code>true</code>, an
-	 * <code>IllegalArgumentException</code> is thrown.
-	 * 
-	 * @param expression
-	 *            the outcode of the check
-	 * @return <code>true</code> if the check passes (does not return if the check fails)
-	 * @exception IllegalArgumentException
-	 *                if the legality test failed
-	 */
-	public static boolean isLegal(boolean expression) {
-		return isLegal(expression, "");//$NON-NLS-1$
-	}
-
-	/**
-	 * Asserts that an argument is legal. If the given boolean is not <code>true</code>, an
-	 * <code>IllegalArgumentException</code> is thrown. The given message is included in that
-	 * exception, to aid debugging.
-	 * 
-	 * @param expression
-	 *            the outcode of the check
-	 * @param message
-	 *            the message to include in the exception
-	 * @return <code>true</code> if the check passes (does not return if the check fails)
-	 * @exception IllegalArgumentException
-	 *                if the legality test failed
-	 */
-	public static boolean isLegal(boolean expression, String message) {
-		if (!expression)
-			throw new IllegalArgumentException();
-		return expression;
-	}
-
-	/**
-	 * Asserts that the given object is not <code>null</code>. If this is not the case, some kind
-	 * of unchecked exception is thrown.
-	 * 
-	 * @param object
-	 *            the value to test
-	 * @exception IllegalArgumentException
-	 *                if the object is <code>null</code>
-	 */
-	public static void isNotNull(Object object) {
-		isNotNull(object, "");//$NON-NLS-1$
-	}
-
-	/**
-	 * Asserts that the given object is not <code>null</code>. If this is not the case, some kind
-	 * of unchecked exception is thrown. The given message is included in that exception, to aid
-	 * debugging.
-	 * 
-	 * @param object
-	 *            the value to test
-	 * @param message
-	 *            the message to include in the exception
-	 * @exception IllegalArgumentException
-	 *                if the object is <code>null</code>
-	 */
-	public static void isNotNull(Object object, String message) {
-		if (object == null) {
-			EcoreUtilitiesPlugin.logError("null_argument: " + message);//$NON-NLS-1$
-			throw new AssertionFailedException();
-		}
-	}
-
-	/**
-	 * Asserts that the given boolean is <code>true</code>. If this is not the case, some kind of
-	 * unchecked exception is thrown.
-	 * 
-	 * @param expression
-	 *            the outcode of the check
-	 * @return <code>true</code> if the check passes (does not return if the check fails)
-	 */
-	public static boolean isTrue(boolean expression) {
-		return isTrue(expression, "");//$NON-NLS-1$
-	}
-
-	/**
-	 * Asserts that the given boolean is <code>true</code>. If this is not the case, some kind of
-	 * unchecked exception is thrown. The given message is included in that exception, to aid
-	 * debugging.
-	 * 
-	 * @param expression
-	 *            the outcode of the check
-	 * @param message
-	 *            the message to include in the exception
-	 * @return <code>true</code> if the check passes (does not return if the check fails)
-	 */
-	public static boolean isTrue(boolean expression, String message) {
-		if (!expression) {
-			EcoreUtilitiesPlugin.logError("assertion failed: " + message);//$NON-NLS-1$
-			throw new AssertionFailedException();
-		}
-		return expression;
-	}
-}
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/AssertionFailedException.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/AssertionFailedException.java
deleted file mode 100644
index 5de492e..0000000
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/AssertionFailedException.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.common.internal.emf.utilities;
-
-
-/**
- * <code>AssertionFailedException</code> is a runtime exception thrown by some of the methods in
- * <code>Assert</code>.
- * <p>
- * This class is not declared public to prevent some misuses; programs that catch or otherwise
- * depend on assertion failures are susceptible to unexpected breakage when assertions in the code
- * are added or removed.
- * </p>
- */
-// This class was, originally, copied directly from com.ibm.itp.common.
-// It was copied to our own package just to minimize minor dependencies
-// on other packages and internal APIs.
-class AssertionFailedException extends RuntimeException {
-	/**
-	 * 
-	 */
-	private static final long serialVersionUID = 3408284008342683621L;
-
-	/**
-	 * Constructs a new exception.
-	 */
-	public AssertionFailedException() {
-	}
-
-	/**
-	 * Constructs a new exception with the given message.
-	 */
-	public AssertionFailedException(String detail) {
-		super(detail);
-	}
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/Association.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/Association.java
deleted file mode 100644
index 485d0c3..0000000
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/Association.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.common.internal.emf.utilities;
-
-/**
- * Insert the type's description here. Creation date: (12/17/2000 7:38:15 PM)
- * 
- * @author: Administrator
- */
-public class Association {
-	protected Object key;
-	protected Object value;
-
-	/**
-	 * Association constructor comment.
-	 */
-	public Association(Object aKey, Object aValue) {
-		setKey(aKey);
-		setValue(aValue);
-	}
-
-	/**
-	 * Insert the method's description here. Creation date: (12/17/2000 7:38:48 PM)
-	 * 
-	 * @return java.lang.Object
-	 */
-	public java.lang.Object getKey() {
-		return key;
-	}
-
-	/**
-	 * Insert the method's description here. Creation date: (12/17/2000 7:38:48 PM)
-	 * 
-	 * @return java.lang.Object
-	 */
-	public java.lang.Object getValue() {
-		return value;
-	}
-
-	/**
-	 * Insert the method's description here. Creation date: (12/17/2000 7:38:48 PM)
-	 * 
-	 * @param newKey
-	 *            java.lang.Object
-	 */
-	public void setKey(java.lang.Object newKey) {
-		key = newKey;
-	}
-
-	/**
-	 * Insert the method's description here. Creation date: (12/17/2000 7:38:48 PM)
-	 * 
-	 * @param newValue
-	 *            java.lang.Object
-	 */
-	public void setValue(java.lang.Object newValue) {
-		value = newValue;
-	}
-}
-
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/CloneablePublic.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/CloneablePublic.java
deleted file mode 100644
index 2c39fbc..0000000
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/CloneablePublic.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 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
- *******************************************************************************/
-/*
- * Created on Sep 22, 2003
- *
- */
-package org.eclipse.wst.common.internal.emf.utilities;
-
-import org.eclipse.emf.common.notify.Adapter;
-
-/**
- * Interface that exposes the clone method, for objects that need to generically copy other
- * cloneable objects
- */
-public interface CloneablePublic extends Cloneable, Adapter.Internal {
-	Object clone();
-
-}
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/CommandContext.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/CommandContext.java
deleted file mode 100644
index 4dcb883..0000000
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/CommandContext.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 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
- *******************************************************************************/
-/*
- * Created on Apr 27, 2004
- */
-package org.eclipse.wst.common.internal.emf.utilities;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
-
-
-
-/**
- * @author John Mourra
- */
-public class CommandContext implements ICommandContext {
-
-	private IProgressMonitor monitor;
-	private Map properties;
-	private ResourceSet resourceSet;
-
-	/**
-	 * @param monitor
-	 */
-	public CommandContext(IProgressMonitor monitor) {
-		this(monitor, null, null);
-	}
-
-	/**
-	 * @param monitor
-	 * @param configurationProperties
-	 * @param resourceSet
-	 */
-	public CommandContext(IProgressMonitor monitor, Map configurationProperties, ResourceSet resourceSet) {
-		this.monitor = monitor;
-		this.properties = configurationProperties;
-		this.resourceSet = resourceSet;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see com.ibm.ws.rd.command.framework.ICommandContext#getProgressMonitor()
-	 */
-	public IProgressMonitor getProgressMonitor() {
-		if (monitor == null)
-			monitor = new NullProgressMonitor();
-		return monitor;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see com.ibm.ws.rd.command.framework.ICommandContext#getConfigurationProperties()
-	 */
-	public Map getConfigurationProperties() {
-		if (properties == null)
-			properties = new HashMap();
-		return properties;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see com.ibm.ws.rd.command.framework.ICommandContext#getResourceSet()
-	 */
-	public ResourceSet getResourceSet() {
-		if (resourceSet == null)
-			resourceSet = new ResourceSetImpl();
-		return resourceSet;
-	}
-}
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/CopyGroup.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/CopyGroup.java
deleted file mode 100644
index a23928c..0000000
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/CopyGroup.java
+++ /dev/null
@@ -1,320 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 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
- *******************************************************************************/
-package org.eclipse.wst.common.internal.emf.utilities;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-
-/**
- * This class is used to copy a group of RefObjects and/or Resources. This group will ensure that
- * all non-composite relationships are deferred until all Resources and RefObjects are copied. This
- * allows you to make copies of a group of objects that may have non-composite relationships and
- * ensure that these relationships are pointing to the copied object if it is part of the group
- * (either directly or through a containment relationship). Creation date: (12/17/2000 1:21:17 PM)
- * 
- * @author: Administrator
- */
-public class CopyGroup {
-	protected String defaultIdSuffix;
-	protected ResourceSet copyContext;
-	protected List resources;
-	protected List refObjects;
-	protected List copiedResources;
-	protected List copiedRefObjects;
-	protected boolean preserveIds = false;
-
-	/**
-	 * CopyGroup constructor comment.
-	 */
-	public CopyGroup() {
-		super();
-	}
-
-	/**
-	 * Insert the method's description here. Creation date: (12/17/2000 1:28:16 PM)
-	 * 
-	 * @param aRefObject
-	 *            org.eclipse.emf.ecore.EObject
-	 */
-	public boolean add(EObject aRefObject) {
-		return add(aRefObject, null);
-	}
-
-	/**
-	 * Insert the method's description here. Creation date: (12/17/2000 1:28:16 PM)
-	 * 
-	 * @param aRefObject
-	 *            org.eclipse.emf.ecore.EObject
-	 */
-	public boolean add(EObject aRefObject, String idSuffix) {
-		if (aRefObject != null && !containsRefObject(aRefObject)) {
-			getRefObjects().add(createAssociation(aRefObject, idSuffix));
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * Insert the method's description here. Creation date: (12/17/2000 1:27:32 PM)
-	 * 
-	 * @param aResources
-	 *            org.eclipse.emf.ecore.resource.Resource
-	 */
-	public void add(Resource aResource) {
-		add(aResource, null);
-	}
-
-	/**
-	 * Insert the method's description here. Creation date: (12/17/2000 1:27:32 PM)
-	 * 
-	 * @param aResources
-	 *            org.eclipse.emf.ecore.resource.Resource
-	 */
-	public void add(Resource aResource, String newUri) {
-		if (aResource != null)
-			getResources().add(createAssociation(aResource, newUri));
-	}
-
-	/**
-	 * Insert the method's description here. Creation date: (12/17/2000 1:28:16 PM)
-	 * 
-	 * @param aRefObject
-	 *            org.eclipse.emf.ecore.EObject
-	 */
-	public void addCopied(EObject aRefObject) {
-		if (aRefObject != null)
-			getCopiedRefObjects().add(aRefObject);
-	}
-
-	/**
-	 * Insert the method's description here. Creation date: (12/17/2000 1:27:32 PM)
-	 * 
-	 * @param aResources
-	 *            org.eclipse.emf.ecore.resource.Resource
-	 */
-	public void addCopied(Resource aResource) {
-		if (aResource != null) {
-			getCopiedResources().add(aResource);
-			if (getCopyContext() != null)
-				getCopyContext().getResources().add(aResource);
-		}
-	}
-
-	protected boolean contains(List associations, Object anObject) {
-		if (anObject == null)
-			return false;
-		int size = associations.size();
-		Association assoc;
-		for (int i = 0; i < size; i++) {
-			assoc = (Association) associations.get(i);
-			if (assoc.getKey() == anObject)
-				return true;
-		}
-		return false;
-	}
-
-	/**
-	 * Return true if
-	 * 
-	 * @aRefObject has been added to this group. Creation date: (12/17/2000 1:28:16 PM)
-	 * @param aRefObject
-	 *            org.eclipse.emf.ecore.EObject
-	 */
-	public boolean containsRefObject(EObject aRefObject) {
-		return contains(getRefObjects(), aRefObject);
-	}
-
-	/**
-	 * Return true if
-	 * 
-	 * @aResource has been added to this group. Creation date: (12/17/2000 1:28:16 PM)
-	 * @param aRefObject
-	 *            org.eclipse.emf.ecore.EObject
-	 */
-	public boolean containsResource(Resource aResource) {
-		return contains(getResources(), aResource);
-	}
-
-	private Association createAssociation(Object key, Object value) {
-		return new Association(key, value);
-	}
-
-	/**
-	 * Returns a List of RefObjects that were copied. Creation date: (12/17/2000 1:25:46 PM)
-	 * 
-	 * @return java.util.List
-	 */
-	public java.util.List getCopiedRefObjects() {
-		if (copiedRefObjects == null)
-			copiedRefObjects = new ArrayList();
-		return copiedRefObjects;
-	}
-
-	/**
-	 * Returns a List of Resources that were copied. Creation date: (12/17/2000 1:25:46 PM)
-	 * 
-	 * @return java.util.List
-	 */
-	public java.util.List getCopiedResources() {
-		if (copiedResources == null)
-			copiedResources = new ArrayList();
-		return copiedResources;
-	}
-
-	/**
-	 * The context to add all copied resources into. Creation date: (12/17/2000 8:09:45 PM)
-	 * 
-	 * @return org.eclipse.emf.ecore.resource.ResourceSet
-	 */
-	public org.eclipse.emf.ecore.resource.ResourceSet getCopyContext() {
-		return copyContext;
-	}
-
-	/**
-	 * Insert the method's description here. Creation date: (12/17/2000 1:44:43 PM)
-	 * 
-	 * @return java.lang.String
-	 */
-	public java.lang.String getDefaultIdSuffix() {
-		return defaultIdSuffix;
-	}
-
-	/**
-	 * Should the id be copied in the case where no suffix is specified? Defaults to false
-	 */
-	public boolean getPreserveIds() {
-		return preserveIds;
-	}
-
-	/**
-	 * Insert the method's description here. Creation date: (12/17/2000 1:25:46 PM)
-	 * 
-	 * @return java.util.List
-	 */
-	public java.util.List getRefObjects() {
-		if (refObjects == null)
-			refObjects = new ArrayList();
-		return refObjects;
-	}
-
-	/**
-	 * Insert the method's description here. Creation date: (12/17/2000 1:25:46 PM)
-	 * 
-	 * @return java.util.List
-	 */
-	public java.util.List getResources() {
-		if (resources == null)
-			resources = new ArrayList();
-		return resources;
-	}
-
-	/**
-	 * Insert the method's description here. Creation date: (12/17/2000 1:25:46 PM)
-	 * 
-	 * @return java.util.List
-	 */
-	public java.util.List primGetRefObjects() {
-		return refObjects;
-	}
-
-	/**
-	 * Insert the method's description here. Creation date: (12/17/2000 1:25:46 PM)
-	 * 
-	 * @return java.util.List
-	 */
-	public java.util.List primGetResources() {
-		return resources;
-	}
-
-	/**
-	 * Insert the method's description here. Creation date: (12/17/2000 1:28:16 PM)
-	 * 
-	 * @param aRefObject
-	 *            org.eclipse.emf.ecore.EObject
-	 * @return boolean
-	 */
-	public boolean remove(EObject aRefObject) {
-		if (aRefObject != null && primGetRefObjects() != null) {
-			Iterator it = primGetRefObjects().iterator();
-			Association association;
-			while (it.hasNext()) {
-				association = (Association) it.next();
-				if (association.getKey() == aRefObject)
-					return primGetRefObjects().remove(association);
-			}
-		}
-		return false;
-	}
-
-	/**
-	 * Insert the method's description here. Creation date: (12/17/2000 1:27:32 PM)
-	 * 
-	 * @param aResources
-	 *            org.eclipse.emf.ecore.resource.Resource
-	 * @return boolean
-	 */
-	public boolean remove(Resource aResource) {
-		if (aResource != null && primGetResources() != null) {
-			Iterator it = primGetResources().iterator();
-			Association association;
-			while (it.hasNext()) {
-				association = (Association) it.next();
-				if (association.getKey() == aResource)
-					return primGetResources().remove(association);
-			}
-		}
-		return false;
-	}
-
-	/**
-	 * Set the context to add all copied resources into. Creation date: (12/17/2000 8:09:45 PM)
-	 * 
-	 * @param newCopyContext
-	 *            org.eclipse.emf.ecore.resource.Context
-	 */
-	public void setCopyContext(org.eclipse.emf.ecore.resource.ResourceSet newCopyContext) {
-		copyContext = newCopyContext;
-	}
-
-	/**
-	 * If an ID suffix is not defined for a EObject that is to be copied, this value will be used.
-	 * Creation date: (12/17/2000 1:44:43 PM)
-	 * 
-	 * @param newDefaultIdSuffix
-	 *            java.lang.String
-	 */
-	public void setDefaultIdSuffix(java.lang.String newDefaultIdSuffix) {
-		defaultIdSuffix = newDefaultIdSuffix;
-	}
-
-	/**
-	 * Should the id be copied in the case where no suffix is specified?
-	 */
-	public void setPreserveIds(boolean value) {
-		preserveIds = value;
-	}
-
-	/**
-	 * Subclasses should override this method if they require additional processing after the group
-	 * has been copied.
-	 * 
-	 * @param copyUtil
-	 */
-	public void postCopy(EtoolsCopyUtility copyUtil) {
-	}
-
-}
-
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/DOMLoadOptions.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/DOMLoadOptions.java
deleted file mode 100644
index 05ae8a5..0000000
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/DOMLoadOptions.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 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
- *******************************************************************************/
-/*
- * Created on Mar 12, 2003
- *
- * To change this generated comment go to 
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-package org.eclipse.wst.common.internal.emf.utilities;
-
-/**
- * @author schacher
- * 
- * To change this generated comment go to Window>Preferences>Java>Code Generation>Code and Comments
- */
-public class DOMLoadOptions {
-	protected boolean validate;
-	protected boolean allowJavaEncodings;
-	protected boolean expandEntityRefererences;
-
-	/**
-	 * @return boolean
-	 */
-	public boolean isAllowJavaEncodings() {
-		return allowJavaEncodings;
-	}
-
-	/**
-	 * @return boolean
-	 */
-	public boolean isExpandEntityRefererences() {
-		return expandEntityRefererences;
-	}
-
-	/**
-	 * @return boolean
-	 */
-	public boolean isValidate() {
-		return validate;
-	}
-
-	/**
-	 * Sets the allowJavaEncodings.
-	 * 
-	 * @param allowJavaEncodings
-	 *            The allowJavaEncodings to set
-	 */
-	public void setAllowJavaEncodings(boolean allowJavaEncodings) {
-		this.allowJavaEncodings = allowJavaEncodings;
-	}
-
-	/**
-	 * Sets the expandEntityRefererences.
-	 * 
-	 * @param expandEntityRefererences
-	 *            The expandEntityRefererences to set
-	 */
-	public void setExpandEntityRefererences(boolean expandEntityRefererences) {
-		this.expandEntityRefererences = expandEntityRefererences;
-	}
-
-	/**
-	 * Sets the validate.
-	 * 
-	 * @param validate
-	 *            The validate to set
-	 */
-	public void setValidate(boolean validate) {
-		this.validate = validate;
-	}
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/DOMUtilities.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/DOMUtilities.java
deleted file mode 100644
index 4d4225d..0000000
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/DOMUtilities.java
+++ /dev/null
@@ -1,708 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 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
- *******************************************************************************/
-package org.eclipse.wst.common.internal.emf.utilities;
-
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStreamWriter;
-import java.io.PrintWriter;
-import java.io.UnsupportedEncodingException;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
-
-import org.eclipse.wst.common.internal.emf.plugin.EcoreUtilitiesPlugin;
-import org.w3c.dom.Document;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import org.w3c.dom.Text;
-import org.xml.sax.EntityResolver;
-import org.xml.sax.ErrorHandler;
-import org.xml.sax.SAXException;
-import org.xml.sax.SAXParseException;
-
-/**
- * A class containing common dom manipulation and search functions.
- */
-public class DOMUtilities {
-	// Handy Constants
-	public static final String INDENT_STRING = "\t"; //$NON-NLS-1$
-	public static final String NEWLINE_STRING = System.getProperty("line.separator"); //$NON-NLS-1$
-	//Hack to be removed when the DOM apis change such that there is an easier
-	//way to fluff up and set the doctype
-	private static final String DUMMY_ENTITY_STRING = "dummy"; //$NON-NLS-1$
-	private static final String DUMMY_ENTITY_NODE_STRING = "<dummy/>"; //$NON-NLS-1$
-	private static DocumentBuilder defaultDocumentBuilder;
-	private static EntityResolver defaultEntityResolver;
-
-	/**
-	 * Returns an iterator that iterates over the sub nodes of a path.
-	 */
-	static public Iterator createPathIterator(String path) {
-		String tPath = path.startsWith("/") ? path.substring(1) : path; //$NON-NLS-1$
-		if (tPath.length() == 0)
-			tPath = null;
-		final String aPath = tPath;
-
-		return new Iterator() {
-			int prevIndex = 0;
-			int curIndex = 0;
-			String pathString = aPath;
-
-			public boolean hasNext() {
-				return pathString != null && prevIndex != -1;
-			}
-
-			public Object next() {
-				curIndex = pathString.indexOf('/', prevIndex);
-				String nodeString = null;
-				if (curIndex != -1)
-					nodeString = pathString.substring(prevIndex, curIndex++);
-				else
-					nodeString = pathString.substring(prevIndex);
-				prevIndex = curIndex;
-				return nodeString;
-			}
-
-			public void remove() {
-				throw new UnsupportedOperationException();
-			}
-		};
-	}
-
-	/**
-	 * Get the text for the passed in node.
-	 */
-	static public String getChildText(Node node) {
-		Text textNode = getChildTextNode(node);
-		if (textNode != null)
-			return textNode.getData();
-		return null;
-	}
-
-	/**
-	 * Get the text for the passed in node.
-	 */
-	static public Text getChildTextNode(Node node) {
-		Node textNode = node.getFirstChild();
-		while (textNode != null && DOMUtilities.isTextNode(textNode)) {
-			if (!isWhitespace(textNode))
-				return (Text) textNode;
-			textNode = textNode.getNextSibling();
-		}
-		return null;
-	}
-
-	/**
-	 * Return a string representing the current indentation of the node.
-	 */
-	static public String getIndentString(Node node) {
-		Revisit.toDo();
-		return ""; //$NON-NLS-1$
-	}
-
-	/**
-	 * Get the last non-text child of a node.
-	 * 
-	 * @return org.w3c.dom.Node The last non-text child node of
-	 * @node.
-	 * @param node
-	 *            org.w3c.dom.Node The node
-	 */
-	public static Node getLastNodeChild(Node node) {
-		if (node == null)
-			return null;
-		Node child = node.getLastChild();
-		while (child != null && child.getNodeType() == Node.TEXT_NODE)
-			child = child.getPreviousSibling();
-		return child;
-	}
-
-	/**
-	 * Get the next non-text sibling after a node.
-	 * 
-	 * @return org.w3c.dom.Node The first non-text sibling node after
-	 * @node. If there is no next non-text sibling, null is returned.
-	 * @param node
-	 *            org.w3c.dom.Node The node
-	 */
-	public static Node getNextNodeSibling(Node node) {
-		Node sibling = node.getNextSibling();
-		while (sibling != null && sibling.getNodeType() != Node.ELEMENT_NODE)
-			sibling = sibling.getNextSibling();
-		return sibling;
-	}
-
-	/**
-	 * Get the first child Node with the specified name
-	 */
-	static public Node getNodeChild(Node node, String nodeName) {
-		Node child = null;
-		NodeList children = node.getChildNodes();
-		for (int i = 0; i < children.getLength(); i++) {
-			Node n = children.item(i);
-			if (n.getNodeType() == Node.ELEMENT_NODE && n.getNodeName().equals(nodeName)) {
-				child = n;
-				break;
-			}
-		}
-		return child;
-	}
-
-	/**
-	 * Traverses the path passed in <pathName>. The path is a string in the form
-	 * 'node1/node2/node3'. This method starts at node.
-	 */
-	static public Node getNodeChildForPath(Node parent, String pathName) {
-
-		Node curNode = parent;
-		Iterator i = DOMUtilities.createPathIterator(pathName);
-		while (i.hasNext()) {
-			String child = (String) i.next();
-			curNode = DOMUtilities.getNodeChild(curNode, child);
-			if (curNode == null)
-				return null;
-		}
-		return curNode;
-	}
-
-	/**
-	 * Get the Node children with the specified names
-	 */
-	static public List getNodeChildren(Node node, String[] nodeNames) {
-		NodeList childNodes = node.getChildNodes();
-		ArrayList results = new ArrayList();
-
-		for (int i = 0; i < childNodes.getLength(); i++) {
-			Node n = childNodes.item(i);
-			if (n.getNodeType() == Node.ELEMENT_NODE) {
-				boolean found = false;
-				for (int j = 0; j < nodeNames.length; j++) {
-					if (nodeNames[j].equals(n.getNodeName())) {
-						found = true;
-						break;
-					}
-				}
-				if (found)
-					results.add(n);
-			}
-		}
-		return results;
-	}
-
-	/**
-	 * Get the Node children with the specified name
-	 */
-	static public List getNodeChildren(Node node, String nodeName) {
-		NodeList childNodes = node.getChildNodes();
-		ArrayList results = new ArrayList();
-
-		for (int i = 0; i < childNodes.getLength(); i++) {
-			Node n = childNodes.item(i);
-			if (n.getNodeType() == Node.ELEMENT_NODE && n.getNodeName().equals(nodeName))
-				results.add(n);
-		}
-		return results;
-	}
-
-	/**
-	 * Get the first non-text sibling before a node.
-	 * 
-	 * @return org.w3c.dom.Node The first non-text sibling node before
-	 * @node. If there is no previous non-text sibling, null is returned.
-	 * @param node
-	 *            org.w3c.dom.Node The node
-	 */
-	public static Node getPreviousNodeSibling(Node node) {
-		if (node == null)
-			return null;
-		Node sibling = node.getPreviousSibling();
-		while (sibling != null && DOMUtilities.isTextNode(sibling))
-			sibling = sibling.getPreviousSibling();
-		return sibling;
-	}
-
-	/**
-	 * Get the first text node before a node.
-	 * 
-	 * @return org.w3c.dom.Node The first text node before
-	 * @node. Null if no such node exist.
-	 * @param node
-	 *            org.w3c.dom.Node The node
-	 */
-	public static Text getPreviousText(Node node) {
-		Text sibling = getPreviousTextSibling(node);
-
-		if (sibling == null && node.getParentNode() != null)
-			sibling = getPreviousText(node.getParentNode());
-
-		return sibling;
-	}
-
-	/**
-	 * Get the first text sibling before a node.
-	 * 
-	 * @return org.w3c.dom.Node The first text sibling node before
-	 * @node. If there is no previous text sibling, null is returned.
-	 * @param node
-	 *            org.w3c.dom.Node The node
-	 */
-	public static Text getPreviousTextSibling(Node node) {
-		Assert.isNotNull(node);
-
-		Node sibling = node.getPreviousSibling();
-		Node lastText = null;
-		while (sibling != null && sibling.getNodeType() == Node.TEXT_NODE) {
-			lastText = sibling;
-			sibling = sibling.getPreviousSibling();
-		}
-		return (Text) lastText;
-	}
-
-	/**
-	 * Get the first text sibling before a node.
-	 * 
-	 * @return org.w3c.dom.Node The first text sibling node before
-	 * @node. If there is no previous text sibling, null is returned.
-	 * @param node
-	 *            org.w3c.dom.Node The node
-	 */
-	public static String getTrailingWhitespace(Text node) {
-		Assert.isNotNull(node);
-
-		String text = node.getData();
-		if (text.length() == 0)
-			return ""; //$NON-NLS-1$
-
-		int i = text.length() - 1;
-		for (; i >= 0; i--) {
-			if (!Character.isWhitespace(text.charAt(i))) {
-				break;
-			}
-		}
-
-		return text.substring(++i);
-	}
-
-	/**
-	 * Inserts <newNode>into <parent>after <refNode>. If <refNode>is null then the node is inserted
-	 * to the beginning of the parent's child nodes.
-	 * 
-	 * @param parent
-	 *            org.w3c.dom.Node
-	 * @param newNode
-	 *            org.w3c.dom.Node
-	 * @param refNode
-	 *            org.w3c.dom.Node
-	 */
-	public static void insertAfterNode(Node parent, Node newNode, Node refNode) {
-		Node insertBeforeNode = null;
-		if (refNode != null) {
-			insertBeforeNode = refNode.getNextSibling();
-		}
-		if (refNode == null)
-			insertBeforeNode(parent, newNode, parent.getFirstChild());
-		else
-			insertBeforeNode(parent, newNode, insertBeforeNode);
-	}
-
-	/**
-	 * Insert a <newNode>into <parent>before <refNode>. This utility method is used to ensure that
-	 * the insertion does not result in two adjacent text nodes. The DOM model does not handle
-	 * adjacent text nodes. They must be joined together.
-	 * 
-	 * @param newNode
-	 *            org.w3c.dom.Node
-	 * @param newNode
-	 *            org.w3c.dom.Node
-	 * @param refNode
-	 *            org.w3c.dom.Node
-	 */
-	static public void insertBeforeNode(Node parent, Node newNode, Node refNode) {
-		if (newNode.getNodeType() == Node.TEXT_NODE) {
-			Text textNewNode = (Text) newNode;
-
-			// If the insert before node is text, join it with the new node.
-			if (refNode != null && refNode.getNodeType() == Node.TEXT_NODE) {
-				Text textRefNode = (Text) refNode;
-				textRefNode.setData(textNewNode.getData() + textRefNode.getData());
-				return;
-			}
-			// If the node we are inserting after is text,
-			// join it with the new node.
-			Node insertAfterNode = (refNode == null) ? parent.getLastChild() : refNode.getPreviousSibling();
-			if (insertAfterNode != null && insertAfterNode.getNodeType() == Node.TEXT_NODE) {
-				Text textInsertAfterNode = (Text) insertAfterNode;
-				textInsertAfterNode.setData(textInsertAfterNode.getData() + textNewNode.getData());
-				return;
-			}
-		}
-		// There is no text node to join to, simple insert the node.
-		parent.insertBefore(newNode, refNode);
-	}
-
-	/**
-	 * Insert a <newNode>into <parent>before <refNode>. This method will also insert the node before
-	 * any whitespace nodes that appear in the tree before <refNode>. This method will also ensure
-	 * that the insertion does not result in two adjacent text nodes. The DOM model does not handle
-	 * adjacent text nodes. They must be joined together.
-	 * 
-	 * @param newNode
-	 *            org.w3c.dom.Node
-	 * @param newNode
-	 *            org.w3c.dom.Node
-	 * @param refNode
-	 *            org.w3c.dom.Node
-	 */
-	static public void insertBeforeNodeAndWhitespace(Node parent, Node newNode, Node refNode) {
-		Node curNode = (refNode == null) ? parent.getLastChild() : refNode.getPreviousSibling();
-		Node lastNode = refNode;
-
-		while (curNode != null && (DOMUtilities.isWhitespace(curNode) || DOMUtilities.isComment(curNode))) {
-			lastNode = curNode;
-			curNode = curNode.getPreviousSibling();
-		}
-
-		insertBeforeNode(parent, newNode, lastNode);
-	}
-
-	/**
-	 * Return whether the node is a text node.
-	 * 
-	 * @return boolean Answer true if the node is a text node, false otherwise.
-	 * @param node
-	 *            org.w3c.dom.Node The node to check
-	 */
-	static public boolean isTextNode(Node node) {
-		Assert.isNotNull(node);
-		return (node.getNodeType() == Node.TEXT_NODE) || (node.getNodeType() == Node.CDATA_SECTION_NODE);
-	}
-
-	/**
-	 * Return whether the node is entirely comment or not.
-	 * 
-	 * @return boolean Answer true if the node is whitespace, false otherwise.
-	 * @param node
-	 *            org.w3c.dom.Node The node to check
-	 */
-	static public boolean isComment(Node node) {
-		Assert.isNotNull(node);
-
-		return node.getNodeType() == Node.COMMENT_NODE;
-	}
-
-	/**
-	 * Return whether the node is entirely whitepace or not.
-	 * 
-	 * @return boolean Answer true if the node is whitespace, false otherwise.
-	 * @param node
-	 *            org.w3c.dom.Node The node to check
-	 */
-	static public boolean isWhitespace(Node node) {
-		Assert.isNotNull(node);
-
-		if (node.getNodeType() != Node.TEXT_NODE)
-			return false;
-
-		Text textNode = (Text) node;
-		String text = textNode.getData();
-		if (text == null)
-			return false;
-
-		for (int i = 0; i < text.length(); i++) {
-			if (!Character.isWhitespace(text.charAt(i))) {
-				return false;
-			}
-		}
-		return true;
-	}
-
-	/**
-	 * Remove all the children of <node>
-	 */
-	static public void removeAllChildren(Node node) {
-		NodeList list = node.getChildNodes();
-		for (int i = 0; i < list.getLength(); i++) {
-			node.removeChild(list.item(i));
-		}
-	}
-
-	// traverses the DOM starting at the specified node and returns a list
-	// of nodes matching the search string
-
-	static public ArrayList getAllNodes(Node node, String nodeName) {
-		ArrayList nodeList = new ArrayList();
-
-		String[] nodeNames = {nodeName};
-		findAllNodes(node, nodeNames, nodeList);
-
-		return nodeList;
-	}
-
-	// traverses the DOM starting at the specified node and returns a list
-	// of nodes matching the search strings
-
-	static public ArrayList getAllNodes(Node node, String[] nodeNamesArray) {
-		ArrayList nodeList = new ArrayList();
-		findAllNodes(node, nodeNamesArray, nodeList);
-
-		return nodeList;
-	}
-
-	// recursive helper for getAllNodes
-	static private void findAllNodes(Node node, String[] nodeNames, ArrayList results) {
-
-		NodeList nodes = node.getChildNodes();
-		if (nodes != null) {
-			for (int i = 0; i < nodes.getLength(); i++) {
-				for (int j = 0; j < nodeNames.length; j++) {
-					if (nodes.item(i).getNodeName().equals(nodeNames[j])) {
-						results.add(nodes.item(i));
-					}
-				}
-				findAllNodes(nodes.item(i), nodeNames, results);
-			}
-		}
-	}
-
-	/**
-	 * Returns the system defined JAXP document builder
-	 */
-	static public DocumentBuilder newDefaultDocumentBuilder(DOMLoadOptions options) throws ParserConfigurationException {
-		DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
-		dbf.setValidating(options.isValidate());
-		dbf.setNamespaceAware(options.isValidate());
-		/*
-		 * Causes errors in IBM JDK try { dbf.setAttribute(Renderer.JAXP_SCHEMA_LANGUAGE,
-		 * Renwderer.W3C_XML_SCHEMA); } catch (IllegalArgumentException x) { }
-		 */
-		try {
-			dbf.setAttribute("http://apache.org/xml/features/allow-java-encodings", new Boolean(options.isAllowJavaEncodings())); //$NON-NLS-1$	        
-		} catch (IllegalArgumentException ignore) {
-			EcoreUtilitiesPlugin.logWarning("Warning: Parser does not support \"http://apache.org/xml/features/allow-java-encodings\"."); //$NON-NLS-1$
-		}
-		try {
-			dbf.setAttribute("http://apache.org/xml/features/validation/schema", new Boolean(options.isValidate())); //$NON-NLS-1$
-		} catch (IllegalArgumentException ignore) {
-			dbf.setValidating(false);
-			EcoreUtilitiesPlugin.logWarning("Warning: Parser does not support \"http://apache.org/xml/features/validation/schema\". Validation will be disabled."); //$NON-NLS-1$
-		}
-		try {
-			dbf.setAttribute("http://apache.org/xml/features/dom/defer-node-expansion", Boolean.FALSE); //$NON-NLS-1$
-		} catch (IllegalArgumentException ignore) {
-			EcoreUtilitiesPlugin.logWarning("Warning: Parser does not support \"http://apache.org/xml/features/dom/defer-node-expansion\"."); //$NON-NLS-1$
-		}
-		dbf.setExpandEntityReferences(options.isExpandEntityRefererences());
-		DocumentBuilder result = dbf.newDocumentBuilder();
-		result.setErrorHandler(new ErrorHandler() {
-			/*
-			 * (non-Javadoc)
-			 * 
-			 * @see org.xml.sax.ErrorHandler#error(org.xml.sax.SAXParseException)
-			 */
-			public void error(SAXParseException arg0) throws SAXException {
-				throw arg0;
-			}
-
-			/*
-			 * (non-Javadoc)
-			 * 
-			 * @see org.xml.sax.ErrorHandler#fatalError(org.xml.sax.SAXParseException)
-			 */
-			public void fatalError(SAXParseException arg0) throws SAXException {
-				throw arg0;
-			}
-
-			public void warning(SAXParseException arg0) throws SAXException {
-				EcoreUtilitiesPlugin.logWarning(arg0);
-			}
-
-		});
-		return result;
-	}
-
-	/**
-	 * Creates a stub document, where the DocumentType is defined by the parameters.
-	 */
-	static public Document createNewDocument(String doctype, String publicId, String systemId) throws ParserConfigurationException, SAXException, IOException {
-		DocumentBuilder builder = getDefaultDocumentBuilder();
-		InputStream in = createHeaderInputStream(doctype, publicId, systemId, true);
-		Document result = builder.parse(in);
-		removeDummyEntity(result);
-		removeExtraneousComments(result);
-		return result;
-	}
-
-	public static Document loadDocument(InputStream in, DOMLoadOptions options, EntityResolver resolver) throws ParserConfigurationException, SAXException, IOException {
-		DocumentBuilder builder = DOMUtilities.newDefaultDocumentBuilder(options);
-		builder.setEntityResolver(resolver);
-		Document result = builder.parse(in);
-		removeExtraneousComments(result);
-		return result;
-	}
-
-	/**
-	 * At the time of this writing, the DOM Level 2 APIs are not advanced enough for setting the
-	 * document type; so the only parser independent way of accomplishing this is by creating a
-	 * stream and parsing it.
-	 */
-	public static InputStream createHeaderInputStream(String doctype, String publicId, String systemId) {
-		return createHeaderInputStream(doctype, publicId, systemId, false);
-	}
-
-
-	
-	private static InputStream createHeaderInputStream(String doctype, String publicId, String systemId, boolean includeDummy) {
-        ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
-
-		// The prior code (which is still in the catch block), uses
-		// the system default encoding [System.getProperty("file.encoding")];
-		// on Z/OS this is Cp1047. The combination of "UTF-8" in the header
-		// and "Cp1047" in the writer create an unusable input stream.
-
-		PrintWriter writer;
-
-		try {
-			OutputStreamWriter outputWriter = new OutputStreamWriter(outputStream, "UTF-8"); //$NON-NLS-1$
-			// throws UnsupportedEncodingException
-			writer = new PrintWriter(outputWriter);
-		} catch (UnsupportedEncodingException e) {
-			// Should never get here (earlier code)
-			writer = new PrintWriter(outputStream); 
-		}
-
-		writeHeader(writer, doctype, publicId, systemId);
-		if (includeDummy)
-			addDummyEntity(writer);
-		writer.flush();
-		writer.close();
-
-		byte[] bytes = outputStream.toByteArray();
-		return new ByteArrayInputStream(bytes);
-	}
-
-
-	private static void writeHeader(PrintWriter writer, String doctype, String publicId, String systemId) {
-		writer.write("<?xml version=\""); //$NON-NLS-1$
-		writer.write("1.0"); //$NON-NLS-1$
-		writer.write("\" encoding=\""); //$NON-NLS-1$
-		writer.write("UTF-8"); //$NON-NLS-1$
-		writer.write("\"?>"); //$NON-NLS-1$
-		writer.println();
-
-		if (doctype != null) {
-			writer.write("<!DOCTYPE "); //$NON-NLS-1$
-			writer.write(doctype);
-			writer.write(" PUBLIC \""); //$NON-NLS-1$
-			writer.write(publicId);
-			writer.write("\" \""); //$NON-NLS-1$
-			writer.write(systemId);
-			writer.write("\">"); //$NON-NLS-1$
-			writer.println();
-		}
-	}
-
-	private static void addDummyEntity(PrintWriter writer) {
-		Revisit.revisit();
-		writer.println(DUMMY_ENTITY_NODE_STRING);
-		//Major hack because we can not parse an empty document
-	}
-
-	private static void removeDummyEntity(Document doc) {
-		doc.removeChild(getNodeChild(doc, DUMMY_ENTITY_STRING));
-	}
-
-	private static void removeExtraneousComments(Document doc) {
-		//another major hack because of a bug in XML4J 4.0.7 that added all the
-		//comments from the dtd to the document. Can be removed after we move up
-		//Xerces levels
-		Node aNode = doc.getFirstChild();
-		while (aNode != null) {
-			Node nextNode = aNode.getNextSibling();
-			if (aNode.getNodeType() == Node.COMMENT_NODE)
-				doc.removeChild(aNode);
-			aNode = nextNode;
-		}
-	}
-
-	/**
-	 * For performance, cache a static instance of the JAXP registered document builder. Validation
-	 * is disabled for this instance. If you need validation, use
-	 * {@link #newDefaultDocumentBuilder(boolean, boolean, boolean)}
-	 * 
-	 * @return DocumentBuilder
-	 * @throws ParserConfigurationException
-	 *             if JAXP is not configured correctly
-	 */
-	public static DocumentBuilder getDefaultDocumentBuilder() throws ParserConfigurationException {
-		if (defaultDocumentBuilder == null) {
-			DOMLoadOptions opts = new DOMLoadOptions();
-			opts.setAllowJavaEncodings(true);
-			opts.setExpandEntityRefererences(true);
-			opts.setValidate(false);
-			defaultDocumentBuilder = newDefaultDocumentBuilder(opts);
-			defaultDocumentBuilder.setEntityResolver(defaultEntityResolver);
-			defaultDocumentBuilder.setErrorHandler(new ErrorHandler() {
-				/*
-				 * (non-Javadoc)
-				 * 
-				 * @see org.xml.sax.ErrorHandler#error(org.xml.sax.SAXParseException)
-				 */
-				public void error(SAXParseException exception) throws SAXException {
-
-				}
-
-				/*
-				 * (non-Javadoc)
-				 * 
-				 * @see org.xml.sax.ErrorHandler#fatalError(org.xml.sax.SAXParseException)
-				 */
-				public void fatalError(SAXParseException exception) throws SAXException {
-
-				}
-
-				/*
-				 * (non-Javadoc)
-				 * 
-				 * @see org.xml.sax.ErrorHandler#warning(org.xml.sax.SAXParseException)
-				 */
-				public void warning(SAXParseException exception) throws SAXException {
-
-				}
-
-			});
-		}
-
-		return defaultDocumentBuilder;
-	}
-
-	/**
-	 * @return
-	 */
-	public static EntityResolver getDefaultEntityResolver() {
-		return defaultEntityResolver;
-	}
-
-	/**
-	 * @param resolver
-	 */
-	public static void setDefaultEntityResolver(EntityResolver resolver) {
-		defaultEntityResolver = resolver;
-	}
-
-}
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/DanglingHREFException.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/DanglingHREFException.java
deleted file mode 100644
index 9207710..0000000
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/DanglingHREFException.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 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
- *******************************************************************************/
-/*
- * Created on May 12, 2003
- *
- */
-package org.eclipse.wst.common.internal.emf.utilities;
-
-/**
- * Exception thrown when a proxy can not be resolved
- */
-public class DanglingHREFException extends Exception {
-
-
-	/**
-	 * 
-	 */
-	private static final long serialVersionUID = -3369128742899263327L;
-
-	public DanglingHREFException() {
-		super();
-	}
-
-	/**
-	 * @param s
-	 */
-	public DanglingHREFException(String s) {
-		super(s);
-	}
-
-
-}
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/DefaultFeatureValueConverter.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/DefaultFeatureValueConverter.java
deleted file mode 100644
index 76e5962..0000000
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/DefaultFeatureValueConverter.java
+++ /dev/null
@@ -1,354 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.common.internal.emf.utilities;
-
-
-
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClassifier;
-import org.eclipse.emf.ecore.EEnum;
-import org.eclipse.emf.ecore.EEnumLiteral;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.EcorePackage;
-import org.eclipse.emf.ecore.xml.type.XMLTypePackage;
-
-/**
- * Insert the type's description here. Creation date: (5/10/2001 2:49:49 PM)
- * 
- * @author: Administrator
- */
-public class DefaultFeatureValueConverter implements FeatureValueConverter {
-	private static final String FAILED_CONVERSION_PATTERN = WFTUtilsResourceHandler.Failed_to_convert__0__to___ERROR_;
-
-	/**
-	 * DefaultFeatureValueConverter constructor comment.
-	 */
-	public DefaultFeatureValueConverter() {
-		super();
-	}
-
-	/**
-	 * Convert
-	 * 
-	 * @aValue to a Boolean.
-	 */
-	protected Object convertToBoolean(Object aValue) {
-		if (aValue instanceof String)
-			return Boolean.valueOf((String) aValue);
-		if (aValue instanceof Boolean)
-			return aValue;
-		return failedToConvert(aValue, WFTUtilsResourceHandler.Boolean_UI_);
-	}
-
-	/**
-	 * Convert
-	 * 
-	 * @aValue to a Byte.
-	 */
-	protected Object convertToByte(Object aValue) {
-		if (aValue instanceof String)
-			return Byte.valueOf((String) aValue);
-		if (aValue instanceof Byte)
-			return aValue;
-		return failedToConvert(aValue, WFTUtilsResourceHandler.Byte_UI_);
-	}
-
-	/**
-	 * Convert
-	 * 
-	 * @aValue to a Character.
-	 */
-	protected Object convertToCharacter(Object aValue) {
-		if (aValue instanceof String && ((String) aValue).length() == 1)
-			return new Character(((String) aValue).charAt(0));
-		if (aValue instanceof Character)
-			return aValue;
-		return failedToConvert(aValue, WFTUtilsResourceHandler.Character_UI_);
-	}
-
-	/**
-	 * Convert
-	 * 
-	 * @aValue to a Double.
-	 */
-	protected Object convertToDouble(Object aValue) {
-		if (aValue instanceof String) {
-			try {
-				return Double.valueOf((String) aValue);
-			} catch (NumberFormatException e) {
-				return defaultDouble();
-			}
-		}
-		if (aValue instanceof Double)
-			return aValue;
-		return failedToConvert(aValue, WFTUtilsResourceHandler.Double_UI_);
-	}
-
-	/**
-	 * Convert
-	 * 
-	 * @aValue to a EEnumLiteral.
-	 */
-	protected Object convertToEnum(Object aValue, EStructuralFeature aFeature) {
-		EEnumLiteral literal = null;
-		EEnum eenum = (EEnum) aFeature.getEType();
-		if (aValue instanceof String)
-			literal = eenum.getEEnumLiteral((String) aValue);
-		else if (aValue instanceof Integer)
-			literal = eenum.getEEnumLiteral(((Integer) aValue).intValue());
-		else if (aValue instanceof EEnumLiteral)
-			literal = (EEnumLiteral) aValue;
-
-		if (literal == null)
-			return failedToConvert(aValue, WFTUtilsResourceHandler.Enumeration_UI_);
-
-		return literal.getInstance();
-	}
-
-	/**
-	 * Convert
-	 * 
-	 * @aValue to a Float.
-	 */
-	protected Object convertToFloat(Object aValue) {
-		if (aValue instanceof String) {
-			try {
-				return Float.valueOf((String) aValue);
-			} catch (NumberFormatException e) {
-				return defaultFloat();
-			}
-		}
-		if (aValue instanceof Float)
-			return aValue;
-		return failedToConvert(aValue, WFTUtilsResourceHandler.Float_UI_);
-	}
-
-	/**
-	 * Convert
-	 * 
-	 * @aValue to a Integer.
-	 */
-	protected Object convertToInteger(Object aValue) {
-		if (aValue instanceof String) {
-			try {
-				return Integer.valueOf((String) aValue);
-			} catch (NumberFormatException e) {
-				return defaultInteger();
-			}
-		}
-		if (aValue instanceof Integer)
-			return aValue;
-		return failedToConvert(aValue, WFTUtilsResourceHandler.Integer_UI_);
-	}
-
-	/**
-	 * Convert
-	 * 
-	 * @aValue to a Java Object.
-	 */
-	protected Object convertToJavaObject(Object aValue) {
-		return aValue;
-	}
-
-	/**
-	 * Convert
-	 * 
-	 * @aValue to a Long.
-	 */
-	protected Object convertToLong(Object aValue) {
-		if (aValue instanceof String) {
-			try {
-				return Long.valueOf((String) aValue);
-			} catch (NumberFormatException e) {
-				return defaultLong();
-			}
-		}
-		if (aValue instanceof Long)
-			return aValue;
-		return failedToConvert(aValue, WFTUtilsResourceHandler.Long_UI_);
-	}
-
-	/**
-	 * Convert
-	 * 
-	 * @aValue to a MofObject.
-	 */
-	protected Object convertToMofObject(Object aValue) {
-		if (aValue instanceof EObject)
-			return aValue;
-		return failedToConvert(aValue, WFTUtilsResourceHandler.MofObject_UI_);
-	}
-
-	/**
-	 * Convert
-	 * 
-	 * @aValue to a Short.
-	 */
-	protected Object convertToShort(Object aValue) {
-		if (aValue instanceof String) {
-			try {
-				return Short.valueOf((String) aValue);
-			} catch (NumberFormatException e) {
-				return defaultShort();
-			}
-		}
-		if (aValue instanceof Short)
-			return aValue;
-		return failedToConvert(aValue, WFTUtilsResourceHandler.Short_UI_);
-	}
-
-	/**
-	 * Convert
-	 * 
-	 * @aValue to a String.
-	 */
-	protected Object convertToString(Object aValue) {
-		return aValue.toString();
-	}
-
-	/**
-	 * Convert
-	 * 
-	 * @aValue to the type of
-	 * @anAttribute.
-	 */
-	protected Object convertValue(Object aValue, org.eclipse.emf.ecore.EAttribute anAttribute) {
-
-		EClassifier meta = anAttribute.getEType();
-		if (meta.eClass() == EcorePackage.eINSTANCE.getEEnum())
-			return convertToEnum(aValue, anAttribute);
-		if (meta.getEPackage() instanceof EcorePackage)
-		{
-			switch (meta.getClassifierID()) {
-				case EcorePackage.ESTRING :
-					return convertToString(aValue);
-				case EcorePackage.EBOOLEAN_OBJECT :
-				case EcorePackage.EBOOLEAN :
-					return convertToBoolean(aValue);
-				case EcorePackage.EINTEGER_OBJECT :
-				case EcorePackage.EINT :
-					return convertToInteger(aValue);
-				case EcorePackage.EFLOAT_OBJECT :
-				case EcorePackage.EFLOAT :
-					return convertToFloat(aValue);
-				case EcorePackage.ECHARACTER_OBJECT :
-				case EcorePackage.ECHAR :
-					return convertToCharacter(aValue);
-				case EcorePackage.ELONG_OBJECT :
-				case EcorePackage.ELONG :
-					return convertToLong(aValue);
-				case EcorePackage.EBYTE_OBJECT :
-				case EcorePackage.EBYTE :
-					return convertToByte(aValue);
-				case EcorePackage.EDOUBLE_OBJECT :
-				case EcorePackage.EDOUBLE :
-					return convertToDouble(aValue);
-				case EcorePackage.ESHORT_OBJECT :
-				case EcorePackage.ESHORT :
-					return convertToShort(aValue);
-				//		case EcorePackage.EENUM:
-				//			return convertToEnum(aValue, anAttribute);
-				case EcorePackage.EOBJECT :
-					return convertToMofObject(aValue);
-				case EcorePackage.EJAVA_OBJECT :
-					return convertToJavaObject(aValue);
-			}
-		}
-		else if (meta.getEPackage() instanceof XMLTypePackage)
-		{
-			switch (meta.getClassifierID()) {
-			case XMLTypePackage.STRING :
-				return convertToString(aValue);
-			case XMLTypePackage.BOOLEAN_OBJECT :
-			case XMLTypePackage.BOOLEAN :
-				return convertToBoolean(aValue);
-			case XMLTypePackage.INT_OBJECT :
-			case XMLTypePackage.INTEGER :
-			case XMLTypePackage.INT :
-				return convertToInteger(aValue);
-			case XMLTypePackage.FLOAT_OBJECT :
-			case XMLTypePackage.FLOAT :
-				return convertToFloat(aValue);
-			case XMLTypePackage.LONG_OBJECT :
-			case XMLTypePackage.LONG :
-				return convertToLong(aValue);
-			case XMLTypePackage.BYTE_OBJECT :
-			case XMLTypePackage.BYTE :
-				return convertToByte(aValue);
-			case XMLTypePackage.DOUBLE_OBJECT :
-			case XMLTypePackage.DOUBLE :
-				return convertToDouble(aValue);
-			case XMLTypePackage.SHORT_OBJECT :
-			case XMLTypePackage.SHORT :
-				return convertToShort(aValue);
-			}
-		}
-		return aValue;
-	}
-
-	/**
-	 * Convert
-	 * 
-	 * @aValue to the type of
-	 * @aFeature.
-	 */
-	public Object convertValue(Object aValue, org.eclipse.emf.ecore.EStructuralFeature aFeature) {
-		if (aValue == null || aFeature == null || !(aFeature instanceof EAttribute))
-			return aValue; //nothing to convert
-		return convertValue(aValue, (EAttribute) aFeature);
-	}
-
-	/**
-	 * Return the default Double value.
-	 */
-	protected Double defaultDouble() {
-		return null;
-	}
-
-	/**
-	 * Return the default Float value.
-	 */
-	protected Float defaultFloat() {
-		return null;
-	}
-
-	/**
-	 * Return the default Integer value.
-	 */
-	protected Integer defaultInteger() {
-		return null;
-	}
-
-	/**
-	 * Return the default Long value.
-	 */
-	protected Long defaultLong() {
-		return null;
-	}
-
-	/**
-	 * Return the default Short value.
-	 */
-	protected Short defaultShort() {
-		return null;
-	}
-
-	/**
-	 * Failed to convert
-	 * 
-	 * @aValue.
-	 */
-	protected Object failedToConvert(Object aValue, String aString) {
-		String errorString = java.text.MessageFormat.format(FAILED_CONVERSION_PATTERN, new Object[]{aValue.toString(), aString});
-		throw new FeatureValueConversionException(errorString);
-	}
-}
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/DefaultOverridableResourceFactoryRegistry.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/DefaultOverridableResourceFactoryRegistry.java
deleted file mode 100644
index 456edb5..0000000
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/DefaultOverridableResourceFactoryRegistry.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Mar 14, 2003
- *
- * To change this generated comment go to 
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-package org.eclipse.wst.common.internal.emf.utilities;
-
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.Resource.Factory;
-import org.eclipse.emf.ecore.resource.impl.ResourceFactoryRegistryImpl;
-
-/**
- * @author DABERG
- * 
- * To change this generated comment go to Window>Preferences>Java>Code Generation>Code and Comments
- */
-public class DefaultOverridableResourceFactoryRegistry extends ResourceFactoryRegistryImpl {
-	protected static Resource.Factory GLOBAL_FACTORY = Resource.Factory.Registry.INSTANCE.getFactory(URI.createURI(DEFAULT_EXTENSION));
-
-	/**
-	 *  
-	 */
-	public DefaultOverridableResourceFactoryRegistry() {
-		super();
-	}
-
-	@Override
-	public Resource.Factory getFactory(URI uri) {
-		return getFactory(uri, null);
-	}
-
-	@Override
-	public Resource.Factory getFactory(URI uri, String contentType)
-	{
-		Object resourceFactory = null;
-		String protocol = uri.scheme();
-		resourceFactory = protocolToFactoryMap.get(protocol);
-		if (resourceFactory == null) {
-			String extension = uri.fileExtension();
-			resourceFactory = extensionToFactoryMap.get(extension);
-			if (resourceFactory == null) {
-				resourceFactory = delegatedGetFactory(uri);
-				if (resourceFactory == GLOBAL_FACTORY) {
-					resourceFactory = extensionToFactoryMap.get(Resource.Factory.Registry.DEFAULT_EXTENSION);
-					if (resourceFactory == null)
-						resourceFactory = GLOBAL_FACTORY;
-				}
-
-			}
-		}
-		
-		return resourceFactory instanceof Resource.Factory.Descriptor ? ((Resource.Factory.Descriptor) resourceFactory).createFactory() : (Resource.Factory) resourceFactory;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.emf.ecore.resource.impl.ResourceFactoryRegistryImpl#delegatedGetFactory(org.eclipse.emf.common.util.URI)
-	 */
-	@Override
-	protected Factory delegatedGetFactory(URI uri) {
-		return Resource.Factory.Registry.INSTANCE.getFactory(uri);
-	}
-}
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/DeferredReferenceUtilityAction.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/DeferredReferenceUtilityAction.java
deleted file mode 100644
index ec1f668..0000000
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/DeferredReferenceUtilityAction.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.common.internal.emf.utilities;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EReference;
-
-/**
- * Insert the type's description here. Creation date: (12/15/2000 5:25:43 PM)
- * 
- * @author: Administrator
- */
-public abstract class DeferredReferenceUtilityAction {
-	protected EReference reference;
-	protected Object referenceValue;
-	protected EObject copyContainer;
-	protected String idSuffix;
-
-	/**
-	 * DeferredCopy constructor comment.
-	 */
-	public DeferredReferenceUtilityAction(EReference aReference, Object aValue, String aSuffix, EObject aCopyContainer) {
-		reference = aReference;
-		referenceValue = aValue;
-		idSuffix = aSuffix;
-		copyContainer = aCopyContainer;
-	}
-
-	/**
-	 * Insert the method's description here. Creation date: (12/16/2000 9:32:28 AM)
-	 * 
-	 * @return org.eclipse.emf.ecore.EObject
-	 */
-	public org.eclipse.emf.ecore.EObject getCopyContainer() {
-		return copyContainer;
-	}
-
-	/**
-	 * Insert the method's description here. Creation date: (12/15/2000 5:34:56 PM)
-	 * 
-	 * @return java.lang.String
-	 */
-	public java.lang.String getIdSuffix() {
-		return idSuffix;
-	}
-
-	/**
-	 * Insert the method's description here. Creation date: (12/15/2000 5:34:56 PM)
-	 * 
-	 * @return org.eclipse.emf.ecore.EReference
-	 */
-	public org.eclipse.emf.ecore.EReference getReference() {
-		return reference;
-	}
-
-	/**
-	 * Insert the method's description here. Creation date: (12/16/2000 9:32:28 AM)
-	 * 
-	 * @return java.lang.Object
-	 */
-	public Object getReferenceValue() {
-		return referenceValue;
-	}
-
-	public abstract void performAction();
-}
-
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/EncoderDecoder.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/EncoderDecoder.java
deleted file mode 100644
index 69fe06b..0000000
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/EncoderDecoder.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.common.internal.emf.utilities;
-
-
-/**
- * Represents an interface to an object which can encode and decode values. This typically involves
- * cryptography algorithms. This interface, along with the supplied adapters provide an extension
- * mechanism for pluggable crytography that can be used when storing and retrieving attribute
- * values, and is used prevalently for encoding and decoding password values of mof objects.
- */
-public interface EncoderDecoder {
-	/**
-	 * Returns a decoded version of the value.
-	 */
-	public String decode(String value);
-
-	/**
-	 * Returns an encoded version of the value.
-	 */
-	public String encode(String value);
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/EncoderDecoderAdapter.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/EncoderDecoderAdapter.java
deleted file mode 100644
index 788b300..0000000
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/EncoderDecoderAdapter.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.common.internal.emf.utilities;
-
-
-/**
- * An adapter for EncoderDecoder implementations
- */
-public abstract class EncoderDecoderAdapter implements EncoderDecoder {
-
-	/**
-	 * EncoderDecoderAdapter constructor comment.
-	 */
-	public EncoderDecoderAdapter() {
-		super();
-	}
-
-	/**
-	 * Returns a decoded version of the value.
-	 */
-	public abstract String decode(String value);
-
-	/**
-	 * Returns an encoded version of the value.
-	 */
-	public abstract String encode(String value);
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/EncoderDecoderRegistry.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/EncoderDecoderRegistry.java
deleted file mode 100644
index d615112..0000000
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/EncoderDecoderRegistry.java
+++ /dev/null
@@ -1,111 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.common.internal.emf.utilities;
-
-
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * Registry for storing and retrieving value decoders and encoders. Usage Example:
- * 
- * <pre>
- * 
- * 
- * // Use the standard WebSphere password value encoder/decoder.
- * EncoderDecoderRegistry.getDefaultRegistry().setDefaultEncoderDecoder(new com.ibm.ejs.security.util.WASEncoderDecoder());
- * // Begin tracking changes...
- * WriteBackHelper.begin();
- * // Load a resource which may have un-encoded values...
- * // Note: The WCCM will attempt to detect un-encoded values.  If unencoded values
- * // are found, the value will be encoded, and the resource will be added to the
- * // WriteBackHelper.
- * Resource res = resourceSet.load(&quot;myResource&quot;);
- * // Ensure that any changes due to encoding are written back out.
- * WriteBackHelper.end();
- * </pre>
- */
-public class EncoderDecoderRegistry {
-	protected static EncoderDecoderRegistry _defaultInstance;
-	public static final EncoderDecoder INITIAL_DEFAULT_ENCODER = PassthruEncoderDecoder.INSTANCE;
-	protected Map encoders = new HashMap();
-	protected Object defaultEncoderKey;
-
-	/**
-	 * EncoderDecoderRegistry constructor comment.
-	 */
-	public EncoderDecoderRegistry() {
-		super();
-		initializeDefaultEncoders();
-	}
-
-	/**
-	 * Insert the method's description here. Creation date: (2/2/2001 12:43:31 AM)
-	 */
-	public void addEncoderDecoder(EncoderDecoder encoderDecoder) {
-		encoders.put(encoderDecoder.getClass().getName(), encoderDecoder);
-		if (defaultEncoderKey == null)
-			defaultEncoderKey = encoderDecoder.getClass().getName();
-	}
-
-	/**
-	 * Returns an encoder/decoder by key.
-	 */
-	public EncoderDecoder getDefaultEncoderDecoder() {
-		if (defaultEncoderKey == null)
-			return null;
-		return (EncoderDecoder) encoders.get(defaultEncoderKey);
-	}
-
-	/**
-	 * Returns the default registry to use for retrieving value encoders and decoders
-	 */
-	public static EncoderDecoderRegistry getDefaultRegistry() {
-		if (_defaultInstance == null) {
-			_defaultInstance = new EncoderDecoderRegistry();
-		}
-		return _defaultInstance;
-	}
-
-	/**
-	 * Returns an encoder/decoder by key.
-	 */
-	public EncoderDecoder getEncoderDecoder(Object key) {
-		return (EncoderDecoder) encoders.get(key);
-	}
-
-	/**
-	 * Initializes a standard set of encoder/decoders.
-	 */
-	public void initializeDefaultEncoders() {
-		setDefaultEncoderDecoder(INITIAL_DEFAULT_ENCODER);
-		addEncoderDecoder(new XMLValueEncoderDecoder());
-	}
-
-	/**
-	 * Removes the encoder/decoder with the specified key.
-	 */
-	public void removeEncoderDecoder(Object key) {
-		if (encoders.containsKey(key)) {
-			encoders.remove(key);
-		}
-	}
-
-	/**
-	 * Returns an encoder/decoder by key.
-	 */
-	public void setDefaultEncoderDecoder(EncoderDecoder encoder) {
-		defaultEncoderKey = encoder.getClass().getName();
-		if (!encoders.containsKey(defaultEncoderKey)) {
-			addEncoderDecoder(encoder);
-		}
-	}
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/EtoolsCopySession.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/EtoolsCopySession.java
deleted file mode 100644
index 1de9513..0000000
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/EtoolsCopySession.java
+++ /dev/null
@@ -1,192 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 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
- *******************************************************************************/
-package org.eclipse.wst.common.internal.emf.utilities;
-
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.emf.common.notify.impl.NotificationImpl;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.xmi.XMLResource;
-
-/**
- * Insert the type's description here. Creation date: (05/04/01 11:25:59 PM)
- * 
- * @author: Administrator
- */
-public class EtoolsCopySession extends EtoolsCopyUtility {
-	public static final int RESOURCE_COPIED = 500;
-	private EtoolsCopyUtility parentCopyUtility;
-	private XMLResource currentResource;
-	private XMLResource currentCopyResource;
-
-	/**
-	 * EtoolsCopySession constructor comment.
-	 */
-	public EtoolsCopySession(EtoolsCopyUtility aCopyUtility) {
-		parentCopyUtility = aCopyUtility;
-		setPreserveIds(aCopyUtility.preserveIds());
-		setCopyAdapters(aCopyUtility.isCopyAdapters());
-	}
-
-	/**
-	 * Copy all Resources and RefObjects within <code>aGroup</code> and add them to
-	 * <code>aGroup</code>. Non composite references will be deferred until all objects are
-	 * copied from <code>aGroup</code>.
-	 * 
-	 * Copy Resources first and then copy RefObjects.
-	 */
-	@Override
-	public void copy(CopyGroup aGroup) {
-		if (aGroup != null) {
-			copyResources(aGroup);
-			copyRefObjects(aGroup);
-			executeDeferredCopyActions();
-			aGroup.postCopy(this);
-			notifyNewResourcesCopied(aGroup);
-		}
-	}
-
-	/**
-	 * This method should be used if you are only going to copy <code>aRefObject</code> in this
-	 * copy execution.
-	 */
-	@Override
-	public EObject copy(EObject aRefObject, String idSuffix) {
-		EObject copied = containmentCopy(aRefObject, idSuffix);
-		executeDeferredCopyActions();
-		return copied;
-	}
-
-	/**
-	 * This method should be used if you are only going to copy <code>aRefObject</code> in this
-	 * copy execution. This method only copies <code>aRefObject</code> attributes.
-	 */
-	@Override
-	public EObject copyObject(EObject aRefObject, String idSuffix) {
-		EObject copied = containmentCopyObject(aRefObject, idSuffix);
-		executeDeferredCopyActions();
-		return copied;
-	}
-
-	/**
-	 * This method should be used if you are only going to copy <code>aResource</code> in this
-	 * copy execution. The copied Resource will have a URI equal to <code>newUri</code>.
-	 */
-	@Override
-	public Resource copy(Resource aResource, String newUri) {
-		Resource copied = containmentCopy(aResource, newUri);
-		executeDeferredCopyActions();
-		copyModificationFlag(aResource, copied);
-		notifyNewResourceCopied(copied);
-		return copied;
-	}
-
-	protected void notifyNewResourcesCopied(CopyGroup group) {
-		List copied = group.getCopiedResources();
-		for (int i = 0; i < copied.size(); i++) {
-			notifyNewResourceCopied((Resource) copied.get(i));
-		}
-	}
-
-	protected void notifyNewResourceCopied(Resource copied) {
-		copied.eNotify(new NotificationImpl(RESOURCE_COPIED, null, null));
-	}
-
-	/**
-	 * @see com.ibm.etools.emf.ecore.utilities.copy.EtoolsCopyUtility#primCopyObject(EObject,
-	 *      String)
-	 */
-	@Override
-	protected EObject primCopyObject(EObject aRefObject, String idSuffix) {
-		EObject copy = super.primCopyObject(aRefObject, idSuffix);
-		copyIdIfNecessary(aRefObject, copy, idSuffix);
-		return copy;
-	}
-
-	protected void copyIdIfNecessary(EObject obj, EObject copy, String idSuffix) {
-		if ((idSuffix == null && !preserveIds) || currentResource == null)
-			return;
-		String id = currentResource.getID(obj);
-		if (id == null)
-			return;
-		id = idSuffix == null ? id : id + idSuffix;
-		currentCopyResource.setID(copy, id);
-	}
-
-
-	/**
-	 * Set delivery back on for all the cached objects and push them to the parentCopyUtility.
-	 */
-	public void flush() {
-		Iterator it = getCopiedObjects().entrySet().iterator();
-		Map parentCopies = getParentCopyUtility().getCopiedObjects();
-		Map.Entry entry;
-		EObject copy;
-		while (it.hasNext()) {
-			entry = (Map.Entry) it.next();
-			copy = (EObject) entry.getValue();
-			copy.eSetDeliver(true);
-			parentCopies.put(entry.getKey(), copy);
-		}
-		copiedObjects = null;
-	}
-
-	/**
-	 * Return a cached copy.
-	 */
-	@Override
-	public EObject getCopy(EObject anObject) {
-		EObject copied = super.getCopy(anObject);
-		if (copied == null)
-			copied = getParentCopyUtility().getCopy(anObject);
-		return copied;
-	}
-
-	/**
-	 * Insert the method's description here. Creation date: (05/04/01 11:28:07 PM)
-	 * 
-	 * @return com.ibm.etools.emf.ecore.utilities.copy.EtoolsCopyUtility
-	 */
-	protected EtoolsCopyUtility getParentCopyUtility() {
-		return parentCopyUtility;
-	}
-
-	/**
-	 * Return an instance of EObject that is the same type as <code>aRefObject</code>.
-	 */
-	@Override
-	public EObject newInstance(EObject aRefObject) {
-		EObject newType = super.newInstance(aRefObject);
-		newType.eSetDeliver(false);
-		return newType;
-	}
-
-	/**
-	 * @see com.ibm.etools.emf.ecore.utilities.copy.EtoolsCopyUtility#newInstance(Resource, String)
-	 */
-	@Override
-	public Resource newInstance(Resource aResource, String newUri) {
-		Resource copy = super.newInstance(aResource, newUri);
-		if (aResource instanceof XMLResource) {
-			currentResource = (XMLResource) aResource;
-			currentCopyResource = (XMLResource) copy;
-		} else {
-			currentResource = null;
-			currentCopyResource = null;
-		}
-		return copy;
-	}
-
-}
-
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/EtoolsCopyUtility.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/EtoolsCopyUtility.java
deleted file mode 100644
index a89a7c7..0000000
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/EtoolsCopyUtility.java
+++ /dev/null
@@ -1,672 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 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
- *******************************************************************************/
-package org.eclipse.wst.common.internal.emf.utilities;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EFactory;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.ecore.ETypedElement;
-import org.eclipse.emf.ecore.EcorePackage;
-import org.eclipse.emf.ecore.resource.Resource;
-
-
-/**
- * Insert the type's description here. Creation date: (12/13/2000 9:10:55 PM)
- * 
- * @author: Administrator
- */
-public class EtoolsCopyUtility {
-	protected static final String REFENUMLITERAL_TYPE_NAME = "EEnumLiteral"; //$NON-NLS-1$
-	private final EcorePackage pkg = EcorePackage.eINSTANCE;
-
-	private final ETypedElement METAENAME = pkg.getENamedElement_Name();
-
-	protected HashMap copiedObjects;
-	protected List deferredReferenceCopies;
-	protected boolean preserveIds = false;
-	protected boolean copyAdapters = false;
-	protected HashMap copiedAdapters;
-
-	protected class DeferredSingleReferenceCopyAction extends DeferredReferenceUtilityAction {
-		public DeferredSingleReferenceCopyAction(EReference aReference, Object aValue, String aSuffix, EObject aCopyContainer) {
-			super(aReference, aValue, aSuffix, aCopyContainer);
-		}
-
-		@Override
-		public void performAction() {
-			EObject value = (EObject) getReferenceValue();
-			getCopyContainer().eSet(getReference(), getCopyIfFound(value));
-		}
-	}
-
-	protected class DeferredManyReferenceCopyAction extends DeferredReferenceUtilityAction {
-		public DeferredManyReferenceCopyAction(EReference aReference, List aValue, String aSuffix, EObject aCopyContainer) {
-			super(aReference, aValue, aSuffix, aCopyContainer);
-		}
-
-		@Override
-		public void performAction() {
-			List copyList = (List) getCopyContainer().eGet(getReference());
-			Iterator it = ((List) getReferenceValue()).iterator();
-			EObject next;
-			while (it.hasNext()) {
-				next = (EObject) it.next();
-				copyList.add(getCopyIfFound(next));
-			}
-		}
-	}
-
-	/**
-	 * Insert the method's description here. Creation date: (12/13/2000 9:14:26 PM)
-	 * 
-	 * @param aRefObject
-	 *            org.eclipse.emf.ecore.EObject
-	 */
-	public EtoolsCopyUtility() {
-	}
-
-	/**
-	 * Create a <code>DeferredManyReferenceCopyAction</code> and add it to the list of deferred
-	 * copy actions.
-	 */
-	protected void addDeferredManyReferenceCopy(EReference reference, List aValue, String idSuffix, EObject aCopyContainer) {
-		getDeferredReferenceCopies().add(new DeferredManyReferenceCopyAction(reference, aValue, idSuffix, aCopyContainer));
-	}
-
-	/**
-	 * Create a <code>DeferredSingleReferenceCopyAction</code> and add it to the list of deferred
-	 * copy actions.
-	 */
-	protected void addDeferredSingleReferenceCopy(EReference reference, EObject aValue, String idSuffix, EObject aCopyContainer) {
-		getDeferredReferenceCopies().add(new DeferredSingleReferenceCopyAction(reference, aValue, idSuffix, aCopyContainer));
-	}
-
-	/**
-	 * Check for an already copied object first.
-	 */
-	protected EObject containmentCopy(EObject anObject, String idSuffix) {
-		EObject copied = getCopy(anObject);
-		if (copied == null)
-			copied = primCopy(anObject, idSuffix);
-		return copied;
-	}
-
-	/**
-	 * Check for an already copied object first.
-	 */
-	protected EObject containmentCopyObject(EObject anObject, String idSuffix) {
-		EObject copied = getCopy(anObject);
-		if (copied == null)
-			copied = primCopyObject(anObject, idSuffix);
-		return copied;
-	}
-
-	protected Resource containmentCopy(Resource aResource, String newUri) {
-		/* copied resources are never cached */
-		return primCopy(aResource, newUri);
-	}
-
-	/**
-	 * Copy all Resources and RefObjects within <code>aGroup</code> and add them to
-	 * <code>aGroup</code>. Non composite references will be deferred until all objects are
-	 * copied from <code>aGroup</code>.
-	 * 
-	 * Copy Resources first and then copy RefObjects.
-	 */
-	public void copy(CopyGroup aGroup) {
-		if (aGroup != null) {
-			EtoolsCopySession session = new EtoolsCopySession(this);
-			session.setPreserveIds(aGroup.getPreserveIds());
-			session.copy(aGroup);
-			session.flush();
-		}
-	}
-
-	public EObject copy(EObject aRefObject) {
-		return copy(aRefObject, null);
-	}
-
-	/**
-	 * This method should be used if you are only going to copy <code>aRefObject</code> in this
-	 * copy execution.
-	 */
-	public EObject copy(EObject aRefObject, String idSuffix) {
-		EtoolsCopySession session = new EtoolsCopySession(this);
-		EObject copied = session.copy(aRefObject, idSuffix);
-		session.flush();
-		return copied;
-	}
-
-	/**
-	 * This method should be used if you are only going to copy <code>aRefObject</code> in this
-	 * copy execution. This method only copies <code>aRefObject</code> with its properties, not
-	 * references.
-	 */
-	public EObject copyObject(EObject aRefObject, String idSuffix) {
-		EtoolsCopySession session = new EtoolsCopySession(this);
-		EObject copied = session.copyObject(aRefObject, idSuffix);
-		session.flush();
-		return copied;
-	}
-
-	/**
-	 * This method should be used if you are only going to copy <code>aResource</code> in this
-	 * copy execution. The copied Resource will have a URI equal to <code>newUri</code>.
-	 */
-	public Resource copy(Resource aResource, String newUri) {
-		EtoolsCopySession session = new EtoolsCopySession(this);
-		Resource copied = session.copy(aResource, newUri);
-		session.flush();
-		return copied;
-	}
-
-	/**
-	 * If an attribute is set and its value is not <code>null</code>, then perform copy
-	 * <code>attribute</code> value from <code>aRefObject</code> to <code>copyRef</code>.
-	 * Null is a valid value if the attribute is set.
-	 */
-
-	protected void copyAttribute(EAttribute attribute, EObject aRefObject, String idSuffix, EObject copyRef) {
-		if (!attribute.isChangeable())
-			return; //ignore
-		if (attribute.isMany()) {
-			List value = (List) aRefObject.eGet(attribute);
-			if (value != null)
-				copyManyAttribute(attribute, value, aRefObject, idSuffix, copyRef);
-		} else if (aRefObject.eIsSet(attribute)) {
-			Object value = aRefObject.eGet(attribute);
-			if (value == null)
-				copyRef.eSet(attribute, value);
-			else
-				copySingleAttribute(attribute, value, aRefObject, idSuffix, copyRef);
-		} else if (attribute == METAENAME) {
-			//set name to the ID (this is computed as a default), only get here if isSetName is
-			// false.
-			copyRef.eSet(attribute, aRefObject.eGet(attribute));
-		}
-	}
-
-	/**
-	 * Iterate over the attributes of the receiver and copy each attribute.
-	 */
-	protected void copyCurrentAttributes(EObject aRefObject, String idSuffix, EObject copyRef) {
-		List attributes = aRefObject.eClass().getEAllAttributes();
-		if (attributes != null) {
-			Iterator it = attributes.iterator();
-			EAttribute ra;
-			while (it.hasNext()) {
-				ra = (EAttribute) it.next();
-				copyAttribute(ra, aRefObject, idSuffix, copyRef);
-			}
-		}
-	}
-
-	/**
-	 * This method will iterate over the references of the receiver. If a reference's value is not
-	 * <code>null</code>, then a series of tests are done before setting the value with the
-	 * copied object, <code>copyRef</code>.
-	 * 
-	 * Tests: 1. Do nothing if the reference equals the metaEContainer or metaEContains references.
-	 */
-
-	protected void copyCurrentReferences(EObject aRefObject, String idSuffix, EObject copyRef) {
-		List references = aRefObject.eClass().getEAllReferences();
-		if (references != null) {
-			Iterator it = references.iterator();
-			EReference rr;
-			while (it.hasNext()) {
-				rr = (EReference) it.next();
-				if (shouldCopyReference(rr))
-					copyReference(rr, aRefObject, idSuffix, copyRef);
-			}
-		}
-	}
-
-	/**
-	 * Iterate over <code>anExtent</code> and copy each element to <code>copyExtent</code>.
-	 */
-	protected void copyExtent(EList anExtent, EList copyExtent) {
-		Iterator it = anExtent.iterator();
-		EObject refObject;
-		while (it.hasNext()) {
-			refObject = (EObject) it.next();
-			copyExtent.add(containmentCopy(refObject, null));
-		}
-	}
-
-	/**
-	 * Copy a many value attribute which is treated as a many valued reference.
-	 * 
-	 * Tests:
-	 * 
-	 * 1. If the type is <bold>not </bold> <code>null</code>, then set the value on
-	 * <code>copyRef</code> without making a copy. 2. If the type is <code>null</code>, then
-	 * obtain the list from <code>copyRef</code> and add a copy of each value from the original
-	 * list to it.
-	 */
-
-	protected void copyManyAttribute(EAttribute attribute, List aValue, EObject aRefObject, String idSuffix, EObject copyRef) {
-		if (attribute.getEType() == null)
-			copyRef.eSet(attribute, aValue);
-		else {
-			List copyList = (List) copyRef.eGet(attribute);
-			Iterator it = aValue.iterator();
-			Object next;
-			while (it.hasNext()) {
-				next = it.next();
-				if (next instanceof EObject)
-					copyList.add(containmentCopy((EObject) next, idSuffix));
-				else
-					copyList.add(next);
-			}
-		}
-	}
-
-	/**
-	 * This method will iterate over the references of the receiver. If a reference's value is not
-	 * <code>null</code>, then a series of tests are done before setting the value with the
-	 * copied object, <code>copyRef</code>.
-	 * 
-	 * Tests: 1. If the reference is many, obtain the list from the receiving object and make a copy
-	 * of each value if the reference is composite before adding to the list; otherwise, just add
-	 * each value to the of the <code>copyRef</code>.
-	 */
-
-	protected void copyManyReference(EReference aReference, List aList, EObject aRefObject, String idSuffix, EObject copyRef) {
-		if (!aList.isEmpty()) {
-			if (aReference.isContainment()) {
-				List copyList = (List) copyRef.eGet(aReference);
-				Iterator it = aList.iterator();
-				EObject targetValue;
-				while (it.hasNext()) {
-					targetValue = (EObject) it.next();
-					copyList.add(containmentCopy(targetValue, idSuffix));
-				}
-			} else
-				addDeferredManyReferenceCopy(aReference, aList, idSuffix, copyRef);
-		}
-	}
-
-	/**
-	 * This method will iterate over the references of the receiver. If a reference's value is not
-	 * <code>null</code>, then perform the copy.
-	 */
-
-	protected void copyReference(EReference aReference, EObject aRefObject, String idSuffix, EObject copyRef) {
-		if (aReference.isMany()) {
-			List value = (List) aRefObject.eGet(aReference);
-			if (value != null)
-				copyManyReference(aReference, value, aRefObject, idSuffix, copyRef);
-		} else if (aRefObject.eIsSet(aReference)) {
-			Object value = aRefObject.eGet(aReference);
-			copySingleReference(aReference, (EObject) value, aRefObject, idSuffix, copyRef);
-		}
-	}
-
-	/**
-	 * Copy all RefObjects from <code>aGroup</code> and add the copy back to <code>aGroup</code>.
-	 */
-	protected void copyRefObjects(CopyGroup aGroup) {
-		Association association;
-		EObject refObject;
-		String idSuffix;
-		if (aGroup.primGetRefObjects() != null) {
-			Iterator it = aGroup.primGetRefObjects().iterator();
-			while (it.hasNext()) {
-				association = (Association) it.next();
-				refObject = (EObject) association.getKey();
-				idSuffix = (String) association.getValue();
-				if (idSuffix == null)
-					idSuffix = aGroup.getDefaultIdSuffix();
-				aGroup.addCopied(containmentCopy(refObject, idSuffix));
-			}
-		}
-	}
-
-	/**
-	 * Copy all Resources from <code>aGroup</code> and add the copy back to <code>aGroup</code>.
-	 */
-	protected void copyResources(CopyGroup aGroup) {
-		Association association;
-		Resource resource;
-		String uri;
-		if (aGroup.primGetResources() != null) {
-			Iterator it = aGroup.primGetResources().iterator();
-			while (it.hasNext()) {
-				association = (Association) it.next();
-				resource = (Resource) association.getKey();
-				uri = (String) association.getValue();
-				Resource copied = containmentCopy(resource, uri);
-				copyModificationFlag(resource, copied);
-				aGroup.addCopied(copied);
-			}
-		}
-	}
-
-	/**
-	 * Copy a single value attribute.
-	 * 
-	 * Tests:
-	 * 
-	 * 1. If an attribute type is not <code>null</code> then it is an object type and it must be
-	 * copied. Do not copy the value if the attribute is an Enumeration type. 2. If an attribute
-	 * type is <bold>not </bold> <code>null</code> then copy the value before setting it on
-	 * <code>copyRef</code>.
-	 */
-
-	protected void copySingleAttribute(EAttribute attribute, Object aValue, EObject aRefObject, String idSuffix, EObject copyRef) {
-		if (attribute.getEType() == null) {
-			copyRef.eSet(attribute, aValue);
-		} else {
-			//MOF108
-			// if (attribute.isObjectType())
-			if (attribute.getEType() instanceof EClass)
-				copyRef.eSet(attribute, containmentCopy((EObject) aValue, idSuffix));
-			else
-				copyRef.eSet(attribute, aValue);
-		}
-	}
-
-	/**
-	 * This method will iterate over the references of the receiver. If a reference's value is not
-	 * <code>null</code>, then a series of tests are done before setting the value with the
-	 * copied object, <code>copyRef</code>.
-	 * 
-	 * Tests: 1. If the reference is <bold>not </bold> many, make a copy of the value if the
-	 * reference is composite before setting the value with <code>copyRef</code>; otherwise, just
-	 * set the value as is.
-	 */
-
-	protected void copySingleReference(EReference aReference, EObject aValue, EObject aRefObject, String idSuffix, EObject copyRef) {
-		//Exceptional case; the relationship is not the container relationship
-		//And is not navigable in the other direction; go ahead and copy
-		if (aValue != aRefObject.eContainer() || aReference.getEOpposite() == null) {
-			if (aReference.isContainment())
-				copyRef.eSet(aReference, containmentCopy(aValue, idSuffix));
-			else
-				addDeferredSingleReferenceCopy(aReference, aValue, idSuffix, copyRef);
-		}
-	}
-
-	/**
-	 * Copy all Resources and RefObjects within <code>aGroup</code> and add them to
-	 * <code>aGroup</code>. Non composite references will be deferred until all objects are
-	 * copied from <code>aGroup</code>.
-	 * 
-	 * Copy Resources first and then copy RefObjects.
-	 */
-	public static void createCopy(CopyGroup aGroup) {
-		EtoolsCopyUtility utility = new EtoolsCopyUtility();
-		utility.copy(aGroup);
-	}
-
-	/**
-	 * Copies attributes
-	 */
-	public static void createAttributeCopy(EObject aRefObject, EObject copyObject) {
-		EtoolsCopyUtility utility = new EtoolsCopyUtility();
-		utility.copyCurrentAttributes(aRefObject, null, copyObject);
-	}
-
-	/**
-	 * Copies all set attributes and references based on containment. Thus, it will copy the entire
-	 * containment tree. Use the idSuffix to define the suffix that will be appended to the existing
-	 * IDs of copied objects.
-	 */
-	public static EObject createCopy(EObject aRefObject) {
-		return createCopy(aRefObject, null);
-	}
-
-	/**
-	 * Copies all set attributes and references based on containment. Thus, it will copy the entire
-	 * containment tree. Use the idSuffix to define the suffix that will be appended to the existing
-	 * IDs of copied objects.
-	 */
-	public static EObject createCopy(EObject aRefObject, String idSuffix) {
-		EtoolsCopyUtility utility = new EtoolsCopyUtility();
-		return utility.copy(aRefObject, idSuffix);
-	}
-
-	/**
-	 * Copy <code>aResource</code> using <code>newUri</code> for the URI.
-	 */
-	public static Resource createCopy(Resource aResource, String newUri) {
-		EtoolsCopyUtility utility = new EtoolsCopyUtility();
-		return utility.copy(aResource, newUri);
-	}
-
-	protected void executeDeferredCopyActions() {
-		if (primGetDeferredReferenceCopies() != null) {
-			Iterator it = primGetDeferredReferenceCopies().iterator();
-			DeferredReferenceUtilityAction action;
-			while (it.hasNext()) {
-				action = (DeferredReferenceUtilityAction) it.next();
-				action.performAction();
-			}
-			primGetDeferredReferenceCopies().clear();
-		}
-	}
-
-	/**
-	 * Insert the method's description here. Creation date: (12/13/2000 9:17:35 PM)
-	 * 
-	 * @return java.util.HashMap
-	 */
-	protected java.util.HashMap getCopiedObjects() {
-		if (copiedObjects == null)
-			copiedObjects = new HashMap(200);
-		return copiedObjects;
-	}
-
-	protected java.util.HashMap getCopiedAdapters() {
-		if (copiedAdapters == null)
-			copiedAdapters = new HashMap(200);
-		return copiedAdapters;
-	}
-
-	/**
-	 * Return a cached copy.
-	 */
-	public EObject getCopy(EObject anObject) {
-		if (anObject == null)
-			return null;
-		return (EObject) getCopiedObjects().get(anObject);
-	}
-
-	/**
-	 * Return a cached copy, if none, return the argument.
-	 */
-	public EObject getCopyIfFound(EObject anObject) {
-		EObject copied = getCopy(anObject);
-		return copied == null ? anObject : copied;
-	}
-
-	/**
-	 * Insert the method's description here. Creation date: (12/16/2000 9:11:32 AM)
-	 * 
-	 * @return java.util.List
-	 */
-	protected java.util.List getDeferredReferenceCopies() {
-		if (deferredReferenceCopies == null)
-			deferredReferenceCopies = new ArrayList(100);
-		return deferredReferenceCopies;
-	}
-
-	/**
-	 * Return an instance of EObject that is the same type as <code>aRefObject</code>.
-	 */
-	public EObject newInstance(EObject aRefObject) {
-		if (aRefObject == null)
-			return null;
-		EPackage epkg = (EPackage) aRefObject.eClass().eContainer();
-		EFactory factory = epkg.getEFactoryInstance();
-		EClass refObj = aRefObject.eClass();
-		return factory.create(refObj);
-	}
-
-	/**
-	 * Return an instance of Resource that uses the same ResourceFactory as the one used by
-	 * <code>aResource</code>. If <code>newUri</code> is <code>null</code> then use the URI
-	 * from <code>aResource</code>.
-	 */
-	public Resource newInstance(Resource aResource, String newUri) {
-		if (aResource == null)
-			return null;
-		String innerNewUri = newUri;
-		Resource newResource;
-		String originalUri = aResource.getURI().toString();
-		innerNewUri = innerNewUri == null ? originalUri : innerNewUri;
-
-		Resource.Factory factory = null;
-		if (aResource.getResourceSet() == null)
-			factory = Resource.Factory.Registry.INSTANCE.getFactory(URI.createURI(originalUri));
-		else
-			factory = aResource.getResourceSet().getResourceFactoryRegistry().getFactory(URI.createURI(originalUri));
-
-
-		newResource = factory.createResource(URI.createURI(innerNewUri));
-		return newResource;
-	}
-
-	/**
-	 * Should the id be copied in the case where no suffix is specified? Defaults to false
-	 */
-	public boolean preserveIds() {
-		return preserveIds;
-	}
-
-	/**
-	 * Copies all set attributes and references based on containment. Thus, it will copy the entire
-	 * containment tree. Use the idSuffix to define the suffix that will be appended to the existing
-	 * IDs of copied objects. If an idSuffix does not exist, do not set an id on the copied object.
-	 */
-	protected EObject primCopy(EObject aRefObject, String idSuffix) {
-		if (aRefObject == null)
-			return null;
-		EObject copyRef = primCopyObject(aRefObject, idSuffix);
-
-		copyCurrentReferences(aRefObject, idSuffix, copyRef);
-		return copyRef;
-	}
-
-	/**
-	 * Copies all set attributes based on containment. Thus, it will copy the entire containment
-	 * tree. Use the idSuffix to define the suffix that will be appended to the existing IDs of
-	 * copied objects. If an idSuffix does not exist, do not set an id on the copied object.
-	 */
-	protected EObject primCopyObject(EObject aRefObject, String idSuffix) {
-		if (aRefObject == null)
-			return null;
-		EObject copyRef = newInstance(aRefObject);
-
-		recordCopy(aRefObject, copyRef);
-		copyCurrentAttributes(aRefObject, idSuffix, copyRef);
-		if (isCopyAdapters())
-			copyAdapters(aRefObject, copyRef);
-		return copyRef;
-	}
-
-	protected void copyAdapters(EObject aRefObject, EObject copyRef) {
-		List adapters = aRefObject.eAdapters();
-		for (int i = 0; i < adapters.size(); i++) {
-			Adapter adapter = (Adapter) adapters.get(i);
-			copyAdapter(aRefObject, copyRef, adapter);
-
-		}
-	}
-
-	protected void copyAdapter(EObject aRefObject, EObject copyRef, Adapter adapter) {
-		if (!(adapter instanceof CloneablePublic))
-			return;
-		CloneablePublic copyAdapter = (CloneablePublic) getCopiedAdapters().get(adapter);
-		if (copyAdapter == null) {
-			copyAdapter = (CloneablePublic) ((CloneablePublic) adapter).clone();
-			getCopiedAdapters().put(adapter, copyAdapter);
-		}
-		if (copyAdapter != null)
-			copyRef.eAdapters().add(copyAdapter);
-	}
-
-	/**
-	 * Copies all set attributes and references based on containment. Thus, it will copy the entire
-	 * containment tree. Use the idSuffix to define the suffix that will be appended to the existing
-	 * IDs of copied objects.
-	 */
-	protected Resource primCopy(Resource aResource, String newUri) {
-		if (aResource == null)
-			return null;
-		Resource copyResource = newInstance(aResource, newUri);
-		copyExtent(aResource.getContents(), copyResource.getContents());
-		return copyResource;
-	}
-
-	protected void copyModificationFlag(Resource aResource, Resource copied) {
-		if (aResource.isModified())
-			copied.setModified(true);
-	}
-
-	/**
-	 * Insert the method's description here. Creation date: (12/16/2000 9:11:32 AM)
-	 * 
-	 * @return java.util.List
-	 */
-	private java.util.List primGetDeferredReferenceCopies() {
-		return deferredReferenceCopies;
-	}
-
-	public void recordCopy(EObject aSource, EObject aCopy) {
-		getCopiedObjects().put(aSource, aCopy);
-	}
-
-	public void recordCopy(Adapter aSource, Adapter aCopy) {
-		getCopiedAdapters().put(aSource, aCopy);
-	}
-
-	/**
-	 * Should the id be copied in the case where no suffix is specified?
-	 */
-	public void setPreserveIds(boolean value) {
-		preserveIds = value;
-	}
-
-	protected boolean shouldCopyReference(EReference aReference) {
-		return aReference.isChangeable();
-	}
-
-	/**
-	 * @return
-	 */
-	public boolean isCopyAdapters() {
-		return copyAdapters;
-	}
-
-	/**
-	 * Flag used to indicate whether adapters should be copied as well. In order for an adapter to
-	 * be copied, it must implement the {@link CloneablePublic}interface.
-	 */
-	public void setCopyAdapters(boolean b) {
-		copyAdapters = b;
-	}
-
-}
-
-
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/ExceptionHelper.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/ExceptionHelper.java
deleted file mode 100644
index 7d629af..0000000
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/ExceptionHelper.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 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
- *******************************************************************************/
-package org.eclipse.wst.common.internal.emf.utilities;
-
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.wst.common.frameworks.internal.enablement.nonui.IWFTWrappedException;
-
-
-
-/**
- * Utility class to factor common code for implementers of IArchiveWrappedException
- */
-public class ExceptionHelper {
-
-	/**
-	 * Utility class; cannot be instantiated
-	 */
-	private ExceptionHelper() {
-		super();
-	}
-
-	/**
-	 * Return the messages from
-	 * 
-	 * @exception and
-	 *                all nested exceptions, in order from outermost to innermost
-	 */
-	public static java.lang.String[] getAllMessages(IWFTWrappedException exception) {
-		List messages = new ArrayList(4);
-		messages.add(exception.getMessage());
-		Exception nested = exception.getNestedException();
-		while (nested != null) {
-			messages.add(nested.getMessage());
-			if (nested instanceof IWFTWrappedException)
-				nested = ((IWFTWrappedException) nested).getNestedException();
-			else
-				nested = null;
-		}
-		return (String[]) messages.toArray(new String[messages.size()]);
-	}
-
-	/**
-	 * Return the messages from
-	 * 
-	 * @exception and
-	 *                all nested exceptions, in order from outermost to innermost, concatenated as
-	 *                one
-	 */
-	public static String getConcatenatedMessages(IWFTWrappedException exception) {
-		String[] messages = getAllMessages(exception);
-		StringBuffer sb = new StringBuffer(256);
-		for (int i = 0; i < messages.length; i++) {
-			sb.append(messages[i]);
-			if (i < messages.length - 1)
-				sb.append('\n');
-		}
-		return sb.toString();
-	}
-}
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/ExtendedEcoreUtil.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/ExtendedEcoreUtil.java
deleted file mode 100644
index 823f191..0000000
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/ExtendedEcoreUtil.java
+++ /dev/null
@@ -1,350 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 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
- *******************************************************************************/
-package org.eclipse.wst.common.internal.emf.utilities;
-
-import java.io.FileNotFoundException;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.notify.Notifier;
-import org.eclipse.emf.common.notify.impl.BasicNotifierImpl.EAdapterList;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.common.util.WrappedException;
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.ENamedElement;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.emf.ecore.xmi.XMLResource;
-
-
-
-public class ExtendedEcoreUtil extends EcoreUtil {
-	private static FileNotFoundDetector FILE_NOT_FOUND_DETECTOR;
-	private static String NAME_ATTRIBUTE_STRING = "name"; //$NON-NLS-1$
-
-	public static class ESynchronizedAdapterList extends EAdapterList
-	  {
-
-	    /**
-		 * 
-		 */
-		private static final long serialVersionUID = 7855438339187540718L;
-
-		public ESynchronizedAdapterList(Notifier notifier) {
-			super(notifier);
-		}
-
-		@Override
-		public synchronized boolean add(Object object)
-	    {
-	    return super.add(object);
-	    }
-
-	    @Override
-		public synchronized void add(int index, Object object)
-	    {
-	    super.add(index, object);
-	    }
-
-	    @Override
-		public synchronized boolean addAll(Collection collection)
-	    {
-	    return super.addAll(collection);
-	    }
-
-	    @Override
-		public synchronized boolean remove(Object object)
-	    {
-	    return super.remove(object);
-	    }
-
-	    @Override
-		public synchronized Object remove(int index)
-	    {
-	    return super.remove(index);
-	    }
-
-	    @Override
-		public synchronized boolean removeAll(Collection collection)
-	    {
-	    return super.removeAll(collection);
-	    }
-
-	    @Override
-		public synchronized void clear()
-	    {
-	     super.clear();
-	    }
-
-
-	    @Override
-		public synchronized Object set(int index, Object object)
-	    {
-	    return super.set(index, object);
-	    }
-
-	    @Override
-		public synchronized void move(int newPosition, Object object)
-	    {
-	    super.move(newPosition, object);
-	    }
-
-	    @Override
-		public synchronized Object move(int newPosition, int oldPosition)
-	    {
-	    return super.move(newPosition, oldPosition);
-	    }
-	  }
-	
-	public interface FileNotFoundDetector {
-		boolean isFileNotFound(WrappedException wrappedEx);
-	}
-
-	public static void setFileNotFoundDetector(FileNotFoundDetector detector) {
-		FILE_NOT_FOUND_DETECTOR = detector;
-	}
-
-	public static FileNotFoundDetector getFileNotFoundDetector() {
-		if (FILE_NOT_FOUND_DETECTOR == null) {
-			FILE_NOT_FOUND_DETECTOR = new FileNotFoundDetector() {
-				public boolean isFileNotFound(WrappedException wrappedEx) {
-					if (getInnerFileNotFoundException(wrappedEx) != null)
-						return true;
-					return false;
-				}
-			};
-		}
-		return FILE_NOT_FOUND_DETECTOR;
-	}
-
-	public static FileNotFoundException getInnerFileNotFoundException(WrappedException wrappedEx) {
-		if (wrappedEx.exception() instanceof java.io.FileNotFoundException) {
-			return (FileNotFoundException) wrappedEx.exception();
-		} else if (wrappedEx.exception() instanceof WrappedException) {
-			return getInnerFileNotFoundException((WrappedException) wrappedEx.exception());
-		}
-		return null;
-	}
-
-	public static void eSetOrAdd(EObject obj, EStructuralFeature feature, Object value) {
-		eSetOrAdd(obj, feature, value, 0);
-	}
-
-	public static void eSetOrAdd(EObject obj, EStructuralFeature feature, Object value, int newIndex) {
-		if (feature.isMany() && value != null) {
-			List featureList = ((List) obj.eGet(feature));
-			if (newIndex >= 0 && newIndex < featureList.size())
-				featureList.add(newIndex, value);
-			else
-				featureList.add(value);
-		} else {
-			obj.eSet(feature, value);
-		}
-	}
-
-	public static void eUnsetOrRemove(EObject obj, EStructuralFeature feature, Object value) {
-		if (feature == null || feature.isMany())
-			((List) obj.eGet(feature)).remove(value);
-		else
-			obj.eUnset(feature);
-	}
-
-	public static boolean endsWith(URI sourceUri, URI testUri) {
-		//TODO Waiting on new emf URI API
-		String[] sourceSegments = sourceUri.segments();
-		String[] testSegments = testUri.segments();
-		int i = testSegments.length;
-		int j = sourceSegments.length;
-		if (j >= i) {
-			boolean test = true;
-
-			while (test && i > 0) {
-				i--;
-				j--;
-				test = testSegments[i].equals(sourceSegments[j]);
-			}
-			return test;
-		}
-		return false;
-	}
-
-	public static String getName(EObject obj) {
-		if (obj == null)
-			return null;
-		if (obj instanceof ENamedElement)
-			return ((ENamedElement) obj).getName();
-		List allAtts = obj.eClass().getEAllAttributes();
-		int size = allAtts.size();
-		EAttribute att, nameAttribute = null;
-		for (int i = 0; i < size; i++) {
-			att = (EAttribute) allAtts.get(i);
-			if (NAME_ATTRIBUTE_STRING.equals(att.getName())) {
-				nameAttribute = att;
-				break;
-			}
-		}
-		if (nameAttribute != null)
-			return (String) obj.eGet(nameAttribute);
-		return null;
-	}
-
-	/**
-	 * @deprecated No longer needed.
-	 */
-	public static void addLoadingTag(Resource resource) {
-		//resource.eAdapters().add(IsLoadingDetector.INSTANCE);
-	}
-
-	/**
-	 * @deprecated No longer needed.
-	 */
-	public static void removeLoadingTag(Resource resource) {
-		//resource.eAdapters().remove(IsLoadingDetector.INSTANCE);
-	}
-
-	/**
-	 * Return true if the resource is currently being loaded. This is determined by checking for the
-	 * IsLoadingDector in the list of eAdapters on the resource.
-	 * 
-	 * @param resource
-	 * @return boolean
-	 * 
-	 * @see addLoadingTag(Resource)
-	 * @see removeLoadingTag(Resource)
-	 *  @deprecated use {@link Resource.Internal#isLoading()}
-	 */
-	public static boolean isLoading(Resource resource) {
-		return resource != null ? ((Resource.Internal)resource).isLoading() : false; 
-	}
-
-	public static Adapter createAdapterForLoading(Adapter targetAdapter, EObject targetObject) {
-		Resource res = targetObject.eResource();
-		if (res == null || isLoading(res))
-			return new IsLoadingProxyAdapter(targetAdapter, targetObject);
-		return targetAdapter;
-	}
-
-	public static void preRegisterPackage(String nsPrefix, EPackage.Descriptor descriptor) {
-		if (!EPackage.Registry.INSTANCE.containsKey(nsPrefix))
-			EPackage.Registry.INSTANCE.put(nsPrefix, descriptor);
-	}
-	/**
-	   * Returns the adapter of the specified type.
-	 * @param anObject 
-	   * @param adapters list of adapters to search.
-	   * @param type the type of adapter.
-	   * @return an adapter from the list or null.
-	   */
-	  public static Adapter getAdapter(EObject anObject, List adapters, Object type) {
-
-		  	Object [] adaptArray = ((EAdapterList)adapters).data();
-		  	if (adaptArray == null) return null;
-			for (int i = 0; i < adaptArray.length; i++) {
-				Adapter adapter = (Adapter) adaptArray[i];
-				if (adapter != null && adapter.isAdapterForType(type)) {
-					return adapter;
-				}
-			}
-			return null;
-	}
-
-	/**
-	 * Remove this object from it's container, and make it and all it's children
-	 * proxies
-	 */
-	public static void unload(EObject root) {
-		Resource res = root.eResource();
-		EObject container = root.eContainer();
-		/* Making sure the proxy is created first before unloading */
-		if (res != null)
-			becomeProxy(root, res);
-		if (container == null)
-			if (res != null)
-				res.getContents().remove(root);
-			else {
-				EStructuralFeature feature = root.eContainmentFeature();
-				if (feature != null)
-					eUnsetOrRemove(container, feature, root);
-			}
-		
-	}
-
-	/**
-	 * Turns this object and all it's children to proxies, and removes adapters precondition: The
-	 * object has been removed from it's container
-	 */
-	public static void becomeProxy(EObject root, Resource res) {
-		Iterator iter = root.eAllContents();
-		while (iter.hasNext()) {
-			doBecomeProxy((InternalEObject) iter.next(), res);
-		}
-		doBecomeProxy((InternalEObject) root, res);
-	}
-
-	protected static void doBecomeProxy(InternalEObject p, Resource res) {
-		String id = res.getURIFragment(p);
-		p.eSetProxyURI(res.getURI().appendFragment(id));
-		if (res instanceof XMLResource) {
-			((XMLResource) res).setID(p,null);
-		}
-		p.eAdapters().clear();
-	}
-
-	public static void removeProxy(EObject root, Resource res) {
-		Iterator iter = root.eAllContents();
-		while (iter.hasNext()) {
-			doRemoveProxy((InternalEObject) iter.next(), res);
-		}
-		doRemoveProxy((InternalEObject) root, res);
-	}
-
-	protected static void doRemoveProxy(InternalEObject p, Resource res) {
-		String id = p.eProxyURI().fragment();
-		if (res instanceof XMLResource) {
-			((XMLResource) res).setID(p, id);
-		}
-		p.eSetProxyURI(null);
-	}
-
-
-	/**
-	 * Ensures the passed object is not a proxy; if it is, throws an exception indicating the bad
-	 * HREF. If the object is null, does nothing.
-	 * 
-	 * @param object
-	 * @throws DanglingHREFException
-	 */
-	public static void checkProxy(EObject object) throws DanglingHREFException {
-		if (object == null || !object.eIsProxy())
-			return;
-		String msg = WFTUtilsResourceHandler.getString(WFTUtilsResourceHandler.DANGLING_HREF_ERROR_, new Object[]{((InternalEObject) object).eProxyURI()});
-		throw new DanglingHREFException(msg);
-	}
-
-	/**
-	 * Return true if o1 and o2 are not the same values. This implementation takes into account that
-	 * either parameter can be null.
-	 * 
-	 * @param o1
-	 * @param o2
-	 * @return
-	 */
-	public static boolean valueChanged(Object o1, Object o2) {
-		return (o1 == null ^ o2 == null) || (o1 == null || !o1.equals(o2));
-	}
-
-}
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/FeatureValueConversionException.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/FeatureValueConversionException.java
deleted file mode 100644
index 38c24d1..0000000
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/FeatureValueConversionException.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors: IBM Corporation - initial API and implementation
- **************************************************************************************************/
-package org.eclipse.wst.common.internal.emf.utilities;
-
-public class FeatureValueConversionException extends RuntimeException {
-
-	/**
-	 * 
-	 */
-	private static final long serialVersionUID = 8190891648333814201L;
-
-	/**
-	 * Constructor for FeatureValueConversionException.
-	 */
-	public FeatureValueConversionException() {
-		super();
-	}
-
-	/**
-	 * Constructor for FeatureValueConversionException.
-	 * 
-	 * @param s
-	 */
-	public FeatureValueConversionException(String s) {
-		super(s);
-	}
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/FeatureValueConverter.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/FeatureValueConverter.java
deleted file mode 100644
index 786a687..0000000
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/FeatureValueConverter.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.common.internal.emf.utilities;
-
-
-
-import org.eclipse.emf.ecore.EStructuralFeature;
-
-/**
- * Insert the type's description here. Creation date: (5/10/2001 2:46:54 PM)
- * 
- * @author: Administrator
- */
-public interface FeatureValueConverter {
-	static final FeatureValueConverter DEFAULT = new DefaultFeatureValueConverter();
-
-	/**
-	 * Convert
-	 * 
-	 * @aValue to the type of
-	 * @aFeature.
-	 */
-	Object convertValue(Object aValue, EStructuralFeature aFeature);
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/ICommand.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/ICommand.java
deleted file mode 100644
index 5ed817b..0000000
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/ICommand.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 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
- *******************************************************************************/
-package org.eclipse.wst.common.internal.emf.utilities;
-
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IResourceDelta;
-import org.eclipse.core.runtime.CoreException;
-
-/**
- * @author John Mourra
- */
-public interface ICommand {
-
-	/*
-	 * This will contain the multi-selection of objects to deploy. This selection could be used to
-	 * filter elements within a Module. Any other setup code should be done here...
-	 */
-	void init(Object[] selection);
-
-	/**
-	 * @param resource
-	 * @param delta
-	 * @param context
-	 * @return
-	 * @throws CoreException
-	 */
-	public boolean execute(IResource resource, IResourceDelta delta, ICommandContext context) throws CoreException;
-
-}
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/ICommand2.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/ICommand2.java
deleted file mode 100644
index 2fb3c95..0000000
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/ICommand2.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.common.internal.emf.utilities;
-
-import java.util.List;
-
-import org.eclipse.core.resources.IProject;
-
-public interface ICommand2 extends ICommand {
-
-	/**
-	 * Accessor for a {@link List} of {@link IProject} that were modified by the execution of this command.
-	 * 
-	 * @return A {@link List} of {@link IProject} that were modified by the execution of this command.
-	 */
-	public List getAffectedProjects();
-}
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/ICommandContext.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/ICommandContext.java
deleted file mode 100644
index e642717..0000000
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/ICommandContext.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 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
- *******************************************************************************/
-package org.eclipse.wst.common.internal.emf.utilities;
-
-import java.util.Map;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-
-/**
- * @author John Mourra
- */
-public interface ICommandContext {
-
-	/**
-	 * @return
-	 */
-	public IProgressMonitor getProgressMonitor();
-
-	/**
-	 * @return
-	 */
-	public Map getConfigurationProperties();
-
-	/**
-	 * @return
-	 */
-	public ResourceSet getResourceSet();
-}
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/IDUtil.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/IDUtil.java
deleted file mode 100644
index 2aa022c..0000000
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/IDUtil.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 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
- *******************************************************************************/
-package org.eclipse.wst.common.internal.emf.utilities;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.xmi.XMLResource;
-
-public class IDUtil {
-
-	/**
-	 * This method is invoked to assign a unique ID to the object. The object must be contained in a
-	 * resource.
-	 */
-	public static void assignID(EObject object) {
-		Resource aResource = object.eResource();
-		if (aResource instanceof XMLResource)
-			assignID(object, (XMLResource) aResource);
-
-	}
-
-	public static String getOrAssignID(EObject object) {
-		Resource aResource = object.eResource();
-		if (aResource instanceof XMLResource)
-			return getOrAssignID(object, (XMLResource) aResource);
-		return null;
-	}
-
-	public static String getOrAssignID(EObject object, XMLResource aResource) {
-		String id = aResource.getID(object);
-		if (id == null)
-			return assignID(object, aResource);
-		return id;
-	}
-
-	public static String assignID(EObject object, XMLResource aResource) {
-		String name = getBaseIDForAssignment(object);
-		if (name == null)
-			return null;
-		String id = ensureUniqueID(aResource, name);
-		aResource.setID(object, id);
-		return id;
-	}
-
-	protected static String ensureUniqueID(XMLResource aResource, String baseIDName) {
-		String innerBaseIDName = baseIDName;
-		innerBaseIDName += "_"; //$NON-NLS-1$
-		//Change to use the current time instead of incremental numbers to help
-		//support team development.
-		long currentTime = System.currentTimeMillis();
-		String id = innerBaseIDName + currentTime;
-		while (aResource.getEObject(id) != null) {
-			++currentTime;
-			id = innerBaseIDName + currentTime;
-		}
-		return id;
-	}
-
-	protected static String getBaseIDForAssignment(EObject object) {
-		EClass metaO = object.eClass();
-		return metaO.getName();
-	}
-
-}
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/InvalidPasswordCipherException.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/InvalidPasswordCipherException.java
deleted file mode 100644
index 18b8d14..0000000
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/InvalidPasswordCipherException.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors: IBM Corporation - initial API and implementation
- **************************************************************************************************/
-package org.eclipse.wst.common.internal.emf.utilities;
-
-
-import org.omg.CORBA.UserException;
-
-public class InvalidPasswordCipherException extends UserException {
-
-	/**
-	 * 
-	 */
-	private static final long serialVersionUID = -1878574401021590545L;
-}
-
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/InvalidPasswordDecodingException.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/InvalidPasswordDecodingException.java
deleted file mode 100644
index 161c069..0000000
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/InvalidPasswordDecodingException.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors: IBM Corporation - initial API and implementation
- **************************************************************************************************/
-package org.eclipse.wst.common.internal.emf.utilities;
-
-
-import org.omg.CORBA.UserException;
-
-public class InvalidPasswordDecodingException extends UserException {
-
-	/**
-	 * 
-	 */
-	private static final long serialVersionUID = 6211942853796823840L;
-}
-
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/InvalidPasswordEncodingException.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/InvalidPasswordEncodingException.java
deleted file mode 100644
index a03e653..0000000
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/InvalidPasswordEncodingException.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors: IBM Corporation - initial API and implementation
- **************************************************************************************************/
-package org.eclipse.wst.common.internal.emf.utilities;
-
-
-import org.omg.CORBA.UserException;
-
-public class InvalidPasswordEncodingException extends UserException {
-
-	/**
-	 * 
-	 */
-	private static final long serialVersionUID = -1320759752706898095L;
-}
-
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/IsLoadingDetector.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/IsLoadingDetector.java
deleted file mode 100644
index d7d114c..0000000
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/IsLoadingDetector.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2003, 2004 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
- **************************************************************************************************/
-/*
- * Created on Apr 1, 2003
- * 
- * To change the template for this generated file go to Window>Preferences>Java>Code Generation>Code
- * and Comments
- */
-package org.eclipse.wst.common.internal.emf.utilities;
-
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.Notifier;
-
-
-public class IsLoadingDetector implements Adapter {
-	public static final IsLoadingDetector INSTANCE = new IsLoadingDetector();
-
-	private IsLoadingDetector() {
-	}
-
-	public void notifyChanged(Notification notification) {
-	}
-
-	public Notifier getTarget() {
-		return null;
-	}
-
-	public void setTarget(Notifier newTarget) {
-	}
-
-	public boolean isAdapterForType(Object type) {
-		return type == this;
-	}
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/IsLoadingProxyAdapter.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/IsLoadingProxyAdapter.java
deleted file mode 100644
index b52fe8a..0000000
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/IsLoadingProxyAdapter.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 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
- *******************************************************************************/
-/*
- * Created on Apr 1, 2003
- *
- * To change the template for this generated file go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-package org.eclipse.wst.common.internal.emf.utilities;
-
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.impl.AdapterImpl;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.resource.Resource;
-
-/**
- * @author DABERG
- * 
- * To change the template for this generated type comment go to Window>Preferences>Java>Code
- * Generation>Code and Comments
- */
-public class IsLoadingProxyAdapter extends AdapterImpl {
-	private Resource resource;
-	private Adapter targetAdapter;
-	private EObject targetObject;
-
-	public IsLoadingProxyAdapter(Adapter aTargetAdapter, EObject aTargetObject) {
-		targetAdapter = aTargetAdapter;
-		targetObject = aTargetObject;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.emf.common.notify.impl.AdapterImpl#notifyChanged(org.eclipse.emf.common.notify.Notification)
-	 */
-	@Override
-	public void notifyChanged(Notification msg) {
-		if (resource != null) {
-			//listen for the remove of the loading adapter
-			if (msg.getFeatureID(null) == Resource.RESOURCE__IS_LOADED && msg.getEventType() == Notification.SET) {
-				removeProxySupport();
-				reset();
-			}
-		} else if (cacheResource()) {
-			targetAdapter.notifyChanged(msg);
-			reset();
-		}
-	}
-
-	/**
-	 * Cache the resource variable and return true if we removed the proxy support.
-	 */
-	private boolean cacheResource() {
-		if (getTarget() != null) {
-			EObject eObj = (EObject) getTarget();
-			resource = eObj.eResource();
-			if (resource != null) {
-				eObj.eAdapters().remove(this);
-				if (ExtendedEcoreUtil.isLoading(resource))
-					resource.eAdapters().add(this);
-				else {
-					targetObject.eAdapters().add(targetAdapter);
-					return true;
-				}
-			}
-		}
-		return false;
-	}
-
-	/**
-	 *  
-	 */
-	private void removeProxySupport() {
-		getTarget().eAdapters().remove(this);
-		targetObject.eAdapters().add(targetAdapter);
-	}
-
-	private void reset() {
-		resource = null;
-		targetAdapter = null;
-		targetObject = null;
-	}
-
-}
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/Namespace.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/Namespace.java
deleted file mode 100644
index 1a4a736..0000000
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/Namespace.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2003, 2004 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
- **************************************************************************************************/
-/*
- * Created on Aug 20, 2003
- *  
- */
-package org.eclipse.wst.common.internal.emf.utilities;
-
-
-public class Namespace {
-
-	protected String prefix;
-	protected String nsURI;
-
-
-	public Namespace(String prefix, String uri) {
-		this.prefix = prefix;
-		this.nsURI = uri;
-	}
-
-	public String getNsURI() {
-		return nsURI;
-	}
-
-	public String getPrefix() {
-		return prefix;
-	}
-
-	public void setNsURI(String string) {
-		nsURI = string;
-	}
-
-	public void setPrefix(String string) {
-		prefix = string;
-	}
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/NamespaceAdapter.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/NamespaceAdapter.java
deleted file mode 100644
index 78892fa..0000000
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/NamespaceAdapter.java
+++ /dev/null
@@ -1,208 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 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
- *******************************************************************************/
-/*
- * Created on Aug 20, 2003
- *
- */
-package org.eclipse.wst.common.internal.emf.utilities;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.emf.common.notify.impl.AdapterImpl;
-import org.eclipse.emf.common.notify.impl.NotificationImpl;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.impl.EStructuralFeatureImpl;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-
-
-/**
- * Internal class used to hold namespaces parsed from an XML file using the xmlns:prefix="aURI"
- * syntax
- */
-public class NamespaceAdapter extends AdapterImpl implements CloneablePublic {
-
-	protected final static String ADAPTER_TYPE = NamespaceAdapter.class.getName();
-	protected Map prefixesToNS;
-	protected List namespaces;
-
-	public final static EStructuralFeature NOTIFICATION_FEATURE = new EStructuralFeatureImpl() {
-	};
-
-	private static class Notification extends NotificationImpl {
-
-		/**
-		 * @param eventType
-		 * @param oldValue
-		 * @param newValue
-		 */
-		public Notification(int eventType, Object oldValue, Object newValue) {
-			super(eventType, oldValue, newValue);
-		}
-
-		/*
-		 * (non-Javadoc)
-		 * 
-		 * @see org.eclipse.emf.common.notify.impl.NotificationImpl#getFeature()
-		 */
-		@Override
-		public Object getFeature() {
-			return NOTIFICATION_FEATURE;
-		}
-	}
-
-	protected NamespaceAdapter() {
-		super();
-	}
-
-	public static void addNamespace(String prefix, String uri, EObject obj) {
-		if (obj == null)
-			return;
-		NamespaceAdapter adapter = getAdapter(obj);
-		if (adapter != null)
-			adapter.addNamespace(prefix, uri);
-	}
-
-	public static void removeNamespace(String prefix, EObject obj) {
-		if (obj == null)
-			return;
-		NamespaceAdapter adapter = retrieveExistingAdapter(obj);
-		if (adapter != null)
-			adapter.removeNamespace(prefix);
-	}
-
-	/**
-	 * Facade method for resolving prefixes to an actual namespace URI. Used for objects contained
-	 * by instances of {@link com.ibm.etools.emf2xml.TranslatorResource}. Walks up the object
-	 * containment path until a namespace is found, or returns null.
-	 */
-	public static String getResolvedNamespaceURI(String prefix, EObject obj) {
-		if (prefix == null || obj == null)
-			return null;
-		EObject container = obj;
-		String nsURI;
-		while (container != null) {
-			nsURI = getNamespaceURIAtThisLevel(prefix, container);
-			if (nsURI != null)
-				return nsURI;
-			container = container.eContainer();
-		}
-		return null;
-	}
-
-	public static String getNamespaceURIAtThisLevel(String prefix, EObject obj) {
-		if (obj == null)
-			return null;
-		NamespaceAdapter adapter = retrieveExistingAdapter(obj);
-		return adapter == null ? null : adapter.getNamespaceURI(prefix);
-	}
-
-	public static List getNamespaces(EObject obj) {
-		if (obj == null)
-			return Collections.EMPTY_LIST;
-		NamespaceAdapter adapter = retrieveExistingAdapter(obj);
-		return adapter == null ? null : adapter.getNamespaces();
-
-	}
-
-	protected static NamespaceAdapter retrieveExistingAdapter(EObject obj) {
-		return (NamespaceAdapter) EcoreUtil.getExistingAdapter(obj, ADAPTER_TYPE);
-	}
-
-	protected static NamespaceAdapter getAdapter(EObject obj) {
-		NamespaceAdapter adapter = retrieveExistingAdapter(obj);
-		return adapter == null ? createAdapter(obj) : adapter;
-	}
-
-	protected static NamespaceAdapter createAdapter(EObject obj) {
-		NamespaceAdapter adapter = new NamespaceAdapter();
-		adapter.setTarget(obj);
-		obj.eAdapters().add(adapter);
-		return adapter;
-	}
-
-	protected void addNamespace(String prefix, String uri) {
-		Namespace ns = new Namespace(prefix, uri);
-		if (namespaces == null)
-			namespaces = new ArrayList();
-		if (prefixesToNS == null)
-			prefixesToNS = new HashMap();
-
-		prefixesToNS.put(prefix, ns);
-		namespaces.add(ns);
-		fireNotification(org.eclipse.emf.common.notify.Notification.ADD, null, ns);
-
-	}
-
-	protected void removeNamespace(String prefix) {
-		Namespace ns = null;
-		if (prefixesToNS != null)
-			ns = (Namespace) prefixesToNS.get(prefix);
-
-		if (ns != null)
-			namespaces.remove(ns);
-		fireNotification(org.eclipse.emf.common.notify.Notification.REMOVE, ns, null);
-	}
-
-	protected String getNamespaceURI(String prefix) {
-		if (prefixesToNS == null)
-			return null;
-		Namespace ns = (Namespace) prefixesToNS.get(prefix);
-		if (ns != null)
-			return ns.getNsURI();
-		return null;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.emf.common.notify.impl.AdapterImpl#isAdapterForType(java.lang.Object)
-	 */
-	@Override
-	public boolean isAdapterForType(Object type) {
-		return ADAPTER_TYPE.equals(type);
-	}
-
-	public List getNamespaces() {
-		return namespaces == null ? Collections.EMPTY_LIST : Collections.unmodifiableList(namespaces);
-	}
-
-	protected void fireNotification(int type, Object oldValue, Object newValue) {
-		if (target != null)
-			target.eNotify(new Notification(type, oldValue, newValue));
-	}
-
-	public boolean hasNamespaces() {
-		return namespaces != null && !namespaces.isEmpty();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see com.ibm.etools.emf.ecore.utilities.CloneablePublic#clone()
-	 */
-	@Override
-	public Object clone() {
-		NamespaceAdapter result = new NamespaceAdapter();
-		if (hasNamespaces()) {
-			for (int i = 0; i < namespaces.size(); i++) {
-				Namespace ns = (Namespace) namespaces.get(i);
-				result.addNamespace(ns.getPrefix(), ns.getNsURI());
-			}
-		}
-		return result;
-	}
-
-}
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/PassthruEncoderDecoder.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/PassthruEncoderDecoder.java
deleted file mode 100644
index d8677eb..0000000
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/PassthruEncoderDecoder.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.common.internal.emf.utilities;
-
-
-/**
- * A passthru EncoderDecoder implementation
- */
-public class PassthruEncoderDecoder extends EncoderDecoderAdapter {
-	public static final PassthruEncoderDecoder INSTANCE = new PassthruEncoderDecoder();
-	public static final String KEY = PassthruEncoderDecoder.class.getName();
-
-	/**
-	 * EncoderDecoderAdapter constructor comment.
-	 */
-	private PassthruEncoderDecoder() {
-		super();
-	}
-
-	/**
-	 * Returns a decoded version of the value.
-	 */
-	@Override
-	public String decode(String value) {
-		return value;
-	}
-
-	/**
-	 * Returns an encoded version of the value.
-	 */
-	@Override
-	public String encode(String value) {
-		return value;
-	}
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/PasswordCipherUtil.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/PasswordCipherUtil.java
deleted file mode 100644
index f237158..0000000
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/PasswordCipherUtil.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors: IBM Corporation - initial API and implementation
- **************************************************************************************************/
-package org.eclipse.wst.common.internal.emf.utilities;
-
-public class PasswordCipherUtil {
-	private static final String DEFAULT_SUPPORTED_CRYPTO_ALGORITHMS[] = {"xor"}; //$NON-NLS-1$
-	private static String _supported_crypto_algorithms[];
-
-	public PasswordCipherUtil() {
-	}
-
-	public static byte[] decipher(byte abyte0[], String s) throws InvalidPasswordCipherException, UnsupportedCryptoAlgorithmException {
-		if (s == null)
-			throw new UnsupportedCryptoAlgorithmException();
-		byte abyte1[] = null;
-		if (s.equalsIgnoreCase(DEFAULT_SUPPORTED_CRYPTO_ALGORITHMS[0]))
-			abyte1 = xor(abyte0);
-		else
-			throw new UnsupportedCryptoAlgorithmException();
-
-		if (abyte1 == null)
-			throw new InvalidPasswordCipherException();
-
-		return abyte1;
-	}
-
-	public static byte[] encipher(byte abyte0[], String s) throws InvalidPasswordCipherException, UnsupportedCryptoAlgorithmException {
-		if (s == null)
-			throw new UnsupportedCryptoAlgorithmException();
-		byte abyte1[] = null;
-		if (s.equalsIgnoreCase(DEFAULT_SUPPORTED_CRYPTO_ALGORITHMS[0]))
-			abyte1 = xor(abyte0);
-		else
-			throw new UnsupportedCryptoAlgorithmException();
-
-		if (abyte1 == null)
-			throw new InvalidPasswordCipherException();
-		return abyte1;
-	}
-
-	public static String[] getSupportedCryptoAlgorithms() {
-		return _supported_crypto_algorithms;
-	}
-
-	private static byte[] xor(byte abyte0[]) {
-		byte abyte1[] = null;
-		if (abyte0 != null) {
-			abyte1 = new byte[abyte0.length];
-			for (int i = 0; i < abyte0.length; i++)
-				abyte1[i] = (byte) (0x5f ^ abyte0[i]);
-		}
-		return abyte1;
-	}
-
-	static {
-		_supported_crypto_algorithms = null;
-		if (_supported_crypto_algorithms == null)
-			_supported_crypto_algorithms = DEFAULT_SUPPORTED_CRYPTO_ALGORITHMS;
-	}
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/PasswordEncoderDecoder.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/PasswordEncoderDecoder.java
deleted file mode 100644
index 1334efb..0000000
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/PasswordEncoderDecoder.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors: IBM Corporation - initial API and implementation
- **************************************************************************************************/
-package org.eclipse.wst.common.internal.emf.utilities;
-
-public class PasswordEncoderDecoder extends EncoderDecoderAdapter {
-	public static final String KEY = "password-security-coder"; //$NON-NLS-1$
-
-	public PasswordEncoderDecoder() {
-	}
-
-	@Override
-	public String decode(String s) {
-		return PasswordUtil.passwordDecode(s);
-	}
-
-	@Override
-	public String encode(String s) {
-		return PasswordUtil.passwordEncode(s);
-	}
-
-	public Object getKey() {
-		return KEY;
-	}
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/PasswordUtil.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/PasswordUtil.java
deleted file mode 100644
index a46a97c..0000000
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/PasswordUtil.java
+++ /dev/null
@@ -1,336 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors: IBM Corporation - initial API and implementation
- **************************************************************************************************/
-package org.eclipse.wst.common.internal.emf.utilities;
-
-
-import java.io.UnsupportedEncodingException;
-
-public class PasswordUtil {
-	public static final String STRING_CONVERSION_CODE = "UTF8"; //$NON-NLS-1$
-	public static final String EMPTY_STRING = ""; //$NON-NLS-1$
-	public static final byte[] EMPTY_BYTE_ARRAY = new byte[0];
-	public static final String DEFAULT_CRYPTO_ALGORITHM;
-	private static final String SUPPORTED_CRYPTO_ALGORITHMS[];
-	private static final byte BASE64_ENCODE_MAP[];
-	private static final byte BASE64_DECODE_MAP[];
-
-	public PasswordUtil() {
-	}
-
-	public static String decode(String s) throws InvalidPasswordDecodingException, UnsupportedCryptoAlgorithmException {
-		if (s == null)
-			throw new InvalidPasswordDecodingException();
-		String s1 = getCryptoAlgorithm(s);
-		if (s1 == null)
-			throw new InvalidPasswordDecodingException();
-
-		if (!isValidCryptoAlgorithm(s1))
-			throw new UnsupportedCryptoAlgorithmException();
-
-		String s2 = decode_password(removeCryptoAlgorithmTag(s), s1);
-		if (s2 == null)
-			throw new InvalidPasswordDecodingException();
-		return s2;
-	}
-
-	public static String encode(String s) throws InvalidPasswordEncodingException, UnsupportedCryptoAlgorithmException {
-		return encode(s, DEFAULT_CRYPTO_ALGORITHM);
-	}
-
-	public static String encode(String s, String s1) throws InvalidPasswordEncodingException, UnsupportedCryptoAlgorithmException {
-		if (!isValidCryptoAlgorithm(s1))
-			throw new UnsupportedCryptoAlgorithmException();
-		if (s == null)
-			throw new InvalidPasswordEncodingException();
-
-		if (getCryptoAlgorithm(s) != null)
-			throw new InvalidPasswordEncodingException();
-
-		String s2 = encode_password(s.trim(), s1.trim());
-		if (s2 == null)
-			throw new InvalidPasswordEncodingException();
-		return s2;
-	}
-
-	public static String getCryptoAlgorithm(String s) {
-		String s1 = null;
-		String innerS = s;
-		if (innerS != null) {
-			innerS = innerS.trim();
-			if (innerS.length() >= 2) {
-				int i = innerS.indexOf("{"); //$NON-NLS-1$
-				if (i == 0) {
-					int j = innerS.indexOf("}", ++i); //$NON-NLS-1$
-					if (j > 0)
-						if (i < j)
-							s1 = innerS.substring(i, j).trim();
-						else
-							s1 = EMPTY_STRING;
-				}
-			}
-		}
-		return s1;
-	}
-
-	public static String getCryptoAlgorithmTag(String s) {
-		String s1 = null;
-		String s2 = getCryptoAlgorithm(s);
-		if (s2 != null) {
-			StringBuffer stringbuffer = new StringBuffer("{"); //$NON-NLS-1$
-			if (s2.length() > 0)
-				stringbuffer.append(s2);
-			stringbuffer.append("}"); //$NON-NLS-1$
-			s1 = stringbuffer.toString();
-		}
-		return s1;
-	}
-
-	public static boolean isValidCryptoAlgorithm(String s) {
-		String innerS = s;
-		if (innerS != null) {
-			innerS = innerS.trim();
-			if (innerS.length() == 0)
-				return true;
-			for (int i = 0; i < SUPPORTED_CRYPTO_ALGORITHMS.length; i++)
-				if (innerS.equalsIgnoreCase(SUPPORTED_CRYPTO_ALGORITHMS[i]))
-					return true;
-		}
-		return false;
-	}
-
-	public static boolean isValidCryptoAlgorithmTag(String s) {
-		return isValidCryptoAlgorithm(getCryptoAlgorithm(s));
-	}
-
-	public static String passwordDecode(String s) {
-		if (s == null)
-			return null;
-		String s1 = getCryptoAlgorithm(s);
-		if (s1 == null)
-			return s;
-		if (!isValidCryptoAlgorithm(s1))
-			return null;
-		return decode_password(removeCryptoAlgorithmTag(s), s1);
-	}
-
-	public static String passwordEncode(String s) {
-		return passwordEncode(s, DEFAULT_CRYPTO_ALGORITHM);
-	}
-
-	public static String passwordEncode(String s, String s1) {
-		if (!isValidCryptoAlgorithm(s1))
-			return null;
-		if (s == null)
-			return null;
-		String s2 = getCryptoAlgorithm(s);
-		if (s2 != null) {
-			if (s2.equalsIgnoreCase(s1.trim()))
-				return s.trim();
-			return null;
-		}
-		return encode_password(s.trim(), s1.trim());
-	}
-
-	public static String removeCryptoAlgorithmTag(String s) {
-		String s1 = null;
-		String innerS = s;
-		if (innerS != null) {
-			innerS = innerS.trim();
-			if (innerS.length() >= 2) {
-				int i = innerS.indexOf("{"); //$NON-NLS-1$
-				if (i == 0) {
-					int j = innerS.indexOf("}", ++i); //$NON-NLS-1$
-					if (j > 0)
-						if (++j < innerS.length())
-							s1 = innerS.substring(j).trim();
-						else
-							s1 = EMPTY_STRING;
-				}
-			}
-		}
-		return s1;
-	}
-
-	private static byte[] convert_to_bytes(String s) {
-		byte abyte0[] = null;
-		if (s != null)
-			if (s.length() == 0)
-				abyte0 = EMPTY_BYTE_ARRAY;
-			else
-				try {
-					abyte0 = s.getBytes(STRING_CONVERSION_CODE);
-				} catch (UnsupportedEncodingException unsupportedencodingexception) {
-					//do nothing
-				}
-		return abyte0;
-	}
-
-	private static String convert_to_string(byte abyte0[]) {
-		String s = null;
-		if (abyte0 != null)
-			if (abyte0.length == 0)
-				s = EMPTY_STRING;
-			else
-				try {
-					s = new String(abyte0, STRING_CONVERSION_CODE);
-				} catch (UnsupportedEncodingException unsupportedencodingexception) {
-					//do nothing
-				}
-		return s;
-	}
-
-	private static byte[] convert_viewable_to_bytes(String s) {
-		byte abyte0[] = null;
-		if (s != null)
-			if (s.length() == 0)
-				abyte0 = EMPTY_BYTE_ARRAY;
-			else
-				try {
-					abyte0 = base64Decode(convert_to_bytes(s));
-				} catch (Exception exception) {
-					abyte0 = null;
-				}
-		return abyte0;
-	}
-
-	private static byte[] base64Decode(byte abyte0[]) {
-		int i;
-		for (i = abyte0.length; abyte0[--i] == 61;){
-			//do nothing just finding index of 61
-		}
-		byte abyte1[] = new byte[(i + 1) - abyte0.length / 4];
-		for (int j = 0; j < abyte0.length; j++)
-			abyte0[j] = BASE64_DECODE_MAP[abyte0[j]];
-		int k = abyte1.length - 2;
-		int l = 0;
-		int i1;
-		for (i1 = 0; l < k; i1 += 4) {
-			abyte1[l] = (byte) (abyte0[i1] << 2 & 0xff | abyte0[i1 + 1] >>> 4 & 0x3);
-			abyte1[l + 1] = (byte) (abyte0[i1 + 1] << 4 & 0xff | abyte0[i1 + 2] >>> 2 & 0xf);
-			abyte1[l + 2] = (byte) (abyte0[i1 + 2] << 6 & 0xff | abyte0[i1 + 3] & 0x3f);
-			l += 3;
-		}
-		if (l < abyte1.length) {
-			abyte1[l++] = (byte) (abyte0[i1] << 2 & 0xff | abyte0[i1 + 1] >>> 4 & 0x3);
-			if (l < abyte1.length)
-				abyte1[l] = (byte) (abyte0[i1 + 1] << 4 & 0xff | abyte0[i1 + 2] >>> 2 & 0xf);
-		}
-		return abyte1;
-	}
-
-	private static String convert_viewable_to_string(byte abyte0[]) {
-		String s = null;
-		if (abyte0 != null)
-			if (abyte0.length == 0)
-				s = EMPTY_STRING;
-			else
-				try {
-					s = convert_to_string(base64Encode(abyte0));
-				} catch (Exception exception) {
-					s = null;
-				}
-		return s;
-	}
-
-	private static byte[] base64Encode(byte abyte0[]) {
-		byte abyte1[] = new byte[((abyte0.length + 2) / 3) * 4];
-		int i = 0;
-		int j = 0;
-		for (; i < abyte0.length - 2; i += 3) {
-			abyte1[j++] = BASE64_ENCODE_MAP[abyte0[i] >>> 2 & 0x3f];
-			abyte1[j++] = BASE64_ENCODE_MAP[abyte0[i + 1] >>> 4 & 0xf | abyte0[i] << 4 & 0x3f];
-			abyte1[j++] = BASE64_ENCODE_MAP[abyte0[i + 2] >>> 6 & 0x3 | abyte0[i + 1] << 2 & 0x3f];
-			abyte1[j++] = BASE64_ENCODE_MAP[abyte0[i + 2] & 0x3f];
-		}
-		if (i < abyte0.length) {
-			abyte1[j++] = BASE64_ENCODE_MAP[abyte0[i] >>> 2 & 0x3f];
-			if (i < abyte0.length - 1) {
-				abyte1[j++] = BASE64_ENCODE_MAP[abyte0[i + 1] >>> 4 & 0xf | abyte0[i] << 4 & 0x3f];
-				abyte1[j++] = BASE64_ENCODE_MAP[abyte0[i + 1] << 2 & 0x3f];
-			} else {
-				abyte1[j++] = BASE64_ENCODE_MAP[abyte0[i] << 4 & 0x3f];
-			}
-		}
-		for (; j < abyte1.length; j++)
-			abyte1[j] = 61;
-		return abyte1;
-	}
-
-	private static String decode_password(String s, String s1) {
-		StringBuffer stringbuffer = new StringBuffer();
-		if (s1.length() == 0) {
-			stringbuffer.append(s);
-		} else {
-			String s2 = null;
-			if (s.length() > 0) {
-				byte abyte0[] = convert_viewable_to_bytes(s);
-				if (abyte0 == null)
-					return null;
-				if (abyte0.length > 0) {
-					byte abyte1[] = null;
-					try {
-						abyte1 = PasswordCipherUtil.decipher(abyte0, s1);
-					} catch (InvalidPasswordCipherException invalidpasswordcipherexception) {
-						return null;
-					} catch (UnsupportedCryptoAlgorithmException unsupportedcryptoalgorithmexception) {
-						return null;
-					}
-					if (abyte1 != null && abyte1.length > 0)
-						s2 = convert_to_string(abyte1);
-				}
-			}
-			if (s2 != null && s2.length() > 0)
-				stringbuffer.append(s2);
-		}
-		return stringbuffer.toString();
-	}
-
-	private static String encode_password(String s, String s1) {
-		StringBuffer stringbuffer = new StringBuffer("{"); //$NON-NLS-1$
-		if (s1.length() == 0) {
-			stringbuffer.append("}").append(s); //$NON-NLS-1$
-		} else {
-			stringbuffer.append(s1).append("}"); //$NON-NLS-1$
-			String s2 = null;
-			if (s.length() > 0) {
-				byte abyte0[] = convert_to_bytes(s);
-				if (abyte0.length > 0) {
-					byte abyte1[] = null;
-					try {
-						abyte1 = PasswordCipherUtil.encipher(abyte0, s1);
-					} catch (InvalidPasswordCipherException invalidpasswordcipherexception) {
-						return null;
-					} catch (UnsupportedCryptoAlgorithmException unsupportedcryptoalgorithmexception) {
-						return null;
-					}
-					if (abyte1 != null && abyte1.length > 0) {
-						s2 = convert_viewable_to_string(abyte1);
-						if (s2 == null)
-							return null;
-					}
-				}
-			}
-			if (s2 != null && s2.length() > 0)
-				stringbuffer.append(s2);
-		}
-		return stringbuffer.toString();
-	}
-
-	static {
-		SUPPORTED_CRYPTO_ALGORITHMS = PasswordCipherUtil.getSupportedCryptoAlgorithms();
-		DEFAULT_CRYPTO_ALGORITHM = SUPPORTED_CRYPTO_ALGORITHMS[0];
-		byte abyte0[] = {65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 43, 47};
-		BASE64_ENCODE_MAP = abyte0;
-		BASE64_DECODE_MAP = new byte[128];
-		for (int i = 0; i < BASE64_DECODE_MAP.length; i++)
-			BASE64_DECODE_MAP[i] = -1;
-		for (int j = 0; j < BASE64_ENCODE_MAP.length; j++)
-			BASE64_DECODE_MAP[BASE64_ENCODE_MAP[j]] = (byte) j;
-	}
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/PleaseMigrateYourCodeError.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/PleaseMigrateYourCodeError.java
deleted file mode 100644
index bd4776e..0000000
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/PleaseMigrateYourCodeError.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 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
- *******************************************************************************/
-package org.eclipse.wst.common.internal.emf.utilities;
-
-
-
-/**
- * @author mdelder
- *  
- */
-public class PleaseMigrateYourCodeError extends Error {
-
-	/**
-	 * 
-	 */
-	private static final long serialVersionUID = 1137010999400298839L;
-
-	//TODO Delete me
-	public PleaseMigrateYourCodeError() {
-		super(WFTUtilsResourceHandler.PleaseMigrateYourCodeError_ERROR_0);
-	}
-}
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/ResourceDependencyRegister.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/ResourceDependencyRegister.java
deleted file mode 100644
index 79c8046..0000000
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/ResourceDependencyRegister.java
+++ /dev/null
@@ -1,216 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors: IBM Corporation - initial API and implementation
- **************************************************************************************************/
-package org.eclipse.wst.common.internal.emf.utilities;
-
-
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.impl.AdapterImpl;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.emf.ecore.resource.URIConverter;
-
-public class ResourceDependencyRegister {
-	protected static Map GLOBAL_DEPENDENCIES = new HashMap();
-	private static String RESOURCE_DEPENDENCY_TYPE = "ResourceDependencyAdapter"; //$NON-NLS-1$
-	protected Map localDependencies = new HashMap();
-
-	class ResourceDependencyAdapter extends AdapterImpl {
-		Resource dependentResource;
-
-		ResourceDependencyAdapter(Resource aDependentResource) {
-			dependentResource = aDependentResource;
-			dependentResource.eAdapters().add(this);
-		}
-
-		/*
-		 * (non-Javadoc)
-		 * 
-		 * @see org.eclipse.emf.common.notify.impl.AdapterImpl#isAdapterForType(java.lang.Object)
-		 */
-		@Override
-		public boolean isAdapterForType(Object type) {
-			return RESOURCE_DEPENDENCY_TYPE.equals(type);
-		}
-
-		/*
-		 * (non-Javadoc)
-		 * 
-		 * @see org.eclipse.emf.common.notify.impl.AdapterImpl#notifyChanged(org.eclipse.emf.common.notify.Notification)
-		 */
-		@Override
-		public void notifyChanged(Notification msg) {
-			//Listen for unloads and removes
-			switch (msg.getFeatureID(null)) {
-				case Resource.RESOURCE__IS_LOADED :
-					if (msg.getNotifier() != dependentResource && msg.getOldBooleanValue() && !msg.getNewBooleanValue())
-						dependentResource.unload();
-					break;
-				case Resource.RESOURCE__RESOURCE_SET :
-					if (msg.getOldValue() != null && msg.getNewValue() == null) {
-						if (msg.getNotifier() == dependentResource)
-							((Resource) getTarget()).eAdapters().remove(this);
-						else {
-							ResourceSet set = dependentResource.getResourceSet();
-							if (set != null)
-								set.getResources().remove(dependentResource);
-						}
-					}
-					break;
-			}
-		}
-	}
-
-	class ResourceSetListener extends AdapterImpl {
-		/*
-		 * (non-Javadoc)
-		 * 
-		 * @see org.eclipse.emf.common.notify.impl.AdapterImpl#notifyChanged(org.eclipse.emf.common.notify.Notification)
-		 */
-		@Override
-		public void notifyChanged(Notification msg) {
-			if (msg.getEventType() == Notification.ADD)
-				proccessAddedResource((ResourceSet) msg.getNotifier(), (Resource) msg.getNewValue());
-		}
-	}
-
-	/**
-	 * Register a dependency between two URIs. The first parameter, aURIString, is the one that
-	 * dependentUriString depends on.
-	 * 
-	 * @param aUriString
-	 *            java.lang.String
-	 * @param dependentUriString
-	 *            java.lang.String
-	 */
-	public static void registerDependency(URI targetURI, URI dependentURI) {
-		if (targetURI != null && dependentURI != null) {
-			GLOBAL_DEPENDENCIES.put(dependentURI, targetURI);
-		}
-	}
-
-	public ResourceDependencyRegister(ResourceSet aResourceSet) {
-		initialize(aResourceSet);
-	}
-
-
-	ResourceDependencyRegister() {
-		super();
-	}
-
-	/**
-	 * @param aResourceSet
-	 */
-	protected void initialize(ResourceSet aResourceSet) {
-		if (aResourceSet == null)
-			throw new NullPointerException("The ResourceSet cannot be null."); //$NON-NLS-1$
-		initializeLocalDependencies(aResourceSet);
-		setupDependencyAdapters(aResourceSet);
-		setupResourceSetListener(aResourceSet);
-	}
-
-	/**
-	 * @param aResourceSet
-	 */
-	protected void setupResourceSetListener(ResourceSet aResourceSet) {
-		aResourceSet.eAdapters().add(new ResourceSetListener());
-	}
-
-	/**
-	 * @param aResourceSet
-	 * @return
-	 */
-	protected void setupDependencyAdapters(ResourceSet aResourceSet) {
-		if (!aResourceSet.getResources().isEmpty()) {
-			Iterator it = localDependencies.entrySet().iterator();
-			Map.Entry entry;
-			URI dependentURI, targetURI;
-			while (it.hasNext()) {
-				entry = (Map.Entry) it.next();
-				dependentURI = (URI) entry.getKey();
-				targetURI = (URI) entry.getValue();
-				setupDependencyAdapter(aResourceSet, dependentURI, targetURI);
-			}
-		}
-	}
-
-	/**
-	 * @param aResourceSet
-	 * @param dependentURI
-	 * @param targetURI
-	 * @return
-	 */
-	protected void setupDependencyAdapter(ResourceSet aResourceSet, URI dependentURI, URI targetURI) {
-		Resource dependent = aResourceSet.getResource(dependentURI, false);
-		if (dependent != null)
-			setupDependencyAdapter(dependent, targetURI, aResourceSet);
-	}
-
-	protected void setupDependencyAdapter(Resource dependent, URI targetURI, ResourceSet aResourceSet) {
-		Resource target = aResourceSet.getResource(targetURI, false);
-		if (target == null)
-			target = aResourceSet.createResource(targetURI);
-		target.eAdapters().add(new ResourceDependencyAdapter(dependent));
-	}
-
-	/**
-	 * @param aResourceSet
-	 */
-	protected void initializeLocalDependencies(ResourceSet aResourceSet) {
-		URIConverter converter = aResourceSet.getURIConverter();
-		initializeLocalDependencies(converter);
-	}
-
-	/**
-	 * @param aResourceSet
-	 */
-	protected void initializeLocalDependencies(URIConverter aConverter) {
-		Iterator it = GLOBAL_DEPENDENCIES.entrySet().iterator();
-		Map resolved = new HashMap();
-		Map.Entry entry;
-		URI key, value;
-		while (it.hasNext()) {
-			entry = (Map.Entry) it.next();
-			key = (URI) entry.getKey();
-			value = (URI) entry.getValue();
-			key = normalize(key, aConverter, resolved);
-			value = normalize(value, aConverter, resolved);
-			localDependencies.put(key, value);
-		}
-	}
-
-	/**
-	 * @param relativeURI
-	 * @param converter
-	 * @param resolved
-	 * @return
-	 */
-	protected URI normalize(URI relativeURI, URIConverter converter, Map resolved) {
-		URI result = (URI) resolved.get(relativeURI);
-		if (result == null) {
-			result = converter.normalize(relativeURI);
-			resolved.put(relativeURI, result);
-		}
-		return result;
-	}
-
-	/**
-	 * @param set
-	 * @param resource
-	 */
-	protected void proccessAddedResource(ResourceSet set, Resource resource) {
-		URI targetURI = (URI) localDependencies.get(resource.getURI());
-		if (targetURI != null)
-			setupDependencyAdapter(resource, targetURI, set);
-	}
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/ResourceIsLoadingAdapter.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/ResourceIsLoadingAdapter.java
deleted file mode 100644
index a5d96ea..0000000
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/ResourceIsLoadingAdapter.java
+++ /dev/null
@@ -1,126 +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
- *******************************************************************************/
-/*
- * Created on Oct 26, 2004
- */
-package org.eclipse.wst.common.internal.emf.utilities;
-
-import java.util.List;
-
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.impl.AdapterImpl;
-import org.eclipse.emf.ecore.resource.Resource;
-
-/**
- * @author mdelder
- */
-public class ResourceIsLoadingAdapter extends AdapterImpl {
-
-    private static final Class RESOURCE_IS_LOADING_ADAPTER_CLASS = ResourceIsLoadingAdapter.class;
-
-    public ResourceIsLoadingAdapter() {
-    }
-
-    public static ResourceIsLoadingAdapter findAdapter(Resource aResource) {
-        ResourceIsLoadingAdapter adapter = null;
-        //System.out.println("ResourceIsLoadingAdapter Synchronizing on " + aResource);
-        
-        /* Synchronize on the Resource (which will be the target of 
-         * the ResourceIsLoadingAdapter in the list, if it exists).
-         * 
-         * removeIsLoadingSupport() will coordinate with this 
-         * synchronization.
-         */
-        synchronized(aResource.eAdapters()) {
-        	adapter = (ResourceIsLoadingAdapter) getAdapter(aResource.eAdapters(), ResourceIsLoadingAdapter.class);
-        }
-        
-        return adapter;
-    }
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.eclipse.emf.common.notify.Adapter#notifyChanged(org.eclipse.emf.common.notify.Notification)
-     */
-    @Override
-	public void notifyChanged(Notification notification) {
-
-        if (notification.getNotifier() != null) {
-
-            // listen for the remove of the loading adapter
-            if (isSetLoadedResourceNotification(notification)) removeIsLoadingSupport();
-        }
-    }
-
-    /**
-     * Default implementation is a no-op.
-     */
-    public void waitForResourceToLoad() {
-
-    }
-    public static Adapter getAdapter(List<Adapter> adapters, Object type)
-    {
-      for (int i = 0, size = adapters.size(); i < size; ++i)
-      {
-        Adapter adapter = adapters.get(i);
-        if (adapter != null && adapter.isAdapterForType(type))
-        {
-          return adapter;
-        }
-      }
-      return null;
-    }
-
-    /**
-     * @param notification
-     * @return
-     */
-    protected boolean isSetLoadedResourceNotification(Notification notification) {
-        return notification.getFeatureID(null) == Resource.RESOURCE__IS_LOADED && notification.getEventType() == Notification.SET;
-    }
-
-    protected void removeIsLoadingSupport() {
-
-        /* Synchronize on the target of the Adapter. If 
-         * the list of adapters is searched for a 
-         * ResourceIsLoadingAdapter using the 
-         * ResourceIsLoadingAdapter.findAdapter() API, then
-         * the access to remove the Adapter using this method 
-         * will be coordinated.  
-         */
-        if (getTarget() != null) {
-            //System.out.println("ResourceIsLoadingAdapter Synchronizing on " + getTarget());
-            synchronized (getTarget().eAdapters()) {
-                getTarget().eAdapters().remove(this);
-            }
-        }
-    }
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.eclipse.emf.common.notify.Adapter#isAdapterForType(java.lang.Object)
-     */
-    @Override
-	public boolean isAdapterForType(Object type) {
-        return type == RESOURCE_IS_LOADING_ADAPTER_CLASS;
-    }
-
-    /**
-     * 
-     */
-    public void forceRelease() {
-
-    }
-
-}
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/ResourceIsLoadingAdapterFactory.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/ResourceIsLoadingAdapterFactory.java
deleted file mode 100644
index 6e30496..0000000
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/ResourceIsLoadingAdapterFactory.java
+++ /dev/null
@@ -1,29 +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
- *******************************************************************************/
-/*
- * Created on Oct 26, 2004
- */
-package org.eclipse.wst.common.internal.emf.utilities;
-
-
-/**
- * @author mdelder
- * 
- */
-public class ResourceIsLoadingAdapterFactory {
-
-    public static ResourceIsLoadingAdapterFactory INSTANCE = new ResourceIsLoadingAdapterFactory();
-         
-    public ResourceIsLoadingAdapter createResourceIsLoadingAdapter() {
-        return new ResourceIsLoadingAdapter();
-    }
-    
-}
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/Revisit.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/Revisit.java
deleted file mode 100644
index 2ec67d4..0000000
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/Revisit.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors: IBM Corporation - initial API and implementation
- **************************************************************************************************/
-package org.eclipse.wst.common.internal.emf.utilities;
-
-
-public class Revisit {
-
-	/**
-	 * Revisit constructor comment.
-	 */
-	public Revisit() {
-		super();
-	}
-
-	public static void revisit() {
-	}
-
-
-	public static void unComment() {
-	}
-
-	public static void toDo() {
-	}
-
-	public static void refactor() {
-	}
-
-	public static void removeDeprecatedMethod() {
-	}
-
-	public static void deleteMe() {
-	}
-
-	public static void reviewDesign() {
-	}
-}
-
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/StringUtil.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/StringUtil.java
deleted file mode 100644
index d1f2308..0000000
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/StringUtil.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 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
- *******************************************************************************/
-/*
- * Created on Mar 18, 2003
- *
- * To change this generated comment go to 
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-package org.eclipse.wst.common.internal.emf.utilities;
-
-/**
- * @author schacher
- * 
- * To change this generated comment go to Window>Preferences>Java>Code Generation>Code and Comments
- */
-public class StringUtil {
-	/**
-	 * Enhanced equality check for two string parameters, that takes into consideration null values.
-	 * If both values are null, this will return true.
-	 * 
-	 * @param s1
-	 * @param s2
-	 * @return boolean
-	 */
-	public static boolean stringsEqual(String s1, String s2) {
-		if (s1 == null)
-			return s2 == null;
-		return s1.equals(s2);
-	}
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/TranslatorManager.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/TranslatorManager.java
deleted file mode 100644
index 975db26..0000000
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/TranslatorManager.java
+++ /dev/null
@@ -1,168 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2003, 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
- **************************************************************************************************/
-package org.eclipse.wst.common.internal.emf.utilities;
-
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Set;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.wst.common.core.util.RegistryReader;
-import org.eclipse.wst.common.internal.emf.plugin.EcoreUtilitiesPlugin;
-import org.eclipse.wst.common.internal.emf.resource.Translator;
-
-/**
- * This is the TranslatorManager class used by the TranslatorService in order to discover
- * and cache all of the extended Translators to be used by EMF2DOMAdapterImpl.
- */
-public class TranslatorManager {
-	
-	/**
-	 * The singleton TranslatorManager instance
-	 */
-	private static final TranslatorManager INSTANCE = new TranslatorManager();
-	
-	/**
-	 * Cache of all the TranslatorDescriptors
-	 */
-	private final Set translators = new HashSet();
-	
-	/**
-	 * Default static empty array used when no descriptors found
-	 */
-	private static final TranslatorDescriptor[] NO_EXTENDED_TRANSLATORS = new TranslatorDescriptor[0];
-	
-	/**
-	 * Returns the singleton instance of the TranslatorManager
-	 * @return TranslatorManager INSTANCE
-	 */
-	public static TranslatorManager getInstance() {
-		return INSTANCE;
-	}
-
-	/**
-	 * Private constructor
-	 */
-	private TranslatorManager() {
-		new TranslatorRegistry().readRegistry();
-	}
-	
-	/**
-	 * Simple Registry Reader used by Translator Manager to recognize the Translator extensions
-	 */
-	private class TranslatorRegistry extends RegistryReader {
-		
-		/**
-		 * The Translator element of the extension point.
-		 */
-		public static final String TRANSLATOR = "translator"; //$NON-NLS-1$
-		
-		/**
-		 * Default constructor
-		 */
-		public TranslatorRegistry() {
-			super(EcoreUtilitiesPlugin.ID, EcoreUtilitiesPlugin.TRANSLATOR_EXTENSTION_POINT);
-		}
-
-		/**
-		 * Add the configuration element if it matchs the expected translator element name
-		 */
-		@Override
-		public boolean readElement(IConfigurationElement element) {
-			boolean result = false;
-			if (TRANSLATOR.equals(element.getName())) {
-				addTranslatorDescriptor(new TranslatorDescriptor(element));
-					result = true;
-			}
-			return result;
-		}
-	}
-
-	/**
-	 * Describes a Translator extension point element
-	 */
-	public class TranslatorDescriptor {
-	
-		/**
-		 * Qualified class name attribute
-		 */
-		public static final String CLASSNAME = "className"; //$NON-NLS-1$
-		
-		/**
-		 * The config element for this Descriptor
-		 */
-		private final IConfigurationElement configElement;
-		
-		/**
-		 * the cached qualified className value of this descriptor
-		 */
-		private String className;
-	
-		/**
-		 * Constructor
-		 * @param aConfigElement
-		 */
-		public TranslatorDescriptor(IConfigurationElement aConfigElement) {
-			super();
-			configElement = aConfigElement;
-			className = configElement.getAttribute(CLASSNAME);
-		}
-		
-		/**
-		 * Retrieve the cached value of the qualified class name of the extended Translator
-		 * @return String classname
-		 */
-		public String getClassName() {
-			return className;
-		}
-	
-		/**
-		 * Create the actual Translator instance from the configuration element.
-		 * @return Translator
-		 */
-		public Translator createTranslator() {
-			Translator instance = null;
-			try {
-				instance = (Translator) configElement.createExecutableExtension(CLASSNAME);
-			} catch (CoreException e) {
-				EcoreUtilitiesPlugin.logError(e);
-			}
-			return instance;
-		}
-	}
-	
-	/**
-	 * Add the TranslatorDescriptor to the cache of descriptor extensions.
-	 * @param descriptor
-	 */
-	private void addTranslatorDescriptor(TranslatorDescriptor descriptor) {
-		Assert.isNotNull(descriptor);
-		translators.add(descriptor);
-	}
-	
-	/**
-	 * Find all the associated TranslatorDescriptors for the Traslator extensions defined.
-	 * @return TranslatorDescriptor[]
-	 */
-	public TranslatorDescriptor[] findTranslators() {
-		List result = new ArrayList();
-		TranslatorDescriptor descriptor = null;
-		for (Iterator translatorsItr = translators.iterator(); translatorsItr.hasNext();) {
-			descriptor = (TranslatorDescriptor) translatorsItr.next();
-			result.add(descriptor);
-		}
-		if (result.size() == 0) {
-			return NO_EXTENDED_TRANSLATORS;
-		}
-		return (TranslatorDescriptor[]) result.toArray(new TranslatorDescriptor[result.size()]);
-	}
-}
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/TranslatorService.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/TranslatorService.java
deleted file mode 100644
index 4012a7b..0000000
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/TranslatorService.java
+++ /dev/null
@@ -1,96 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2003, 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
- **************************************************************************************************/
-package org.eclipse.wst.common.internal.emf.utilities;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.wst.common.internal.emf.resource.Translator;
-import org.eclipse.wst.common.internal.emf.utilities.TranslatorManager.TranslatorDescriptor;
-
-/**
- * This is the service class to deliver API to use to retrieve Translator extensions from
- * the TranslatorManager and its RegistryReader.
- */
-public class TranslatorService {
-
-	/**
-	 * Static Key value pair of descriptors as keys and Translator instances as values
-	 */
-	private static final Map translators = new HashMap();
-	
-	/**
-	 * Static empty array used when no extensions found
-	 */
-	// never used
-	//private static final Translator[] NO_TRANSLATORS = new Translator[0];
-	
-	/**
-	 * Singleton instance of the Translator service
-	 */
-	private static final TranslatorService INSTANCE = new TranslatorService();
-	
-	/**
-	 * Default constructor
-	 */
-	private TranslatorService() {
-		super();
-	}
-	
-	public static TranslatorService getInstance() {
-		return INSTANCE;
-	}
-	
-	/**
-	 * This will return the associated extension point TranslatorDescriptor objects from the manager
-	 * @return TranslatorDescriptor[]
-	 */
-	public TranslatorDescriptor[] getTranslatorDescriptors() {
-		return TranslatorManager.getInstance().findTranslators();
-	}
-	
-	/**
-     * This retrieves the extended Translators using the extension point manager and descriptors
-     * @return Translator[] (Note, the return value may contain null entries.)
-     */
-	public Translator[] getTranslators() {
-		TranslatorDescriptor[] descriptors = getTranslatorDescriptors();
-		Translator[] result = new Translator[descriptors.length];
-		//The result index could differ from the descriptors index.
-		int resultIndex = 0;
-		for (int i=0; i<descriptors.length; i++) {
-			Translator instance = getTranslator(descriptors[i]);
-			if (instance!=null) {
-				result[resultIndex] = instance;
-				resultIndex++;
-			}
-		}
-		return result;  
-    }
-	
-	/**
-	 * Retrieve the existing associated Translator instance for the descriptor, or create a new
-	 * one and cache on the Set.
-	 * 
-	 * @param translatorDescriptor
-	 * @return Translator associated with the descriptor
-	 */
-	public Translator getTranslator(TranslatorDescriptor translatorDescriptor) {
-		Translator translator = (Translator) translators.get(translatorDescriptor);
-		if (translator != null)
-			return translator;
-		
-		synchronized (translators) {
-			translator = translatorDescriptor.createTranslator();
-			if (translator != null)
-				translators.put(translatorDescriptor, translator);
-		}
-		return translator;
-	}
-}
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/UnsupportedCryptoAlgorithmException.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/UnsupportedCryptoAlgorithmException.java
deleted file mode 100644
index 58459bf..0000000
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/UnsupportedCryptoAlgorithmException.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors: IBM Corporation - initial API and implementation
- **************************************************************************************************/
-package org.eclipse.wst.common.internal.emf.utilities;
-
-
-import org.omg.CORBA.UserException;
-
-public class UnsupportedCryptoAlgorithmException extends UserException {
-
-	/**
-	 * 
-	 */
-	private static final long serialVersionUID = -3510453767624155991L;
-}
-
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/WFTUtilsResourceHandler.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/WFTUtilsResourceHandler.java
deleted file mode 100644
index 6506318..0000000
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/WFTUtilsResourceHandler.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 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
- *******************************************************************************/
-package org.eclipse.wst.common.internal.emf.utilities;
-
-
-import org.eclipse.osgi.util.NLS;
-
-public class WFTUtilsResourceHandler extends NLS {
-	private static final String BUNDLE_NAME = "wftutils";//$NON-NLS-1$
-
-	private WFTUtilsResourceHandler() {
-		// Do not instantiate
-	}
-
-	public static String DANGLING_HREF_ERROR_;
-	public static String Integer_UI_;
-	public static String Failed_to_convert__0__to___ERROR_;
-	public static String Enumeration_UI_;
-	public static String Short_UI_;
-	public static String Character_UI_;
-	public static String Long_UI_;
-	public static String Double_UI_;
-	public static String ResourceDependencyRegister_ERROR_0;
-	public static String Float_UI_;
-	public static String Byte_UI_;
-	public static String Warning__Could_not_write_b_WARN_;
-	public static String Boolean_UI_;
-	public static String Stack_trace_of_nested_exce_ERROR_;
-	public static String MofObject_UI_;
-	public static String PleaseMigrateYourCodeError_ERROR_0;
-	public static String EMF2DOMAdapterImpl_ERROR_0;
-
-	static {
-		NLS.initializeMessages(BUNDLE_NAME, WFTUtilsResourceHandler.class);
-	}
-
-	public static String getString(String key, Object[] args) {
-		return NLS.bind(key, args);
-	}
-}
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/WriteBackHelper.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/WriteBackHelper.java
deleted file mode 100644
index 7a0aa43..0000000
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/WriteBackHelper.java
+++ /dev/null
@@ -1,136 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 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
- *******************************************************************************/
-package org.eclipse.wst.common.internal.emf.utilities;
-
-
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.Set;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.resource.Resource;
-
-
-/**
- * @deprecated This class will be deleted. If you still need to use this class, please contact the
- *             WCCM team. A class which can be used in conjunction with Encoder/Decoders to save
- *             resources if they are made dirty by automatic encoding support. Usage Example:
- * 
- * <pre>
- * 
- * 
- * // Use the standard WebSphere password value encoder/decoder.
- * EncoderDecoderRegistry.getDefaultRegistry().setDefaultEncoderDecoder(new com.ibm.ejs.security.util.WASEncoderDecoder());
- * // Begin tracking changes...
- * WriteBackHelper.begin();
- * // Load a resource which may have un-encoded values...
- * // Note: The WCCM will attempt to detect un-encoded values.  If unencoded values
- * // are found, the value will be encoded, and the resource will be added to the
- * // WriteBackHelper.
- * Resource res = resourceSet.load(&quot;myResource&quot;);
- * // Ensure that any changes due to encoding are written back out.
- * WriteBackHelper.end();
- * </pre>
- */
-public class WriteBackHelper {
-	private Set dirtyObjects = new HashSet();
-	private boolean trackingChanges = false;
-	private static WriteBackHelper _instance;
-	static {
-		//Deprecated class
-		Revisit.deleteMe();
-	}
-
-	/**
-	 * Private constructor ensures proper usage through singleton.
-	 */
-	private WriteBackHelper() {
-		super();
-	}
-
-	/**
-	 * Adds a resource which is dirty, and needs to be saved.
-	 */
-	public void addDirtyObject(EObject dirtyObject) {
-		dirtyObjects.add(dirtyObject);
-	}
-
-	/**
-	 * Begin collecting objects which have changed.
-	 */
-	public void begin() {
-		trackingChanges = true;
-	}
-
-	/**
-	 * Attempts to save all dirty resources (if possible), then marks the resources as non-dirty.
-	 */
-	public void end() {
-		saveDirtyResources();
-		reset();
-		trackingChanges = false;
-	}
-
-	/**
-	 * Returns true if changes to mof objects are currently being tracked.
-	 */
-	public boolean isActive() {
-		return trackingChanges;
-	}
-
-	/**
-	 * Clears the list of dirty resources.
-	 */
-	protected void reset() {
-		dirtyObjects.clear();
-	}
-
-	/**
-	 * Attempts to save all dirty resources (if possible), then marks the resources as non-dirty.
-	 */
-	protected void saveDirtyResources() {
-		Set dirtyResources = new HashSet();
-		Iterator dirtyObjIter = dirtyObjects.iterator();
-		while (dirtyObjIter.hasNext()) {
-			EObject dirtyObject = (EObject) dirtyObjIter.next();
-			if (dirtyObject.eResource() != null && !dirtyResources.contains(dirtyObject)) {
-				dirtyResources.add(dirtyObject.eResource());
-			}
-		}
-		Iterator dirtyIter = dirtyResources.iterator();
-		while (dirtyIter.hasNext()) {
-			Resource dirtyResource = (Resource) dirtyIter.next();
-			try {
-				dirtyResource.save(Collections.EMPTY_MAP);
-			} catch (Exception e) {
-				warn(dirtyResource, e);
-			}
-		}
-	}
-
-	/**
-	 * Adds a resource which is dirty, and needs to be saved.
-	 */
-	public static WriteBackHelper singleton() {
-		if (_instance == null) {
-			_instance = new WriteBackHelper();
-		}
-		return _instance;
-	}
-
-	/**
-	 * Warn the user of problems during save.
-	 */
-	protected void warn(Resource res, Exception e) {
-		System.err.println(WFTUtilsResourceHandler.getString(WFTUtilsResourceHandler.Warning__Could_not_write_b_WARN_, new Object[]{res.getURI()}));
-	}
-}
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/XMLValueEncoderDecoder.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/XMLValueEncoderDecoder.java
deleted file mode 100644
index 7503523..0000000
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/XMLValueEncoderDecoder.java
+++ /dev/null
@@ -1,113 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.common.internal.emf.utilities;
-
-
-/**
- * An XML value escaping EncoderDecoder implementation
- */
-public class XMLValueEncoderDecoder extends EncoderDecoderAdapter {
-	/**
-	 * Identifies the last printable character in the Unicode range that is supported by the
-	 * encoding used with this serializer. For 8-bit encodings this will be either 0x7E or 0xFF. For
-	 * 16-bit encodings this will be 0xFFFF. Characters that are not printable will be escaped using
-	 * character references.
-	 */
-	private int _lastPrintable = 0x7E;
-	protected static XMLValueEncoderDecoder _singleton;
-
-	/**
-	 * EncoderDecoderAdapter constructor comment.
-	 */
-	public XMLValueEncoderDecoder() {
-		super();
-	}
-
-	/**
-	 * Returns a decoded version of the value.
-	 */
-	@Override
-	public String decode(String value) {
-		// NOT_IMPLEMENTED
-		return value;
-	}
-
-	/**
-	 * Escapes a string so it may be printed as text content or attribute value. Non printable
-	 * characters are escaped using character references. Where the format specifies a deault entity
-	 * reference, that reference is used (e.g. <tt>&amp;lt;</tt>).
-	 * 
-	 * @param source
-	 *            The string to escape
-	 */
-	@Override
-	public String encode(String value) {
-		StringBuffer sbuf = new StringBuffer(value.length());
-		String charRef = null;
-		char ch;
-		for (int i = 0; i < value.length(); ++i) {
-			ch = value.charAt(i);
-			// If there is a suitable entity reference for this
-			// character, print it. The list of available entity
-			// references is almost but not identical between
-			// XML and HTML.
-			charRef = getEntityRef(ch);
-			if (charRef != null) {
-				sbuf.append('&');
-				sbuf.append(charRef);
-				sbuf.append(';');
-			} else if ((ch >= ' ' && ch <= _lastPrintable && ch != 0xF7) || ch == '\n' || ch == '\r' || ch == '\t') {
-				// If the character is not printable, print as character reference.
-				// Non printables are below ASCII space but not tab or line
-				// terminator, ASCII delete, or above a certain Unicode threshold.
-				sbuf.append(ch);
-			} else {
-				sbuf.append("&#");//$NON-NLS-1$
-				sbuf.append(Integer.toString(ch));
-				sbuf.append(';');
-			}
-		}
-		return sbuf.toString();
-	}
-
-	public static String escape(String value) {
-		if (_singleton == null) {
-			_singleton = new XMLValueEncoderDecoder();
-		}
-		return _singleton.encode(value);
-	}
-
-	/**
-	 * Returns the suitable entity reference for this character value, or null if no such entity
-	 * exists. Calling this method with <tt>'&amp;'</tt> will return <tt>"&amp;amp;"</tt>.
-	 * 
-	 * @param ch
-	 *            Character value
-	 * @return Character entity name, or null
-	 */
-	protected String getEntityRef(char ch) {
-		// Encode special XML characters into the equivalent character references.
-		// These five are defined by default for all XML documents.
-		switch (ch) {
-			case '<' :
-				return "lt";//$NON-NLS-1$
-			case '>' :
-				return "gt";//$NON-NLS-1$
-			case '"' :
-				return "quot";//$NON-NLS-1$
-			case '\'' :
-				return "apos";//$NON-NLS-1$
-			case '&' :
-				return "amp";//$NON-NLS-1$
-		}
-		return null;
-	}
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/wftutils.properties b/plugins/org.eclipse.wst.common.emf/wtpemf/wftutils.properties
deleted file mode 100644
index 4b2e2ae..0000000
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/wftutils.properties
+++ /dev/null
@@ -1,28 +0,0 @@
-###############################################################################
-# Copyright (c) 2003, 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
-###############################################################################
-Warning__Could_not_write_b_WARN_=IWAE0008W Warning: Could not write back {0}
-Stack_trace_of_nested_exce_ERROR_=IWAE0009E Stack trace of nested exception:
-Enumeration_UI_=Enumeration
-Double_UI_=Double
-Float_UI_=Float
-Long_UI_=Long
-Short_UI_=Short
-Boolean_UI_=Boolean
-Integer_UI_=Integer
-Character_UI_=Character
-Byte_UI_=Byte
-Failed_to_convert__0__to___ERROR_=IWAE0014E Failed to convert {0} to {1}.
-DANGLING_HREF_ERROR_=IWAE0001E Unable to resolve HREF {0}. Check the descriptor files and ensure the ids are valid.
-MofObject_UI_=MofObject_UI_
-PleaseMigrateYourCodeError_ERROR_0=PleaseMigrateYourCodeError_ERROR_0
-EMF2DOMAdapterImpl_ERROR_0=EMF2DOMAdapterImpl_ERROR_0
-
-ResourceDependencyRegister_ERROR_0=IWAE0002E The ResourceSet cannot be null.
diff --git a/plugins/org.eclipse.wst.common.modulecore.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.wst.common.modulecore.ui/META-INF/MANIFEST.MF
index a9e7dbf..9275fc3 100644
--- a/plugins/org.eclipse.wst.common.modulecore.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.wst.common.modulecore.ui/META-INF/MANIFEST.MF
@@ -3,13 +3,13 @@
 Bundle-Name: %Bundle-Name.0
 Bundle-Vendor: %provider
 Bundle-SymbolicName: org.eclipse.wst.common.modulecore.ui; singleton:=true
-Bundle-Version: 1.0.3.qualifier
+Bundle-Version: 1.0.102.qualifier
 Bundle-Localization: plugin
 Bundle-Activator: org.eclipse.wst.common.componentcore.ui.ModuleCoreUIPlugin
 Require-Bundle: org.eclipse.ui;bundle-version="[3.5.0,4.0.0)",
  org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
  org.eclipse.core.resources;bundle-version="[3.5.0,4.0.0)",
- org.eclipse.wst.common.modulecore;bundle-version="[1.1.300,2.0.0)",
+ org.eclipse.wst.common.modulecore;bundle-version="[1.2.101,2.0.0)",
  org.eclipse.wst.common.frameworks;bundle-version="[1.1.300,2.0.0)",
  org.eclipse.wst.common.project.facet.core;bundle-version="[1.4.0,2.0.0)",
  org.eclipse.jem.util;bundle-version="[2.0.200,3.0.0)",
diff --git a/plugins/org.eclipse.wst.common.modulecore.ui/schema/moduleDependencyPropertyPage.exsd b/plugins/org.eclipse.wst.common.modulecore.ui/schema/moduleDependencyPropertyPage.exsd
index 7562a68..df32f3e 100644
--- a/plugins/org.eclipse.wst.common.modulecore.ui/schema/moduleDependencyPropertyPage.exsd
+++ b/plugins/org.eclipse.wst.common.modulecore.ui/schema/moduleDependencyPropertyPage.exsd
@@ -13,6 +13,7 @@
    <element name="extension">
       <annotation>
          <appinfo>
+            <meta.element />
          </appinfo>
       </annotation>
       <complexType>
@@ -43,6 +44,13 @@
                </appinfo>
             </annotation>
          </attribute>
+         <attribute name="weight" type="string">
+            <annotation>
+               <documentation>
+                  Default weight is 100. Make higher is wanting to override
+               </documentation>
+            </annotation>
+         </attribute>
       </complexType>
    </element>
 
@@ -65,6 +73,13 @@
                </appinfo>
             </annotation>
          </attribute>
+         <attribute name="weight" type="string">
+            <annotation>
+               <documentation>
+                  Default weight is 100. Make higher is wanting to override
+               </documentation>
+            </annotation>
+         </attribute>
       </complexType>
    </element>
 
diff --git a/plugins/org.eclipse.wst.common.modulecore.ui/src/org/eclipse/wst/common/componentcore/ui/Messages.java b/plugins/org.eclipse.wst.common.modulecore.ui/src/org/eclipse/wst/common/componentcore/ui/Messages.java
index 3d3c3c1..7281d5c 100644
--- a/plugins/org.eclipse.wst.common.modulecore.ui/src/org/eclipse/wst/common/componentcore/ui/Messages.java
+++ b/plugins/org.eclipse.wst.common.modulecore.ui/src/org/eclipse/wst/common/componentcore/ui/Messages.java
@@ -43,7 +43,9 @@
 	public static String VariableReferenceDescription;
 	public static String WizardError;
 	public static String ProjectConversionError;
+	public static String ExistingFolderError;
 	public static String Revert;
+	public static String ErrorEntryNotFound;
 	
 	static {
 		// initialize resource bundle
diff --git a/plugins/org.eclipse.wst.common.modulecore.ui/src/org/eclipse/wst/common/componentcore/ui/internal/propertypage/ComponentDependencyContentProvider.java b/plugins/org.eclipse.wst.common.modulecore.ui/src/org/eclipse/wst/common/componentcore/ui/internal/propertypage/ComponentDependencyContentProvider.java
index 8a0997c..d262603 100644
--- a/plugins/org.eclipse.wst.common.modulecore.ui/src/org/eclipse/wst/common/componentcore/ui/internal/propertypage/ComponentDependencyContentProvider.java
+++ b/plugins/org.eclipse.wst.common.modulecore.ui/src/org/eclipse/wst/common/componentcore/ui/internal/propertypage/ComponentDependencyContentProvider.java
@@ -15,6 +15,7 @@
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.resources.IWorkspaceRoot;
 import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.Path;
 import org.eclipse.jface.viewers.DecoratingLabelProvider;
 import org.eclipse.jface.viewers.IStructuredContentProvider;
 import org.eclipse.jface.viewers.ITableLabelProvider;
@@ -95,15 +96,18 @@
 		if( element instanceof ComponentResourceProxy) {
 			if( columnIndex == AddModuleDependenciesPropertiesPage.SOURCE_COLUMN ) { 
 				return ((ComponentResourceProxy)element).source.toString();
-			} else if( columnIndex == AddModuleDependenciesPropertiesPage.DEPLOY_COLUMN ) { 
-				return ((ComponentResourceProxy)element).runtimePath.toString();
+			} else if( columnIndex == AddModuleDependenciesPropertiesPage.DEPLOY_COLUMN ) {
+				if(((ComponentResourceProxy)element).runtimePath.isRoot())
+					return ((ComponentResourceProxy)element).runtimePath.toString();
+				else
+					return ((ComponentResourceProxy)element).runtimePath.makeRelative().toString();
 			}
 		}
 		if( element instanceof IVirtualReference) {
 			if (columnIndex == AddModuleDependenciesPropertiesPage.SOURCE_COLUMN) {
 				return handleSourceText(((IVirtualReference)element).getReferencedComponent());
 			} else if (columnIndex == AddModuleDependenciesPropertiesPage.DEPLOY_COLUMN) {
-				return AddModuleDependenciesPropertiesPage.getSafeRuntimePath((IVirtualReference)element);
+				return new Path(AddModuleDependenciesPropertiesPage.getSafeRuntimePath((IVirtualReference)element)).makeRelative().toString();
 			} 
 		}
 		return null;
@@ -119,8 +123,8 @@
 		
 		// default impl
 		if( component.isBinary() ) {
-			IPath p = (IPath)component.getAdapter(IPath.class);
-			return p == null ? null : p.toString();
+			IPath p = (IPath)component.getAdapter(IPath.class);			
+			return p == null ? component.getName() : p.toString();
 		}
 		return component.getProject().getName();
 	}
diff --git a/plugins/org.eclipse.wst.common.modulecore.ui/src/org/eclipse/wst/common/componentcore/ui/internal/propertypage/DependencyPageExtensionManager.java b/plugins/org.eclipse.wst.common.modulecore.ui/src/org/eclipse/wst/common/componentcore/ui/internal/propertypage/DependencyPageExtensionManager.java
index c05df3d..01dd452 100644
--- a/plugins/org.eclipse.wst.common.modulecore.ui/src/org/eclipse/wst/common/componentcore/ui/internal/propertypage/DependencyPageExtensionManager.java
+++ b/plugins/org.eclipse.wst.common.modulecore.ui/src/org/eclipse/wst/common/componentcore/ui/internal/propertypage/DependencyPageExtensionManager.java
@@ -40,6 +40,7 @@
 import org.eclipse.wst.common.project.facet.core.IFacetedProject;
 
 public class DependencyPageExtensionManager {
+	private static final String DEFAULT_WEIGHT = "100"; //$NON-NLS-1$
 	private static DependencyPageExtensionManager manager = null;
 	public static DependencyPageExtensionManager getManager() {
 		if( manager == null )
@@ -48,22 +49,37 @@
 	}
 	
 	private HashMap<String, IDependencyPageProvider> providers = null;
+	private HashMap<String, String> providerWeight;
 	
 	public IDependencyPageProvider getProvider(IFacetedProject project) {
 		if( providers == null )
 			loadProviders();
-		Iterator<IDependencyPageProvider> i = providers.values().iterator();
-		IDependencyPageProvider temp;
-		while(i.hasNext()) {
-			temp = i.next();
-			if( temp.canHandle(project))
-				return temp;
+		IDependencyPageProvider foundProvider = null;
+		int highestWeight = 0;
+		for (Iterator iterator = providers.keySet().iterator(); iterator.hasNext();) {
+			String id = (String) iterator.next();
+			IDependencyPageProvider temp = providers.get(id);
+			if( temp.canHandle(project)) {
+				int weight = Integer.valueOf(providerWeight.get(id)).intValue();
+				if (foundProvider == null) {
+					foundProvider = temp;
+					highestWeight = weight;
+				}
+				else {
+					if (highestWeight < weight) {
+						foundProvider = temp;
+						highestWeight = weight;
+					}
+				}
+			}
 		}
-		return null;
+		return foundProvider;
 	}
 	
 	private void loadProviders() {
 		HashMap<String, IDependencyPageProvider> temp = new HashMap<String, IDependencyPageProvider>();
+		HashMap<String, String> tempProviderWeight = new HashMap<String, String>();
+		String weight;
 		IExtensionRegistry registry = Platform.getExtensionRegistry();
 		IConfigurationElement[] cf = registry.getConfigurationElementsFor(
 				ModuleCoreUIPlugin.PLUGIN_ID, "moduleDependencyPropertyPage"); //$NON-NLS-1$
@@ -71,12 +87,15 @@
 			try {
 				temp.put(cf[i].getAttribute("id"),  //$NON-NLS-1$
 					(IDependencyPageProvider)cf[i].createExecutableExtension("class"));  //$NON-NLS-1$
+				weight = cf[i].getAttribute("weight"); //$NON-NLS-1$
+				tempProviderWeight.put(cf[i].getAttribute("id"),(weight == null) ? DEFAULT_WEIGHT : weight); //$NON-NLS-1$
 			} catch( CoreException ce ) 
 			{
 				ModuleCoreUIPlugin.log( ce );
 			}
 		}
 		providers = temp;
+		providerWeight = tempProviderWeight;
 	}
 	
 	public WizardFragment[] loadAllReferenceWizardFragments() {
diff --git a/plugins/org.eclipse.wst.common.modulecore.ui/src/org/eclipse/wst/common/componentcore/ui/internal/propertypage/FolderMappingWizardFragment.java b/plugins/org.eclipse.wst.common.modulecore.ui/src/org/eclipse/wst/common/componentcore/ui/internal/propertypage/FolderMappingWizardFragment.java
index aedeb13..e9b1306 100644
--- a/plugins/org.eclipse.wst.common.modulecore.ui/src/org/eclipse/wst/common/componentcore/ui/internal/propertypage/FolderMappingWizardFragment.java
+++ b/plugins/org.eclipse.wst.common.modulecore.ui/src/org/eclipse/wst/common/componentcore/ui/internal/propertypage/FolderMappingWizardFragment.java
@@ -12,6 +12,9 @@
 
 package org.eclipse.wst.common.componentcore.ui.internal.propertypage;
 
+
+import java.util.ArrayList;
+
 import org.eclipse.core.resources.IContainer;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.resources.IResource;
@@ -19,6 +22,7 @@
 import org.eclipse.core.runtime.IPath;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.Path;
+import org.eclipse.jface.dialogs.IMessageProvider;
 import org.eclipse.jface.viewers.ISelectionChangedListener;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.ITreeContentProvider;
@@ -27,6 +31,7 @@
 import org.eclipse.jface.viewers.TreeViewer;
 import org.eclipse.jface.viewers.Viewer;
 import org.eclipse.jface.viewers.ViewerFilter;
+import org.eclipse.osgi.util.NLS;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.layout.GridData;
@@ -88,15 +93,38 @@
 				Object first = sel.getFirstElement();
 				if( first instanceof IContainer) {
 					selected = (IContainer)first;
-					if(!isComplete) {
-						isComplete = true;
-						handle.update();
-					}
+					String errorMessage=validateFolder();
+					if (errorMessage !=  null)
+						handle.setMessage(errorMessage,IMessageProvider.ERROR);
+					else
+						handle.setMessage(Messages.AddFolderMappings, IMessageProvider.NONE);
+					handle.update();
 				}
 			}
 		};
 	}
 	
+	protected String validateFolder() {
+		IContainer c = getSelected();
+		IPath p = c.getProjectRelativePath().makeAbsolute();					
+		ArrayList<Object> currentRefs = (ArrayList<Object>)getTaskModel().getObject(IReferenceWizardConstants.ALL_DIRECTIVES);
+		if (!currentRefs.isEmpty())
+			for (int j = 0; j < currentRefs.size(); j++) 
+			{
+				Object ref = currentRefs.get(j);
+				if (ref instanceof ComponentResourceProxy)
+				{					
+					ComponentResourceProxy folder = (ComponentResourceProxy) ref;
+					if (p.equals(folder.source)){						
+						isComplete=false;				
+						return NLS.bind(Messages.ExistingFolderError, folder.source); 						
+					}
+				}							
+			}	
+		isComplete = true;
+		return null;
+	}
+	
 	public IContainer getSelected() {
 		return selected;
 	}
diff --git a/plugins/org.eclipse.wst.common.modulecore.ui/src/org/eclipse/wst/common/componentcore/ui/internal/propertypage/verifier/DefaultDeploymentAssemblyVerifier.java b/plugins/org.eclipse.wst.common.modulecore.ui/src/org/eclipse/wst/common/componentcore/ui/internal/propertypage/verifier/DefaultDeploymentAssemblyVerifier.java
new file mode 100644
index 0000000..1a158ee
--- /dev/null
+++ b/plugins/org.eclipse.wst.common.modulecore.ui/src/org/eclipse/wst/common/componentcore/ui/internal/propertypage/verifier/DefaultDeploymentAssemblyVerifier.java
@@ -0,0 +1,111 @@
+/*******************************************************************************
+ * Copyright (c) 2011 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+
+
+package org.eclipse.wst.common.componentcore.ui.internal.propertypage.verifier;
+
+import java.util.ArrayList;
+
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.MultiStatus;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.wst.common.componentcore.ui.Messages;
+import org.eclipse.osgi.util.NLS;
+import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
+import org.eclipse.wst.common.componentcore.resources.IVirtualReference;
+import org.eclipse.wst.common.componentcore.ui.ModuleCoreUIPlugin;
+import org.eclipse.wst.common.componentcore.ui.internal.propertypage.ResourceMappingFilterExtensionRegistry;
+import org.eclipse.wst.common.componentcore.ui.propertypage.AddModuleDependenciesPropertiesPage.ComponentResourceProxy;
+
+/**
+ * This class does basic validation of the deployment assembly. It validates that 
+ * references to other components like projects and archives exists. It also validates that
+ * folder mappings exists in the project.  
+ * 
+ */
+
+public class DefaultDeploymentAssemblyVerifier extends AbstractDeploymentAssemblyVerifier {
+
+	@Override
+	public IStatus verify(DeploymentAssemblyVerifierData data) {
+		IStatus status = validateResourceMappings(data, null);
+		return validateMissingReferences(data, status);
+	}
+	
+	
+	protected IStatus validateResourceMappings(DeploymentAssemblyVerifierData data, IStatus existingStatus){
+		IStatus status = existingStatus!=null?existingStatus:Status.OK_STATUS;
+		ArrayList<ComponentResourceProxy> mappings = data.getResourceMappings();
+		if (mappings == null)
+			return status;		
+		int severity = Status.ERROR;
+		String msg = null;
+		IProject project = data.getComponent().getProject();
+		for (ComponentResourceProxy mapping:mappings){
+			if (ResourceMappingFilterExtensionRegistry.shouldFilter(mapping.source))
+				continue;  // Do not validate filtered entries
+			if (!project.exists(mapping.source)){
+				msg = NLS.bind(Messages.ErrorEntryNotFound, mapping.source); 
+				status = appendStatusMessage(status, msg, severity);
+			}
+		}
+		return status;
+		
+	}
+	
+	protected IStatus validateMissingReferences(DeploymentAssemblyVerifierData data, IStatus existingStatus) {
+		IStatus status = existingStatus!=null?existingStatus:Status.OK_STATUS;
+		ArrayList<IVirtualReference> references = data.getCurrentReferences();
+		if (references == null){
+			return status;
+		}
+		int severity = Status.ERROR;
+		String msg = null;
+		for (IVirtualReference reference:references){
+			if (!reference.getReferencedComponent().exists()){
+				String name;
+				if( reference.getReferencedComponent().isBinary() ) {
+					IVirtualComponent vc = reference.getReferencedComponent();
+					IPath p = (IPath)vc.getAdapter(IPath.class);
+					name= p == null ? vc.getName() : p.toString();
+				}
+				else {
+					name = reference.getReferencedComponent().getProject().getName();
+				}
+				msg = NLS.bind(Messages.ErrorEntryNotFound, name); 
+				status = appendStatusMessage(status, msg, severity);
+			}
+		}
+		return status;		
+	}
+	
+	private IStatus appendStatusMessage(IStatus existingStatus, String message, int severity) {
+        MultiStatus multiStatus;
+        IStatus newStatus = new Status(severity, ModuleCoreUIPlugin.PLUGIN_ID, message);
+		int newSeverity = severity;
+		if(existingStatus.getSeverity() > severity)
+			newSeverity = existingStatus.getSeverity();
+        if(existingStatus instanceof MultiStatus){
+            multiStatus = (MultiStatus)existingStatus;
+            multiStatus.merge(newStatus);
+        } else {
+        	if(!existingStatus.isMultiStatus() && existingStatus.isOK()) {
+        		return newStatus;
+        	}
+            IStatus [] children = new IStatus [] {existingStatus, newStatus};
+            multiStatus = new MultiStatus(ModuleCoreUIPlugin.PLUGIN_ID, newSeverity, children, null, null);
+        }
+        return multiStatus;
+    }
+
+}
diff --git a/plugins/org.eclipse.wst.common.modulecore.ui/src/org/eclipse/wst/common/componentcore/ui/internal/propertypage/verifier/DeploymentAssemblyVerifierHelper.java b/plugins/org.eclipse.wst.common.modulecore.ui/src/org/eclipse/wst/common/componentcore/ui/internal/propertypage/verifier/DeploymentAssemblyVerifierHelper.java
index f96926e..aa1b6cd 100644
--- a/plugins/org.eclipse.wst.common.modulecore.ui/src/org/eclipse/wst/common/componentcore/ui/internal/propertypage/verifier/DeploymentAssemblyVerifierHelper.java
+++ b/plugins/org.eclipse.wst.common.modulecore.ui/src/org/eclipse/wst/common/componentcore/ui/internal/propertypage/verifier/DeploymentAssemblyVerifierHelper.java
@@ -60,7 +60,11 @@
 				verifier = (IDeploymentAssemblyVerifier) ((IConfigurationElement) verifiers.get(i)).createExecutableExtension(VerifierRegistryReader.VERIFIER_CLASS);
 				DeploymentAssemblyVerifierData data = new DeploymentAssemblyVerifierData(component, runtime,currentReferences,resourceMappings,resourceMappingsChanged);
 				IStatus verifyStatus = verifier.verify(data);
-				masterStatus.add(verifyStatus);
+				if(verifyStatus != null && verifyStatus.isMultiStatus()) {
+					masterStatus.addAll(verifyStatus);
+				} else {
+					masterStatus.add(verifyStatus);
+				}
 			} catch (Exception e) {
 				ModuleCoreUIPlugin.log(e);
 				continue;
diff --git a/plugins/org.eclipse.wst.common.modulecore.ui/src/org/eclipse/wst/common/componentcore/ui/internal/propertypage/verifier/VerifierRegistry.java b/plugins/org.eclipse.wst.common.modulecore.ui/src/org/eclipse/wst/common/componentcore/ui/internal/propertypage/verifier/VerifierRegistry.java
index 0af3524..ba74ba0 100644
--- a/plugins/org.eclipse.wst.common.modulecore.ui/src/org/eclipse/wst/common/componentcore/ui/internal/propertypage/verifier/VerifierRegistry.java
+++ b/plugins/org.eclipse.wst.common.modulecore.ui/src/org/eclipse/wst/common/componentcore/ui/internal/propertypage/verifier/VerifierRegistry.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010 IBM Corporation and others.
+ * Copyright (c) 2010, 2011 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
@@ -102,16 +102,25 @@
 	 * @return List of IConfigurationElements representing instances of IDeploymentAssemblyVerifier
 	 */
 	public List getVerifierExtensions(String facetTypeID, IRuntime runtime) {
-		
+		// Identifier used by verifiers that will run for any runtime
+		String allRuntimes = "org.eclipse.wst.common.modulecore.ui.deploymentAssemblyVerifier.anyruntime"; //$NON-NLS-1$
 		String runtimeID = null;
 		if (runtime == null)
 			runtimeID = "None"; //$NON-NLS-1$
 		else
 			runtimeID = runtime.getRuntimeType().getId();
-		List verifiers = getVerifiers(facetTypeID, runtimeID);
+		// Get the verifiers specific for the target runtime
+		List verifiers = getVerifiers(facetTypeID, runtimeID);		
 		if (verifiers == null)
-			return Collections.EMPTY_LIST;
-		return verifiers;
+			verifiers = Collections.EMPTY_LIST;
+		// Get the verifiers for any runtime
+		List genericVerifiers = getVerifiers(facetTypeID, allRuntimes);
+		if (genericVerifiers == null)
+			genericVerifiers = Collections.EMPTY_LIST;
+		// Merge both verifiers into one list and return
+		List result = new ArrayList(verifiers);
+		result.addAll(genericVerifiers);
+		return result;
 	}
 
 
diff --git a/plugins/org.eclipse.wst.common.modulecore.ui/src/org/eclipse/wst/common/componentcore/ui/messages.properties b/plugins/org.eclipse.wst.common.modulecore.ui/src/org/eclipse/wst/common/componentcore/ui/messages.properties
index 4f1791e..5083668 100644
--- a/plugins/org.eclipse.wst.common.modulecore.ui/src/org/eclipse/wst/common/componentcore/ui/messages.properties
+++ b/plugins/org.eclipse.wst.common.modulecore.ui/src/org/eclipse/wst/common/componentcore/ui/messages.properties
@@ -8,7 +8,7 @@
 AddFolder=Folder
 AddFolderElipses=Add Folder...
 AddFolderMappings=Select a project folder to include in the deployment assembly.
-AddEllipsis=&Add...
+AddEllipsis=A&dd...
 EditEllipsis=&Edit...
 RemoveSelected=&Remove
 ExternalJarTitle=Add an External Jar Reference
@@ -25,4 +25,6 @@
 VariableReferenceDescription="Here you can reference a variable which maps to a single jar.\nThis is not a suggested use-case, but is here for backwards compatability.
 WizardError=Wizard Error
 ProjectConversionError=Error converting project {0} into a flexible project
-Revert=Re&vert
\ No newline at end of file
+ExistingFolderError= Folder "{0}" already exists.
+Revert=Re&vert
+ErrorEntryNotFound=Cannot find entry: "{0}".
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.modulecore.ui/src/org/eclipse/wst/common/componentcore/ui/propertypage/AbstractIModuleDependenciesControl.java b/plugins/org.eclipse.wst.common.modulecore.ui/src/org/eclipse/wst/common/componentcore/ui/propertypage/AbstractIModuleDependenciesControl.java
new file mode 100644
index 0000000..05845d4
--- /dev/null
+++ b/plugins/org.eclipse.wst.common.modulecore.ui/src/org/eclipse/wst/common/componentcore/ui/propertypage/AbstractIModuleDependenciesControl.java
@@ -0,0 +1,27 @@
+/*******************************************************************************
+ * Copyright (c) 2010 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * IBM Corporation - initial implementation
+ *******************************************************************************/
+package org.eclipse.wst.common.componentcore.ui.propertypage;
+
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Status;
+
+public abstract class AbstractIModuleDependenciesControl implements IModuleDependenciesControl {
+
+	/**
+	 * Returns any error/warning messages that are associated with the current content of the page  
+	 * @param parent Parent Composite.
+	 * @return IStatus with all the error/warning messages associated with the page
+	 */
+	public IStatus validate() {
+		return Status.OK_STATUS;
+	}
+
+}
diff --git a/plugins/org.eclipse.wst.common.modulecore.ui/src/org/eclipse/wst/common/componentcore/ui/propertypage/AddModuleDependenciesPropertiesPage.java b/plugins/org.eclipse.wst.common.modulecore.ui/src/org/eclipse/wst/common/componentcore/ui/propertypage/AddModuleDependenciesPropertiesPage.java
index ed1e9e5..1300350 100644
--- a/plugins/org.eclipse.wst.common.modulecore.ui/src/org/eclipse/wst/common/componentcore/ui/propertypage/AddModuleDependenciesPropertiesPage.java
+++ b/plugins/org.eclipse.wst.common.modulecore.ui/src/org/eclipse/wst/common/componentcore/ui/propertypage/AddModuleDependenciesPropertiesPage.java
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright (c) 2010 Red Hat
+ * Copyright (c) 2010, 2011 Red Hat 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
@@ -8,11 +8,14 @@
  * Contributors:
  *    Rob Stryker - initial implementation and ongoing maintenance
  *    Konstantin Komissarchik - misc. UI cleanup
+ *    Roberto Sanchez (IBM) - Handle tags in mappings
  *    
  * API in these packages is provisional in this release
  ******************************************************************************/
 package org.eclipse.wst.common.componentcore.ui.propertypage;
 
+import java.io.File;
+import java.text.Collator;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashMap;
@@ -35,20 +38,32 @@
 import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.layout.GridDataFactory;
 import org.eclipse.jface.viewers.CellEditor;
+import org.eclipse.jface.viewers.ColumnViewerEditor;
+import org.eclipse.jface.viewers.ColumnViewerEditorActivationEvent;
+import org.eclipse.jface.viewers.ColumnViewerEditorActivationStrategy;
 import org.eclipse.jface.viewers.ColumnWeightData;
+import org.eclipse.jface.viewers.FocusCellOwnerDrawHighlighter;
+import org.eclipse.jface.viewers.IBaseLabelProvider;
 import org.eclipse.jface.viewers.ICellModifier;
 import org.eclipse.jface.viewers.ILabelProviderListener;
 import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.jface.viewers.ISelectionChangedListener;
 import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.ITableLabelProvider;
 import org.eclipse.jface.viewers.LabelProviderChangedEvent;
 import org.eclipse.jface.viewers.SelectionChangedEvent;
 import org.eclipse.jface.viewers.TableLayout;
 import org.eclipse.jface.viewers.TextCellEditor;
 import org.eclipse.jface.viewers.TreeViewer;
+import org.eclipse.jface.viewers.TreeViewerEditor;
+import org.eclipse.jface.viewers.TreeViewerFocusCellManager;
+import org.eclipse.jface.viewers.Viewer;
+import org.eclipse.jface.viewers.ViewerComparator;
 import org.eclipse.jface.window.Window;
 import org.eclipse.jface.wizard.WizardDialog;
 import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.events.SelectionListener;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.Button;
@@ -74,7 +89,10 @@
 import org.eclipse.wst.common.componentcore.internal.impl.TaskModel;
 import org.eclipse.wst.common.componentcore.internal.operation.AddReferenceDataModelProvider;
 import org.eclipse.wst.common.componentcore.internal.operation.RemoveReferenceDataModelProvider;
+import org.eclipse.wst.common.componentcore.internal.resources.VirtualArchiveComponent;
 import org.eclipse.wst.common.componentcore.internal.resources.VirtualReference;
+import org.eclipse.wst.common.componentcore.internal.util.VirtualReferenceUtilities;
+import org.eclipse.wst.common.componentcore.resources.ITaggedVirtualResource;
 import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
 import org.eclipse.wst.common.componentcore.resources.IVirtualFolder;
 import org.eclipse.wst.common.componentcore.resources.IVirtualReference;
@@ -98,8 +116,8 @@
 import org.eclipse.wst.server.core.IRuntime;
 import org.eclipse.wst.server.core.internal.facets.FacetUtil;
  
-public class AddModuleDependenciesPropertiesPage implements Listener,
-		IModuleDependenciesControl, ILabelProviderListener {
+public class AddModuleDependenciesPropertiesPage extends AbstractIModuleDependenciesControl implements Listener,
+		ILabelProviderListener {
 
 	
 	public static final int SOURCE_COLUMN = 0;
@@ -154,11 +172,22 @@
 
 	public static void setRuntimePathSafe(IVirtualReference ref, String newPath) {
 		if( ref.getDependencyType() == IVirtualReference.DEPENDENCY_TYPE_CONSUMES)
-			ref.setRuntimePath(new Path(newPath == null ? "/" : newPath));
+			ref.setRuntimePath(new Path(newPath == null ? "/" : newPath.trim()).makeRelative().makeAbsolute());
 		else {
-			IPath path2 = new Path(newPath == null ? "/" : newPath);
+			IPath path2 = new Path(newPath == null ? "/" : newPath.trim()).makeRelative().makeAbsolute();
 			ref.setRuntimePath(path2.segmentCount() > 1 ? path2.removeLastSegments(1) : new Path("/"));
-			ref.setArchiveName(path2.segmentCount() > 0 ? path2.lastSegment() : "");
+			if(path2.segmentCount() > 0) {
+				ref.setArchiveName(path2.lastSegment());
+			} else if(ref.getReferencedComponent() instanceof VirtualArchiveComponent && ((VirtualArchiveComponent)ref.getReferencedComponent()).getArchiveType().equals(VirtualArchiveComponent.VARARCHIVETYPE) ) {
+				File diskFile = (java.io.File)ref.getReferencedComponent().getAdapter(java.io.File.class);
+				IPath filePath = null;
+				if (diskFile.exists()) {
+					filePath = new Path(diskFile.getAbsolutePath());
+					ref.setArchiveName(filePath.lastSegment());
+				}
+			} else {
+				ref.setArchiveName(VirtualReferenceUtilities.INSTANCE.getDefaultArchiveName(ref));
+			}
 		}
 	}
 	
@@ -469,9 +498,12 @@
 
 		public Object getValue(Object element, String property) {
 			if( element instanceof IVirtualReference ) {
-				return getSafeRuntimePath((IVirtualReference)element);
+				return new Path(getSafeRuntimePath((IVirtualReference)element)).makeRelative().toString();
 			} else if( element instanceof ComponentResourceProxy) {
-				return ((ComponentResourceProxy)element).runtimePath.toString();
+				if(((ComponentResourceProxy)element).runtimePath.isRoot())
+					return ((ComponentResourceProxy)element).runtimePath.toString();
+				else
+					return ((ComponentResourceProxy)element).runtimePath.makeRelative().toString();
 			}
 			return new Path("/"); //$NON-NLS-1$
 		}
@@ -489,14 +521,23 @@
 				}
 				if( item.getData() instanceof IVirtualReference) {
 					setRuntimePathSafe((IVirtualReference)item.getData(), (String) value);
-					if(tableIndex >= 0)
-						components[tableIndex].setText(AddModuleDependenciesPropertiesPage.DEPLOY_COLUMN, (String)value);
+					if(tableIndex >= 0) {
+						IPath deployPath = ((IVirtualReference)item.getData()).getRuntimePath();
+						if( ((IVirtualReference)item.getData()).getDependencyType() == IVirtualReference.DEPENDENCY_TYPE_USES ) 
+							deployPath = deployPath.append(((IVirtualReference)item.getData()).getArchiveName());
+						components[tableIndex].setText(AddModuleDependenciesPropertiesPage.DEPLOY_COLUMN, deployPath.makeRelative().toString());
+					}
 				} else if( item.getData() instanceof ComponentResourceProxy) {
 					ComponentResourceProxy c = ((ComponentResourceProxy)item.getData());
-					c.runtimePath = new Path((String)value);
+					c.runtimePath = new Path((String)value).makeAbsolute();
+					String runtimePath;
+					if(c.runtimePath.isRoot())
+						runtimePath = c.runtimePath.toString();
+					else
+						runtimePath = c.runtimePath.makeRelative().toString();
 					resourceMappingsChanged = true;
 					if(tableIndex >= 0)
-						components[tableIndex].setText(AddModuleDependenciesPropertiesPage.DEPLOY_COLUMN, (String)value);
+						components[tableIndex].setText(AddModuleDependenciesPropertiesPage.DEPLOY_COLUMN, runtimePath);
 				}
 				verify();
 			}
@@ -652,11 +693,97 @@
 		}
 	}
 	
+	/**
+	 * Provides two possible sorts for each column based on the text labels.
+	 * Clicking on the column will toggle forwards/backwards sorting
+	 * @author jsholl
+	 */
+	private static class TreeViewerTableColumnSortToggler {
+		private int sortDirection = 0;
+		private int sortColumn = 0;
+		private TreeViewer treeViewer;
+		
+		private TreeViewerTableColumnSortToggler(TreeViewer treeViewer){
+			this.treeViewer = treeViewer;
+		}
+		
+		private void toggleSort(int column){
+			if(sortColumn == column){
+				//cycle through sort options
+				switch(sortDirection){
+				case SWT.NONE:
+					sortDirection = SWT.UP;
+					break;
+				case SWT.UP:
+					sortDirection = SWT.DOWN;
+					break;
+				case SWT.DOWN:
+					sortDirection = SWT.UP;
+					break;
+				}
+			} else {
+				//clicked on a different column reset cycle
+				sortColumn = column;
+				sortDirection = SWT.UP;
+			}
+			
+			ViewerComparator comparator = getViewerComparator(column, sortDirection);
+			treeViewer.setComparator(comparator);
+			
+			Tree tree = treeViewer.getTree();
+			TreeColumn sortColumn = treeViewer.getTree().getColumn(column);
+			tree.setSortColumn(sortColumn);
+			tree.setSortDirection(sortDirection);
+		}
+		
+		private ViewerComparator getViewerComparator(final int columnIndex, final int sortDirection) {
+			if(sortDirection == SWT.NONE){
+				return null;
+			}
+			return new ViewerComparator() {
+				Collator collator = Collator.getInstance();
+				public int compare(Viewer viewerLocal, Object e1, Object e2) {
+					IBaseLabelProvider baseLabelProvider = treeViewer.getLabelProvider();
+					if(baseLabelProvider instanceof ITableLabelProvider){
+						ITableLabelProvider tableLabelProvider = (ITableLabelProvider)baseLabelProvider;
+						String text1 = tableLabelProvider.getColumnText(e1, columnIndex);
+						if(text1 != null){
+							String text2 = tableLabelProvider.getColumnText(e2, columnIndex);
+							int comp = collator.compare(text1, text2);
+							if(sortDirection == SWT.DOWN){
+								comp = -comp;
+							}
+							return comp;
+						}
+					}
+					return 0;
+				}
+			};
+		}
+	};
+	
 	public TreeViewer createAvailableComponentsViewer(Composite parent) {
 		int flags = SWT.BORDER | SWT.FULL_SELECTION | SWT.MULTI;
 
 		Tree tree = new Tree(parent, flags);
 		TreeViewer tempViewer = new TreeViewer(tree);
+		final TreeViewerTableColumnSortToggler sortController = new TreeViewerTableColumnSortToggler(tempViewer);
+		
+		TreeViewerFocusCellManager focusCellManager = new TreeViewerFocusCellManager(tempViewer,new FocusCellOwnerDrawHighlighter(tempViewer));
+		ColumnViewerEditorActivationStrategy actSupport = new ColumnViewerEditorActivationStrategy(tempViewer) {
+			private final int SPACE = 32;
+			protected boolean isEditorActivationEvent(
+					ColumnViewerEditorActivationEvent event) {
+				return event.eventType == ColumnViewerEditorActivationEvent.TRAVERSAL
+						|| event.eventType == ColumnViewerEditorActivationEvent.MOUSE_DOUBLE_CLICK_SELECTION
+						|| (event.eventType == ColumnViewerEditorActivationEvent.KEY_PRESSED && event.keyCode == SPACE)
+						|| event.eventType == ColumnViewerEditorActivationEvent.PROGRAMMATIC;
+			}
+		};
+		
+		TreeViewerEditor.create(tempViewer, focusCellManager, actSupport, ColumnViewerEditor.TABBING_HORIZONTAL
+				| ColumnViewerEditor.TABBING_MOVE_TO_ROW_NEIGHBOR
+				| ColumnViewerEditor.TABBING_VERTICAL | ColumnViewerEditor.KEYBOARD_ACTIVATION);
 
 		// set up table layout
 		TableLayout tableLayout = new org.eclipse.jface.viewers.TableLayout();
@@ -670,12 +797,29 @@
 		TreeColumn projectColumn = new TreeColumn(tree, SWT.NONE, SOURCE_COLUMN);
 		projectColumn.setText(Messages.SourceColumn);
 		projectColumn.setResizable(true);
+		projectColumn.addSelectionListener(new SelectionListener() {
+			public void widgetSelected(SelectionEvent e) {
+				sortController.toggleSort(0);
+			}
+			public void widgetDefaultSelected(SelectionEvent e) {
+				//do nothing
+			}
+		});
 
 		TreeColumn bndColumn = new TreeColumn(tree, SWT.NONE, DEPLOY_COLUMN);
 		bndColumn.setText(Messages.DeployPathColumn);
 		bndColumn.setResizable(true);
-
+		bndColumn.addSelectionListener(new SelectionListener() {
+			public void widgetSelected(SelectionEvent e) {
+				sortController.toggleSort(1);
+			}
+			public void widgetDefaultSelected(SelectionEvent e) {
+				//do nothing
+			}
+		});
+		
 		tableLayout.layout(tree, true);
+		sortController.toggleSort(0);
 		return tempViewer;
 
 	}
@@ -698,12 +842,15 @@
 	}
 
 	protected void verify() {
+		propPage.refreshProblemsView();
+	}
+	
+	public IStatus validate() {
 		ArrayList<ComponentResourceProxy> allMappings = new ArrayList<ComponentResourceProxy>();
 		allMappings.addAll(resourceMappings);
 		allMappings.addAll(hiddenMappings);
 		
-		IStatus status = DeploymentAssemblyVerifierHelper.verify(rootComponent, runtime, currentReferences, allMappings,resourceMappingsChanged);
-		setErrorMessage(status);
+		return DeploymentAssemblyVerifierHelper.verify(rootComponent, runtime, currentReferences, allMappings,resourceMappingsChanged);
 	}
 	
 	protected void setErrorMessage(IStatus status) {
@@ -757,7 +904,7 @@
 
 	protected void initialize() {
 		Map<String, Object> options = new HashMap<String, Object>();
-		options.put(IVirtualComponent.REQUESTED_REFERENCE_TYPE, IVirtualComponent.DISPLAYABLE_REFERENCES);
+		options.put(IVirtualComponent.REQUESTED_REFERENCE_TYPE, IVirtualComponent.DISPLAYABLE_REFERENCES_ALL);
 		IVirtualReference[] refs = rootComponent.getReferences(options);
 		IVirtualComponent comp;
 		originalReferences.addAll(Arrays.asList(refs));
@@ -766,13 +913,13 @@
 		ComponentResource[] allMappings = findAllExposedMappings();
 		for( int i = 0; i < allMappings.length; i++ ) {
 			resourceMappings.add(new ComponentResourceProxy(
-					allMappings[i].getSourcePath(), allMappings[i].getRuntimePath()
+					allMappings[i].getSourcePath(), allMappings[i].getRuntimePath(), allMappings[i].getTag()
 			));
 		}
 		ComponentResource[] onlyHiddenMappings = findOnlyHiddenMappings();
 		for( int i = 0; i < onlyHiddenMappings.length; i++ ) {
 			hiddenMappings.add(new ComponentResourceProxy(
-					onlyHiddenMappings[i].getSourcePath(), onlyHiddenMappings[i].getRuntimePath()
+					onlyHiddenMappings[i].getSourcePath(), onlyHiddenMappings[i].getRuntimePath(), onlyHiddenMappings[i].getTag()
 			));
 		}
 		if(editReferenceButton != null)
@@ -875,9 +1022,14 @@
 	
 	public static class ComponentResourceProxy {
 		public IPath source, runtimePath;
+		public String tag;
 		public ComponentResourceProxy(IPath source, IPath runtimePath) {
+			this(source, runtimePath, null);
+		}
+		public ComponentResourceProxy(IPath source, IPath runtimePath, String tag) {
 			this.source = source;
 			this.runtimePath = runtimePath;
+			this.tag = tag;
 		}
 	}
 	
@@ -897,7 +1049,7 @@
 		ComponentResource[] allMappings = findAllExposedMappings();
 		for( int i = 0; i < allMappings.length; i++ ) {
 			resourceMappings.add(new ComponentResourceProxy(
-					allMappings[i].getSourcePath(), allMappings[i].getRuntimePath()
+					allMappings[i].getSourcePath(), allMappings[i].getRuntimePath(), allMappings[i].getTag()
 			));
 		}
 		refresh();
@@ -965,9 +1117,14 @@
 	protected boolean addNewResourceMappings() {
 		ComponentResourceProxy[] proxies = resourceMappings.toArray(new ComponentResourceProxy[resourceMappings.size()]);
 		IVirtualFolder rootFolder = rootComponent.getRootFolder();
+		IVirtualFolder subFolder = null;
 		for( int i = 0; i < proxies.length; i++ ) {
-			try {
-				rootFolder.getFolder(proxies[i].runtimePath).createLink(proxies[i].source, 0, null);
+			try {			
+				subFolder= rootFolder.getFolder(proxies[i].runtimePath);
+				subFolder.createLink(proxies[i].source, 0, null);
+				if (subFolder instanceof ITaggedVirtualResource){
+					((ITaggedVirtualResource) subFolder).tagResource(proxies[i].source, proxies[i].tag, null);
+				}
 			} catch( CoreException ce ) {
 				ModuleCoreUIPlugin.logError(ce);
 			}
diff --git a/plugins/org.eclipse.wst.common.modulecore.ui/src/org/eclipse/wst/common/componentcore/ui/propertypage/ModuleAssemblyRootPage.java b/plugins/org.eclipse.wst.common.modulecore.ui/src/org/eclipse/wst/common/componentcore/ui/propertypage/ModuleAssemblyRootPage.java
index c7214e8..a9360c5 100644
--- a/plugins/org.eclipse.wst.common.modulecore.ui/src/org/eclipse/wst/common/componentcore/ui/propertypage/ModuleAssemblyRootPage.java
+++ b/plugins/org.eclipse.wst.common.modulecore.ui/src/org/eclipse/wst/common/componentcore/ui/propertypage/ModuleAssemblyRootPage.java
@@ -13,15 +13,32 @@
  ******************************************************************************/
 package org.eclipse.wst.common.componentcore.ui.propertypage;
 
+import java.util.ArrayList;
+import java.util.List;
+
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.resources.IResource;
 import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.MultiStatus;
+import org.eclipse.core.runtime.Status;
 import org.eclipse.swt.SWT;
+import org.eclipse.swt.custom.SashForm;
+import org.eclipse.swt.custom.ScrolledComposite;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.graphics.Point;
+import org.eclipse.swt.graphics.Rectangle;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.swt.widgets.Event;
 import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Listener;
+import org.eclipse.swt.widgets.Text;
+import org.eclipse.ui.ISharedImages;
+import org.eclipse.ui.PlatformUI;
 import org.eclipse.ui.dialogs.PropertyPage;
 import org.eclipse.wst.common.componentcore.ComponentCore;
 import org.eclipse.wst.common.componentcore.ui.Messages;
@@ -36,6 +53,10 @@
 	
 	private IProject project;
 	private IModuleDependenciesControl[] controls = new IModuleDependenciesControl[0];
+	private SashForm sform1;
+	private Composite topComposite;
+	private ScrolledComposite problemsViewComposite;
+	private Composite subProblemsViewComposite;
 	
 	public ModuleAssemblyRootPage() {
 		super();
@@ -150,7 +171,8 @@
 	private static void fillDescription(Composite c, String s) {
 		GridData data = new GridData(GridData.FILL_HORIZONTAL);
 		data.widthHint = 250;
-		final Label label = new Label( c, SWT.NONE );
+		final Text label = new Text( c, SWT.WRAP | SWT.READ_ONLY);
+		label.setBackground(c.getBackground());
 		label.setLayoutData(data);
 		label.setText(s);
 	}
@@ -172,24 +194,219 @@
 					controls = controls == null ? new IModuleDependenciesControl[]{} : controls;
 					if (provider.getPageTitle(project) != null)
 						setTitle(provider.getPageTitle(project));
-					return provider.createRootControl(facetedProject, controls, parent);
+					
+					this.sform1 = new SashForm( parent, SWT.VERTICAL | SWT.SMOOTH );
+					GridData gd1 = new GridData(SWT.LEFT, SWT.FILL, false, false);
+			        this.sform1.setLayoutData(gd1);
+			        
+					topComposite = provider.createRootControl(facetedProject, controls, sform1);
+				} else {				
+					if( ComponentCore.createComponent(project) == null )
+						return getVirtCompErrorComposite(parent);
+					
+					AddModuleDependenciesPropertiesPage page = new AddModuleDependenciesPropertiesPage(project, this);
+					controls = new IModuleDependenciesControl[1];
+					controls[0] = page;
+					this.sform1 = new SashForm( parent, SWT.VERTICAL | SWT.SMOOTH );
+					GridData gd1 = new GridData(SWT.LEFT, SWT.FILL, false, false);
+			        this.sform1.setLayoutData(gd1);
+			        
+					topComposite = page.createContents(sform1);
 				}
 				
-				if( ComponentCore.createComponent(project) == null )
-					return getVirtCompErrorComposite(parent);
-				
-				AddModuleDependenciesPropertiesPage page = new AddModuleDependenciesPropertiesPage(project, this);
-				controls = new IModuleDependenciesControl[1];
-				controls[0] = page;
-				return page.createContents(parent);
+				problemsViewComposite = new ScrolledComposite(sform1, SWT.BORDER | SWT.V_SCROLL | SWT.H_SCROLL);
+				GridData gd = new GridData();
+	    		gd.heightHint = 100;
+	        	gd.horizontalAlignment = SWT.FILL;
+	    		gd.verticalAlignment = SWT.BOTTOM;
+	    		problemsViewComposite.setLayoutData(gd);
+	    		problemsViewComposite.setBackground( Display.getDefault().getSystemColor(SWT.COLOR_WHITE) );
+				fillProblemsViewComposite();
+		        this.sform1.setWeights( new int[] { 80, 20 } );
+		        problemsViewComposite.addListener(SWT.Resize, new Listener() {
+					public void handleEvent(Event e) {
+						handleProblemsViewResize();
+					}
+				});
+		        return sform1;
 			} catch( CoreException ce )	{
 			}
 		}
 		return getFacetErrorComposite(parent);
 	}
 	
+	private void handleProblemsViewResize() {
+		if(subProblemsViewComposite != null && !subProblemsViewComposite.isDisposed() && topComposite != null) {
+           	int width = topComposite.getClientArea().width;
+           	if(width < 400) {
+           		width = 400;
+           	}
+			int i = 1;
+			for( Control child : subProblemsViewComposite.getChildren() )
+			{
+				if(i%2 == 0) {
+					GridData gd = (GridData) child.getLayoutData();
+					gd.widthHint = width - 50;
+				}
+				i++;
+			}
+			subProblemsViewComposite.setSize(subProblemsViewComposite.computeSize(SWT.DEFAULT, SWT.DEFAULT));
+        	subProblemsViewComposite.update();
+		}
+	}
+	
+	protected void fillProblemsViewComposite() {
+		if(problemsViewComposite != null) {
+			IStatus [] problems = getProblemElements();
+	    	if(problems != null && problems.length > 0) {
+	    		boolean resize = false;
+				for( Control child : problemsViewComposite.getChildren() )
+				{
+					child.dispose();
+					resize = true;
+				}
+
+	        	subProblemsViewComposite = new Composite( problemsViewComposite, SWT.NONE);
+	            subProblemsViewComposite.setLayoutData(new GridData( SWT.FILL, SWT.FILL, true, true));
+	            subProblemsViewComposite.setLayout(glmargins( new GridLayout(2, false ), 0, 0, 5, 5) );
+	            subProblemsViewComposite.setBackground( Display.getDefault().getSystemColor(SWT.COLOR_WHITE));
+
+	            int width = 400;
+	            if(topComposite != null && topComposite.getClientArea().width > 400) {
+	            	width = topComposite.getClientArea().width;
+	            }
+	            
+	            Listener focusOnProblemListener = new Listener() {
+	                public void handleEvent(Event e) {
+	                  Control problemLabel = (Control) e.widget;
+	                  Rectangle problemLabelBounds = problemLabel.getBounds();
+	                  Rectangle scrollableArea = problemsViewComposite.getClientArea();
+	                  Point currentScrollPosition = problemsViewComposite.getOrigin();
+	                  if (currentScrollPosition.y > problemLabelBounds.y)
+	                	  currentScrollPosition.y = Math.max(0, problemLabelBounds.y);
+	                  if (currentScrollPosition.y + scrollableArea.height < problemLabelBounds.y + problemLabelBounds.height)
+	                	  currentScrollPosition.y = Math.max(0, problemLabelBounds.y + problemLabelBounds.height - scrollableArea.height);
+	                  problemsViewComposite.setOrigin(currentScrollPosition);
+	                }
+	              };
+	           	
+	        	for (int i = 0; i < problems.length; i++) {
+	    			IStatus singleStatus = problems[i];
+	    			if (!singleStatus.isOK() && singleStatus.getMessage() != null) {
+	    				final Label image = new Label( subProblemsViewComposite, SWT.NONE );
+	    				GridData gdImage = new GridData();	    				
+	    				gdImage.verticalAlignment = SWT.BEGINNING;
+	    	            image.setBackground( Display.getDefault().getSystemColor(SWT.COLOR_WHITE) );
+	    	            image.setImage(getProblemImage(singleStatus));
+	    	            image.setLayoutData(gdImage);
+	    	            
+	    	            final Text text  = new Text( subProblemsViewComposite, SWT.WRAP | SWT.READ_ONLY);
+	    	            GridData gdLabel = new GridData();
+	    	            gdLabel.widthHint = width - 50;
+	    	            text.setBackground( Display.getDefault().getSystemColor(SWT.COLOR_WHITE) );
+	    	            text.setText(singleStatus.getMessage());
+	    	            text.setLayoutData(gdLabel);
+	    	            text.addListener(SWT.Activate, focusOnProblemListener);
+	    			}
+	    		}
+	            problemsViewComposite.setContent(subProblemsViewComposite);
+	            
+	            if(resize)
+	            	handleProblemsViewResize();
+	            
+	            if( this.sform1.getMaximizedControl() != null ) {
+	                this.sform1.setMaximizedControl( null );
+	            }
+	    	} else {
+	    		this.sform1.setMaximizedControl( this.topComposite );
+	    	}
+		}
+	}
+	
+	
+	private final static GridLayout glmargins( final GridLayout layout,
+			final int marginWidth,
+			final int marginHeight,
+			final int marginTop,
+			final int marginBottom)
+	{
+		layout.marginWidth = marginWidth;
+		layout.marginHeight = marginHeight;
+		layout.marginLeft = 0;
+		layout.marginRight = 0;
+		layout.marginTop = marginTop;
+		layout.marginBottom = marginBottom;
+
+		return layout;
+	}
+	
     public void createControl(Composite parent){
     	super.createControl(parent);
     	getDefaultsButton().setText(Messages.Revert);
     }
+    
+    public void refreshProblemsView(){
+    	setErrorMessage(null);
+		setMessage(null);
+    	setValid(true);
+    	fillProblemsViewComposite();
+    }
+    
+    private Image getProblemImage(IStatus element) {
+		final ISharedImages sharedImages = PlatformUI.getWorkbench().getSharedImages();
+		final String imageType;
+
+		if(element.getSeverity() == IStatus.ERROR) {
+			imageType = ISharedImages.IMG_OBJS_ERROR_TSK;
+		}
+		else {
+			imageType = ISharedImages.IMG_OBJS_WARN_TSK;
+		}
+		return sharedImages.getImage( imageType );
+	}
+    
+    protected IStatus[] getProblemElements() {
+		final List<IStatus> errors = new ArrayList<IStatus>();
+		final List<IStatus> warnings = new ArrayList<IStatus>();
+        
+		for (int i = 0; i < controls.length; i++) {
+			if (controls[i] != null) {
+				IStatus status = Status.OK_STATUS;
+				if(controls[i] instanceof AbstractIModuleDependenciesControl)
+					status = ((AbstractIModuleDependenciesControl) controls[i]).validate();
+				if(status != null) {
+					if (status.isMultiStatus()) {
+						MultiStatus multi = (MultiStatus)status;
+						if (!multi.isOK()) {
+							for (int y = 0; y < multi.getChildren().length; y++) {
+								IStatus singleStatus = multi.getChildren()[y];
+								if(singleStatus.getMessage() != null && singleStatus.getMessage().trim().length() > 0) {
+									if(multi.getChildren()[y].getSeverity() == IStatus.ERROR) {
+										errors.add(multi.getChildren()[y]);
+									} else {
+										warnings.add(multi.getChildren()[y]);
+									}
+								}
+							}
+						}
+					} else if (!status.isOK()) {
+						if(status.getMessage() != null && status.getMessage().trim().length() > 0) {
+							if(status.getSeverity() == IStatus.ERROR) {
+								errors.add(status);
+							} else {
+								warnings.add(status);
+							}
+						}
+					}
+				}
+			}
+		}
+		if(errors.size() > 0) {
+			setValid(false);
+			errors.addAll(warnings);
+			// This returns all the errors followed by all the warnings
+			return errors.toArray(new IStatus[errors.size()]);
+		}
+		return warnings.toArray(new IStatus[warnings.size()]);
+	}
 }
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 9803e2a..e426e65 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.2.4.qualifier
+Bundle-Version: 1.2.103.qualifier
 Bundle-Activator: org.eclipse.wst.common.componentcore.internal.ModulecorePlugin
 Bundle-Localization: plugin
 Export-Package: org.eclipse.wst.common.componentcore,
diff --git a/plugins/org.eclipse.wst.common.modulecore/model/componentCore.ecore b/plugins/org.eclipse.wst.common.modulecore/model/componentCore.ecore
index fccafb8..ec338c4 100644
--- a/plugins/org.eclipse.wst.common.modulecore/model/componentCore.ecore
+++ b/plugins/org.eclipse.wst.common.modulecore/model/componentCore.ecore
@@ -28,6 +28,7 @@
         lowerBound="1" eType="#//WorkbenchComponent" eOpposite="#//WorkbenchComponent/resources"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="resourceType" lowerBound="1"
         eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString" defaultValueLiteral=""/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="tag" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EDataType" name="IPath" instanceClassName="org.eclipse.core.runtime.IPath">
     <eAnnotations source="keywords">
diff --git a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/datamodel/FacetProjectCreationDataModelProvider.java b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/datamodel/FacetProjectCreationDataModelProvider.java
index aecde37..3f0001a 100644
--- a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/datamodel/FacetProjectCreationDataModelProvider.java
+++ b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/datamodel/FacetProjectCreationDataModelProvider.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2003, 2007 IBM Corporation and others.
+ * Copyright (c) 2003, 2011 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
@@ -17,6 +17,7 @@
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Iterator;
+import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
@@ -64,6 +65,9 @@
 	
 	public static final String FORCE_VERSION_COMPLIANCE = "FacetProjectCreationDataModelProvider.FORCE_VERSION_COMPLIANCE";
 	
+	private List<IFacetedProjectListener> facetedProjectListeners = new ArrayList<IFacetedProjectListener>();
+	private IDataModelListener dataModelListener;
+	
 	public FacetProjectCreationDataModelProvider() {
 		super();
 	}
@@ -87,45 +91,42 @@
 		
 		model.setProperty(FACETED_PROJECT_WORKING_COPY, fpjwc);
 		
-		fpjwc.addListener
-		(
-		    new IFacetedProjectListener()
-		    {
-                public void handleEvent( final IFacetedProjectEvent event )
+		IFacetedProjectListener projectFacetChangedListener = new IFacetedProjectListener()
+	    {
+            public void handleEvent( final IFacetedProjectEvent event )
+            {
+                for( IFacetedProject.Action action : fpjwc.getProjectFacetActions() )
                 {
-                    for( IFacetedProject.Action action : fpjwc.getProjectFacetActions() )
+                    final Object config = action.getConfig();
+                    
+                    if( config != null && config instanceof IDataModel )
                     {
-                        final Object config = action.getConfig();
+                        final IDataModel dm = (IDataModel) config;
                         
-                        if( config != null && config instanceof IDataModel )
+                        if( dm.getAllProperties().contains( FacetInstallDataModelProvider.MASTER_PROJECT_DM ) )
                         {
-                            final IDataModel dm = (IDataModel) config;
-                            
-                            if( dm.getAllProperties().contains( FacetInstallDataModelProvider.MASTER_PROJECT_DM ) )
-                            {
-                                dm.setProperty( FacetInstallDataModelProvider.MASTER_PROJECT_DM, model );
-                            }
+                            dm.setProperty( FacetInstallDataModelProvider.MASTER_PROJECT_DM, model );
                         }
                     }
                 }
-		    },
-		    IFacetedProjectEvent.Type.PROJECT_FACETS_CHANGED
-		);
+            }
+	    };
+	    this.facetedProjectListeners.add(projectFacetChangedListener);    
+		fpjwc.addListener(projectFacetChangedListener, IFacetedProjectEvent.Type.PROJECT_FACETS_CHANGED	);
 
-        fpjwc.addListener
-        (
-            new IFacetedProjectListener()
+		IFacetedProjectListener availableRuntimeChangedListener = new IFacetedProjectListener()
+        {
+            public void handleEvent( final IFacetedProjectEvent event )
             {
-                public void handleEvent( final IFacetedProjectEvent event )
-                {
-                    model.notifyPropertyChange(FACET_RUNTIME, IDataModel.VALID_VALUES_CHG);
-                }
-            },
-            IFacetedProjectEvent.Type.AVAILABLE_RUNTIMES_CHANGED
-        );
+                model.notifyPropertyChange(FACET_RUNTIME, IDataModel.VALID_VALUES_CHG);
+            }
+        };
+        this.facetedProjectListeners.add(availableRuntimeChangedListener);
+        fpjwc.addListener(availableRuntimeChangedListener, IFacetedProjectEvent.Type.AVAILABLE_RUNTIMES_CHANGED);
 		
 		IDataModel projectDataModel = DataModelFactory.createDataModel(new ProjectCreationDataModelProviderNew());
-		projectDataModel.addListener(new IDataModelListener() {
+		
+		dataModelListener = new IDataModelListener() {
 			public void propertyChanged(DataModelEvent event) 
 			{
 			    final String prop = event.getPropertyName();
@@ -146,15 +147,27 @@
                     fpjwc.setProjectLocation( location == null ? null : new Path( location ) );
                 }
 			}
-		});
+		};
+			
+		projectDataModel.addListener(dataModelListener);
 		model.addNestedModel(NESTED_PROJECT_DM, projectDataModel);
 	}
 
 	@Override
 	public void dispose() {
 		if(fpjwc != null){
+			for (IFacetedProjectListener listener:this.facetedProjectListeners){
+				fpjwc.removeListener(listener);
+			}
 			fpjwc.dispose();
 		}
+		if (model != null){
+			IDataModel nestedProjectDM = model.getNestedModel(NESTED_PROJECT_DM);
+			if (nestedProjectDM != null){
+				nestedProjectDM.removeListener(dataModelListener);
+			}
+		}
+		setDataModel(null);
 		super.dispose();
 	}
 	
diff --git a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/datamodel/properties/IAddReferenceDataModelProperties.java b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/datamodel/properties/IAddReferenceDataModelProperties.java
index 2367892..200a2dd 100644
--- a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/datamodel/properties/IAddReferenceDataModelProperties.java
+++ b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/datamodel/properties/IAddReferenceDataModelProperties.java
@@ -7,6 +7,7 @@
  *
  * Contributors:
  *    Rob Stryker - initial implementation and ongoing maintenance
+ *    Carl Anderson (IBM) - SYNC_PRIMARY_RUNTIME
  ******************************************************************************/
 package org.eclipse.wst.common.componentcore.datamodel.properties;
 
@@ -40,4 +41,12 @@
 	 * </p>
 	 */
 	public static final String TARGET_REFERENCE_LIST = "IAddReferenceDataModelProperties.TARGET_REFERENCE_LIST"; //$NON-NLS-1$
+
+	/**
+	 * <p>
+	 * This required property is a {@link java.util.Boolean} that specifies whether the child project's primary runtime should be set 
+	 * to the same primary runtime as the parent.  The default is TRUE.
+	 * </p>
+	 */
+	public static final String SYNC_PRIMARY_RUNTIME = "IAddReferenceDataModelProperties.SYNC_PRIMARY_RUNTIME"; //$NON-NLS-1$
 }
diff --git a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/ComponentResource.java b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/ComponentResource.java
index efe8adc..4fe2aac 100644
--- a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/ComponentResource.java
+++ b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/ComponentResource.java
@@ -1,7 +1,7 @@
 /**
  * <copyright></copyright>
  * 
- * $Id: ComponentResource.java,v 1.6 2006/04/27 04:17:40 cbridgha Exp $
+ * $Id: ComponentResource.java,v 1.7 2011/08/10 21:40:14 rsanchez Exp $
  */
 package org.eclipse.wst.common.componentcore.internal;
 
@@ -33,6 +33,7 @@
  *   <li>{@link org.eclipse.wst.common.componentcore.internal.ComponentResource#getExclusions <em>Exclusions</em>}</li>
  *   <li>{@link org.eclipse.wst.common.componentcore.internal.ComponentResource#getComponent <em>Component</em>}</li>
  *   <li>{@link org.eclipse.wst.common.componentcore.internal.ComponentResource#getResourceType <em>Resource Type</em>}</li>
+ *   <li>{@link org.eclipse.wst.common.componentcore.internal.ComponentResource#getTag <em>Tag</em>}</li>
  * </ul>
  * </p>
  *
@@ -165,6 +166,32 @@
 	 */
 	void setResourceType(String value);
 
+	/**
+	 * Returns the value of the '<em><b>Tag</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Tag</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Tag</em>' attribute.
+	 * @see #setTag(String)
+	 * @see org.eclipse.wst.common.componentcore.ComponentcorePackage#getComponentResource_Tag()
+	 * @model
+	 * @generated
+	 */
+	String getTag();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.wst.common.componentcore.internal.ComponentResource#getTag <em>Tag</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Tag</em>' attribute.
+	 * @see #getTag()
+	 * @generated
+	 */
+	void setTag(String value);
+
 	IProject getOwningProject();
 	void setOwningProject(IProject aProject);
 
diff --git a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/ComponentcorePackage.java b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/ComponentcorePackage.java
index e789e75..737cc80 100644
--- a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/ComponentcorePackage.java
+++ b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/ComponentcorePackage.java
@@ -2,7 +2,7 @@
  * <copyright>
  * </copyright>
  *
- * $Id: ComponentcorePackage.java,v 1.9 2009/06/09 20:02:04 jsholl Exp $
+ * $Id: ComponentcorePackage.java,v 1.10 2011/08/10 21:40:14 rsanchez Exp $
  */
 package org.eclipse.wst.common.componentcore.internal;
 
@@ -191,13 +191,22 @@
 	int COMPONENT_RESOURCE__RESOURCE_TYPE = 4;
 
 	/**
+	 * The feature id for the '<em><b>Tag</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int COMPONENT_RESOURCE__TAG = 5;
+
+	/**
 	 * The number of structural features of the '<em>Component Resource</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int COMPONENT_RESOURCE_FEATURE_COUNT = 5;
+	int COMPONENT_RESOURCE_FEATURE_COUNT = 6;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.wst.common.componentcore.internal.impl.ComponentTypeImpl <em>Component Type</em>}' class.
@@ -574,6 +583,17 @@
 	EAttribute getComponentResource_ResourceType();
 
 	/**
+	 * Returns the meta object for the attribute '{@link org.eclipse.wst.common.componentcore.internal.ComponentResource#getTag <em>Tag</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Tag</em>'.
+	 * @see org.eclipse.wst.common.componentcore.internal.ComponentResource#getTag()
+	 * @see #getComponentResource()
+	 * @generated
+	 */
+	EAttribute getComponentResource_Tag();
+
+	/**
 	 * Returns the meta object for class '{@link org.eclipse.wst.common.componentcore.internal.ComponentType <em>Component Type</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -784,7 +804,7 @@
 	 * @return the meta object for data type '<em>IPath</em>'.
 	 * @see org.eclipse.core.runtime.IPath
 	 * @model instanceClass="org.eclipse.core.runtime.IPath"
-	 *        annotation="keywords datatype='null'" 
+	 *        annotation="keywords datatype='null'"
 	 * @generated
 	 */
 	EDataType getIPath();
@@ -796,7 +816,7 @@
 	 * @return the meta object for data type '<em>URI</em>'.
 	 * @see org.eclipse.emf.common.util.URI
 	 * @model instanceClass="org.eclipse.emf.common.util.URI"
-	 *        annotation="keywords datatype='null'" 
+	 *        annotation="keywords datatype='null'"
 	 * @generated
 	 */
 	EDataType getURI();
@@ -932,6 +952,14 @@
 		EAttribute COMPONENT_RESOURCE__RESOURCE_TYPE = eINSTANCE.getComponentResource_ResourceType();
 
 		/**
+		 * The meta object literal for the '<em><b>Tag</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute COMPONENT_RESOURCE__TAG = eINSTANCE.getComponentResource_Tag();
+
+		/**
 		 * The meta object literal for the '{@link org.eclipse.wst.common.componentcore.internal.impl.ComponentTypeImpl <em>Component Type</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
diff --git a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/StructureEdit.java b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/StructureEdit.java
index 4bcf5a8..d284ca7 100644
--- a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/StructureEdit.java
+++ b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/StructureEdit.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2003, 2007 IBM Corporation and others.
+ * Copyright (c) 2003, 2011 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
@@ -113,8 +113,9 @@
 	 * 
 	 * @param aProject
 	 *            The IProject that contains the WTP Modules model to load
-	 * @return A ModuleCore edit facade to access the WTP Modules Model, null
-	 *         for non-flexible projects
+	 * @return A ModuleCore edit facade to access the WTP Modules Model or
+	 *         <code>null</code> if the project is inaccessible or not a
+	 *         flexible project
 	 */
 	public static StructureEdit getStructureEditForRead(IProject aProject) {
 		ModuleCoreNature nature = ModuleCoreNature.getModuleCoreNature(aProject);
@@ -124,17 +125,19 @@
 	/**
 	 * 
 	 * <p>
-	 * Each ModuleCore edit facade is tied to a specific project. A project may have multiple
-	 * ModuleCore edit facades live at any given time.
+	 * Each ModuleCore edit facade is tied to a specific project. A project
+	 * may have multiple ModuleCore edit facades live at any given time.
 	 * </p>
 	 * <p>
-	 * Use to acquire a ModuleCore facade for a specific project that may be used to modify the
-	 * model.
+	 * Use to acquire a ModuleCore facade for a specific project that may be
+	 * used to modify the model.
 	 * </p>
 	 * 
 	 * @param aProject
 	 *            The IProject that contains the WTP Modules model to load
-	 * @return A ModuleCore edit facade to access the WTP Modules Model
+	 * @return A ModuleCore edit facade to access the WTP Modules Model or
+	 *         <code>null</code> if the project is inaccessible or not a
+	 *         flexible project
 	 */
 	public static StructureEdit getStructureEditForWrite(IProject aProject) {
 		ModuleCoreNature nature = ModuleCoreNature.getModuleCoreNature(aProject);
@@ -143,9 +146,10 @@
 
 	/**
 	 * <p>
-	 * A convenience API to fetch the {@see ModuleCoreNature}&nbsp;for a particular module URI. The
-	 * module URI must be of the valid form, or an exception will be thrown. The module URI must be
-	 * contained by a project that has a {@see ModuleCoreNature}&nbsp;or null will be returned.
+	 * A convenience API to fetch the {@see ModuleCoreNature}&nbsp;for a
+	 * particular module URI. The module URI must be of the valid form, or an
+	 * exception will be thrown. The module URI must be contained by a project
+	 * that has a {@see ModuleCoreNature}&nbsp;or null will be returned.
 	 * </p>
 	 * <p>
 	 * <b>This method may return null. </b>
@@ -154,6 +158,9 @@
 	 * @param aModuleURI
 	 *            A valid, fully-qualified module URI
 	 * @return The ModuleCoreNature of the project associated with aModuleURI
+	 *         or <code>null</code> if the URI has no containing project, its
+	 *         containing project is either inaccessible or not a flexible
+	 *         project
 	 * @throws UnresolveableURIException
 	 *             If the supplied module URI is invalid or unresolveable.
 	 */
@@ -193,13 +200,51 @@
 		return null;
 	}
 	
+	
 	/**
 	 * <p>
 	 * For {@see WorkbenchComponent}s that are contained within a project, the containing project
 	 * can be determined with the {@see WorkbenchComponent}'s fully-qualified module URI.
 	 * </p>
 	 * <p>
-	 * The following method will return the the corresponding project for the supplied module URI,
+	 * The following method will return the corresponding project for the supplied module URI,
+	 * if it can be determined.
+	 * </p>
+	 * <p>
+	 * The method may return an inaccessible project.	
+	 * </p>
+	 * <p>
+	 * <b>This method may return null. </b>
+	 * </p>
+	 * 
+	 * @param aModuleURI
+	 *            A valid, fully-qualified module URI
+	 * @param onlyAccessibleProjects
+	 *            True if the method should return only accessible projects. 
+	 * @return The project that contains the module referenced by the module URI
+	 * @throws UnresolveableURIException
+	 *             If the supplied module URI is invalid or unresolveable.
+	 */
+	public static IProject getContainingProject(URI aModuleURI, boolean onlyAccessibleProjects) throws UnresolveableURIException {
+		ModuleURIUtil.ensureValidFullyQualifiedModuleURI(aModuleURI);
+		String projectName = aModuleURI.segment(ModuleURIUtil.ModuleURI.PROJECT_NAME_INDX);
+		if (projectName == null || projectName.length() == 0)
+			throw new UnresolveableURIException(aModuleURI);
+		IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(projectName);
+		if (!onlyAccessibleProjects)
+			return project;
+		if (project.isAccessible())
+			return project;
+		return null;
+	}
+	
+	/**
+	 * <p>
+	 * For {@see WorkbenchComponent}s that are contained within a project, the containing project
+	 * can be determined with the {@see WorkbenchComponent}'s fully-qualified module URI.
+	 * </p>
+	 * <p>
+	 * The following method will return the corresponding project for the supplied module URI,
 	 * if it can be determined.
 	 * </p>
 	 * <p>
@@ -216,14 +261,7 @@
 	 *             If the supplied module URI is invalid or unresolveable.
 	 */
 	public static IProject getContainingProject(URI aModuleURI) throws UnresolveableURIException {
-		ModuleURIUtil.ensureValidFullyQualifiedModuleURI(aModuleURI);
-		String projectName = aModuleURI.segment(ModuleURIUtil.ModuleURI.PROJECT_NAME_INDX);
-		if (projectName == null || projectName.length() == 0)
-			throw new UnresolveableURIException(aModuleURI);
-		IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(projectName);
-		if (project.isAccessible())
-			return project;
-		return null;
+		return getContainingProject(aModuleURI, true);
 	}
 
 	/**
diff --git a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/WorkbenchComponent.java b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/WorkbenchComponent.java
index e8d7586..58b6899 100644
--- a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/WorkbenchComponent.java
+++ b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/WorkbenchComponent.java
@@ -166,5 +166,7 @@
 	ComponentResource[] findResourcesBySourcePath(IPath aSourcePath, int resourceFlag);
 	
 	boolean exists(IPath aSourcePath, int resourceFlag);
+	
+	final String DEFAULT_ROOT_SOURCE_TAG = "defaultRootSource";
 
 } // WorkbenchComponent
diff --git a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/builder/DependencyGraphImpl.java b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/builder/DependencyGraphImpl.java
index 3c960a2..c9b9ee9 100644
--- a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/builder/DependencyGraphImpl.java
+++ b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/builder/DependencyGraphImpl.java
@@ -1,5 +1,25 @@
+/*******************************************************************************
+ * Copyright (c) 2008, 2011 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * IBM Corporation - initial API and implementation
+ *******************************************************************************/
+
 package org.eclipse.wst.common.componentcore.internal.builder;
 
+import java.io.BufferedInputStream;
+import java.io.BufferedOutputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -7,6 +27,7 @@
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Set;
+import java.util.concurrent.atomic.AtomicLong;
 
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.resources.IResource;
@@ -14,8 +35,10 @@
 import org.eclipse.core.resources.IResourceChangeListener;
 import org.eclipse.core.resources.IResourceDelta;
 import org.eclipse.core.resources.IResourceDeltaVisitor;
+import org.eclipse.core.resources.IWorkspaceRoot;
 import org.eclipse.core.resources.ResourcesPlugin;
 import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IPath;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.ISafeRunnable;
 import org.eclipse.core.runtime.IStatus;
@@ -41,23 +64,27 @@
 	/**
 	 * Don't read or write the graph without first obtaining the graphLock.
 	 */
-	private Object graphLock = new Object();
+	private final Object graphLock = new Object();
 
 	/**
-	 * If projects A and and B both depend on C an entry in this graph would be {C ->
-	 * {A, B} }
+	 * If projects A and and B both depend on C an entry in this graph would be
+	 * {C -> {A, B} }
 	 */
-	private Map<IProject, Set<IProject>> graph = null;
+	private Map<IProject, Set<IProject>> graph;
+
+	private final AtomicLong modStamp = new AtomicLong();
+
+	private final ListenerList listeners = new ListenerList();
 	
-	private long modStamp = 0;
-	
-	private ListenerList listeners = new ListenerList();
-	
+	/** Used to guard pauseCount. */
+	private final Object jobLock = new Object();
+
+	/** If this is greater than zero we do not run the graph update job. This is guarded by jobLock. */
+	private int pauseCount;
+
 	/**
-	 * This is not public; only {@link IDependencyGraph#INSTANCE} should be
+	 * This is not public, only {@link IDependencyGraph#INSTANCE} should be
 	 * used.
-	 * 
-	 * @return
 	 */
 	static IDependencyGraph getInstance() {
 		if (instance == null) {
@@ -67,40 +94,50 @@
 		return instance;
 	}
 
-	private static DependencyGraphImpl instance = null;
+	private static DependencyGraphImpl instance;
 
 	private DependencyGraphImpl() {
 	}
 
 	public long getModStamp() {
-		synchronized (graphLock) {
-			return modStamp;
-		}
+		return modStamp.get();
 	}
-	
-	private void incrementModStamp(){
-		synchronized (graphLock) {
-			modStamp++;
-		}
+
+	private void incrementModStamp() {
+		modStamp.incrementAndGet();
 	}
+
 	/**
 	 * Returns the set of projects whose components reference the specified
 	 * target project's component. For example if projects A and B both
 	 * reference C. Passing C as the targetProject will return {A, B}
 	 */
 	public Set<IProject> getReferencingComponents(IProject targetProject) {
-		waitForAllUpdates(null);
+		IDependencyGraphReferences refs = getReferencingComponents(targetProject, true);
+		return refs.getReferencingComponents();
+	}
+
+	public IDependencyGraphReferences getReferencingComponents(
+			IProject targetProject, boolean waitForAllUpdates) {
+		DependencyGraphReferences refs = new DependencyGraphReferences();
+		refs.targetProject = targetProject;
+		if (waitForAllUpdates) {
+			refs.stale = false;
+			waitForAllUpdates(null);
+		} else if (isUpdateNecessary()) {
+			refs.stale = true;
+		}
 		synchronized (graphLock) {
 			Set<IProject> set = graph.get(targetProject);
 			if (set == null) {
-				return Collections.EMPTY_SET;
+				refs.referencingProjects = Collections.EMPTY_SET;
 			} else {
 				DependencyGraphEvent event = null;
-				for (Iterator<IProject> iterator = set.iterator(); iterator.hasNext();) {
+				for (Iterator<IProject> iterator = set.iterator(); iterator	.hasNext();) {
 					IProject sourceProject = iterator.next();
 					if (!sourceProject.isAccessible()) {
 						iterator.remove();
-						if(event == null){
+						if (event == null) {
 							incrementModStamp();
 							event = new DependencyGraphEvent();
 							event.setModStamp(getModStamp());
@@ -108,17 +145,26 @@
 						event.removeReference(sourceProject, targetProject);
 					}
 				}
-				if(event != null){
+				if (event != null) {
 					notifiyListeners(event);
 				}
 				Set<IProject> copy = new HashSet<IProject>();
 				copy.addAll(set);
-				return copy;
+				refs.referencingProjects = copy;
 			}
 		}
+		return refs;
 	}
 
+	public boolean isStale() {
+		return isUpdateNecessary();
+	}
+
+	/**
+	 * The purpose of this class is to queue up relevant changes for the graph update job.
+	 */
 	private class DependencyGraphResourceChangedListener implements IResourceChangeListener, IResourceDeltaVisitor {
+		
 		// only registered for post change events
 		public void resourceChanged(IResourceChangeEvent event) {
 			try {
@@ -137,22 +183,21 @@
 			case IResource.ROOT:
 				return true;
 			case IResource.PROJECT: {
-				int kind = delta.getKind();
+				final int kind = delta.getKind();
+				final IProject project = (IProject)resource;
 				if ((IResourceDelta.ADDED & kind) != 0) {
-					update((IProject) resource, IDependencyGraph.ADDED);
+					update(project, IDependencyGraph.ADDED);
 					return false;
 				} else if ((IResourceDelta.REMOVED & kind) != 0) {
-					update((IProject) resource, IDependencyGraph.REMOVED);
+					update(project, IDependencyGraph.REMOVED);
 					return false;
 				} else if ((IResourceDelta.CHANGED & kind) != 0) {
 					int flags = delta.getFlags();
 					if ((IResourceDelta.OPEN & flags) != 0) {
-						boolean isOpen = ((IProject) resource).isOpen();
-						if (isOpen) {
-							update((IProject) resource, IDependencyGraph.ADDED);
-						} else {
-							update((IProject) resource, IDependencyGraph.REMOVED);
-						}
+						boolean isOpen = project.isOpen();
+						if (isOpen)update(project, IDependencyGraph.ADDED);
+						else update(project, IDependencyGraph.REMOVED);
+						
 						return false;
 					}
 					return true;
@@ -160,19 +205,17 @@
 				return false;
 			}
 			case IResource.FOLDER:
-				if (resource.getName().equals(IModuleConstants.DOT_SETTINGS)) {
-					return true;
-				}
+				if (resource.getName().equals(IModuleConstants.DOT_SETTINGS))return true;
 				return false;
 			case IResource.FILE:
 				String name = resource.getName();
 				if (name.equals(WTPModulesResourceFactory.WTP_MODULES_SHORT_NAME)) {
-					if((delta.getKind() & IResourceDelta.ADDED) != 0){
+					if ((delta.getKind() & IResourceDelta.ADDED) != 0) {
 						update(resource.getProject(), IDependencyGraph.ADDED);
 					} else {
 						update(resource.getProject(), IDependencyGraph.MODIFIED);
 					}
-				} else if(name.equals(".project")){
+				} else if (name.equals(".project")) {
 					update(resource.getProject(), IDependencyGraph.ADDED);
 				}
 			default:
@@ -181,7 +224,7 @@
 		}
 	};
 
-	private DependencyGraphResourceChangedListener listener = null;
+	private DependencyGraphResourceChangedListener listener;
 
 	/**
 	 * The graph is built lazily once. Afterwards, the graph is updated as
@@ -194,33 +237,29 @@
 				graph = new HashMap<IProject, Set<IProject>>();
 				listener = new DependencyGraphResourceChangedListener();
 				ResourcesPlugin.getWorkspace().addResourceChangeListener(listener, IResourceChangeEvent.POST_CHANGE);
-				initAll();
+				if (restoreGraph() == null)rebuild();
 			} finally {
 				postUpdate();
 			}
 		}
 	}
-	
-	private void initAll(){
-		synchronized (graphLock) {
-			try{
-				preUpdate();
-				IProject[] allProjects = ResourcesPlugin.getWorkspace().getRoot().getProjects();
-				for (IProject sourceProject : allProjects) {
-					update(sourceProject, IDependencyGraph.ADDED);
-				}	
-			} finally{
-				postUpdate();
-			}
-			
+
+	private void rebuild() {
+		IProject[] allProjects = ResourcesPlugin.getWorkspace().getRoot().getProjects();
+		rebuild(allProjects);
+	}
+
+	private void rebuild(IProject[] allProjects) {
+		for (IProject sourceProject : allProjects) {
+			update(sourceProject, IDependencyGraph.ADDED);
 		}
 	}
-	
-	private void removeAllReferences(DependencyGraphEvent event){
+
+	private void removeAllReferences(DependencyGraphEvent event) {
 		synchronized (graphLock) {
-			IProject [] allReferenceKeys = new IProject [graph.keySet().size()];
+			IProject[] allReferenceKeys = new IProject[graph.keySet().size()];
 			graph.keySet().toArray(allReferenceKeys);
-			for(IProject project : allReferenceKeys){
+			for (IProject project : allReferenceKeys) {
 				removeAllReferences(project, event);
 			}
 		}
@@ -230,20 +269,19 @@
 		synchronized (graphLock) {
 			boolean removed = false;
 			Set<IProject> removedSet = graph.remove(targetProject);
-			if(removedSet != null && !removedSet.isEmpty()){
+			if (removedSet != null && !removedSet.isEmpty()) {
 				removed = true;
-				for(Iterator<IProject>iterator = removedSet.iterator(); iterator.hasNext();){
-					event.removeReference(iterator.next(), targetProject);
+				for (IProject project : removedSet) {
+					event.removeReference(project, targetProject);
 				}
 			}
-			for(Iterator <Entry<IProject,Set<IProject>>>iterator = graph.entrySet().iterator(); iterator.hasNext();){
-				Entry<IProject,Set<IProject>> entry = iterator.next();
-				if(!entry.getValue().isEmpty() && entry.getValue().remove(targetProject)){
+			for (Entry<IProject, Set<IProject>> entry : graph.entrySet()) {
+				if (!entry.getValue().isEmpty()	&& entry.getValue().remove(targetProject)) {
 					removed = true;
 					event.removeReference(targetProject, entry.getKey());
 				}
 			}
-			if(removed){
+			if (removed) {
 				incrementModStamp();
 				event.setModStamp(getModStamp());
 			}
@@ -254,7 +292,7 @@
 		synchronized (graphLock) {
 			Set<IProject> referencingProjects = graph.get(targetProject);
 			if (referencingProjects != null) {
-				if(referencingProjects.remove(sourceProject)){
+				if (referencingProjects.remove(sourceProject)) {
 					event.removeReference(sourceProject, targetProject);
 					incrementModStamp();
 					event.setModStamp(getModStamp());
@@ -271,7 +309,7 @@
 				graph.put(targetProject, referencingProjects);
 			}
 			boolean added = referencingProjects.add(sourceProject);
-			if(added){
+			if (added) {
 				event.addRefererence(sourceProject, targetProject);
 				incrementModStamp();
 				event.setModStamp(getModStamp());
@@ -281,31 +319,45 @@
 
 	public static final Object GRAPH_UPDATE_JOB_FAMILY = new Object();
 
+	/** The amount of time that we delay before starting the graph update job. */
 	private static final int JOB_DELAY = 100;
 
 	private final GraphUpdateJob graphUpdateJob = new GraphUpdateJob();
-	private final Object jobLock = new Object();
-	
-	//This lock is used for deadlock avoidance.  The specific scenario
-	//is during waitForAllUpdates(); if a deadlock is detected during 
-	//the lock's acquire() method, this thread will temporarily release
-	//its already acquired ILocks to allow other threads to continue.
-	//When execution is returned to this thread, any release ILocks will
-	//be reacquired before proceeding
+
+	// This lock is used for deadlock avoidance. The specific scenario
+	// is during waitForAllUpdates(); if a deadlock is detected during
+	// the lock's acquire() method, this thread will temporarily release
+	// its already acquired ILocks to allow other threads to continue.
+	// When execution is returned to this thread, any released ILocks will
+	// be acquired again before proceeding.
 	private final ILock jobILock = Job.getJobManager().newLock();
 
+	/**
+	 * The purpose of this job is to react to resources changes that were detected by the dependency
+	 * graph resource change listener.
+	 *
+	 */
 	private class GraphUpdateJob extends Job {
 
+		private final Queue projectsAdded = new Queue();
+		private final Queue projectsRemoved = new Queue();
+		private final Queue projectsUpdated = new Queue();
+		
+		/** Used to guard runStamp and running. */
+		private final Object runLock = new Object();
+		
+		/** A simple counter that keeps track of which run number we are. */
+		private long runStamp;
+		
+		private boolean running;
+
 		public GraphUpdateJob() {
 			super(Resources.JOB_NAME);
 			setSystem(true);
 		}
 
 		public boolean belongsTo(Object family) {
-			if (family == GRAPH_UPDATE_JOB_FAMILY) {
-				return true;
-			}
-			return super.belongsTo(family);
+			return family == GRAPH_UPDATE_JOB_FAMILY;
 		}
 
 		// We use the listener list as a thread safe queue.
@@ -316,17 +368,11 @@
 				return data;
 			}
 
-			public synchronized boolean isEmpty() {
+			public boolean isEmpty() {
 				return super.isEmpty();
 			}
 		};
 
-		private Queue projectsAdded = new Queue();
-
-		private Queue projectsRemoved = new Queue();
-
-		private Queue projectsUpdated = new Queue();
-
 		public void queueProjectAdded(IProject project) {
 			incrementModStamp();
 			projectsAdded.add(project);
@@ -347,68 +393,59 @@
 			boolean isEmpty = projectsAdded.isEmpty() && projectsRemoved.isEmpty() && projectsUpdated.isEmpty();
 			return !isEmpty;
 		}
-		
-		private boolean running = false;
+
 		private void setRunning(boolean b) {
 			synchronized (runLock) {
 				running = b;
-				if(running){
-					runStamp++;
-				}
+				if (running)runStamp++;
 			}
 		}
-		
-		private boolean isRunning(){
+
+		private boolean isRunning() {
 			synchronized (runLock) {
 				return running;
 			}
 		}
-		
-		private boolean didRun(long stamp){
+
+		private boolean didRun(long stamp) {
 			synchronized (runLock) {
 				return stamp != runStamp;
 			}
 		}
-		
-		//keeps track of when each run
-		private long runStamp = 0;
-		private Object runLock = new Object();
-		
+
 		public void waitForRun(long maxWaitTime) {
-			if(isRunning()){
-				return;
-			} else {
-				final long startTime = System.currentTimeMillis();
-				long localRunStamp = 0;
-				synchronized (graphLock) {
-					localRunStamp = runStamp;
-				}
-				while(true){
-					if(System.currentTimeMillis() - startTime > maxWaitTime){
-						return;
-					}
-					if(didRun(localRunStamp)){
-						return;
-					}
-					try {
-						Thread.sleep(50);
-					} catch (InterruptedException e) {
-						Thread.interrupted();
-					}
+			if (isRunning())return;
+			
+			final long startTime = System.currentTimeMillis();
+			long localRunStamp = 0;
+			synchronized (runLock) {
+				localRunStamp = runStamp;
+			}
+			
+			while (true) {
+				if (System.currentTimeMillis() - startTime > maxWaitTime)return;
+				
+				if (didRun(localRunStamp))return;
+				
+				try {
+					Thread.sleep(50);
+				} catch (InterruptedException e) {
+					Thread.interrupted();
 				}
 			}
 		}
-		
+
 		protected IStatus run(IProgressMonitor monitor) {
-			try{
+			try {
 				jobILock.acquire();
 				setRunning(true);
-				
-				if(ResourcesPlugin.getPlugin().getBundle().getState() == Bundle.STARTING ){
+
+				// we do not want to be running during the early part of startup
+				if (ResourcesPlugin.getPlugin().getBundle().getState() == Bundle.STARTING) {
 					graphUpdateJob.schedule(JOB_DELAY);
 					return Status.OK_STATUS;
 				}
-				
+
 				final Object[] removed = projectsRemoved.getListeners();
 				final Object[] updated = projectsUpdated.getListeners();
 				final Object[] added = projectsAdded.getListeners();
@@ -416,19 +453,22 @@
 					return Status.OK_STATUS;
 				}
 				incrementModStamp();
-				if(ResourcesPlugin.getPlugin().getBundle().getState() != Bundle.ACTIVE){
+				if (ResourcesPlugin.getPlugin().getBundle().getState() != Bundle.ACTIVE) {
+					
+					 // GRK - why don't we need to schedule the job again? 
 					return Status.OK_STATUS;
 				}
+				
 				SafeRunner.run(new ISafeRunnable() {
 					public void handleException(Throwable e) {
 						ModulecorePlugin.logError(e);
 					}
-	
+
 					public void run() throws Exception {
 						final DependencyGraphEvent event = new DependencyGraphEvent();
-						
-						//all references will be rebuilt during an add
-						if(added.length == 0){
+
+						// all references will be rebuilt during an add
+						if (added.length == 0) {
 							// this is the simple case; just remove them all
 							synchronized (graphLock) {
 								for (Object o : removed) {
@@ -438,8 +478,8 @@
 							}
 						}
 						// get the updated queue in case there are any adds
-						// if there are any added projects, then unfortunately the
-						// entire workspace needs to be processed
+						// if there are any added projects, then unfortunately
+						// the entire workspace needs to be processed
 						if (added.length > 0) {
 							removeAllReferences(event);
 							IProject[] allProjects = null;
@@ -449,27 +489,27 @@
 							} else {
 								return;
 							}
-							
+
 							for (IProject sourceProject : allProjects) {
 								IVirtualComponent component = ComponentCore.createComponent(sourceProject);
-								if (component != null && component instanceof VirtualComponent) {
-									((VirtualComponent)component).flushCache();
+								if (component instanceof VirtualComponent) {
+									((VirtualComponent) component).flushCache();
 								}
 							}
-							
+
 							for (IProject sourceProject : allProjects) {
 								IVirtualComponent component = ComponentCore.createComponent(sourceProject);
-								if (component != null && component instanceof VirtualComponent) {
-									IVirtualReference[] references = ((VirtualComponent)component).getRawReferences();
+								if (component instanceof VirtualComponent) {
+									IVirtualReference[] references = ((VirtualComponent) component).getRawReferences();
 									for (IVirtualReference ref : references) {
 										IVirtualComponent targetComponent = ref.getReferencedComponent();
 										if (targetComponent != null) {
 											IProject targetProject = targetComponent.getProject();
 											if (targetProject != null && !targetProject.equals(sourceProject)) {
-												addReference(sourceProject, targetProject, event);
+												addReference(sourceProject,	targetProject, event);
 											}
 										}
-									}	
+									}
 								}
 							}
 						} else if (updated.length > 0) {
@@ -480,15 +520,15 @@
 							} else {
 								return;
 							}
-							
+
 							Set<IProject> validRefs = new HashSet<IProject>();
 							for (Object o : updated) {
 								IProject sourceProject = (IProject) o;
 								IVirtualComponent component = ComponentCore.createComponent(sourceProject);
-								if (component != null && component instanceof VirtualComponent) {
+								if (component instanceof VirtualComponent) {
 									validRefs.clear();
-									((VirtualComponent)component).flushCache();
-									IVirtualReference[] references = ((VirtualComponent)component).getRawReferences();
+									((VirtualComponent) component).flushCache();
+									IVirtualReference[] references = ((VirtualComponent) component).getRawReferences();
 									for (IVirtualReference ref : references) {
 										IVirtualComponent targetComponent = ref.getReferencedComponent();
 										if (targetComponent != null) {
@@ -500,19 +540,16 @@
 									}
 									synchronized (graphLock) {
 										for (IProject targetProject : allProjects) {
-											// if the reference was identified
-											// above, be sure to add it
-											// otherwise, remove it
+											// if the reference was identified above, be sure to add it otherwise, remove it
 											if (validRefs.remove(targetProject)) {
-												addReference(sourceProject, targetProject, event);
+												addReference(sourceProject,	targetProject, event);
 											} else {
-												removeReference(sourceProject, targetProject, event);
+												removeReference(sourceProject,	targetProject, event);
 											}
 										}
 									}
 								} else {
-									// if this project is not a component, then it
-									// should be completely removed.
+									// if this project is not a component, then it should be completely removed.
 									removeAllReferences(sourceProject, event);
 								}
 							}
@@ -529,26 +566,28 @@
 	};
 
 	public void addListener(IDependencyGraphListener listener) {
-		listeners.add(listener);		
+		listeners.add(listener);
 	}
-	
+
 	public void removeListener(IDependencyGraphListener listener) {
 		listeners.remove(listener);
 	}
 
 	private void notifiyListeners(final DependencyGraphEvent event) {
-		if(event.getType() == 0){
+		if (event.getType() == 0) {
 			return;
 		}
-		//fire notifications on a different job so they do not block waitForAllUpdates()
-		Job notificationJob = new Job(Resources.NOTIFICATION_JOB_NAME){
+		// fire notifications on a different job so they do not block
+		// waitForAllUpdates()
+		Job notificationJob = new Job(Resources.NOTIFICATION_JOB_NAME) {
 			@Override
 			protected IStatus run(final IProgressMonitor monitor) {
 				SafeRunner.run(new ISafeRunnable() {
 					public void run() throws Exception {
-						for(Object listener : listeners.getListeners()){
-							((IDependencyGraphListener)listener).dependencyGraphUpdate(event);
+						for (Object listener : listeners.getListeners()) {
+							((IDependencyGraphListener) listener).dependencyGraphUpdate(event);
 						}
+						saveGraph(); // trigger a future save
 						monitor.done();
 					}
 
@@ -563,10 +602,10 @@
 		notificationJob.setRule(null);
 		notificationJob.schedule();
 	}
-	
-	
+
 	/**
 	 * Use: update(project, IDependencyGraph.ADDED);
+	 * 
 	 * @deprecated use {@link #update(IProject, int)}
 	 */
 	public void queueProjectAdded(IProject project) {
@@ -575,6 +614,7 @@
 
 	/**
 	 * Use: update(project, IDependencyGraph.REMOVED);
+	 * 
 	 * @deprecated use {@link #update(IProject, int)}
 	 */
 	public void queueProjectDeleted(IProject project) {
@@ -583,14 +623,15 @@
 
 	/**
 	 * Use: update(project, IDependencyGraph.MODIFIED);
+	 * 
 	 * @deprecated use {@link #update(IProject, int)}
 	 */
 	public void update(IProject project) {
 		update(project, IDependencyGraph.MODIFIED);
 	}
 
-	public void update(IProject project, final int updateType){
-		switch(updateType){
+	public void update(IProject project, final int updateType) {
+		switch (updateType) {
 		case IDependencyGraph.MODIFIED:
 			graphUpdateJob.queueProjectUpdated(project);
 			break;
@@ -602,20 +643,14 @@
 			break;
 		}
 		synchronized (jobLock) {
-			if (pauseCount > 0) {
-				return;
-			}
+			if (pauseCount > 0)return;
+			graphUpdateJob.schedule(JOB_DELAY);
 		}
-		graphUpdateJob.schedule(JOB_DELAY);
 	}
-	
-	
-	
-	private int pauseCount = 0;
 
 	/**
 	 * Pauses updates; any caller of this method must ensure through a
-	 * try/finally block that resumeUpdates is subsequently called.
+	 * try/finally block that postUpdate is subsequently called.
 	 */
 	public void preUpdate() {
 		synchronized (jobLock) {
@@ -625,78 +660,354 @@
 
 	public void postUpdate() {
 		synchronized (jobLock) {
-			if (pauseCount > 0) {
-				pauseCount--;
-			}
-			if (pauseCount > 0) {
-				return;
-			}
+			if (pauseCount > 0)pauseCount--;			
+			if (pauseCount > 0)return;
+			graphUpdateJob.schedule(JOB_DELAY);
 		}
-		graphUpdateJob.schedule(JOB_DELAY);
 	}
 
 	public void waitForAllUpdates(IProgressMonitor monitor) {
 		SubMonitor subMonitor = SubMonitor.convert(monitor);
 		subMonitor.subTask(Resources.WAITING);
-		
+
 		Job currentJob = Job.getJobManager().currentJob();
 		if (currentJob != graphUpdateJob) {
-			if(Job.getJobManager().isSuspended()){
+			// GRK - This seems dangerous, we should document why this call is here.
+			if (Job.getJobManager().isSuspended()) {
 				Job.getJobManager().resume();
 			}
-			while(isUpdateNecessary()){
-				if(subMonitor.isCanceled()){
-					throw new OperationCanceledException();
-				}
-				
+			
+			while (isUpdateNecessary()) {
+				if (subMonitor.isCanceled())throw new OperationCanceledException();
+
 				// Ensure any pending work has caused the job to become scheduled
-				if(graphUpdateJob.shouldSchedule()){
+				if (graphUpdateJob.shouldSchedule()) {
 					graphUpdateJob.schedule();
 				}
-				// Wake up any sleeping jobs since we're going to wait on the job, 
+				// Wake up any sleeping jobs since we're going to wait on the job,
 				// there is no sense to wait for a sleeping job
 				graphUpdateJob.wakeUp();
-				if(currentJob != null && !ResourcesPlugin.getWorkspace().isTreeLocked()){
+				if (currentJob != null && !ResourcesPlugin.getWorkspace().isTreeLocked()) {
 					currentJob.yieldRule(subMonitor.newChild(100));
 				}
-				
+
 				graphUpdateJob.waitForRun(500);
-				
+
 				boolean interrupted = false;
 				try {
-					if(jobILock.acquire(500)){
+					if (jobILock.acquire(500)) {
 						jobILock.release();
-						//only exit if the job has had a chance to run
-						if(!isUpdateNecessary()){
-							break;	
+						// only exit if the job has had a chance to run
+						if (!isUpdateNecessary()) {
+							break;
 						}
 					}
 				} catch (InterruptedException e) {
 					interrupted = true;
-				} finally{
-					if(interrupted){
+				} finally {
+					if (interrupted) {
 						// Propagate interrupts
 						Thread.currentThread().interrupt();
 					}
 				}
 			}
-		}		
-		if(null != monitor){
+		}
+		if (null != monitor) {
 			monitor.done();
 		}
 	}
 
 	// necessary if the job is running, waiting, or sleeping
-	// or there is anything in the graphqueue
+	// or there is anything in the graph queue.
 	private boolean isUpdateNecessary() {
 		return graphUpdateJob.getState() != Job.NONE || graphUpdateJob.shouldSchedule();
 	}
 
+	private static final class RestoredGraphResults {
+		private DependencyGraphEvent event;
+		private HashMap<String, Set<String>> graph;
+	}
+
+	/**
+	 * This file will be stored here:
+	 * .metadata\.plugins\org.eclipse.wst.common.modulecore
+	 * \dependencyCache.index
+	 */
+	private static final String DEPENDENCY_GRAPH_CACHE = "dependencyCache.index";
+
+	/**
+	 * Restores the graph if possible and returns a {@link RestoredGraphResults}
+	 * if successful.
+	 * 
+	 * <p>
+	 * It is essential this method do everything possible to avoid restoring bad
+	 * data to ensure bad data does not corrupt the current workspace instance.
+	 * If bad data is detected, it is deleted to avoid a repeat failure the next
+	 * time the workspace is restarted.
+	 * 
+	 * @return {@link RestoredGraphResults} if successful in restoring the
+	 *         graph, <code>null</code> if not successful
+	 */
+	private RestoredGraphResults restoreGraph() {
+		try {
+			synchronized (graphLock) {
+				graph = new HashMap<IProject, Set<IProject>>();
+				IPath stateLocation = ModulecorePlugin.getDefault().getStateLocation();
+				File file = stateLocation.append(DEPENDENCY_GRAPH_CACHE).toFile();
+				if (!file.exists()) {
+					return null; // no state to restore from
+				} else {
+					HashMap<String, Set<String>> savedMap = null;
+					FileInputStream fIn = null;
+					boolean deleteCache = true;
+					try {
+						fIn = new FileInputStream(file);
+						BufferedInputStream bIn = new BufferedInputStream(fIn);
+						ObjectInputStream oIn = new ObjectInputStream(bIn);
+						savedMap = (HashMap<String, Set<String>>) oIn.readObject();
+						oIn.close();
+						deleteCache = false;
+					} catch (FileNotFoundException e) {
+						ModulecorePlugin.logError(e);
+						return null;
+					} catch (IOException e) {
+						ModulecorePlugin.logError(e);
+						return null;
+					} catch (ClassNotFoundException e) {
+						ModulecorePlugin.logError(e);
+						return null;
+					} finally {
+						if (fIn != null) {
+							try {
+								fIn.close();
+							} catch (IOException e) {
+								ModulecorePlugin.logError(e);
+							}
+						}
+						if (deleteCache) {
+							file.delete();
+						}
+					}
+					if (savedMap != null) { 
+						// we have something to restore the state from
+						// first check to ensure all projects are still present
+						IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot();
+						for (String sourceProjectName : savedMap.keySet()) {
+							IProject sourceProject = root.getProject(sourceProjectName);
+							if (!sourceProject.exists()) {
+								return null;
+							} else {
+								Set<String> targetProjectNames = savedMap.get(sourceProjectName);
+								for (String targetProjectName : targetProjectNames) {
+									IProject targetProject = root.getProject(targetProjectName);
+									if (!targetProject.exists()) {
+										return null;
+									}
+								}
+							}
+						}
+
+						// next add the references
+						DependencyGraphEvent event = new DependencyGraphEvent();
+						incrementModStamp();
+						event = new DependencyGraphEvent();
+						event.setModStamp(getModStamp());
+
+						Set<Entry<String, Set<String>>> entries = savedMap.entrySet();
+						for (Entry<String, Set<String>> entry : entries) {
+							IProject sourceProject = root.getProject(entry.getKey());
+							for (String targetProjectName : entry.getValue()) {
+								IProject targetProject = root.getProject(targetProjectName);
+								addReference(targetProject, sourceProject, event);
+							}
+						}
+
+						RestoredGraphResults results = new RestoredGraphResults();
+						results.event = event;
+						results.graph = savedMap;
+
+						// finally ensure the results are accurate
+						checkRestoredResults(results);
+						return results;
+					}
+				}
+			}
+		} catch (Throwable e) {
+			try {
+				ModulecorePlugin.logError(e);
+				IPath stateLocation = ModulecorePlugin.getDefault().getStateLocation();
+				File file = stateLocation.append(DEPENDENCY_GRAPH_CACHE).toFile();
+				file.delete();
+			} catch (Exception e2) {
+				// eat it
+			}
+		}
+		return null;
+	}
+
+	private class PersistJob extends Job {
+
+		public PersistJob() {
+			super(Resources.GRAPH_SAVE_JOB_NAME);
+			setSystem(true);
+			setRule(null);
+		}
+
+		@Override
+		protected IStatus run(IProgressMonitor monitor) {
+			SafeRunner.run(new ISafeRunnable() {
+				public void run() throws Exception {
+					persist();
+				}
+
+				public void handleException(Throwable exception) {
+					ModulecorePlugin.logError(exception);
+				}
+			});
+			return Status.OK_STATUS;
+		}
+	}
+
+	private final static int persistDelay = 60000; // 1 minute
+	private final PersistJob persistJob = new PersistJob();
+
+	/**
+	 * Farm out the I/O to a job to minimize the necessary processing.
+	 */
+	private void saveGraph() {
+		persistJob.schedule(persistDelay);
+	}
+
+	private void persist() {
+		Map<String, Set<String>> savedMap = null;
+		synchronized (graphLock) {
+			savedMap = new HashMap<String, Set<String>>(graph.size());
+			for (IProject sourceProject : graph.keySet()) {
+				Set<String> savedTargets = new HashSet<String>();
+				for (IProject targetProject : graph.get(sourceProject)) {
+					savedTargets.add(targetProject.getName());
+				}
+				savedMap.put(sourceProject.getName(), savedTargets);
+			}
+		}
+		IPath stateLocation = ModulecorePlugin.getDefault().getStateLocation();
+		File file = stateLocation.append(DEPENDENCY_GRAPH_CACHE).toFile();
+		if (savedMap.isEmpty()) {
+			// if there is nothing to persist, delete the file.
+			if (file.exists()) {
+				file.delete();
+			}
+		} else {
+			FileOutputStream fOut = null;
+			try {
+				fOut = new FileOutputStream(file);
+				BufferedOutputStream bOut = new BufferedOutputStream(fOut);
+				ObjectOutputStream oOut = new ObjectOutputStream(bOut);
+				oOut.writeObject(savedMap);
+				oOut.close();
+			} catch (FileNotFoundException e) {
+				ModulecorePlugin.logError(e);
+			} catch (IOException e) {
+				ModulecorePlugin.logError(e);
+			} finally {
+				if (fOut != null) {
+					try {
+						fOut.close();
+					} catch (IOException e) {
+						ModulecorePlugin.logError(e);
+					}
+				}
+			}
+		}
+	}
+
+	private void checkRestoredResults(final RestoredGraphResults restoredGraphResults) {
+		Job checkRestoreDataJob = new Job(Resources.CHECK_GRAPH_RESTORE_JOB_NAME) {
+			
+			@Override
+			protected IStatus run(final IProgressMonitor monitor) {
+				SafeRunner.run(new ISafeRunnable() {
+					public void run() throws Exception {
+						try {
+							IProject[] allProjects = null;
+							int state = ResourcesPlugin.getPlugin().getBundle().getState();
+							if (state == Bundle.ACTIVE) {
+								allProjects = ResourcesPlugin.getWorkspace().getRoot().getProjects();
+							} else {
+								return;
+							}
+							if (isStale(allProjects)) {
+								rebuild(allProjects);
+								saveGraph(); // trigger a future save
+							}
+						} finally {
+							monitor.done();
+						}
+					}
+
+					private boolean isStale(IProject[] allProjects) {
+						if (restoredGraphResults.event.getModStamp() != getModStamp()) {
+							return true;
+						}
+
+						HashMap<String, Set<String>> computedGraph = new HashMap<String, Set<String>>();
+
+						for (IProject sourceProject : allProjects) {
+							if (restoredGraphResults.event.getModStamp() != getModStamp()) {
+								return true;
+							}
+							IVirtualComponent component = ComponentCore.createComponent(sourceProject);
+							if (component instanceof VirtualComponent) {
+								IVirtualReference[] references = ((VirtualComponent) component).getRawReferences();
+								for (IVirtualReference ref : references) {
+									if (restoredGraphResults.event.getModStamp() != getModStamp()) {
+										return true;
+									}
+									IVirtualComponent targetComponent = ref.getReferencedComponent();
+									if (targetComponent != null) {
+										IProject targetProject = targetComponent.getProject();
+										if (targetProject != null && !targetProject.equals(sourceProject)) {
+											String targetProjectName = targetProject.getName();
+											String sourceProjectName = sourceProject.getName();
+											Set<String> targetProjects = computedGraph.get(targetProjectName);
+											if (targetProjects == null) {
+												targetProjects = new HashSet<String>();
+												computedGraph.put(targetProjectName, targetProjects);
+											}
+											targetProjects.add(sourceProjectName);
+										}
+									}
+								}
+							}
+						}
+						if (restoredGraphResults.event.getModStamp() != getModStamp()) {
+							return true;
+						}
+						if (!restoredGraphResults.graph.equals(computedGraph)) {
+							return true;
+						}
+						if (restoredGraphResults.event.getModStamp() != getModStamp()) {
+							return true;
+						}
+						return false;
+					}
+
+					public void handleException(Throwable exception) {
+						ModulecorePlugin.logError(exception);
+					}
+				});
+				return Status.OK_STATUS;
+			}
+		};
+		checkRestoreDataJob.setSystem(true);
+		checkRestoreDataJob.setRule(ResourcesPlugin.getWorkspace().getRoot());
+		checkRestoreDataJob.schedule();
+	}
+
 	public String toString() {
 		synchronized (graphLock) {
 			StringBuffer buff = new StringBuffer("Dependency Graph:\n{\n");
-			for (Iterator<Map.Entry<IProject, Set<IProject>>> iterator = graph.entrySet().iterator(); iterator.hasNext();) {
-				Map.Entry<IProject, Set<IProject>> entry = iterator.next();
+			for (Map.Entry<IProject, Set<IProject>> entry : graph.entrySet()) {
 				buff.append("  " + entry.getKey().getName() + " -> {");
 				for (Iterator<IProject> mappedProjects = entry.getValue().iterator(); mappedProjects.hasNext();) {
 					buff.append(mappedProjects.next().getName());
@@ -711,16 +1022,17 @@
 		}
 
 	}
-	
+
 	public static final class Resources extends NLS {
-	    public static String WAITING;
-	    public static String JOB_NAME;
-	    public static String NOTIFICATION_JOB_NAME;
-	    
-	    static
-	    {
-	        initializeMessages( DependencyGraphImpl.class.getName(), Resources.class );
-	    }
+		public static String WAITING;
+		public static String JOB_NAME;
+		public static String NOTIFICATION_JOB_NAME;
+		public static String CHECK_GRAPH_RESTORE_JOB_NAME;
+		public static String GRAPH_SAVE_JOB_NAME;
+
+		static {
+			initializeMessages(DependencyGraphImpl.class.getName(),	Resources.class);
+		}
 	}
 
 }
diff --git a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/builder/DependencyGraphImpl.properties b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/builder/DependencyGraphImpl.properties
index b8552a8..0d0f481 100644
--- a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/builder/DependencyGraphImpl.properties
+++ b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/builder/DependencyGraphImpl.properties
@@ -1,3 +1,5 @@
 WAITING=Waiting
 JOB_NAME=Graph Update
-NOTIFICATION_JOB_NAME=Graph Update Notification
\ No newline at end of file
+NOTIFICATION_JOB_NAME=Graph Update Notification
+CHECK_GRAPH_RESTORE_JOB_NAME=Graph Restore
+GRAPH_SAVE_JOB_NAME=Graph persist
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/builder/DependencyGraphReferences.java b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/builder/DependencyGraphReferences.java
new file mode 100644
index 0000000..115195a
--- /dev/null
+++ b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/builder/DependencyGraphReferences.java
@@ -0,0 +1,46 @@
+/*******************************************************************************
+ * Copyright (c) 2011 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * IBM Corporation - initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.wst.common.componentcore.internal.builder;
+
+import java.util.Set;
+
+import org.eclipse.core.resources.IProject;
+
+class DependencyGraphReferences implements IDependencyGraphReferences {
+
+	IProject targetProject = null;
+
+	Set<IProject> referencingProjects = null;
+
+	boolean stale;
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.wst.common.componentcore.internal.builder.IDependencyGraphReferences#getTargetProject()
+	 */
+	public IProject getTargetProject() {
+		return targetProject;
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.wst.common.componentcore.internal.builder.IDependencyGraphReferences#getReferencingComponents()
+	 */
+	public Set<IProject> getReferencingComponents() {
+		return referencingProjects;
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.wst.common.componentcore.internal.builder.IDependencyGraphReferences#isStale()
+	 */
+	public boolean isStale() {
+		return stale;
+	}
+}
diff --git a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/builder/IDependencyGraph.java b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/builder/IDependencyGraph.java
index 07442a1..e597350 100644
--- a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/builder/IDependencyGraph.java
+++ b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/builder/IDependencyGraph.java
@@ -1,3 +1,14 @@
+/*******************************************************************************
+ * Copyright (c) 2008, 2011 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * IBM Corporation - initial API and implementation
+ *******************************************************************************/
+
 package org.eclipse.wst.common.componentcore.internal.builder;
 
 import java.util.Set;
@@ -11,7 +22,7 @@
  * provides a project limited inverse of
  * {@link IVirtualComponent#getReferences()}.
  * 
- * For example:
+ * <p>For example:
  * <ul>
  * <li>if the IVirtualComponent for project A has a dependency on the
  * IVirtualComponent for project B, then calling
@@ -35,28 +46,28 @@
 public interface IDependencyGraph {
 
 	/**
-	 * Flag used by {@link #update(IProject, int)} to specify that something has
+	 * Flag used by {@link #update(IProject, int)} to specify that something has been
 	 * modified in a project which has changed the component dependencies.
 	 */
-	public static final int MODIFIED = 0;
+	int MODIFIED = 0;
 
 	/**
 	 * Flag used by {@link #update(IProject, int)} to specify a project has been
 	 * added or opened. This flag should be used as sparingly as possible
 	 * because there are performance implications.
 	 */
-	public static final int ADDED = 1;
+	int ADDED = 1;
 
 	/**
 	 * Flag used by {@link #update(IProject, int)} to specify a project has been
 	 * removed or closed.
 	 */
-	public static final int REMOVED = 2;
+	int REMOVED = 2;
 
 	/**
-	 * The static instance of this graph
+	 * The static instance of this graph.
 	 */
-	public static IDependencyGraph INSTANCE = DependencyGraphImpl.getInstance();
+	IDependencyGraph INSTANCE = DependencyGraphImpl.getInstance();
 
 	/**
 	 * Returns the set of component projects referencing the specified target
@@ -65,48 +76,70 @@
 	 * @param targetProject
 	 * @return
 	 */
-	public Set<IProject> getReferencingComponents(IProject targetProject);
+	Set<IProject> getReferencingComponents(IProject targetProject);
 
 	/**
+	 * If <code>waitForAllUpdates</code> is <code>true</code> this method is
+	 * equivalent to {@link #getReferencingComponents(IProject)}. Otherwise this
+	 * method will return immediately without waiting for all updates to occur
+	 * and potentially returning stale data. This a safer way to call
+	 * getReferences to avoid deadlocks. If stale data is returned, then a
+	 * subsequent on the same thread can be made, but there may be deadlock risk
+	 * depending on what ISchedulingRule is currently held.  A safer reaction
+	 * to stale data would be to schedule another job to run in future to try again.
+	 * 
+	 * @param targetProject
+	 * @param waitForAllUpdates
+	 * @return
+	 */
+	IDependencyGraphReferences getReferencingComponents(IProject targetProject, boolean waitForAllUpdates);
+		
+	/**
+	 * Returns <code>true</code> if there are any pending updates.
+	 * @return
+	 */
+	boolean isStale();
+	
+	/**
 	 * Returns a modification stamp. This modification stamp will be different
 	 * if the project dependencies ever change.
 	 */
-	public long getModStamp();
+	long getModStamp();
 	
-	public void addListener(IDependencyGraphListener listener);
+	void addListener(IDependencyGraphListener listener);
 	
-	public void removeListener(IDependencyGraphListener listener);
+	void removeListener(IDependencyGraphListener listener);
 
 	/**
 	 * WARNING: this should only be called by implementors of the
 	 * org.eclipse.wst.common.modulecore.componentimpl extension point.
 	 * 
-	 * This method is part of the update API.
+	 * <p>This method is part of the update API.
 	 * 
 	 * @see {@link #update(IProject)}
 	 */
-	public void preUpdate();
+	void preUpdate();
 
 	/**
 	 * WARNING: this should only be called by implementors of the
 	 * org.eclipse.wst.common.modulecore.componentimpl extension point.
 	 * 
-	 * This method is part of the update API.
+	 * <p>This method is part of the update API.
 	 * 
 	 * @see {@link #update(IProject)}
 	 */
-	public void postUpdate();
+	void postUpdate();
 
 	/**
 	 * @deprecated use {@link #update(IProject, int) using the #MODIFIED flag.
 	 */
-	public void update(IProject sourceProject);
+	void update(IProject sourceProject);
 
 	/**
 	 * WARNING: this should only be called by implementors of the
 	 * org.eclipse.wst.common.modulecore.componentimpl extension point.
 	 * 
-	 * This method must be called when a resource change is detected which will
+	 * <p>This method must be called when a resource change is detected which will
 	 * affect how dependencies behave. For example, the core IVirtualComponent
 	 * framework updates when changes are made to the
 	 * .settings/org.eclipse.wst.common.component file changes, and also when
@@ -115,22 +148,23 @@
 	 * general a call to update should only be made from a fast
 	 * {@link IResourceDeltaVisitor}.
 	 * 
-	 * In order to improve efficiency and avoid unnecessary update processing,
+	 * <p>In order to improve efficiency and avoid unnecessary update processing,
 	 * it is necessary to always proceed calls to update() with a call to
 	 * preUpdate() and follow with a call to postUpdate() using a try finally
-	 * block as follows: <code>
+	 * block as follows: 
+	 * <pre>
 	 * try {
 	 *     preUpdate();
 	 *     // perform 0 or more update() calls here
 	 * } finally {
 	 *     IDependencyGraph.INSTANCE.postUpdate();
 	 * }    
-	 * </code>
+	 * </pre>
 	 * 
 	 * Valid updateType flags are {@link #MODIFIED}, {@link #ADDED}, and
 	 * {@link #REMOVED}
 	 * 
 	 */
-	public void update(IProject sourceProject, int updateType);
+	void update(IProject sourceProject, int updateType);
 
 }
diff --git a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/builder/IDependencyGraphReferences.java b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/builder/IDependencyGraphReferences.java
new file mode 100644
index 0000000..03e7161
--- /dev/null
+++ b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/builder/IDependencyGraphReferences.java
@@ -0,0 +1,34 @@
+/*******************************************************************************
+ * Copyright (c) 2011 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * IBM Corporation - initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.wst.common.componentcore.internal.builder;
+
+import java.util.Set;
+
+import org.eclipse.core.resources.IProject;
+
+public interface IDependencyGraphReferences {
+
+	IProject getTargetProject();
+
+	/**
+	 * Returns the set of referencing projects; see
+	 * {@link IDependencyGraph#getReferencingComponents(IProject)}
+	 */
+	Set<IProject> getReferencingComponents();
+
+	/**
+	 * If this returns <code>true</code>, then it is possible that this data
+	 * are stale. It is also possible this data are accurate.
+	 */
+	boolean isStale();
+
+}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/builder/IDependencyGraphUpdateEvent.java b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/builder/IDependencyGraphUpdateEvent.java
index 0d1094b..b50748a 100644
--- a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/builder/IDependencyGraphUpdateEvent.java
+++ b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/builder/IDependencyGraphUpdateEvent.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010 IBM Corporation and others.
+ * Copyright (c) 2010, 2011 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
@@ -17,8 +17,8 @@
 
 public interface IDependencyGraphUpdateEvent {
 
-	public static int ADDED = 1;
-	public static int REMOVED = 2;
+	int ADDED = 1;
+	int REMOVED = 2;
 
 	
 	/**
@@ -27,20 +27,20 @@
 	 * @see {@link #ADDED} {@link #REMOVED}
 	 * @return
 	 */
-	public abstract int getType();
+	int getType();
 
 	/**
 	 * Returns the modification stamp for the last update change in the
 	 * {@link IDependencyGraph} being notified by this event.
 	 * 
-	 * Note that updates to the {@link IDependencyGraph} may be queued so
+	 * <p>Note that updates to the {@link IDependencyGraph} may be queued so
 	 * several are handled by a single event.
 	 * 
 	 * @see IDependencyGraph#getModStamp()
 	 * 
 	 * @return
 	 */
-	public abstract long getModStamp();
+	long getModStamp();
 
 	/**
 	 * The key contains the referenced component, the value contains the set of
@@ -48,7 +48,7 @@
 	 * changes since the last event was fired. If {@link #getType()} |
 	 * {@link #ADDED} != {@link #ADDED} then this will be an empty map.
 	 * 
-	 * Note that the changes specified by this map do not necessarily reflect
+	 * <p>Note that the changes specified by this map do not necessarily reflect
 	 * the current state of the {@link IDependencyGraph} because it is possible
 	 * that additional changes have occurred since this event was fired.
 	 * {@link IDependencyGraph#getReferencingComponents(IProject)} will return
@@ -56,7 +56,7 @@
 	 * 
 	 * @return
 	 */
-	public abstract Map<IProject, Set<IProject>> getAddedReferences();
+	Map<IProject, Set<IProject>> getAddedReferences();
 
 	/**
 	 * The key contains the referenced component, the value contains the set of
@@ -64,7 +64,7 @@
 	 * changes since the last event was fired. If {@link #getType()} |
 	 * {@link #REMOVED} != {@link #REMOVED} then this will be an empty map.
 	 * 
-	 * Note that the changes specified by this map do not necessarily reflect
+	 * <p>Note that the changes specified by this map do not necessarily reflect
 	 * the current state of the {@link IDependencyGraph} because it is possible
 	 * that additional changes have occurred since this event was fired.
 	 * {@link IDependencyGraph#getReferencingComponents(IProject)} will return
@@ -72,6 +72,6 @@
 	 * 
 	 * @return
 	 */
-	public abstract Map<IProject, Set<IProject>> getRemovedReferences();
+	Map<IProject, Set<IProject>> getRemovedReferences();
 
 }
diff --git a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/flat/AbstractFlattenParticipant.java b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/flat/AbstractFlattenParticipant.java
index 024f710..a844e07 100644
--- a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/flat/AbstractFlattenParticipant.java
+++ b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/flat/AbstractFlattenParticipant.java
@@ -60,4 +60,8 @@
 		return false;
 	}
 
+	public List<IVirtualReference> getChildModules(IVirtualComponent rootComponent, FlatComponentTaskModel dataModel) {
+		return null;
+	}
+
 }
diff --git a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/flat/FlatVirtualComponent.java b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/flat/FlatVirtualComponent.java
index 299c5b9..a85580c 100644
--- a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/flat/FlatVirtualComponent.java
+++ b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/flat/FlatVirtualComponent.java
@@ -200,8 +200,8 @@
 
 	protected void consumeComponent(VirtualComponentFlattenUtility util, IPath root, IVirtualReference reference) throws CoreException {
 		IVirtualComponent consumedComponent = reference.getReferencedComponent();
-		if (consumedComponent.getRootFolder()!=null) {
-			IVirtualFolder vFolder = consumedComponent.getRootFolder();
+		IVirtualFolder vFolder = consumedComponent.getRootFolder();
+		if (vFolder !=null) {
 			util.addMembers(consumedComponent, vFolder, root.append(reference.getRuntimePath().makeRelative()));
 			addConsumedReferences(util, consumedComponent, root.append(reference.getRuntimePath().makeRelative()));
 			addUsedReferences(util, consumedComponent, root.append(reference.getRuntimePath().makeRelative()));
@@ -247,11 +247,49 @@
 					children.removeAll(duplicates);
 					children.add(cm);
 				}
-			}
+			}	
     	}
+    	addUsedReferencesFromParticipants(util, vc, root);    	
 	}
 	
 	/**
+	 * Add references provided by participants (e.g., components provided by a child to the receiving parent by 
+	 * mapping it to ../
+	 * @param util
+	 * @param vc
+	 * @param root
+	 * @throws CoreException
+	 */
+	
+	protected void addUsedReferencesFromParticipants(VirtualComponentFlattenUtility util, IVirtualComponent vc, IPath root) throws CoreException{		
+		List<IVirtualReference> references = null;
+		for( int i = 0; i < participants.length; i++ ) {
+			references = participants[i].getChildModules(vc, dataModel);
+			if (references == null || references.isEmpty()){
+				continue;
+			}
+			
+			for (IVirtualReference reference:references) {
+				IVirtualComponent virtualComp = reference.getReferencedComponent();
+				if (reference.getDependencyType() == DependencyType.USES ) {		
+					if( !isChildModule(reference)) {
+						addNonChildUsedReference(util, vc, reference, root.append(reference.getRuntimePath()));
+					} else {
+						ChildModuleReference cm = new ChildModuleReference(reference, root);
+						List<IChildModuleReference> duplicates = new ArrayList();
+						for( IChildModuleReference tmp : children ) {
+							if(tmp.getRelativeURI().equals(cm.getRelativeURI()))
+								duplicates.add(tmp);
+						}
+						children.removeAll(duplicates);
+						children.add(cm);
+					}
+				}	
+			}
+		}	
+	}
+
+	/**
 	 * Should we expose this used reference as a member file?
 	 * 
 	 * @param currentComponent the current component we're traversing
diff --git a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/flat/IFlattenParticipant.java b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/flat/IFlattenParticipant.java
index 54fd742..7beb7b3 100644
--- a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/flat/IFlattenParticipant.java
+++ b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/flat/IFlattenParticipant.java
@@ -162,5 +162,14 @@
 	 */
 	public void finalize(IVirtualComponent component, 
 			FlatComponentTaskModel dataModel, List<IFlatResource> resources);
+	
+	
+	/**
+	 * Return a list of references that this participant believes should be treated as child modules.
+	 * @param rootComponent
+	 * @param dataModel
+	 * @return
+	 */
+	public List<IVirtualReference> getChildModules(IVirtualComponent rootComponent, FlatComponentTaskModel dataModel);
 
 }
diff --git a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/flat/VirtualComponentFlattenUtility.java b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/flat/VirtualComponentFlattenUtility.java
index 01aad61..e59198a 100644
--- a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/flat/VirtualComponentFlattenUtility.java
+++ b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/flat/VirtualComponentFlattenUtility.java
@@ -25,6 +25,7 @@
 import org.eclipse.core.runtime.Path;
 import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
 import org.eclipse.wst.common.componentcore.resources.IVirtualContainer;
+import org.eclipse.wst.common.componentcore.resources.IVirtualFile;
 import org.eclipse.wst.common.componentcore.resources.IVirtualResource;
 
 /**
@@ -104,18 +105,22 @@
 	}
 	
 	public void addFile(IVirtualComponent current, IPath path, IAdaptable file) {
+		IVirtualFile vf = (IVirtualFile)file.getAdapter(IVirtualFile.class);
 		IFile f = (IFile)file.getAdapter(IFile.class);
 		IFlatFile mf = null;
+		String vfName = null;
+		if( vf != null && vf.getName() != null )
+			vfName = vf.getName();
 		if( f != null )
-			 mf = createModuleFile(f, path.makeRelative());
+			 mf = new FlatFile(f, vfName == null ? f.getName() : vfName, path.makeRelative());
 		else {
 			File f2 = (File)file.getAdapter(File.class);
 			if( f2 != null )
-				mf = new FlatFile(f2, f2.getName(), path.makeRelative());
+				mf = new FlatFile(f2, vfName == null ? f2.getName() : vfName, path.makeRelative());
 		}
 		if( mf != null ) {
 			if (handler == null || handler.shouldAddComponentFile(current, mf)) {
-				if( mf.getModuleRelativePath().isEmpty()) {
+				if( mf.getModuleRelativePath().segmentCount() == 0) {
 					members.remove(mf);
 					members.add(mf);
 				}
diff --git a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/impl/ComponentResourceImpl.java b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/impl/ComponentResourceImpl.java
index 84ea36d..e076bc4 100644
--- a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/impl/ComponentResourceImpl.java
+++ b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/impl/ComponentResourceImpl.java
@@ -2,7 +2,7 @@
  * <copyright>
  * </copyright>
  *
- * $Id: ComponentResourceImpl.java,v 1.4 2010/05/13 04:04:35 canderson Exp $
+ * $Id: ComponentResourceImpl.java,v 1.5 2011/08/10 21:40:14 rsanchez Exp $
  */
 package org.eclipse.wst.common.componentcore.internal.impl;
 
@@ -37,6 +37,7 @@
  *   <li>{@link org.eclipse.wst.common.componentcore.internal.impl.ComponentResourceImpl#getExclusions <em>Exclusions</em>}</li>
  *   <li>{@link org.eclipse.wst.common.componentcore.internal.impl.ComponentResourceImpl#getComponent <em>Component</em>}</li>
  *   <li>{@link org.eclipse.wst.common.componentcore.internal.impl.ComponentResourceImpl#getResourceType <em>Resource Type</em>}</li>
+ *   <li>{@link org.eclipse.wst.common.componentcore.internal.impl.ComponentResourceImpl#getTag <em>Tag</em>}</li>
  * </ul>
  * </p>
  *
@@ -91,7 +92,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected EList exclusions = null;
+	protected EList exclusions;
 	
 	/**
 	 * The default value of the '{@link #getResourceType() <em>Resource Type</em>}' attribute.
@@ -113,6 +114,26 @@
 	 */
 	protected String resourceType = RESOURCE_TYPE_EDEFAULT;
 
+	/**
+	 * The default value of the '{@link #getTag() <em>Tag</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getTag()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String TAG_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getTag() <em>Tag</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getTag()
+	 * @generated
+	 * @ordered
+	 */
+	protected String tag = TAG_EDEFAULT;
+
 	protected IProject owningProject;
 	protected static final int VIRTUAL = 0;
 	protected static final int PERSISTED = 1;
@@ -248,6 +269,27 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	public String getTag() {
+		return tag;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setTag(String newTag) {
+		String oldTag = tag;
+		tag = newTag;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, ComponentcorePackage.COMPONENT_RESOURCE__TAG, oldTag, tag));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
 	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
 		if (featureID >= 0) {
 			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
@@ -315,6 +357,8 @@
 				return getComponent();
 			case ComponentcorePackage.COMPONENT_RESOURCE__RESOURCE_TYPE:
 				return getResourceType();
+			case ComponentcorePackage.COMPONENT_RESOURCE__TAG:
+				return getTag();
 		}
 		return eDynamicGet(eFeature, resolve);
 	}
@@ -342,6 +386,9 @@
 			case ComponentcorePackage.COMPONENT_RESOURCE__RESOURCE_TYPE:
 				setResourceType((String)newValue);
 				return;
+			case ComponentcorePackage.COMPONENT_RESOURCE__TAG:
+				setTag((String)newValue);
+				return;
 		}
 		eDynamicSet(eFeature, newValue);
 	}
@@ -368,6 +415,9 @@
 			case ComponentcorePackage.COMPONENT_RESOURCE__RESOURCE_TYPE:
 				setResourceType(RESOURCE_TYPE_EDEFAULT);
 				return;
+			case ComponentcorePackage.COMPONENT_RESOURCE__TAG:
+				setTag(TAG_EDEFAULT);
+				return;
 		}
 		eDynamicUnset(eFeature);
 	}
@@ -389,6 +439,8 @@
 				return getComponent() != null;
 			case ComponentcorePackage.COMPONENT_RESOURCE__RESOURCE_TYPE:
 				return RESOURCE_TYPE_EDEFAULT == null ? resourceType != null : !RESOURCE_TYPE_EDEFAULT.equals(resourceType);
+			case ComponentcorePackage.COMPONENT_RESOURCE__TAG:
+				return TAG_EDEFAULT == null ? tag != null : !TAG_EDEFAULT.equals(tag);
 		}
 		return eDynamicIsSet(eFeature);
 	}
@@ -410,6 +462,8 @@
 		result.append(exclusions);
 		result.append(", resourceType: ");
 		result.append(resourceType);
+		result.append(", tag: ");
+		result.append(tag);
 		result.append(')');
 		return result.toString();
 	}
diff --git a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/impl/ComponentcorePackageImpl.java b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/impl/ComponentcorePackageImpl.java
index c04eedd..cb71b6a 100644
--- a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/impl/ComponentcorePackageImpl.java
+++ b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/impl/ComponentcorePackageImpl.java
@@ -2,7 +2,7 @@
  * <copyright>
  * </copyright>
  *
- * $Id: ComponentcorePackageImpl.java,v 1.10 2009/06/09 20:02:04 jsholl Exp $
+ * $Id: ComponentcorePackageImpl.java,v 1.11 2011/08/10 21:40:14 rsanchez Exp $
  */
 package org.eclipse.wst.common.componentcore.internal.impl;
 
@@ -284,6 +284,15 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	public EAttribute getComponentResource_Tag() {
+		return (EAttribute)componentResourceEClass.getEStructuralFeatures().get(5);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
 	public EClass getComponentType() {
 		return componentTypeEClass;
 	}
@@ -510,6 +519,7 @@
 		createEAttribute(componentResourceEClass, COMPONENT_RESOURCE__EXCLUSIONS);
 		createEReference(componentResourceEClass, COMPONENT_RESOURCE__COMPONENT);
 		createEAttribute(componentResourceEClass, COMPONENT_RESOURCE__RESOURCE_TYPE);
+		createEAttribute(componentResourceEClass, COMPONENT_RESOURCE__TAG);
 
 		componentTypeEClass = createEClass(COMPONENT_TYPE);
 		createEAttribute(componentTypeEClass, COMPONENT_TYPE__COMPONENT_TYPE_ID);
@@ -581,6 +591,7 @@
 		initEAttribute(getComponentResource_Exclusions(), ecorePackage.getEString(), "exclusions", "", 0, -1, ComponentResource.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
 		initEReference(getComponentResource_Component(), this.getWorkbenchComponent(), this.getWorkbenchComponent_Resources(), "component", null, 1, 1, ComponentResource.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
 		initEAttribute(getComponentResource_ResourceType(), ecorePackage.getEString(), "resourceType", "", 1, 1, ComponentResource.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+		initEAttribute(getComponentResource_Tag(), ecorePackage.getEString(), "tag", null, 0, 1, ComponentResource.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
 
 		initEClass(componentTypeEClass, ComponentType.class, "ComponentType", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
 		initEAttribute(getComponentType_ComponentTypeId(), ecorePackage.getEString(), "componentTypeId", "", 1, 1, ComponentType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
diff --git a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/impl/WorkbenchComponentImpl.java b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/impl/WorkbenchComponentImpl.java
index c8b183a..5e65bab 100644
--- a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/impl/WorkbenchComponentImpl.java
+++ b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/impl/WorkbenchComponentImpl.java
@@ -226,6 +226,17 @@
 		}	
 		return null;
 	}
+	
+	private IPath getFirstTaggedRootSource(){
+		List res = getResources();
+		for (Iterator iter = res.iterator(); iter.hasNext();) {
+			ComponentResource element = (ComponentResource) iter.next();
+			if (element.getRuntimePath().equals(new Path("/")) &&  DEFAULT_ROOT_SOURCE_TAG.equals(element.getTag()))
+				return element.getSourcePath();
+		}	
+		return null;		
+	}
+
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
@@ -572,8 +583,13 @@
 	}
 	
 	public IPath getDefaultSourceRoot() {
-		if (defaultSourceRoot == null)
-			defaultSourceRoot = getFirstRootSource();
+		if (defaultSourceRoot == null){
+			defaultSourceRoot = getFirstTaggedRootSource();
+			if (defaultSourceRoot == null)
+			{
+				defaultSourceRoot = getFirstRootSource();
+			}
+		}
 		return defaultSourceRoot;
 	}
 	
diff --git a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/operation/AddReferenceDataModelProvider.java b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/operation/AddReferenceDataModelProvider.java
index 40c6e65..083cea6 100644
--- a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/operation/AddReferenceDataModelProvider.java
+++ b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/operation/AddReferenceDataModelProvider.java
@@ -30,6 +30,7 @@
 		Set propertyNames = super.getPropertyNames();
 		propertyNames.add(SOURCE_COMPONENT);
 		propertyNames.add(TARGET_REFERENCE_LIST);
+		propertyNames.add(SYNC_PRIMARY_RUNTIME);
 		return propertyNames;
 	}
 
@@ -38,7 +39,10 @@
 	}
 
 	public Object getDefaultProperty(String propertyName) {
-		// No defaults, both must be set
-		return super.getDefaultProperty(propertyName);
+		Object retVal = super.getDefaultProperty(propertyName);
+		if (SYNC_PRIMARY_RUNTIME.equals(propertyName)){
+			retVal = Boolean.TRUE;
+		}
+		return retVal;
 	}
 }
diff --git a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/operation/AddReferencesOp.java b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/operation/AddReferencesOp.java
index f71cf3b..a9f9ddf 100644
--- a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/operation/AddReferencesOp.java
+++ b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/operation/AddReferencesOp.java
@@ -106,34 +106,37 @@
 		try {
 			ProjectUtilities.addReferenceProjects(sourceComp.getProject(), targetprojectList);
 
-			// set the primary runtime for the child modules to be the parent module's primary runtime, if necessary
-            IFacetedProject sourceProject = ProjectFacetsManager.create( sourceComp.getProject() );
-            IRuntime sourceRuntime = sourceProject.getPrimaryRuntime();
-            for (Iterator tplItr = targetprojectList.iterator(); tplItr.hasNext();)
-            {
-	            IFacetedProject moduleFacetedProject = ProjectFacetsManager.create( ((IProject)tplItr.next()) );
-	
-	            if( moduleFacetedProject != null && ! equals( sourceRuntime, moduleFacetedProject.getPrimaryRuntime() ) )
+			if (model.getBooleanProperty(IAddReferenceDataModelProperties.SYNC_PRIMARY_RUNTIME))
+			{
+				// set the primary runtime for the child modules to be the parent module's primary runtime, if necessary
+	            IFacetedProject sourceProject = ProjectFacetsManager.create( sourceComp.getProject() );
+	            IRuntime sourceRuntime = sourceProject.getPrimaryRuntime();
+	            for (Iterator tplItr = targetprojectList.iterator(); tplItr.hasNext();)
 	            {
-	            	boolean supports = true;
-	
-	            	if( sourceRuntime != null )
-	            	{
-	            		for( Iterator itr = moduleFacetedProject.getProjectFacets().iterator(); itr.hasNext(); )
-	            		{
-	            			IProjectFacetVersion fver = (IProjectFacetVersion) itr.next();
-	            			if( ! sourceRuntime.supports( fver ) )
-	            			{
-	            				supports = false;
-	            				break;
-	            			}
-	            		}
-	            	}
-		            if( supports )
+		            IFacetedProject moduleFacetedProject = ProjectFacetsManager.create( ((IProject)tplItr.next()) );
+		
+		            if( moduleFacetedProject != null && ! equals( sourceRuntime, moduleFacetedProject.getPrimaryRuntime() ) )
 		            {
-		                moduleFacetedProject.setRuntime( sourceRuntime, submon( monitor, 1 ) );
-		            }
-		        }
+		            	boolean supports = true;
+		
+		            	if( sourceRuntime != null )
+		            	{
+		            		for( Iterator itr = moduleFacetedProject.getProjectFacets().iterator(); itr.hasNext(); )
+		            		{
+		            			IProjectFacetVersion fver = (IProjectFacetVersion) itr.next();
+		            			if( ! sourceRuntime.supports( fver ) )
+		            			{
+		            				supports = false;
+		            				break;
+		            			}
+		            		}
+		            	}
+			            if( supports )
+			            {
+			                moduleFacetedProject.setRuntime( sourceRuntime, submon( monitor, 1 ) );
+			            }
+			        }
+	            }
             }
 		} catch (CoreException e) {
 			ModulecorePlugin.logError(e);
diff --git a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/operation/RemoveReferenceOperation.java b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/operation/RemoveReferenceOperation.java
index fcc3b1a..cd085b3 100644
--- a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/operation/RemoveReferenceOperation.java
+++ b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/operation/RemoveReferenceOperation.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
+ * Copyright (c) 2005, 2011 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
@@ -12,7 +12,9 @@
 
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 import org.eclipse.core.commands.ExecutionException;
 import org.eclipse.core.resources.IProject;
@@ -61,7 +63,9 @@
 		IVirtualComponent sourceComp = (IVirtualComponent) model.getProperty(IAddReferenceDataModelProperties.SOURCE_COMPONENT);
 		if (sourceComp == null || !sourceComp.getProject().isAccessible() || sourceComp.isBinary()) return;
 		
-		IVirtualReference [] existingReferencesArray = sourceComp.getReferences();
+		Map<String, Object> options = new HashMap<String, Object>();
+		options.put(IVirtualComponent.REQUESTED_REFERENCE_TYPE, IVirtualComponent.DISPLAYABLE_REFERENCES_ALL);
+		IVirtualReference [] existingReferencesArray = sourceComp.getReferences(options);
 		if(existingReferencesArray == null || existingReferencesArray.length == 0){
 			return;
 		}
diff --git a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/resources/NonResolvableVirtualComponent.java b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/resources/NonResolvableVirtualComponent.java
new file mode 100644
index 0000000..e8ae753
--- /dev/null
+++ b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/resources/NonResolvableVirtualComponent.java
@@ -0,0 +1,57 @@
+/*******************************************************************************
+ * Copyright (c) 2011 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * IBM Corporation - initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.wst.common.componentcore.internal.resources;
+
+import org.eclipse.core.resources.IContainer;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.wst.common.componentcore.ModuleCoreNature;
+import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
+
+/**
+ * This class is a stub for virtual components whose underlying project is not accessible (e.g the project 
+ * is closed, or was deleted). This class can be returned by virtual component methods to get references 
+ * if the underlying project of the referenced component is not accessible. 
+ */
+
+public class NonResolvableVirtualComponent extends AbstractResourceListVirtualComponent {
+
+	public NonResolvableVirtualComponent(IProject p, IVirtualComponent referencingComponent) {
+		super(p, referencingComponent);
+	}
+	
+	@Override
+	protected IContainer[] getUnderlyingContainers() {
+		return new IContainer[]{};
+	}
+
+	@Override
+	protected IResource[] getLooseResources() {
+		return new IResource[]{};
+	}
+	
+	@Override
+	public boolean exists() { 
+		IProject project = getProject();
+		return (project.isAccessible() && ModuleCoreNature.isFlexibleProject(project));
+	}
+
+	@Override
+	protected String getFirstIdSegment() {
+		return null;
+	}
+	
+	@Override
+	public String getName(){
+		return getProject().getName();
+	}
+}
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 a1f8fbd..6a3ea0f 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
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2003, 2006 IBM Corporation and others.
+ * Copyright (c) 2003, 2011 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
@@ -33,6 +33,7 @@
 import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.wst.common.componentcore.ComponentCore;
 import org.eclipse.wst.common.componentcore.ModuleCoreNature;
+import org.eclipse.wst.common.componentcore.UnresolveableURIException;
 import org.eclipse.wst.common.componentcore.internal.ComponentcoreFactory;
 import org.eclipse.wst.common.componentcore.internal.ComponentcorePackage;
 import org.eclipse.wst.common.componentcore.internal.ModulecorePlugin;
@@ -41,6 +42,7 @@
 import org.eclipse.wst.common.componentcore.internal.StructureEdit;
 import org.eclipse.wst.common.componentcore.internal.WorkbenchComponent;
 import org.eclipse.wst.common.componentcore.internal.builder.IDependencyGraph;
+import org.eclipse.wst.common.componentcore.internal.impl.ModuleURIUtil;
 import org.eclipse.wst.common.componentcore.resolvers.IReferenceResolver;
 import org.eclipse.wst.common.componentcore.resolvers.ReferenceResolverUtil;
 import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
@@ -373,10 +375,14 @@
 			}
 		}
 	}	
-	
+
 	/**
 	 * Returns a raw list of references exactly as defined in
-	 * .settings/org.eclipse.wst.common.component
+	 * .settings/org.eclipse.wst.common.component. All returned references will
+	 * return a non <code>null</code> for
+	 * {@link IVirtualReference#getReferencedComponent()}, however, it is
+	 * possible that calls to these component's
+	 * {@link IVirtualComponent#exists()} may return <code>false</code>.
 	 * 
 	 * @return
 	 */
@@ -398,7 +404,7 @@
 							continue;
 						}
 						IVirtualReference vReference = StructureEdit.createVirtualReference(this, referencedComponent);
-						if (vReference != null && vReference.getReferencedComponent() != null && vReference.getReferencedComponent().exists()) {
+						if (vReference != null && vReference.getReferencedComponent() != null) {
 							references.add(vReference);
 						}
 					}
@@ -652,11 +658,20 @@
 						if (referencedComponent==null) 
 							continue;
 						IVirtualReference vReference = StructureEdit.createVirtualReference(this, referencedComponent);
-						if( vReference != null ){
+						if (vReference != null && vReference.getReferencedComponent() != null){
 							vReference.setArchiveName( referencedComponent.getArchiveName() );
+							references.add(vReference);
 						}
-						if (vReference != null && vReference.getReferencedComponent() != null)
-							references.add(vReference); 
+						else {
+							if (vReference != null && vReference.getReferencedComponent() == null){
+								// If none of the resolvers used by StructureEdit.createVirtualReference could find a reference with 
+								// a non-null referenced component, try to find it ourselves.  
+								vReference = getReferenceForNonResolvableComponent(this, referencedComponent);
+							}
+							if (vReference != null && vReference.getReferencedComponent() != null){
+								references.add(vReference);
+							}
+						}
 					}
 				}
 			}
@@ -667,7 +682,33 @@
 				core.dispose();
 		}		
 	}
+		
 	
+	/*
+	 * Similar to org.eclipse.wst.common.componentcore.resolvers.DefaultReferenceResolver#resolve(IVirtualComponent context, ReferencedComponent referencedComponent)
+	 */
+	private IVirtualReference getReferenceForNonResolvableComponent(VirtualComponent context, ReferencedComponent referencedComponent) {
+		IVirtualComponent targetComponent = null;
+		IProject targetProject = null;
+		URI uri = referencedComponent.getHandle();
+		if (uri == null)
+			return null;
+		boolean isClassPathURI = ModuleURIUtil.isClassPathURI(uri);
+		if( !isClassPathURI ){
+			try { 
+				targetProject = StructureEdit.getContainingProject(uri, false);
+			} catch(UnresolveableURIException uurie) {
+				return null;
+			} 
+
+			targetComponent = new NonResolvableVirtualComponent(targetProject, null);
+			VirtualReference vRef = new VirtualReference(context, targetComponent, referencedComponent.getRuntimePath(), referencedComponent.getDependencyType().getValue());
+			vRef.setArchiveName(referencedComponent.getArchiveName());
+			return vRef;
+		}
+		return null;
+	}
+
 	/**
 	 * This is an internal method and should not be called except by the 
 	 * {@link org.eclipse.wst.common.component.internal.builder.DependencyGraphImpl}
diff --git a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/resources/VirtualFile.java b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/resources/VirtualFile.java
index 9aa66c6..c97ed5a 100644
--- a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/resources/VirtualFile.java
+++ b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/resources/VirtualFile.java
@@ -128,6 +128,10 @@
 		if( IFile.class.equals(adapter)) {
 			return getUnderlyingFile();
 		}
+		if( IVirtualFile.class.equals(adapter))
+			return this;
+		if( IVirtualResource.class.equals(adapter))
+			return this;
 		return null;
 	}
 }
diff --git a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/resources/VirtualFolder.java b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/resources/VirtualFolder.java
index b3fa912..0753a61 100644
--- a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/resources/VirtualFolder.java
+++ b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/resources/VirtualFolder.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
+ * Copyright (c) 2003, 2011 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
@@ -24,12 +24,12 @@
 import org.eclipse.wst.common.componentcore.internal.ComponentResource;
 import org.eclipse.wst.common.componentcore.internal.StructureEdit;
 import org.eclipse.wst.common.componentcore.internal.WorkbenchComponent;
+import org.eclipse.wst.common.componentcore.resources.ITaggedVirtualResource;
 import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
 import org.eclipse.wst.common.componentcore.resources.IVirtualFolder;
 import org.eclipse.wst.common.componentcore.resources.IVirtualResource;
 
-public class VirtualFolder extends VirtualContainer implements IVirtualFolder { 
-
+public class VirtualFolder extends VirtualContainer implements IVirtualFolder, ITaggedVirtualResource { 
 
 	/**
 	 * p> Creates an unassigned mapping contained by the component identified by aComponentHandle
@@ -147,4 +147,63 @@
 		}
 	}
 
+
+	public boolean tagResource(IPath aProjectRelativeLocation, String tag, IProgressMonitor monitor) {
+		StructureEdit moduleCore = null;
+		try {
+			if (aProjectRelativeLocation != null){
+				if (aProjectRelativeLocation.isUNC()){
+					aProjectRelativeLocation = aProjectRelativeLocation.makeUNC(false);
+				}
+				IPath absolutePath = aProjectRelativeLocation.makeAbsolute();
+				moduleCore = StructureEdit.getStructureEditForWrite(getProject());
+				WorkbenchComponent aComponent = moduleCore.getComponent();
+				ComponentResource[] resources = aComponent.findResourcesByRuntimePath(getRuntimePath());
+				for (ComponentResource resource:resources){
+					if (resource.getSourcePath().equals(absolutePath)){
+						resource.setTag(tag);
+						return true;
+					}
+				}
+			}
+			return false;
+		}
+		finally {
+			if (moduleCore != null) {
+				moduleCore.saveIfNecessary(monitor);
+				moduleCore.dispose();
+			}
+		}
+		
+	}
+
+	public IPath getFirstTaggedResource(String tag) {
+		WorkbenchComponent aComponent = null;
+		IPath path = null;
+		
+		aComponent = getReadOnlyComponent();
+		ComponentResource[] resources = aComponent.findResourcesByRuntimePath(getRuntimePath());
+		for (ComponentResource resource:resources){
+			if (tag.equals(resource.getTag())){
+				path = resource.getSourcePath();
+				break;
+			}
+		}		
+		return path;
+	}
+
+	public IPath[] getTaggedResources(String tag) {
+		WorkbenchComponent aComponent = null;
+		List<IPath> paths = new ArrayList<IPath>();
+		
+		aComponent = getReadOnlyComponent();
+		ComponentResource[] resources = aComponent.findResourcesByRuntimePath(getRuntimePath());
+		for (ComponentResource resource:resources){
+			if (tag.equals(resource.getTag())){
+				paths.add(resource.getSourcePath());
+			}
+		}		
+		return paths.toArray(new IPath[0]);
+	}
+
 }
diff --git a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/util/ComponentResolver.java b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/util/ComponentResolver.java
index c6a83bb..0dd0417 100644
--- a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/util/ComponentResolver.java
+++ b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/util/ComponentResolver.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2001, 2009 IBM Corporation and others.
+ * Copyright (c) 2001, 2010 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -44,46 +44,33 @@
 	 * is the correct number. On Win32, java.io.File.toURL adds only 1 slash,
 	 * and on Unix it adds 2.
 	 * 
-	 * @param uri
-	 * @return The IFile for this file location
+	 * @param location
+	 * @return The IFile for this location
 	 */
-	private IFile recalculateFile(String uri) {
+	private IFile recalculateFile(String location) {
 		IFile file = null;
-		String location = null;
+		String uriLocation = null;
 
 		long time0 = -1;
 		if (_DEBUG)
 			time0 = System.currentTimeMillis();
-		if (uri.startsWith(HTTP_PROTOCOL)) {
-			IFile files[] = ResourcesPlugin.getWorkspace().getRoot().findFilesForLocationURI(URI.create(uri));
-			for (int i = 0; i < files.length && file == null; i++) {
-				if (files[i].isAccessible()) {
-					file = files[i];
-				}
-			}
-			if (_DEBUG) {
-				System.out.println("\"" + uri + "\" findFilesForLocationURI:" + (System.currentTimeMillis() - time0));
-				time0 = System.currentTimeMillis();
-			}
+		if (location.startsWith(FILE_PROTOCOL)) {
+			uriLocation = location.substring(FILE_PROTOCOL.length());
+		}
+		else if (location.startsWith(FILE_PROTOCOL2)) {
+			uriLocation = location.substring(FILE_PROTOCOL2.length());
 		}
 		else {
-			if (uri.startsWith(FILE_PROTOCOL)) {
-				location = uri.substring(FILE_PROTOCOL.length());
-			}
-			else if (uri.startsWith(FILE_PROTOCOL2)) {
-				location = uri.substring(FILE_PROTOCOL2.length());
-			}
-			else {
-				location = uri;
-			}
-			IPath path = new Path(location);
-			IFile[] files = ResourcesPlugin.getWorkspace().getRoot().findFilesForLocation(path);
-			for (int i = 0; i < files.length && file == null; i++) {
-				if (files[i].isAccessible()) {
-					file = files[i];
-				}
+			uriLocation = location;
+		}
+
+		IFile[] files = ResourcesPlugin.getWorkspace().getRoot().findFilesForLocation(new Path(uriLocation));
+		for (int i = 0; i < files.length && file == null; i++) {
+			if (files[i].isAccessible()) {
+				file = files[i];
 			}
 		}
+
 		if (_DEBUG)
 			System.out.println("\"" + location + "\" findFilesForLocation:" + (System.currentTimeMillis() - time0));
 		return file;
@@ -107,9 +94,10 @@
 
 		/* Recompute the IFile, if needed, from the base location. */
 		if (file == null) {
-			if (baseLocation == null || baseLocation.length() == 0 || baseLocation.startsWith("wbit:")) { //$NON-NLS-1$
+			// Generates Internal Error message if we continue with a http URI: org.eclipse.core.runtime.CoreException: No file system is defined for scheme: http
+			if (baseLocation == null || baseLocation.length() == 0 || baseLocation.startsWith("wbit:") || baseLocation.startsWith(HTTP_PROTOCOL)) { //$NON-NLS-1$
 				/*
-				 * We can't proceed if we lack both an IFile and a system
+				 * We can't proceed if we lack both an IFile and a valid filesystem
 				 * reference
 				 */
 				if (_DEBUG) {
diff --git a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/util/ComponentcoreAdapterFactory.java b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/util/ComponentcoreAdapterFactory.java
index 3716298..39b9c64 100644
--- a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/util/ComponentcoreAdapterFactory.java
+++ b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/util/ComponentcoreAdapterFactory.java
@@ -2,7 +2,7 @@
  * <copyright>
  * </copyright>
  *
- * $Id: ComponentcoreAdapterFactory.java,v 1.6 2005/10/18 22:27:18 cbridgha Exp $
+ * $Id: ComponentcoreAdapterFactory.java,v 1.7 2011/08/10 21:40:14 rsanchez Exp $
  */
 package org.eclipse.wst.common.componentcore.internal.util;
 
@@ -66,7 +66,7 @@
 	}
 
 	/**
-	 * The switch the delegates to the <code>createXXX</code> methods.
+	 * The switch that delegates to the <code>createXXX</code> methods.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
diff --git a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/util/ComponentcoreSwitch.java b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/util/ComponentcoreSwitch.java
index e8c0cc4..74a7b67 100644
--- a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/util/ComponentcoreSwitch.java
+++ b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/util/ComponentcoreSwitch.java
@@ -2,7 +2,7 @@
  * <copyright>
  * </copyright>
  *
- * $Id: ComponentcoreSwitch.java,v 1.7 2009/06/09 20:02:03 jsholl Exp $
+ * $Id: ComponentcoreSwitch.java,v 1.8 2011/08/10 21:40:14 rsanchez Exp $
  */
 package org.eclipse.wst.common.componentcore.internal.util;
 
@@ -74,11 +74,13 @@
 		if (theEClass.eContainer() == modelPackage) {
 			return doSwitch(theEClass.getClassifierID(), theEObject);
 		}
-		List eSuperTypes = theEClass.getESuperTypes();
-		return
-			eSuperTypes.isEmpty() ?
-				defaultCase(theEObject) :
-				doSwitch((EClass)eSuperTypes.get(0), theEObject);
+		else {
+			List eSuperTypes = theEClass.getESuperTypes();
+			return
+				eSuperTypes.isEmpty() ?
+					defaultCase(theEObject) :
+					doSwitch((EClass)eSuperTypes.get(0), theEObject);
+		}
 	}
 
 	/**
@@ -131,13 +133,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Workbench Component</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Workbench Component</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Workbench Component</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>Workbench Component</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -146,13 +148,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Component Resource</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Component Resource</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Component Resource</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>Component Resource</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -161,13 +163,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Component Type</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Component Type</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Component Type</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>Component Type</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -176,13 +178,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Property</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Property</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Property</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>Property</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -191,13 +193,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Referenced Component</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Referenced Component</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Referenced Component</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>Referenced Component</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -206,13 +208,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Project Components</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Project Components</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Project Components</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>Project Components</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -221,13 +223,13 @@
 	}
 
 	/**
-	 * Returns the result of interpretting the object as an instance of '<em>EObject</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>EObject</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch, but this is the last case anyway.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>EObject</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>EObject</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject)
 	 * @generated
 	 */
diff --git a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/util/WTPModulesTranslator.java b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/util/WTPModulesTranslator.java
index b88af6b..47fa640 100644
--- a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/util/WTPModulesTranslator.java
+++ b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/util/WTPModulesTranslator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
+ * Copyright (c) 2005, 2011 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
@@ -107,7 +107,8 @@
 			new IPathTranslator(SOURCE_PATH, MODULE_CORE_PKG.getComponentResource_SourcePath(), DOM_ATTRIBUTE),
 			new IPathTranslator(RUNTIME_PATH, MODULE_CORE_PKG.getComponentResource_RuntimePath(), DOM_ATTRIBUTE),
 			new Translator(RESOURCE_TYPE, MODULE_CORE_PKG.getComponentResource_ResourceType(), DOM_ATTRIBUTE),
-			new Translator(EXCLUSIONS, MODULE_CORE_PKG.getComponentResource_Exclusions())
+			new Translator(EXCLUSIONS, MODULE_CORE_PKG.getComponentResource_Exclusions()),
+			new Translator(TAG, MODULE_CORE_PKG.getComponentResource_Tag(),DOM_ATTRIBUTE)
 		});
 		return result;
 	}
diff --git a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/util/WTPModulesXmlMapperI.java b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/util/WTPModulesXmlMapperI.java
index 6dd9ab3..8dc57fa 100644
--- a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/util/WTPModulesXmlMapperI.java
+++ b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/util/WTPModulesXmlMapperI.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
+ * Copyright (c) 2005, 2011 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
@@ -33,5 +33,5 @@
 	String RESOURCE_TYPE = "resource-type";//$NON-NLS-1$
 	String ARCHIVE_NAME="archiveName";//$NON-NLS-1$
 	String PROJECT_VERSION="project-version"; //$NON-NLS-1$
-	
+	String TAG="tag";//$NON-NLS-1$
 }
diff --git a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/resources/ITaggedVirtualResource.java b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/resources/ITaggedVirtualResource.java
new file mode 100644
index 0000000..542cf46
--- /dev/null
+++ b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/resources/ITaggedVirtualResource.java
@@ -0,0 +1,42 @@
+/*******************************************************************************
+ * Copyright (c) 2011 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.wst.common.componentcore.resources;
+
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.IProgressMonitor;
+
+public interface ITaggedVirtualResource {
+	
+	/**
+	 * Sets the given tag to the path linked to this resource 
+	 * @param aProjectRelativeLocation - path linked to the resource
+	 * @param tag - The tag to be set
+	 * @param monitor - can be null
+	 * @return true if the path was tagged correctly, false otherwise (e.g. the path is not linked to the resource)  
+	 */
+	
+	boolean tagResource(IPath aProjectRelativeLocation, String tag, IProgressMonitor monitor);
+	
+	/**
+	 * Returns the path of the first link to this resource tagged with the given tag
+	 * @param tag
+	 * @return the path linked to this resource tagged with the given tag, or null if no path can be found.
+	 */
+	IPath getFirstTaggedResource(String tag);
+	
+	/**
+	 * Returns the paths of the links to this resource tagged with the given tag
+	 * @param tag
+	 * @return the paths linked to this resource tagged with the given tag, or empty array if no paths can be found.
+	 */
+	IPath[] getTaggedResources(String tag);
+
+}
diff --git a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/resources/IVirtualComponent.java b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/resources/IVirtualComponent.java
index 69a1b5a..0df6a67 100644
--- a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/resources/IVirtualComponent.java
+++ b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/resources/IVirtualComponent.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2003, 2006 IBM Corporation and others.
+ * Copyright (c) 2003, 2011 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
@@ -43,7 +43,19 @@
 	public static final String REQUESTED_REFERENCE_TYPE = "REQUESTED_REFERENCE_TYPE";
 	public static final String HARD_REFERENCES = "HARD_REFERENCES";
 	public static final String NON_DERIVED_REFERENCES = "NON_DERIVED_REFERENCES";
+	
+	/**
+	 * Retrieve all component references displayable to the user, excluding references to components that might not
+	 * exist (i.e. calls to these component's {@link IVirtualComponent#exists()} return false)
+	 */
 	public static final String DISPLAYABLE_REFERENCES = "DISPLAYABLE_REFERENCES";
+	
+	/**
+	 * Retrieve all component references displayable to the user, including references to components that might not
+	 * exist (i.e. calls to these component's {@link IVirtualComponent#exists()} return false)
+	 */
+	public static final String DISPLAYABLE_REFERENCES_ALL = "DISPLAYABLE_REFERENCES_ALL";
+
 	public static final String FLATTENABLE_REFERENCES = "FLATTENABLE_REFERENCES";
 		
 	/**
diff --git a/plugins/org.eclipse.wst.common.modulecore/schema/resourceFactories.exsd b/plugins/org.eclipse.wst.common.modulecore/schema/resourceFactories.exsd
index 49f7a80..f309491 100644
--- a/plugins/org.eclipse.wst.common.modulecore/schema/resourceFactories.exsd
+++ b/plugins/org.eclipse.wst.common.modulecore/schema/resourceFactories.exsd
@@ -18,7 +18,7 @@
       </annotation>
       <complexType>
          <sequence>
-            <element ref="resourceFactory"/>
+            <element ref="resourceFactory" maxOccurs="unbounded"/>
          </sequence>
          <attribute name="point" type="string" use="required">
             <annotation>
diff --git a/plugins/org.eclipse.wst.validation.ui/.classpath b/plugins/org.eclipse.wst.validation.ui/.classpath
new file mode 100644
index 0000000..7acdda6
--- /dev/null
+++ b/plugins/org.eclipse.wst.validation.ui/.classpath
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="validateui"/>
+	<classpathentry kind="src" path="property_files"/>
+	<classpathentry kind="src" path="vf2"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/plugins/org.eclipse.wst.common.emf/.cvsignore b/plugins/org.eclipse.wst.validation.ui/.cvsignore
similarity index 64%
rename from plugins/org.eclipse.wst.common.emf/.cvsignore
rename to plugins/org.eclipse.wst.validation.ui/.cvsignore
index 26458b4..b39f8f4 100644
--- a/plugins/org.eclipse.wst.common.emf/.cvsignore
+++ b/plugins/org.eclipse.wst.validation.ui/.cvsignore
@@ -1,8 +1,7 @@
 bin
-runtime
 temp.folder
 build.xml
-org.eclipse.wst.common.emf_1.0.0.zip
-src.zip
+runtime
 @dot
+src.zip
 javaCompiler...args
diff --git a/plugins/org.eclipse.wst.common.emf/.project b/plugins/org.eclipse.wst.validation.ui/.project
similarity index 89%
copy from plugins/org.eclipse.wst.common.emf/.project
copy to plugins/org.eclipse.wst.validation.ui/.project
index 5b5f0fe..32471f6 100644
--- a/plugins/org.eclipse.wst.common.emf/.project
+++ b/plugins/org.eclipse.wst.validation.ui/.project
@@ -1,9 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>org.eclipse.wst.common.emf</name>
+	<name>org.eclipse.wst.validation.ui</name>
 	<comment></comment>
-	<projects>
-	</projects>
 	<buildSpec>
 		<buildCommand>
 			<name>org.eclipse.jdt.core.javabuilder</name>
diff --git a/plugins/org.eclipse.wst.validation.ui/.settings/org.eclipse.core.resources.prefs b/plugins/org.eclipse.wst.validation.ui/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000..9306ade
--- /dev/null
+++ b/plugins/org.eclipse.wst.validation.ui/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,3 @@
+#Mon May 08 09:24:56 EDT 2006
+eclipse.preferences.version=1
+encoding/<project>=ISO-8859-1
diff --git a/plugins/org.eclipse.wst.validation.ui/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.wst.validation.ui/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000..7f1fe24
--- /dev/null
+++ b/plugins/org.eclipse.wst.validation.ui/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,71 @@
+#Tue Feb 12 12:30:46 EST 2008
+eclipse.preferences.version=1
+org.eclipse.jdt.core.codeComplete.argumentPrefixes=
+org.eclipse.jdt.core.codeComplete.argumentSuffixes=
+org.eclipse.jdt.core.codeComplete.fieldPrefixes=_
+org.eclipse.jdt.core.codeComplete.fieldSuffixes=
+org.eclipse.jdt.core.codeComplete.localPrefixes=
+org.eclipse.jdt.core.codeComplete.localSuffixes=
+org.eclipse.jdt.core.codeComplete.staticFieldPrefixes=_
+org.eclipse.jdt.core.codeComplete.staticFieldSuffixes=
+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=warning
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
+org.eclipse.jdt.core.compiler.problem.deprecation=ignore
+org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
+org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
+org.eclipse.jdt.core.compiler.problem.discouragedReference=ignore
+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.fatalOptionalError=disabled
+org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
+org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
+org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
+org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
+org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
+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=warning
+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=warning
+org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=warning
+org.eclipse.jdt.core.compiler.problem.nullReference=ignore
+org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
+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.specialParameterHidingField=disabled
+org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
+org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
+org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
+org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
+org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
+org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
+org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
+org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
+org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=error
+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=warning
+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=warning
+org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
+org.eclipse.jdt.core.compiler.source=1.5
diff --git a/plugins/org.eclipse.wst.validation.ui/.settings/org.eclipse.jdt.ui.prefs b/plugins/org.eclipse.wst.validation.ui/.settings/org.eclipse.jdt.ui.prefs
new file mode 100644
index 0000000..4638d6c
--- /dev/null
+++ b/plugins/org.eclipse.wst.validation.ui/.settings/org.eclipse.jdt.ui.prefs
@@ -0,0 +1,6 @@
+#Tue Feb 12 12:30:46 EST 2008
+eclipse.preferences.version=1
+org.eclipse.jdt.ui.exception.name=e
+org.eclipse.jdt.ui.gettersetter.use.is=true
+org.eclipse.jdt.ui.keywordthis=false
+org.eclipse.jdt.ui.overrideannotation=true
diff --git a/plugins/org.eclipse.wst.validation.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.wst.validation.ui/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..e07fade
--- /dev/null
+++ b/plugins/org.eclipse.wst.validation.ui/META-INF/MANIFEST.MF
@@ -0,0 +1,22 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %Bundle-Name.0
+Bundle-SymbolicName: org.eclipse.wst.validation.ui; singleton:=true
+Bundle-Version: 1.2.300.qualifier
+Bundle-Activator: org.eclipse.wst.validation.internal.ui.plugin.ValidationUIPlugin
+Bundle-Vendor: %Bundle-Vendor.0
+Bundle-Localization: plugin
+Export-Package: org.eclipse.wst.validation.internal.ui;x-internal:=true,
+ org.eclipse.wst.validation.internal.ui.plugin;x-internal:=true
+Require-Bundle: org.eclipse.ui.ide;bundle-version="[3.4.0,4.0.0)",
+ org.eclipse.core.resources;bundle-version="[3.4.0,4.0.0)",
+ org.eclipse.ui;bundle-version="[3.4.0,4.0.0)",
+ org.eclipse.swt;bundle-version="[3.4.0,4.0.0)",
+ org.eclipse.wst.common.frameworks.ui;bundle-version="[1.1.200,2.0.0)",
+ org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
+ org.eclipse.wst.common.frameworks;bundle-version="[1.1.200,2.0.0)",
+ org.eclipse.wst.validation;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.ui.forms;bundle-version="[3.3.100,4.0.0)",
+ org.eclipse.wst.common.project.facet.core;bundle-version="[1.4.102,2.0.0)"
+Bundle-ActivationPolicy: lazy
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/plugins/org.eclipse.wst.common.emf/about.html b/plugins/org.eclipse.wst.validation.ui/about.html
similarity index 100%
copy from plugins/org.eclipse.wst.common.emf/about.html
copy to plugins/org.eclipse.wst.validation.ui/about.html
diff --git a/plugins/org.eclipse.wst.common.emf/build.properties b/plugins/org.eclipse.wst.validation.ui/build.properties
similarity index 65%
copy from plugins/org.eclipse.wst.common.emf/build.properties
copy to plugins/org.eclipse.wst.validation.ui/build.properties
index ed37cff..1749ccd 100644
--- a/plugins/org.eclipse.wst.common.emf/build.properties
+++ b/plugins/org.eclipse.wst.validation.ui/build.properties
@@ -1,5 +1,5 @@
 ###############################################################################
-# Copyright (c) 2003, 2006 IBM Corporation and others.
+# Copyright (c) 2001, 2007 IBM Corporation and others.
 # All rights reserved. This program and the accompanying materials
 # are made available under the terms of the Eclipse Public License v1.0
 # which accompanies this distribution, and is available at
@@ -8,15 +8,13 @@
 # Contributors:
 # IBM Corporation - initial API and implementation
 ###############################################################################
-bin.includes = plugin.xml,\
+bin.includes = .,\
+               plugin.xml,\
                META-INF/,\
                about.html,\
-               plugin.properties,\
-               .,\
-               schema/
-jars.compile.order = .
-src.includes = component.xml,\
-               schema/
+               icons/,\
+               plugin.properties
+source.. = validateui/,\
+           property_files/,\
+           vf2/
 output.. = bin/
-source.. = wtpemf/,\
-           workbench/
diff --git a/plugins/org.eclipse.wst.validation.ui/icons/fail_tbl.gif b/plugins/org.eclipse.wst.validation.ui/icons/fail_tbl.gif
new file mode 100644
index 0000000..9bd9b0c
--- /dev/null
+++ b/plugins/org.eclipse.wst.validation.ui/icons/fail_tbl.gif
Binary files differ
diff --git a/plugins/org.eclipse.wst.validation.ui/icons/fail_tbl_disabled.gif b/plugins/org.eclipse.wst.validation.ui/icons/fail_tbl_disabled.gif
new file mode 100644
index 0000000..91333a1
--- /dev/null
+++ b/plugins/org.eclipse.wst.validation.ui/icons/fail_tbl_disabled.gif
Binary files differ
diff --git a/plugins/org.eclipse.wst.validation.ui/icons/ok_tbl.gif b/plugins/org.eclipse.wst.validation.ui/icons/ok_tbl.gif
new file mode 100644
index 0000000..9cacb96
--- /dev/null
+++ b/plugins/org.eclipse.wst.validation.ui/icons/ok_tbl.gif
Binary files differ
diff --git a/plugins/org.eclipse.wst.validation.ui/icons/ok_tbl_disabled.gif b/plugins/org.eclipse.wst.validation.ui/icons/ok_tbl_disabled.gif
new file mode 100644
index 0000000..1d8900b
--- /dev/null
+++ b/plugins/org.eclipse.wst.validation.ui/icons/ok_tbl_disabled.gif
Binary files differ
diff --git a/plugins/org.eclipse.wst.validation.ui/icons/settings.gif b/plugins/org.eclipse.wst.validation.ui/icons/settings.gif
new file mode 100644
index 0000000..9c99aad
--- /dev/null
+++ b/plugins/org.eclipse.wst.validation.ui/icons/settings.gif
Binary files differ
diff --git a/plugins/org.eclipse.wst.validation.ui/icons/settings_disabled.gif b/plugins/org.eclipse.wst.validation.ui/icons/settings_disabled.gif
new file mode 100644
index 0000000..09166da
--- /dev/null
+++ b/plugins/org.eclipse.wst.validation.ui/icons/settings_disabled.gif
Binary files differ
diff --git a/plugins/org.eclipse.wst.validation.ui/plugin.properties b/plugins/org.eclipse.wst.validation.ui/plugin.properties
new file mode 100644
index 0000000..887dfc0
--- /dev/null
+++ b/plugins/org.eclipse.wst.validation.ui/plugin.properties
@@ -0,0 +1,19 @@
+###############################################################################
+# Copyright (c) 2001, 2009 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
+###############################################################################
+#
+# Version 1.3
+#
+VBF_TITLE_PROPERTIES=Validation
+VBF_UI_POPUP_RUNVALIDATION=&Validate
+VBF_TITLE_PREFERENCE=Validation
+
+Bundle-Name.0 = Validation Framework UI
+Bundle-Vendor.0 = Eclipse Web Tools Platform
diff --git a/plugins/org.eclipse.wst.validation.ui/plugin.xml b/plugins/org.eclipse.wst.validation.ui/plugin.xml
new file mode 100644
index 0000000..20502a4
--- /dev/null
+++ b/plugins/org.eclipse.wst.validation.ui/plugin.xml
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.0"?>
+<plugin>
+
+    
+<!-- ============================================== -->
+<!-- Popup Contributions                            -->
+<!-- ============================================== -->
+<!-- By saying "adaptable=true", this item will appear on both IProject and IJavaProject -->
+   <extension
+         point="org.eclipse.ui.popupMenus">
+      <objectContribution
+            adaptable="true"
+            objectClass="org.eclipse.core.resources.IResource"
+            id="ValidationMenuAction">
+         <action
+               label="%VBF_UI_POPUP_RUNVALIDATION"
+               class="org.eclipse.wst.validation.internal.ui.ValidationMenuAction"
+               menubarPath="additions"
+               enablesFor="+"
+               id="ValidationAction">
+         </action>
+      </objectContribution>      
+   </extension>
+  
+
+<!-- ====================================================== -->
+<!--           Validation preference page                   -->
+<!-- ====================================================== -->
+   <extension
+         point="org.eclipse.ui.preferencePages">
+      <page
+            name="%VBF_TITLE_PREFERENCE"
+            class="org.eclipse.wst.validation.ui.internal.preferences.ValidationPreferencePage"
+            id="ValidationPreferencePage">
+      </page>
+   </extension>
+   
+<!-- ====================================================== -->
+<!--           Validation properties page                   -->
+<!-- ====================================================== -->
+<!-- By saying "adaptable=true", this item will appear on both IProject and IJavaProject -->
+   <extension
+         point="org.eclipse.ui.propertyPages">
+      <page
+            name="%VBF_TITLE_PROPERTIES"
+            class="org.eclipse.wst.validation.ui.internal.preferences.ValidationPropertyPage"
+            id="ValidationPropertiesPage">
+         <enabledWhen>
+	         <adapt type="org.eclipse.core.resources.IProject"/>
+         </enabledWhen>
+      </page>
+   </extension>
+
+</plugin>
diff --git a/plugins/org.eclipse.wst.validation.ui/property_files/org/eclipse/wst/validation/internal/ui/validationui.properties b/plugins/org.eclipse.wst.validation.ui/property_files/org/eclipse/wst/validation/internal/ui/validationui.properties
new file mode 100644
index 0000000..4db102d
--- /dev/null
+++ b/plugins/org.eclipse.wst.validation.ui/property_files/org/eclipse/wst/validation/internal/ui/validationui.properties
@@ -0,0 +1,39 @@
+###############################################################################
+# Copyright (c) 2008 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
+###############################################################################
+
+SaveFilesDialog_saving=Saving Resources
+SaveFilesDialog_always_save=&Always save all modified resources automatically prior to validating
+SaveFilesDialog_save_all_resources=Save All Modified Resources
+SaveFilesDialog_must_save=All modified resources must be saved before this operation.
+
+PrefPage_always_save=&Save all modified resources automatically prior to validating
+
+RunValidationDialogTitle=Running Validation
+UnableToSave=Unable to set save automatically preference in save files for validation dialog:
+Validate=Validate
+
+ValResults=Validation Results
+
+ValError1Resource1=The validation completed, one error was discovered. One resource was validated in {0}.
+ValErrorsResource1=The validation completed, {0} errors were discovered. One resource was validated in {1}.
+ValWarn1Resource1=The validation completed with one warning. One resource was validated in {0}.
+ValWarnResource1=The validation completed with {0} warnings. One resource was validated in {1}.
+ValInfo1Resource1=The validation completed with one informational message. One resource was validated in {0}.
+ValInfoResource1=The validation completed with {0} informational messages. One resource was validated in {1}.
+
+ValError1Resources=The validation completed, one error was discovered. {0} resources were validated in {1}.
+ValErrorsResources=The validation completed, {0} errors were discovered. {1} resources were validated in {2}.
+ValWarn1Resources=The validation completed with one warning. {0} resources were validated in {1}.
+ValWarnResources=The validation completed with {0} warnings. {1} resources were validated in {2}.
+ValInfo1Resources=The validation completed with one informational message. {0} resources were validated in {1}.
+ValInfoResources=The validation completed with {0} informational messages. {1} resources were validated in {2}.
+
+ValSuccess=The validation completed with no errors or warnings.
diff --git a/plugins/org.eclipse.wst.validation.ui/property_files/org/eclipse/wst/validation/ui/internal/messages.properties b/plugins/org.eclipse.wst.validation.ui/property_files/org/eclipse/wst/validation/ui/internal/messages.properties
new file mode 100644
index 0000000..364d308
--- /dev/null
+++ b/plugins/org.eclipse.wst.validation.ui/property_files/org/eclipse/wst/validation/ui/internal/messages.properties
@@ -0,0 +1,162 @@
+###############################################################################
+# Copyright (c) 2001, 2009 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
+###############################################################################
+#     *************************************************************************
+#     * Code oriented instructions:
+#     *
+#     * In the string, you may see the following special sequences:
+#     * a) {n}  where n is a number. These are replaceable parameters.
+#     * b) ''  In .properties files, in order to see one apostrophe (') in the final
+#     *    string, sometimes two apostrophes must be entered in the string. In the translated
+#     *    string, if there is at least one {n} in the string, then to show one apostrophe
+#     *    to the user, put two apostrophes in the string. If there are no {n} in the string,
+#     *    then put one apostrophe.
+#     *    For example, say that you want the user to read "George's file". 
+#     *        GEORGE=George's file was on the desk.
+#     *        GEORGE2=George''s file and {0} were on the desk.
+#     *    GEORGE uses one apostrophe because there are no {n} and GEORGE2
+#     *    uses two apostrophes because there is a {n}.
+#     * c) '' text '' where text can be any word(s). The text between the double
+#     *    apostrophes should not be translated. 
+#     * d) <text> where text can be any word(s). The text between the angle
+#     *    brackets should NOT be translated.
+#     * e) "text" where text can be any word(s). The text between the quotation 
+#     *    marks should NOT be translated.
+#     *    
+#     *************************************************************************
+#     * Other instructions
+#     * a) Do not translate any text that is on a line which begins with a comment 
+#     *    symbol (#).
+#     * b) Do not translate these words: 
+#     *        schema, EJB, RDB, JAR, RMI, BMP, CMP, OOSQL
+#     * c) Please return the .properties files using the same directory structure.
+#     *    This is necessary because two of the files have the same name.
+#     *
+#     *************************************************************************
+# Any other comments to the translators are on lines which start like this:  # 2TC:
+#
+# Version 1.12
+#
+#
+# ID:
+#    VBF - Validation Builder Framework
+#
+
+# 
+# Begin Validation Builder Framework UI Strings
+#
+# IDs:
+#    VBF_EXC=Exception or error text
+#    VBF_UI=UI label
+#
+PREF_BUTTON_OVERRIDE=Allow projects to &override these preference settings
+PREF_BUTTON_ENABLEALL=E&nable All
+PREF_BUTTON_DISABLEALL=D&isable All
+PREF_VALLIST_TITLE=The selected &validators will run when validation is performed:
+PREF_MNU_MANUAL=&Manual
+PREF_MNU_BUILD=&Build
+PREF_MNU_SETTINGS=&Settings...
+
+VBF_EXC_INTERNAL_TITLE=Internal error
+VBF_EXC_INTERNAL_PAGE=An unexpected error occurred; click Cancel to close the wizard.
+
+VBF_EXC_INVALID_REGISTER=Validators can run only on open resources.
+ProjectOverridesNotAllowed=The workspace validation preferences do not allow projects to override the workspace settings. In order to allow project settings you need to configure the workspace settings to allow project overrides.  
+ 
+VBF_UI_NO_VALIDATORS_INSTALLED=No validators are installed.
+
+DISABLE_VALIDATION=S&uspend all validators
+
+DelegatesDialogTitle=Validator Preferences
+DelegatesComboLabel=Im&plementation:
+ADD_VALIDATION_BUILDER=Add Validation &Builder to project
+ConfigWsSettings=Configure Workspace Settings...
+VALIDATOR=Validator
+MANUAL=Manual
+BUILD=Build
+SETTINGS=Settings
+
+SaveFilesDialog_saving=Saving Resources
+SaveFilesDialog_always_save=&Always save all modified resources automatically prior to validating
+SaveFilesDialog_save_all_resources=Save All Modified Resources
+SaveFilesDialog_must_save=All modified resources must be saved before this operation.
+
+PrefPage_always_save=&Save all modified resources automatically prior to validating
+PrefPageConfirmDialog=Show a &confirmation dialog when performing manual validations
+
+RunValidationDialogTitle=Running Validation
+
+fdTitle=Validation Filters for {0}
+fdNoFilters=The validator does not have currently have any filters installed.
+ErrConfig=Extension configuration error. An internal error has happened, the validator {0} has incorrectly configured the validation extension point.
+
+FilterHelp=Filter rules are grouped into groups. Inside of any one group the rules are combined by using the logical OR operator. There are two types of groups Include and Exclude. If any of the rules in the Exclude group match, the resource is not validated. If there are Include groups, at least one rule from each group must match before the resource is validated.
+ButtonAddGroupInclude=Add &Include Group...
+ButtonAddGroupExclude=Add &Exclude Group...
+ButtonAddRule=Add R&ule...
+ButtonRemove=&Remove 
+
+LabelEnableProjectSpecific=Enable pr&oject specific settings
+
+LabelExtension=File &extension
+LabelFile=F&older or file name
+LabelProjects=Project &nature
+LabelFacets=&Facet
+LabelContentType=&Content Type
+LabelTargetRuntime=&Target Runtime
+
+# Note to translators, keep the <A> and </A> tags exactly as they are
+DoNotShowResults=Do not show this dialog in the future.
+
+DescExtension=File extension, for example "html" for HTML files.
+DescFile=Either a folder, a relative file, or a fully qualified file name.
+DescProjects=A project nature.
+DescFacets=A facet.
+DescContentType=A content type, for example the XML content type.
+DescTargetRuntime=A target runtime, for example "JBoss v5.0".
+
+ErrorsWarnings=Errors/Warnings
+
+Validation=Validating
+ValidationStatus=Validation Status
+
+ErrSummary=Validation results. Errors={0}, Warnings={1}, Information={2}
+ValidationSuccessful=Validation was successful
+
+FrWizard=New Filter Rule Wizard
+FrSelectFilterType=Select Filter Type
+FrFileExtension=File Extension
+FrFileExtensionLabel=File &extension, for example html:
+FrCaseSensitive=Is the comparison case &sensitive?
+FrExactMatch=Check this if the content type needs to &match exactly. Do not check it, if sub types need to match as well.
+FrSimpleFileName=For file based &comparisons, use only the simple file name.
+FrFolderOrFile=Folder or File Name
+FrFolderOrFileLabel=Fil&e or folder:
+FrBrowseFile=Browse &File...
+FrFileFilter=Select the file that will serve as the filter
+FrBrowseFolder=Browse F&older...
+FrFolderFilter=Select the folder that will serve as the filter
+FrProjectNature=Project Nature
+FrProjectNatureLabel=Project &nature:
+FrFacit=Facet
+FrFacitLabel=&Facet id:
+FrNewFacitLabel=&Facet:
+FrContentType=Content Type
+FrContentTypeLabel=&Content Type:
+FrMsgSev=Select the severity level for the following problems
+FrTargetRuntimeLabel=Target Runtime
+
+RebuildTitle=Validation Settings Changed
+RebuildMsg=The validation settings have changed. A full rebuild is required for the changes to take effect. Do the full build now?
+
+#
+# End Validation Builder Framework UI Strings
+#
+
diff --git a/plugins/org.eclipse.wst.validation.ui/validateui/org/eclipse/wst/validation/internal/ui/ContextIds.java b/plugins/org.eclipse.wst.validation.ui/validateui/org/eclipse/wst/validation/internal/ui/ContextIds.java
new file mode 100644
index 0000000..d8ce485
--- /dev/null
+++ b/plugins/org.eclipse.wst.validation.ui/validateui/org/eclipse/wst/validation/internal/ui/ContextIds.java
@@ -0,0 +1,46 @@
+/*******************************************************************************
+ * Copyright (c) 2001, 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
+ *******************************************************************************/
+package org.eclipse.wst.validation.internal.ui;
+
+import org.eclipse.wst.common.frameworks.internal.ui.WTPUIPlugin;
+
+public interface ContextIds {
+	static final String PREFIX = WTPUIPlugin.PLUGIN_ID;
+
+	// context ids for the Validation Properties Page
+	public static final String VALIDATION_PROPERTIES_PAGE = PREFIX + ".jvpp0000"; //$NON-NLS-1$
+	public static final String VALIDATION_PROPERTIES_PAGE_DISABLED_OVERRIDE = PREFIX + ".jvpp0001"; //$NON-NLS-1$
+	public static final String VALIDATION_PROPERTIES_PAGE_DISABLED_BUILD_NOVALSELECTED = PREFIX + ".jvpp0003"; //$NON-NLS-1$
+	public static final String VALIDATION_PROPERTIES_PAGE_DISABLED_AUTO_AUTOBUILD = PREFIX + ".jvpp0004"; //$NON-NLS-1$
+	public static final String VALIDATION_PROPERTIES_PAGE_DISABLED_AUTO_NOINCVALSELECTED = PREFIX + ".jvpp0005"; //$NON-NLS-1$
+	public static final String VALIDATION_PROPERTIES_PAGE_DISABLED_AUTO_NOINCVALCONFIG = PREFIX + ".jvpp0006"; //$NON-NLS-1$
+	public static final String VALIDATION_PROPERTIES_PAGE_AUTO_ENABLED = PREFIX + ".jvpp0020"; //$NON-NLS-1$
+	public static final String VALIDATION_PROPERTIES_PAGE_OVERRIDE_ENABLED = PREFIX + ".jvpp0030"; //$NON-NLS-1$
+	public static final String VALIDATION_PROPERTIES_PAGE_OVERRIDE_ENABLED_CANNOT_HONOUR_BOTH = PREFIX + ".jvpp0031"; //$NON-NLS-1$
+	public static final String VALIDATION_PROPERTIES_PAGE_OVERRIDE_ENABLED_CANNOT_HONOUR_AUTO = PREFIX + ".jvpp0032"; //$NON-NLS-1$
+	public static final String VALIDATION_PROPERTIES_PAGE_OVERRIDE_ENABLED_CANNOT_HONOUR_MANUAL = PREFIX + ".jvpp0033"; //$NON-NLS-1$
+	public static final String VALIDATION_PROPERTIES_PAGE_REBUILD_ENABLED = PREFIX + ".jvpp0040"; //$NON-NLS-1$
+	public static final String VALIDATION_PROPERTIES_PAGE_MAX_MESSAGES = PREFIX + ".jvpp0050"; //$NON-NLS-1$
+
+	public static final String VALIDATION_PREFERENCE_PAGE = PREFIX + ".jvgp0000"; //$NON-NLS-1$
+	public static final String VALIDATION_PREFERENCE_PAGE_OVERRIDE = PREFIX + ".jvgp0005"; //$NON-NLS-1$
+	public static final String VALIDATION_PREFERENCE_PAGE_DISABLE_ALL_ENABLED = PREFIX + ".jvgp0010"; //$NON-NLS-1$
+	//	public static final String VALIDATION_PREFERENCE_PAGE_REBUILD_DISABLED = PREFIX +
+	// ".jvgp0011"; //$NON-NLS-1$
+	public static final String VALIDATION_PREFERENCE_PAGE_AUTO_ENABLED = PREFIX + ".jvgp0020"; //$NON-NLS-1$
+	//	public static final String VALIDATION_PREFERENCE_PAGE_AUTO_DISABLED_AUTOBUILD = PREFIX +
+	// ".jvgp0021"; //$NON-NLS-1$
+	//	public static final String VALIDATION_PREFERENCE_PAGE_AUTO_DISABLED_NOINCVALSELECTED = PREFIX
+	// + ".jvgp0022"; //$NON-NLS-1$
+	//	public static final String VALIDATION_PREFERENCE_PAGE_AUTO_DISABLED_NOINCVALCONFIG = PREFIX +
+	// ".jvgp0023"; //$NON-NLS-1$
+	public static final String VALIDATION_PREFERENCE_PAGE_MAX_MESSAGES = PREFIX + ".jvgp0030"; //$NON-NLS-1$
+}
diff --git a/plugins/org.eclipse.wst.validation.ui/validateui/org/eclipse/wst/validation/internal/ui/DelegatingValidatorPreferencesDialog.java b/plugins/org.eclipse.wst.validation.ui/validateui/org/eclipse/wst/validation/internal/ui/DelegatingValidatorPreferencesDialog.java
new file mode 100644
index 0000000..e00900a
--- /dev/null
+++ b/plugins/org.eclipse.wst.validation.ui/validateui/org/eclipse/wst/validation/internal/ui/DelegatingValidatorPreferencesDialog.java
@@ -0,0 +1,270 @@
+/*******************************************************************************
+ * Copyright (c) 2006, 2008 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
+ * David Schneider, david.schneider@unisys.com - [142500] WTP properties pages fonts don't follow Eclipse preferences
+ *******************************************************************************/
+
+package org.eclipse.wst.validation.internal.ui;
+
+import java.util.Map;
+
+import org.eclipse.jface.dialogs.Dialog;
+import org.eclipse.jface.resource.JFaceResources;
+import org.eclipse.jface.viewers.ComboViewer;
+import org.eclipse.jface.viewers.ILabelProvider;
+import org.eclipse.jface.viewers.ILabelProviderListener;
+import org.eclipse.jface.viewers.ISelectionChangedListener;
+import org.eclipse.jface.viewers.IStructuredContentProvider;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.StructuredSelection;
+import org.eclipse.jface.viewers.Viewer;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Combo;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Shell;
+import org.eclipse.wst.validation.internal.ValidatorMetaData;
+import org.eclipse.wst.validation.internal.delegates.ValidatorDelegateDescriptor;
+import org.eclipse.wst.validation.internal.delegates.ValidatorDelegatesRegistry;
+import org.eclipse.wst.validation.ui.internal.ValUIMessages;
+
+/**
+ * Dialog used to allow the user to select a validator delegate from the list of
+ * registered delegates for a given delegating validator.
+ */
+public class DelegatingValidatorPreferencesDialog extends Dialog
+{
+  /**
+   * The delegating validator's descriptor.
+   */
+  private ValidatorMetaData delegatingValidatorDescriptor;
+
+  /**
+   * The selected validator delegate ID.
+   */
+  private String delegateID;
+
+  /**
+   * Constructs the dialog on the given shell.
+   * 
+   * @param parentShell
+   *          the dialog's parent. Must not be null.
+   * @param targetID
+   *          the delegating validator's id
+   * 
+   * @param delegateID
+   *          the ID of the currently selected validator delegate.
+   */
+  public DelegatingValidatorPreferencesDialog(Shell parentShell, ValidatorMetaData vmd, String delegateID)
+  {
+    super(parentShell);
+
+    delegatingValidatorDescriptor = vmd;
+    this.delegateID = delegateID;
+  }
+
+  /*
+   * (non-Javadoc)
+   * 
+   * @see org.eclipse.jface.dialogs.Dialog#createDialogArea(org.eclipse.swt.widgets.Composite)
+   */
+  protected Control createDialogArea(Composite parent)
+  {
+    super.createDialogArea(parent);
+
+    getShell().setText(ValUIMessages.DelegatesDialogTitle);
+
+    GridLayout layout = new GridLayout();
+    parent.setLayout(layout);
+
+    Label label = new Label(parent, SWT.NONE);
+    GridData labelData = new GridData(SWT.FILL, SWT.CENTER, true, false);
+    labelData.widthHint = 250;
+    label.setLayoutData(labelData);
+    label.setFont(JFaceResources.getFontRegistry().getBold(JFaceResources.DIALOG_FONT));
+    String delegatingValidatorName = delegatingValidatorDescriptor.getValidatorDisplayName();
+    label.setText(delegatingValidatorName);
+
+    Label separator = new Label(parent, SWT.SEPARATOR | SWT.HORIZONTAL);
+    GridData separatorData = new GridData(SWT.FILL, SWT.CENTER, true, false);
+    separator.setLayoutData(separatorData);
+
+    Composite group = new Composite(parent, SWT.NONE);
+    GridData groupGridData = new GridData(SWT.FILL, SWT.CENTER, true, false);
+    group.setLayoutData(groupGridData);
+    GridLayout groupLayout = new GridLayout(2, false);
+    group.setLayout(groupLayout);
+
+    Label comboLabel = new Label(group, SWT.NONE);
+    comboLabel.setLayoutData(new GridData());
+    comboLabel.setText(ValUIMessages.DelegatesComboLabel);
+    
+    Combo combo = new Combo(group, SWT.READ_ONLY);
+    GridData comboGridData = new GridData(SWT.FILL, SWT.CENTER, true, false);
+    combo.setLayoutData(comboGridData);
+
+    final ComboViewer comboViewer = new ComboViewer(combo);
+    comboViewer.setContentProvider(new DelegatesContentProvider());
+    comboViewer.setLabelProvider(new DelegatesLabelProvider());
+    String targetID = delegatingValidatorDescriptor.getValidatorUniqueName();
+
+    comboViewer.addSelectionChangedListener(new ISelectionChangedListener()
+    {
+
+      public void selectionChanged(org.eclipse.jface.viewers.SelectionChangedEvent event)
+      {
+        IStructuredSelection selection = (IStructuredSelection) comboViewer.getSelection();
+        setDelegateID(((ValidatorDelegateDescriptor) selection.getFirstElement()).getId());
+      }
+    });
+
+    comboViewer.setInput(targetID);
+
+    ValidatorDelegateDescriptor selected = ValidatorDelegatesRegistry.getInstance().getDescriptor(targetID, delegateID);
+
+    if (selected != null)
+    {
+      comboViewer.setSelection(new StructuredSelection(new Object[] { selected }));
+    }
+
+    Label endSeparator = new Label(parent, SWT.SEPARATOR | SWT.HORIZONTAL);
+    GridData endSeparatorData = new GridData(SWT.FILL, SWT.CENTER, true, false); 
+    endSeparator.setLayoutData(endSeparatorData);
+    Dialog.applyDialogFont(parent);
+    
+    return parent;
+  }
+
+  /**
+   * Provides contents for the delegate validators combo box.
+   */
+  private final class DelegatesContentProvider implements IStructuredContentProvider
+  {
+    public void dispose()
+    {
+    }
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see org.eclipse.jface.viewers.IStructuredContentProvider#getElements(java.lang.Object)
+     */
+    public Object[] getElements(Object inputElement)
+    {
+      String targetID = (String) inputElement;
+      Map delegatesByID = ValidatorDelegatesRegistry.getInstance().getDelegateDescriptors(targetID);
+      
+      if (delegatesByID == null)
+      {
+        return new Object[] {};
+      }
+
+      return delegatesByID.values().toArray();
+    }
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see org.eclipse.jface.viewers.IContentProvider#inputChanged(org.eclipse.jface.viewers.Viewer,
+     *      java.lang.Object, java.lang.Object)
+     */
+    public void inputChanged(Viewer viewer, Object oldInput, Object newInput)
+    {
+    }
+  }
+
+  /**
+   * Provides the labels/images for the delegate validator combo box
+   * 
+   * @author vbaciul
+   * 
+   */
+  private final class DelegatesLabelProvider implements ILabelProvider
+  {
+    /*
+     * (non-Javadoc)
+     * 
+     * @see org.eclipse.jface.viewers.IBaseLabelProvider#addListener(org.eclipse.jface.viewers.ILabelProviderListener)
+     */
+    public void addListener(ILabelProviderListener listener)
+    {
+    }
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see org.eclipse.jface.viewers.IBaseLabelProvider#dispose()
+     */
+    public void dispose()
+    {
+    }
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see org.eclipse.jface.viewers.ILabelProvider#getImage(java.lang.Object)
+     */
+    public Image getImage(Object element)
+    {
+      return null;
+    }
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see org.eclipse.jface.viewers.ILabelProvider#getText(java.lang.Object)
+     */
+    public String getText(Object element)
+    {
+      return ((ValidatorDelegateDescriptor) element).getName();
+    }
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see org.eclipse.jface.viewers.IBaseLabelProvider#isLabelProperty(java.lang.Object,
+     *      java.lang.String)
+     */
+    public boolean isLabelProperty(Object element, String property)
+    {
+      return false;
+    }
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see org.eclipse.jface.viewers.IBaseLabelProvider#removeListener(org.eclipse.jface.viewers.ILabelProviderListener)
+     */
+    public void removeListener(ILabelProviderListener listener)
+    {
+    }
+  }
+
+  /*
+   * Provides the ID of the currently selected validator delegate ID.
+   */
+  public String getDelegateID()
+  {
+    return delegateID;
+  }
+
+  /**
+   * Sets the currently selected validator delegate ID.
+   * 
+   * @param delegateID
+   */
+  private void setDelegateID(String delegateID)
+  {
+    this.delegateID = delegateID;
+  }
+}
diff --git a/plugins/org.eclipse.wst.validation.ui/validateui/org/eclipse/wst/validation/internal/ui/ListContentProvider.java b/plugins/org.eclipse.wst.validation.ui/validateui/org/eclipse/wst/validation/internal/ui/ListContentProvider.java
new file mode 100644
index 0000000..90b6d02
--- /dev/null
+++ b/plugins/org.eclipse.wst.validation.ui/validateui/org/eclipse/wst/validation/internal/ui/ListContentProvider.java
@@ -0,0 +1,49 @@
+/*******************************************************************************
+ * 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
+ *******************************************************************************/
+package org.eclipse.wst.validation.internal.ui;
+
+import java.util.List;
+
+import org.eclipse.jface.viewers.IStructuredContentProvider;
+import org.eclipse.jface.viewers.Viewer;
+
+/** 
+ * A specialized content provider to show a list of editor parts.
+ * This class has been copied from org.eclipse.jdt.internal.ui.viewsupport.ListContentProvider
+ * This class should be removed once a generic solution is made available.
+ */ 
+public class ListContentProvider implements IStructuredContentProvider {
+	List fContents;	
+
+	public ListContentProvider() {
+	}
+	
+	public Object[] getElements(Object input) {
+		if (fContents != null && fContents == input)
+			return fContents.toArray();
+		return new Object[0];
+	}
+
+	public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
+		if (newInput instanceof List) 
+			fContents= (List)newInput;
+		else
+			fContents= null;
+		// we use a fixed set.
+	}
+
+	public void dispose() {
+	}
+	
+	public boolean isDeleted(Object o) {
+		return fContents != null && !fContents.contains(o);
+	}
+}
diff --git a/plugins/org.eclipse.wst.validation.ui/validateui/org/eclipse/wst/validation/internal/ui/SaveFilesDialog.java b/plugins/org.eclipse.wst.validation.ui/validateui/org/eclipse/wst/validation/internal/ui/SaveFilesDialog.java
new file mode 100644
index 0000000..2deb872
--- /dev/null
+++ b/plugins/org.eclipse.wst.validation.ui/validateui/org/eclipse/wst/validation/internal/ui/SaveFilesDialog.java
@@ -0,0 +1,91 @@
+/*******************************************************************************
+ * Copyright (c) 2006, 2007 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   IBM - Initial API and implementation
+ * /
+ *******************************************************************************/
+package org.eclipse.wst.validation.internal.ui;
+
+import java.lang.reflect.InvocationTargetException;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+import org.eclipse.jface.viewers.ILabelProvider;
+import org.eclipse.jface.viewers.LabelProvider;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.SelectionAdapter;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.widgets.Button;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.Shell;
+import org.eclipse.ui.IEditorPart;
+import org.eclipse.ui.dialogs.ListDialog;
+import org.eclipse.wst.validation.internal.ConfigurationManager;
+import org.eclipse.wst.validation.internal.GlobalConfiguration;
+import org.eclipse.wst.validation.internal.ui.plugin.ValidationUIPlugin;
+
+/**
+ * A generic save files dialog. The bulk of the code
+ * for this dialog was taken from the JDT refactoring
+ * support in org.eclipse.jdt.internal.ui.refactoring.RefactoringSaveHelper.
+ * This class is a good candidate for reuse amoung components.
+ */
+public class SaveFilesDialog extends ListDialog {
+	
+	public SaveFilesDialog(Shell parent)
+	{
+	  super(parent);
+	  setTitle(ValidationUIMessages.SaveFilesDialog_save_all_resources); 
+	  setAddCancelButton(true);
+	  setLabelProvider(createDialogLabelProvider());
+	  setMessage(ValidationUIMessages.SaveFilesDialog_must_save); 
+	  setContentProvider(new ListContentProvider());
+	}
+
+	protected Control createDialogArea(Composite container) 
+	{
+		Composite result= (Composite) super.createDialogArea(container);
+		boolean fAllowSaveAlways = true;
+		if (fAllowSaveAlways) {
+			final Button check= new Button(result, SWT.CHECK);
+			check.setText(ValidationUIMessages.SaveFilesDialog_always_save); 
+			//check.setSelection(RefactoringSavePreferences.getSaveAllEditors());
+			check.addSelectionListener(new SelectionAdapter() {
+				public void widgetSelected(SelectionEvent e) {
+				  try
+				  {
+				    GlobalConfiguration config = ConfigurationManager.getManager().getGlobalConfiguration();
+				    config.setSaveAutomatically(check.getSelection());
+				    config.store();
+				  }
+				  catch(InvocationTargetException exc)
+				  {
+					Logger.getLogger(ValidationUIPlugin.getBundleName()).log(Level.WARNING, 
+						ValidationUIMessages.UnableToSave + exc);
+				  }
+				  
+				}
+			});
+			applyDialogFont(result);
+		}
+		return result;
+	}
+	
+	private ILabelProvider createDialogLabelProvider() {
+		return new LabelProvider() {
+			public Image getImage(Object element) {
+				return ((IEditorPart) element).getTitleImage();
+			}
+			public String getText(Object element) {
+				return ((IEditorPart) element).getTitle();
+			}
+		};
+	}	
+}
diff --git a/plugins/org.eclipse.wst.validation.ui/validateui/org/eclipse/wst/validation/internal/ui/SaveFilesHelper.java b/plugins/org.eclipse.wst.validation.ui/validateui/org/eclipse/wst/validation/internal/ui/SaveFilesHelper.java
new file mode 100644
index 0000000..f323332
--- /dev/null
+++ b/plugins/org.eclipse.wst.validation.ui/validateui/org/eclipse/wst/validation/internal/ui/SaveFilesHelper.java
@@ -0,0 +1,67 @@
+/*******************************************************************************
+ * Copyright (c) 2006, 2007 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   IBM - Initial API and implementation
+ * /
+ *******************************************************************************/
+package org.eclipse.wst.validation.internal.ui;
+
+import java.util.HashSet;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Set;
+
+import org.eclipse.ui.IEditorInput;
+import org.eclipse.ui.IEditorPart;
+import org.eclipse.ui.IFileEditorInput;
+import org.eclipse.ui.IWorkbench;
+import org.eclipse.ui.IWorkbenchPage;
+import org.eclipse.ui.IWorkbenchWindow;
+import org.eclipse.ui.PlatformUI;
+
+/**
+ * A helper class for the save dirty files dialog.
+ */
+public class SaveFilesHelper {
+
+	/**
+	 * Retreive an array of IEditorParts representing all the dirty
+	 * editors open for the files provided in the list.
+	 * 
+	 * @param files
+	 * 			A list of IFiles.
+	 * @return
+	 * 			An array of IEditorParts containing all the dirty editors for the files in the list.
+	 */
+	public static IEditorPart[] getDirtyEditors(List files) {
+		Set<IEditorInput> inputs = new HashSet<IEditorInput>();
+		List<IEditorPart> result = new LinkedList<IEditorPart>();
+		IWorkbench workbench = PlatformUI.getWorkbench();
+		IWorkbenchWindow[] windows = workbench.getWorkbenchWindows();
+		for (int i = 0; i < windows.length; i++) {
+			IWorkbenchPage[] pages = windows[i].getPages();
+			for (int x = 0; x < pages.length; x++) {
+				IEditorPart[] editors = pages[x].getDirtyEditors();
+				for (int z = 0; z < editors.length; z++) {
+					IEditorPart ep = editors[z];
+					IEditorInput input = ep.getEditorInput();
+					if (input instanceof IFileEditorInput) {
+						IFileEditorInput fileInput = (IFileEditorInput) input;
+						if (files.contains(fileInput.getFile())) {
+							if (!inputs.contains(input)) {
+								inputs.add(input);
+								result.add(ep);
+							}
+						}
+					}
+				}
+			}
+		}
+		return result.toArray(new IEditorPart[result.size()]);
+	}
+}
diff --git a/plugins/org.eclipse.wst.validation.ui/validateui/org/eclipse/wst/validation/internal/ui/ValidateAction.java b/plugins/org.eclipse.wst.validation.ui/validateui/org/eclipse/wst/validation/internal/ui/ValidateAction.java
new file mode 100644
index 0000000..a04c829
--- /dev/null
+++ b/plugins/org.eclipse.wst.validation.ui/validateui/org/eclipse/wst/validation/internal/ui/ValidateAction.java
@@ -0,0 +1,67 @@
+/*******************************************************************************
+ * Copyright (c) 2001, 2008 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.wst.validation.internal.ui;
+
+
+import org.eclipse.core.resources.IResource;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.ui.actions.SelectionListenerAction;
+
+
+public class ValidateAction extends SelectionListenerAction {
+	protected ValidationMenuAction delegate;
+
+	public ValidateAction() {
+		super(ValidationUIMessages.Validate);
+		delegate = new ValidationMenuAction();
+	}
+
+	/**
+	 * Implementation of method defined on <code>IAction</code>.
+	 */
+	public void run() {
+		delegate.run(this);
+	}
+
+	/**
+	 * Updates this action in response to the given selection.
+	 * <p>
+	 * The <code>SelectionListenerAction</code> implementation of this method returns
+	 * <code>true</code>. Subclasses may extend to react to selection changes; however, if the
+	 * super method returns <code>false</code>, the overriding method must also return
+	 * <code>false</code>.
+	 * </p>
+	 * 
+	 * @param selection
+	 *            the new selection
+	 * @return <code>true</code> if the action should be enabled for this selection, and
+	 *         <code>false</code> otherwise
+	 */
+	protected boolean updateSelection(IStructuredSelection selection) {
+		if (!super.updateSelection(selection))
+			return false;
+
+		delegate.selectionChanged(this, selection);
+
+		return isEnabled(); // "Enabled" is set by the delegate.
+	}
+
+	/**
+	 * If a subclass of ValidateAction enables this menu action on a type that is not an IResource,
+	 * this method returns the IResource[] that represent that object. If null is returned, the
+	 * object will be ignored and the user will not be notified that the object was not validated.
+	 * This method will be called when updateSelection and run are called. (The result of this
+	 * method is used to determine which resources will be validated)
+	 */
+	protected IResource[] getResource(Object selected) {
+		return null;
+	}
+}
diff --git a/plugins/org.eclipse.wst.validation.ui/validateui/org/eclipse/wst/validation/internal/ui/ValidationJob.java b/plugins/org.eclipse.wst.validation.ui/validateui/org/eclipse/wst/validation/internal/ui/ValidationJob.java
new file mode 100644
index 0000000..aa37f64
--- /dev/null
+++ b/plugins/org.eclipse.wst.validation.ui/validateui/org/eclipse/wst/validation/internal/ui/ValidationJob.java
@@ -0,0 +1,41 @@
+/*******************************************************************************
+ * Copyright (c) 2005, 2007 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.wst.validation.internal.ui;
+
+import java.util.Map;
+
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.jobs.Job;
+
+public class ValidationJob extends Job {
+
+
+	private Map projects;
+	public ValidationJob(String name) {
+		super(name);
+	}
+
+
+	public void setProjectsMap(Map projects){
+		this.projects = projects;
+	}
+
+
+	protected IStatus run(IProgressMonitor monitor) {
+
+		return null;
+	}
+	
+	protected Map getProjects() {
+		return projects;
+	}
+}
diff --git a/plugins/org.eclipse.wst.validation.ui/validateui/org/eclipse/wst/validation/internal/ui/ValidationMenuAction.java b/plugins/org.eclipse.wst.validation.ui/validateui/org/eclipse/wst/validation/internal/ui/ValidationMenuAction.java
new file mode 100644
index 0000000..126c407
--- /dev/null
+++ b/plugins/org.eclipse.wst.validation.ui/validateui/org/eclipse/wst/validation/internal/ui/ValidationMenuAction.java
@@ -0,0 +1,393 @@
+/*******************************************************************************
+ * Copyright (c) 2001, 2008 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.wst.validation.internal.ui;
+
+import java.lang.reflect.InvocationTargetException;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IFolder;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.resources.IResourceVisitor;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.SubProgressMonitor;
+import org.eclipse.jface.action.IAction;
+import org.eclipse.jface.dialogs.ProgressMonitorDialog;
+import org.eclipse.jface.operation.IRunnableWithProgress;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.window.Window;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.swt.widgets.Shell;
+import org.eclipse.ui.IEditorPart;
+import org.eclipse.ui.IViewActionDelegate;
+import org.eclipse.ui.IViewPart;
+import org.eclipse.wst.validation.ValidationFramework;
+import org.eclipse.wst.validation.internal.ConfigurationManager;
+import org.eclipse.wst.validation.internal.DisabledResourceManager;
+import org.eclipse.wst.validation.internal.ValType;
+import org.eclipse.wst.validation.internal.ValidationRegistryReader;
+import org.eclipse.wst.validation.internal.ValidationSelectionHandlerRegistryReader;
+import org.eclipse.wst.validation.internal.plugin.ValidationPlugin;
+import org.eclipse.wst.validation.internal.ui.plugin.ValidationUIPlugin;
+import org.eclipse.wst.validation.ui.internal.ManualValidationRunner;
+
+/**
+ * This class implements the pop-up menu item "Run Validation" When the item is selected, this
+ * action triggers a validation of the project, using all configured, enabled validators.
+ */
+public class ValidationMenuAction implements IViewActionDelegate {
+	private ISelection 		_currentSelection;
+	protected static final String SEP = "/"; //$NON-NLS-1$
+	private Display 		_currentDisplay;
+	private IResourceVisitor _folderVisitor;
+	private IResourceVisitor _projectVisitor;
+	private Map<IProject, Set<IResource>> _selectedResources;
+
+	public ValidationMenuAction() {
+		// cache the display before this action is forked. After the action is forked,
+		// Display.getCurrent() returns null.
+		_currentDisplay = Display.getCurrent(); 
+		_selectedResources = new HashMap<IProject, Set<IResource>>();
+	}
+
+	private Display getDisplay() {
+		return (_currentDisplay == null) ? Display.getCurrent() : _currentDisplay;
+	}
+
+	/**
+	 * Return the wizard's shell.
+	 */
+	Shell getShell() {
+		Display display = getDisplay();
+		Shell shell = (display == null) ? null : display.getActiveShell();
+		if (shell == null && display != null) {
+			Shell[] shells = display.getShells();
+			if (shells.length > 0)
+				shell = shells[0];
+		}
+		return shell;
+	}
+
+	/**
+	 * Return a map of the selected elements. Each key of the map is an IProject, and the value is a
+	 * Set of the selected resources in that project. If a project is selected, and nothing else in
+	 * the project is selected, a full validation (null value) will be done on the project. If a
+	 * project is selected, and some files/folders in the project are also selected, only the
+	 * files/folders will be validated. If a folder is selected, all of its contents are also
+	 * validated.
+	 * 
+	 * @return null if there is no selection.
+	 */
+	private Map<IProject, Set<IResource>> loadSelected(ValidateAction action) {
+		// GRK previously this did not do a clear, but I couldn't understand why that would be so I am forcing a clear
+		// GRK In my testing, not doing a clear caused duplicate validations
+		_selectedResources.clear();
+		if ((_currentSelection == null) || _currentSelection.isEmpty() || 
+			!(_currentSelection instanceof IStructuredSelection))return null;
+		
+		Object[] elements = ((IStructuredSelection) _currentSelection).toArray();
+		for (Object element : elements) {
+			if (element != null)addSelected(action, element);
+		}
+		return _selectedResources;
+	}
+
+	private void addSelected(ValidateAction action, Object selected) {
+		if (selected instanceof IProject) {
+			addVisitor((IProject) selected);
+		} else if (selected instanceof IFile) {
+			addSelected((IFile) selected);
+		} else if (selected instanceof IFolder) {
+			addVisitor((IFolder) selected);
+		} else if (isValidType(getExtendedType(selected))) {
+			addSelected(action,getExtendedType(selected));
+		} else {
+			// Not a valid input type. Must be IProject, IJavaProject, or IResource.
+			// If this ValidationMenuAction is a delegate of ValidateAction, is
+			// the input type recognized by the ValidateAction?
+			boolean valid = false;
+			if (action != null) {
+				IResource[] resources = action.getResource(selected);
+				if (resources != null) {
+					valid = true;
+					for (int i = 0; i < resources.length; i++) {
+						addSelected(action, resources[i]);
+					}
+				}
+			}
+			if (!valid) {
+				// Stop processing. This allows the "Run Validation" menu item
+				// to gray out once an element that can not be validated is selected.
+				_selectedResources.clear();
+			}
+		}
+	}
+	
+	private Object getExtendedType(Object selected) {
+		Object result = ValidationSelectionHandlerRegistryReader.getInstance().getExtendedType(selected);
+		return result == null ? selected : result;
+	}
+	
+	private boolean isValidType(Object object) {
+		return object instanceof IProject || object instanceof IFile || object instanceof IFolder;
+	}
+
+
+	void addSelected(IResource selected) {
+		IProject project = selected.getProject();
+		boolean added = _selectedResources.containsKey(project);
+		Set<IResource> changedRes = null;
+		if (added) {
+			// If the value is null, the entire project needs to be validated anyway.
+			changedRes = _selectedResources.get(project);
+			if (changedRes == null)return;
+			
+		} else {
+			changedRes = new HashSet<IResource>();
+		}
+		if (changedRes.add(selected)) {
+			_selectedResources.put(project, changedRes);
+		}
+	}
+
+	private void addVisitor(IFolder selected) {
+		// add the folder and its children
+		try {
+			selected.accept(getFolderVisitor());
+		} catch (CoreException exc) {
+			ValidationUIPlugin.getPlugin().handleException(exc);
+			return;
+		}
+	}
+
+	private IResourceVisitor getFolderVisitor() {
+		if (_folderVisitor == null) {
+			_folderVisitor = new IResourceVisitor() {
+				public boolean visit(IResource res) {
+					if (res instanceof IFile) {
+						addSelected(res);
+					} else if (res instanceof IFolder) {
+						addSelected(res);
+					}
+					return true; // visit the resource's children
+				}
+			};
+		}
+		return _folderVisitor;
+	}
+	
+	private void addVisitor(IProject selected) {
+		// add the folder and its children
+		if(!selected.isAccessible())return;
+		try {
+			selected.accept(getProjectVisitor());
+		} catch (CoreException exc) {
+			ValidationUIPlugin.getPlugin().handleException(exc);
+			return;
+		}
+	}
+
+	private IResourceVisitor getProjectVisitor() {
+		if (_projectVisitor == null) {
+			_projectVisitor = new IResourceVisitor() {
+				public boolean visit(IResource res) {
+					if (DisabledResourceManager.getDefault().isDisabled(res))return false;
+					if (res instanceof IFile)addSelected(res);
+					else if (res instanceof IFolder)addSelected(res);
+					else if (res instanceof IProject)addSelected(res);
+					
+					return true;
+				}
+			};
+		}
+		return _projectVisitor;
+	}
+
+	/**
+	 * The delegating action has been invoked. This method does the actual work.
+	 * 
+	 * @param action
+	 *            Action proxy that handles the presentation portion of the plug-in action.
+	 */
+	public void run(IAction action) {
+		ValidateAction vaction = null;
+		if (action instanceof ValidateAction) {
+			vaction = (ValidateAction) action;
+		}
+		final Map<IProject, Set<IResource>> projects = loadSelected(vaction);
+		if ((projects == null) || (projects.size() == 0)) {
+			return;
+		}
+		
+		// If the files aren't saved do not run validation.
+		if(!handleFilesToSave(projects))return;
+
+		boolean confirm = org.eclipse.wst.validation.internal.ValManager.getDefault().getGlobalPreferences()
+			.getConfirmDialog();
+		ManualValidationRunner.validate(projects, ValType.Manual, confirm);
+	}
+	
+	/**
+	 * Selection in the desktop has changed. Plug-in provider can use it to change the availability
+	 * of the action or to modify other presentation properties.
+	 * 
+	 * <p>
+	 * Action delegate cannot be notified about selection changes before it is loaded. For that
+	 * reason, control of action's enable state should also be performed through simple XML rules
+	 * defined for the extension point. These rules allow enable state control before the delegate
+	 * has been loaded.
+	 * </p>
+	 * 
+	 * @param action
+	 *            action proxy that handles presentation portion of the plug-in action
+	 * @param selection
+	 *            current selection in the desktop
+	 */
+	public void selectionChanged(IAction action, ISelection selection) {
+		_currentSelection = selection;
+		boolean enabled = quickCheck(selection);
+		
+		// Don't force the plug-in to be activated just to check this setting.
+		if (enabled && ValidationPlugin.isActivated() && ValidationRegistryReader.isActivated()){
+			enabled = hasManualValidators(selection);
+		}
+		action.setEnabled(enabled);
+	}
+	
+	/**
+	 * Do a quick check on the selection, so see if we know that we don't want to validate the selection.
+	 * 
+	 * @param selection
+	 * @return false if we are sure that we don't want to validate it. Return true if we are still not sure.
+	 */
+	private boolean quickCheck(ISelection selection){
+		if (selection == null || selection.isEmpty())return false;
+		if (selection instanceof IStructuredSelection){
+			IStructuredSelection ss = (IStructuredSelection)selection;
+			Object sel = ss.getFirstElement();
+			if (sel != null){
+				if (sel instanceof IProject){
+					IProject project = (IProject)sel;
+					if (!project.isOpen())return false;
+				}
+			}
+		}
+
+		return true;
+	}
+	
+	/**
+	 * Answer true if any of the selected items have manual validators enabled.
+	 * @param selection
+	 */
+	private boolean hasManualValidators(ISelection selection){
+				
+		if (selection instanceof IStructuredSelection){
+			IStructuredSelection ss = (IStructuredSelection)selection;
+			for (Iterator it = ss.iterator(); it.hasNext();){
+				Object sel = it.next();
+				if (sel instanceof IResource){
+					IResource resource = (IResource)sel;
+					if (ValidationFramework.getDefault().hasValidators(resource, true, false))return true;
+				}
+			}		
+		}
+		
+		return false;
+		
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.ui.IViewActionDelegate#init(org.eclipse.ui.IViewPart)
+	 */
+	public void init(IViewPart view) { 
+	}
+	
+	/**
+	 * Handle any files that must be saved prior to running
+	 * validation.
+	 * 
+	 * @param projects
+	 * 			The list of projects that will be validated.
+	 * @return
+	 * 			True if all files have been saved, false otherwise.
+	 */
+	protected boolean handleFilesToSave(Map<IProject, Set<IResource>> projects)
+	{
+	  List fileList = getIFiles(projects);
+      final IEditorPart[] dirtyEditors = SaveFilesHelper.getDirtyEditors(fileList);
+      if(dirtyEditors == null || dirtyEditors.length == 0)return true;
+      boolean saveAutomatically = false;
+      try
+      {
+        saveAutomatically = ConfigurationManager.getManager().getGlobalConfiguration().getSaveAutomatically();
+      }
+      catch(InvocationTargetException e)
+      {
+    	// In this case simply default to false.
+      }
+      SaveFilesDialog sfDialog = null;
+      if(!saveAutomatically)
+      {
+	    sfDialog = new SaveFilesDialog(ValidationUIPlugin.getPlugin().getWorkbench().getActiveWorkbenchWindow().getShell());
+	    sfDialog.setInput(Arrays.asList(dirtyEditors));
+      }
+      
+      if(saveAutomatically || sfDialog.open() == Window.OK){
+    	  ProgressMonitorDialog ctx = new ProgressMonitorDialog(getShell());
+          
+          IRunnableWithProgress runnable = new IRunnableWithProgress(){
+              public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException{
+            	  try {
+            		  monitor.beginTask(ValidationUIMessages.SaveFilesDialog_saving, dirtyEditors.length);
+            		  int numDirtyEditors = dirtyEditors.length;
+                      for(int i = 0; i < numDirtyEditors; i++){
+                    	  dirtyEditors[i].doSave(new SubProgressMonitor(monitor, 1));
+                      }
+            	  } finally {
+            		  monitor.done();
+            	  }
+             }
+          };
+          
+          try {
+                ctx.run(false, true, runnable);
+                return true;
+          } catch (InvocationTargetException e) {
+                ValidationUIPlugin.getPlugin().handleException(e);
+          } catch (InterruptedException e) {
+        	  ValidationUIPlugin.getPlugin().handleException(e);
+          }
+      }
+	  return false;
+	}
+	
+	protected List<IFile> getIFiles(Map<IProject, Set<IResource>> projects) {
+		List<IFile> fileList = new LinkedList<IFile>();
+		for(IProject project : projects.keySet()) {
+		  for(IResource resource : projects.get(project)) {
+			if(resource instanceof IFile)fileList.add((IFile)resource);
+		  }
+		}
+		return fileList;
+	}
+	
+}
diff --git a/plugins/org.eclipse.wst.validation.ui/validateui/org/eclipse/wst/validation/internal/ui/ValidationUIMessages.java b/plugins/org.eclipse.wst.validation.ui/validateui/org/eclipse/wst/validation/internal/ui/ValidationUIMessages.java
new file mode 100644
index 0000000..d6963b3
--- /dev/null
+++ b/plugins/org.eclipse.wst.validation.ui/validateui/org/eclipse/wst/validation/internal/ui/ValidationUIMessages.java
@@ -0,0 +1,61 @@
+/*******************************************************************************
+ * Copyright (c) 2006, 2008 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 - Initial API and implementation
+ * /
+ *******************************************************************************/
+package org.eclipse.wst.validation.internal.ui;
+
+import org.eclipse.osgi.util.NLS;
+
+/**
+ * Strings used by Validation UI.
+ */
+public class ValidationUIMessages extends NLS {
+	private static final String BUNDLE_NAME = "org.eclipse.wst.validation.internal.ui.validationui";//$NON-NLS-1$
+
+	public static String SaveFilesDialog_saving;
+	public static String SaveFilesDialog_always_save;
+	public static String SaveFilesDialog_save_all_resources;
+	public static String SaveFilesDialog_must_save;
+	public static String PrefPage_always_save;
+	public static String RunValidationDialogTitle;
+	public static String UnableToSave;
+	
+	public static String Validate;
+	
+	public static String ValResults;
+
+	// results validating one resource
+	public static String ValError1Resource1;
+	public static String ValErrorsResource1;
+	public static String ValWarn1Resource1;
+	public static String ValWarnResource1;
+	public static String ValInfo1Resource1;
+	public static String ValInfoResource1;
+
+	// results validating multiple resources
+	public static String ValError1Resources;
+	public static String ValErrorsResources;
+	public static String ValWarn1Resources;
+	public static String ValWarnResources;
+	public static String ValInfo1Resources;
+	public static String ValInfoResources;
+
+	public static String ValSuccess;
+	
+
+	static {
+		// load message values from bundle file
+		NLS.initializeMessages(BUNDLE_NAME, ValidationUIMessages.class);
+	}
+
+	private ValidationUIMessages() {
+		// cannot create new instance
+	}
+}
diff --git a/plugins/org.eclipse.wst.validation.ui/validateui/org/eclipse/wst/validation/internal/ui/plugin/RunnableWithProgressWrapper.java b/plugins/org.eclipse.wst.validation.ui/validateui/org/eclipse/wst/validation/internal/ui/plugin/RunnableWithProgressWrapper.java
new file mode 100644
index 0000000..4a8acb8
--- /dev/null
+++ b/plugins/org.eclipse.wst.validation.ui/validateui/org/eclipse/wst/validation/internal/ui/plugin/RunnableWithProgressWrapper.java
@@ -0,0 +1,97 @@
+/*******************************************************************************
+ * Copyright (c) 2001, 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
+ *******************************************************************************/
+package org.eclipse.wst.validation.internal.ui.plugin;
+
+import java.lang.reflect.InvocationTargetException;
+
+import org.eclipse.core.resources.IWorkspaceRunnable;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.jface.operation.IRunnableWithProgress;
+import org.eclipse.wst.common.frameworks.internal.operations.IHeadlessRunnableWithProgress;
+import org.eclipse.wst.validation.internal.operations.ValidationOperation;
+
+
+/**
+ * This is a wrapper for an IWorkspaceRunnable to the IRunnableWithProgress. This class needs to be
+ * used when running the operation from a IRunnableContext.
+ * 
+ * @see IRunnableContext
+ * @see ValidationUIPlugin#getRunnableWithProgress Creation date: (5/8/2001 1:28:45 PM)
+ * @author: Administrator
+ */
+public class RunnableWithProgressWrapper implements IRunnableWithProgress {
+	private IHeadlessRunnableWithProgress headlessRunnable = null;
+	private IWorkspaceRunnable workspaceRunnable = null;
+	private ValidationOperation validationOperation = null;
+
+	/**
+	 * @deprecated Will be removed in Milestone 3. Use
+	 *             RunnableWithProgressWrapper(IWorkspaceRunnable)
+	 */
+	public RunnableWithProgressWrapper(IHeadlessRunnableWithProgress aHeadlessRunnableWithProgress) {
+		setHeadlessRunnable(aHeadlessRunnableWithProgress);
+	}
+
+	public RunnableWithProgressWrapper(IWorkspaceRunnable aHeadlessRunnableWithProgress) {
+		setWorkspaceRunnable(aHeadlessRunnableWithProgress);
+	}
+
+	public RunnableWithProgressWrapper(ValidationOperation op) {
+		setValidationOperation(op);
+	}
+
+	/**
+	 * @deprecated Will be removed in Milestone 3. Use getWorkspaceRunnable()
+	 */
+	protected IHeadlessRunnableWithProgress getHeadlessRunnable() {
+		return headlessRunnable;
+	}
+
+	protected IWorkspaceRunnable getWorkspaceRunnable() {
+		return workspaceRunnable;
+	}
+
+	/**
+	 * @see IRunnableWithProgress
+	 */
+	public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException {
+		try {
+			if (getHeadlessRunnable() != null) {
+				getHeadlessRunnable().run(monitor);
+			} else {
+				IWorkspaceRunnable runnable = (getWorkspaceRunnable() == null) ? validationOperation : getWorkspaceRunnable();
+				if (runnable == null) {
+					return;
+				}
+				ResourcesPlugin.getWorkspace().run(runnable, monitor);
+			}
+		} catch (CoreException exc) {
+			throw new InvocationTargetException(exc);
+		}
+	}
+
+	/**
+	 * @deprecated Will be removed in Milestone 3. Use setWorkspaceRunnable(IWorkspaceRunnable)
+	 */
+	protected void setHeadlessRunnable(IHeadlessRunnableWithProgress newHeadlessRunnable) {
+		headlessRunnable = newHeadlessRunnable;
+	}
+
+	protected void setWorkspaceRunnable(IWorkspaceRunnable newWorkspaceRunnable) {
+		workspaceRunnable = newWorkspaceRunnable;
+	}
+
+	protected void setValidationOperation(ValidationOperation op) {
+		validationOperation = op;
+	}
+}
diff --git a/plugins/org.eclipse.wst.validation.ui/validateui/org/eclipse/wst/validation/internal/ui/plugin/ValidationUIPlugin.java b/plugins/org.eclipse.wst.validation.ui/validateui/org/eclipse/wst/validation/internal/ui/plugin/ValidationUIPlugin.java
new file mode 100644
index 0000000..3f0496b
--- /dev/null
+++ b/plugins/org.eclipse.wst.validation.ui/validateui/org/eclipse/wst/validation/internal/ui/plugin/ValidationUIPlugin.java
@@ -0,0 +1,171 @@
+/*******************************************************************************
+ * Copyright (c) 2001, 2008 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.wst.validation.internal.ui.plugin;
+
+import java.net.MalformedURLException;
+import java.net.URL;
+
+import org.eclipse.core.resources.IWorkspaceRunnable;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Path;
+import org.eclipse.core.runtime.Platform;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.jface.operation.IRunnableWithProgress;
+import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.jface.resource.ImageRegistry;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.wst.common.frameworks.internal.ui.WTPUIPlugin;
+import org.eclipse.wst.validation.internal.operations.ValidationOperation;
+import org.osgi.framework.Bundle;
+import org.osgi.framework.BundleContext;
+
+
+
+public class ValidationUIPlugin extends WTPUIPlugin {
+	private static ValidationUIPlugin _plugin = null;
+
+	public final static String VALIDATION_PROP_FILE_NAME = "validate_ui"; //$NON-NLS-1$
+	public static final String VALIDATION_PLUGIN_ID = "org.eclipse.wst.validation.ui"; //$NON-NLS-1$
+	public static final String[] ICON_DIRS = new String[]{"icons"}; //$NON-NLS-1$
+
+	public ValidationUIPlugin() {
+		super();
+		if (_plugin == null) {
+			_plugin = this;
+		}
+	}
+
+	public static String getBundleName() {
+		return VALIDATION_PROP_FILE_NAME;
+	}
+
+	public static ValidationUIPlugin getPlugin() {
+		return _plugin;
+	}
+
+	/**
+	 * Returns the translated String found with the given key.
+	 * 
+	 * @param key
+	 *            java.lang.String
+	 * @return java.lang.String
+	 */
+	public static String getResourceString(String key) {
+		try {
+			return Platform.getResourceString(Platform.getBundle(VALIDATION_PLUGIN_ID), key);
+		} catch (Exception e) {
+			ValidationUIPlugin.getPlugin().handleException(e);
+			return key;
+		}
+	}
+
+	/**
+	 * This method should be called whenever you need to run one of our headless operations in the
+	 * UI.
+	 */
+	public static IRunnableWithProgress getRunnableWithProgress(IWorkspaceRunnable aWorkspaceRunnable) {
+		return new RunnableWithProgressWrapper(aWorkspaceRunnable);
+	}
+
+//	public static IRunnableWithProgress getRunnableWithProgress(IHeadlessRunnableWithProgress aHeadlessRunnableWithProgress) {
+//		return new RunnableWithProgressWrapper(aHeadlessRunnableWithProgress);
+//	}
+
+	// Need a third, ValidationOperation version of this method, because ValidationOperation
+	// is both an IWorkspaceRunnable and an IHeadlessRunnableWithProgress. This method will
+	// exist only while IHeadlessRunnableWithProgress exists.
+	public static IRunnableWithProgress getRunnableWithProgress(ValidationOperation op) {
+		return new RunnableWithProgressWrapper(op);
+	}
+
+	public void start(BundleContext context) throws Exception {
+		super.start(context);
+		//	org.eclipse.wst.validation.internal.operations.ValidatorManager.setResourceUtilClass(org.eclipse.wst.validation.internal.operations.ui.UIResourceUtil.class);
+	}
+	
+	/**
+	 * Get a .gif from the image registry.
+	 */
+	public Image getImage(String key) {
+		ImageRegistry imageRegistry = getImageRegistry();
+		Image image = imageRegistry.get(key);
+		if (image == null || image.isDisposed()) {
+			ImageDescriptor descriptor = getImageDescriptor(key);
+			if (descriptor != null) {
+				image = descriptor.createImage();
+				imageRegistry.put(key, image);
+			}
+		}
+		return image;
+	}
+	
+	/**
+	 * This gets a .gif from the icons folder.
+	 */
+	public ImageDescriptor getImageDescriptor(String key) {
+		ImageDescriptor imageDescriptor = null;
+		URL gifImageURL = getImageURL(key);
+		if (gifImageURL != null)
+			imageDescriptor = ImageDescriptor.createFromURL(gifImageURL);
+		return imageDescriptor;
+	}
+	
+	/**
+	 * @param key
+	 * @return
+	 */
+	private URL getImageURL(String key) {
+		return ValidationUIPlugin.getImageURL(key, getBundle());
+	}
+	
+	/**
+	 * This gets a .gif from the icons folder.
+	 */
+	public static URL getImageURL(String key, Bundle bundle) {
+		String gif = "/" + key + ".gif"; //$NON-NLS-1$ //$NON-NLS-2$
+		IPath path = null;
+		for (int i = 0; i < ICON_DIRS.length; i++) {
+			path = new Path(ICON_DIRS[i]).append(gif);
+			if (Platform.find(bundle,path) == null)
+				continue;
+			try {
+				return new URL( bundle.getEntry("/"), path.toString()); //$NON-NLS-1$ 
+			} catch (MalformedURLException exception) {
+				exception.printStackTrace();
+				continue;
+			}
+		}
+		return null;
+	}
+	
+	
+	public void handleException(Throwable e){
+		Status status = new Status(IStatus.ERROR, PLUGIN_ID, e.getLocalizedMessage(), e);
+		getLog().log(status);
+	}
+	
+	/** 
+	 * Write a message into the log. 
+	 * 
+	 * We are in the transition of moving to a new approach for localized messages. This is the new 
+	 * approach for exceptions.
+	 * 
+	 * @param severity message severity, see IStaus
+	 * @param message a localized message
+	 */
+	public void logMessage(int severity, String message){
+		Status status = new Status(severity, PLUGIN_ID, message);
+		getLog().log(status);
+		
+	}	
+
+}
diff --git a/plugins/org.eclipse.wst.validation.ui/vf2/org/eclipse/wst/validation/ui/internal/AdapterFactory.java b/plugins/org.eclipse.wst.validation.ui/vf2/org/eclipse/wst/validation/ui/internal/AdapterFactory.java
new file mode 100644
index 0000000..750c6fd
--- /dev/null
+++ b/plugins/org.eclipse.wst.validation.ui/vf2/org/eclipse/wst/validation/ui/internal/AdapterFactory.java
@@ -0,0 +1,116 @@
+/*******************************************************************************
+ * Copyright (c) 2005, 2007 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.wst.validation.ui.internal;
+
+import org.eclipse.core.runtime.IAdapterFactory;
+import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.ui.model.IWorkbenchAdapter;
+import org.eclipse.wst.validation.Validator;
+import org.eclipse.wst.validation.internal.ValidatorMutable;
+import org.eclipse.wst.validation.internal.model.FilterGroup;
+import org.eclipse.wst.validation.internal.model.FilterRule;
+
+public class AdapterFactory implements IAdapterFactory {
+
+	public Object getAdapter(Object adaptableObject, Class adapterType) {
+		if (adapterType == IWorkbenchAdapter.class && adaptableObject instanceof Validator.V2)return _valAdaptor;
+		if (adapterType == IWorkbenchAdapter.class && adaptableObject instanceof FilterGroup)return _fgAdaptor;
+		if (adapterType == IWorkbenchAdapter.class && adaptableObject instanceof FilterRule)return _ruleAdaptor;
+		if (adapterType == IWorkbenchAdapter.class && adaptableObject instanceof ValidatorMutable)return _valMutableAdaptor;
+
+		return null;
+	}
+
+	public Class[] getAdapterList() {
+		return new Class[] { IWorkbenchAdapter.class };
+	}
+
+	private IWorkbenchAdapter _valAdaptor = new IWorkbenchAdapter() {
+
+		public Object[] getChildren(Object o) {
+			return ((Validator.V2) o).getGroups();
+		}
+
+		public ImageDescriptor getImageDescriptor(Object o) {
+			return null;
+		}
+
+		public String getLabel(Object o) {
+			return ((Validator.V2) o).getName();
+		}
+
+		public Object getParent(Object o) {
+			return null;
+		}
+
+	};
+	private IWorkbenchAdapter _valMutableAdaptor = new IWorkbenchAdapter() {
+
+		public Object[] getChildren(Object o) {
+			return ((ValidatorMutable) o).getGroups();
+		}
+
+		public ImageDescriptor getImageDescriptor(Object o) {
+			return null;
+		}
+
+		public String getLabel(Object o) {
+			return ((ValidatorMutable) o).getName();
+		}
+
+		public Object getParent(Object o) {
+			return null;
+		}
+
+	};
+
+	private IWorkbenchAdapter _fgAdaptor = new IWorkbenchAdapter() {
+
+		public Object[] getChildren(Object o) {
+			return ((FilterGroup) o).getRules();
+		}
+
+		public ImageDescriptor getImageDescriptor(Object o) {
+			return null;
+		}
+
+		public String getLabel(Object o) {
+			FilterGroup fg = (FilterGroup) o;
+			return fg.getDisplayableType();
+		}
+
+		public Object getParent(Object o) {
+			return null;
+		}
+	};
+
+	private IWorkbenchAdapter _ruleAdaptor = new IWorkbenchAdapter() {
+
+		public Object[] getChildren(Object o) {
+			return new Object[0];
+		}
+
+		public ImageDescriptor getImageDescriptor(Object o) {
+			return null;
+		}
+
+		public String getLabel(Object o) {
+			FilterRule rule = (FilterRule) o;
+			return rule.getName();
+		}
+
+		public Object getParent(Object o) {
+			return null;
+		}
+
+	};
+
+}
diff --git a/plugins/org.eclipse.wst.validation.ui/vf2/org/eclipse/wst/validation/ui/internal/HelpContextIds.java b/plugins/org.eclipse.wst.validation.ui/vf2/org/eclipse/wst/validation/ui/internal/HelpContextIds.java
new file mode 100644
index 0000000..1af7aeb
--- /dev/null
+++ b/plugins/org.eclipse.wst.validation.ui/vf2/org/eclipse/wst/validation/ui/internal/HelpContextIds.java
@@ -0,0 +1,18 @@
+package org.eclipse.wst.validation.ui.internal;
+
+import org.eclipse.wst.validation.internal.ui.plugin.ValidationUIPlugin;
+
+public interface HelpContextIds {
+	String PreferencePage = ValidationUIPlugin.VALIDATION_PLUGIN_ID + ".jvgp0000"; //$NON-NLS-1$
+	
+	String FilterRule = ValidationUIPlugin.VALIDATION_PLUGIN_ID + ".jvgp0100";  //$NON-NLS-1$
+	String FRFileExt = ValidationUIPlugin.VALIDATION_PLUGIN_ID + ".jvgp0101";  //$NON-NLS-1$
+	String FRName = ValidationUIPlugin.VALIDATION_PLUGIN_ID + ".jvgp0102";  //$NON-NLS-1$
+	String FRProjectNature = ValidationUIPlugin.VALIDATION_PLUGIN_ID + ".jvgp0103";  //$NON-NLS-1$
+	String FRFacet = ValidationUIPlugin.VALIDATION_PLUGIN_ID + ".jvgp0104";  //$NON-NLS-1$
+	String FRContentType = ValidationUIPlugin.VALIDATION_PLUGIN_ID + ".jvgp0105";  //$NON-NLS-1$
+	
+	String ProjectPage = ValidationUIPlugin.VALIDATION_PLUGIN_ID + ".jvpp0000"; //$NON-NLS-1$
+	String ProjectFilterRule = ValidationUIPlugin.VALIDATION_PLUGIN_ID + ".jvpp0100";  //$NON-NLS-1$
+
+}
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/IRootObjectResource.java b/plugins/org.eclipse.wst.validation.ui/vf2/org/eclipse/wst/validation/ui/internal/ImageNames.java
similarity index 62%
copy from plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/IRootObjectResource.java
copy to plugins/org.eclipse.wst.validation.ui/vf2/org/eclipse/wst/validation/ui/internal/ImageNames.java
index 7048136..5873170 100644
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/IRootObjectResource.java
+++ b/plugins/org.eclipse.wst.validation.ui/vf2/org/eclipse/wst/validation/ui/internal/ImageNames.java
@@ -8,12 +8,17 @@
  * Contributors:
  *     IBM Corporation - initial API and implementation
  *******************************************************************************/
-package org.eclipse.wst.common.internal.emf.resource;
+package org.eclipse.wst.validation.ui.internal;
 
-import org.eclipse.emf.ecore.EObject;
-
-public interface IRootObjectResource {
-
-	public EObject getRootObject();
-
+/**
+ * Names of the images.
+ * @author karasiuk
+ *
+ */
+public interface ImageNames {
+	
+	String okTable 		= "ok_tbl"; //$NON-NLS-1$
+	String failTable 	= "fail_tbl"; //$NON-NLS-1$	
+	String settings 	= "settings"; //$NON-NLS-1$
+	String disabled 	= "_disabled"; //$NON-NLS-1$
 }
diff --git a/plugins/org.eclipse.wst.validation.ui/vf2/org/eclipse/wst/validation/ui/internal/ManualValidationRunner.java b/plugins/org.eclipse.wst.validation.ui/vf2/org/eclipse/wst/validation/ui/internal/ManualValidationRunner.java
new file mode 100644
index 0000000..f70bcce
--- /dev/null
+++ b/plugins/org.eclipse.wst.validation.ui/vf2/org/eclipse/wst/validation/ui/internal/ManualValidationRunner.java
@@ -0,0 +1,105 @@
+/*******************************************************************************
+ * Copyright (c) 2007, 2008 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.wst.validation.ui.internal;
+
+import java.util.Map;
+import java.util.Set;
+
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.resources.WorkspaceJob;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.core.runtime.jobs.MultiRule;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.wst.validation.internal.ValOperation;
+import org.eclipse.wst.validation.internal.ValType;
+import org.eclipse.wst.validation.internal.ValidationResultSummary;
+import org.eclipse.wst.validation.internal.ValidationRunner;
+import org.eclipse.wst.validation.ui.internal.dialog.ResultsDialog;
+
+/**
+ * Run a manual validation. 
+ * @author karasiuk
+ *
+ */
+public class ManualValidationRunner extends WorkspaceJob {
+	
+	private Map<IProject, Set<IResource>> 	_projects;
+	private ValType _valType;
+	private boolean	_showResults;
+	
+	/**
+	 * Validate the selected projects and/or resources.
+	 * 
+	 * @param projects
+	 *            The selected projects. The key is an IProject and the value is
+	 *            the Set of IResources that were selected. Often this will be
+	 *            every resource in the project.
+	 * 
+	 * @param isManual
+	 *            Is this a manual validation?
+	 * 
+	 * @param isBuild
+	 *            Is this a build based validation?
+	 * 
+	 * @param showResults
+	 *            When the validation is finished, show the results in a dialog box.
+	 */
+	public static void validate(Map<IProject, Set<IResource>> projects, ValType valType, boolean showResults){
+		ManualValidationRunner me = new ManualValidationRunner(projects, valType, showResults);
+		
+		//TODO optimize this, I don't like the idea of validators having to lock the entire project
+		Set<IProject> keys = projects.keySet();
+		IProject[] projectArray = new IProject[keys.size()];
+		keys.toArray(projectArray);
+		if (projectArray.length == 1)me.setRule(projectArray[0]);
+		else {
+			me.setRule(MultiRule.combine(projectArray));
+		}
+		me.schedule();
+	}
+	
+	private ManualValidationRunner(Map<IProject, Set<IResource>> projects, ValType valType, boolean showResults){
+		super(ValUIMessages.Validation);
+		_projects = projects;
+		_valType = valType;
+		_showResults = showResults;
+	}
+
+	public IStatus runInWorkspace(IProgressMonitor monitor) throws CoreException {
+		
+		long start = System.currentTimeMillis();
+		final ValOperation vo = ValidationRunner.validate(_projects, _valType, monitor, false);
+		final long time = System.currentTimeMillis() - start;
+		int resourceCount = 0;
+		for (Set s : _projects.values())resourceCount += s.size();
+		final int finalResourceCount = resourceCount;
+		if (vo.isCanceled())return Status.CANCEL_STATUS;
+		
+		if (_showResults){
+			Display display = Display.getDefault();
+			Runnable run = new Runnable(){
+
+				public void run() {
+					ValidationResultSummary vr = vo.getResult();
+					ResultsDialog rd = new ResultsDialog(null, vr, time, finalResourceCount);
+					rd.open();
+				}
+				
+			};
+			display.asyncExec(run);			
+		}
+		return Status.OK_STATUS;
+	}
+}
diff --git a/plugins/org.eclipse.wst.validation.ui/vf2/org/eclipse/wst/validation/ui/internal/ValUIMessages.java b/plugins/org.eclipse.wst.validation.ui/vf2/org/eclipse/wst/validation/ui/internal/ValUIMessages.java
new file mode 100644
index 0000000..5001d84
--- /dev/null
+++ b/plugins/org.eclipse.wst.validation.ui/vf2/org/eclipse/wst/validation/ui/internal/ValUIMessages.java
@@ -0,0 +1,122 @@
+/*******************************************************************************
+ * Copyright (c) 2007, 2008 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.wst.validation.ui.internal;
+
+import org.eclipse.osgi.util.NLS;
+
+public class ValUIMessages extends NLS {
+	
+	private static final String BUNDLE_NAME = "org.eclipse.wst.validation.ui.internal.messages"; //$NON-NLS-1$
+	   
+	public static String ADD_VALIDATION_BUILDER;
+	
+	public static String PREF_BUTTON_OVERRIDE;
+	public static String PREF_VALLIST_TITLE;
+	public static String PREF_BUTTON_ENABLEALL;
+	public static String PREF_BUTTON_DISABLEALL;
+	public static String PREF_MNU_MANUAL;
+	public static String PREF_MNU_BUILD;
+	public static String PREF_MNU_SETTINGS;
+	
+	public static String ConfigWsSettings;
+	public static String DoNotShowResults;
+	public static String DelegatesDialogTitle;
+	public static String DelegatesComboLabel;
+	
+	public static String ErrorsWarnings;
+		
+	public static String VBF_EXC_INTERNAL_TITLE;
+	public static String VBF_EXC_INTERNAL_PAGE;
+	public static String VBF_EXC_INVALID_REGISTER;
+	public static String DISABLE_VALIDATION;
+	
+	public static String MANUAL;
+	public static String BUILD;
+	public static String SETTINGS;
+	public static String VALIDATOR;
+	public static String VBF_UI_NO_VALIDATORS_INSTALLED;
+	
+	public static String SaveFilesDialog_saving;
+	public static String SaveFilesDialog_always_save;
+	public static String SaveFilesDialog_save_all_resources;
+	public static String SaveFilesDialog_must_save;
+	public static String PrefPage_always_save;
+	public static String PrefPageConfirmDialog;
+	public static String ProjectOverridesNotAllowed;
+	public static String RunValidationDialogTitle;
+	
+	/* Validator Filters */
+	public static String fdTitle;
+	public static String fdNoFilters;
+
+	public static String ErrConfig;
+	
+	public static String FilterHelp;
+	
+	public static String ButtonAddGroupInclude;	
+	public static String ButtonAddGroupExclude;	
+	public static String ButtonAddRule;	
+	public static String ButtonRemove;
+	
+	public static String LabelExtension;
+	public static String LabelFile;
+	public static String LabelProjects;
+	public static String LabelFacets;
+	public static String LabelContentType;
+	public static String LabelEnableProjectSpecific;
+	public static String LabelTargetRuntime;
+	
+	public static String DescExtension;
+	public static String DescFile;
+	public static String DescProjects;
+	public static String DescFacets;
+	public static String DescContentType;
+	public static String DescTargetRuntime;
+	
+	public static String Validation;
+	public static String ValidationStatus;
+	
+	public static String ErrSummary;
+	public static String ValidationSuccessful;
+	
+	public static String FrWizard;
+	public static String FrSelectFilterType;
+	public static String FrFileExtension;
+	public static String FrFileExtensionLabel;
+	public static String FrCaseSensitive;
+	public static String FrExactMatch;
+	public static String FrFolderOrFile;
+	public static String FrFolderOrFileLabel;
+	public static String FrBrowseFile;
+	public static String FrFileFilter;
+	public static String FrBrowseFolder;
+	public static String FrFolderFilter;
+	public static String FrProjectNature;
+	public static String FrProjectNatureLabel;
+	public static String FrSimpleFileName;
+	public static String FrFacit;
+	public static String FrFacitLabel;
+	public static String FrContentType;
+	public static String FrNewFacitLabel;
+	public static String FrContentTypeLabel;
+	public static String FrMsgSev;
+	public static String FrTargetRuntimeLabel;
+	
+	public static String RebuildTitle;
+	public static String RebuildMsg;
+	
+		
+	static {
+		NLS.initializeMessages(BUNDLE_NAME, ValUIMessages.class);
+	  }
+
+}
diff --git a/plugins/org.eclipse.wst.validation.ui/vf2/org/eclipse/wst/validation/ui/internal/dialog/FilterDialog.java b/plugins/org.eclipse.wst.validation.ui/vf2/org/eclipse/wst/validation/ui/internal/dialog/FilterDialog.java
new file mode 100644
index 0000000..186eaae
--- /dev/null
+++ b/plugins/org.eclipse.wst.validation.ui/vf2/org/eclipse/wst/validation/ui/internal/dialog/FilterDialog.java
@@ -0,0 +1,469 @@
+/*******************************************************************************
+ * Copyright (c) 2005, 2009 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.wst.validation.ui.internal.dialog;
+
+import java.lang.reflect.InvocationTargetException;
+import java.util.Iterator;
+import java.util.Map;
+
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.runtime.IAdapterFactory;
+import org.eclipse.core.runtime.Platform;
+import org.eclipse.jface.dialogs.Dialog;
+import org.eclipse.jface.resource.JFaceResources;
+import org.eclipse.jface.viewers.ISelectionChangedListener;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.SelectionChangedEvent;
+import org.eclipse.jface.viewers.TreeViewer;
+import org.eclipse.jface.wizard.WizardDialog;
+import org.eclipse.osgi.util.NLS;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.events.SelectionListener;
+import org.eclipse.swt.graphics.Point;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.layout.RowLayout;
+import org.eclipse.swt.widgets.Button;
+import org.eclipse.swt.widgets.Combo;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.Group;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Shell;
+import org.eclipse.ui.model.BaseWorkbenchContentProvider;
+import org.eclipse.ui.model.WorkbenchLabelProvider;
+import org.eclipse.wst.validation.MessageSeveritySetting;
+import org.eclipse.wst.validation.Validator;
+import org.eclipse.wst.validation.internal.ValManager;
+import org.eclipse.wst.validation.internal.ValMessages;
+import org.eclipse.wst.validation.internal.ValidatorMutable;
+import org.eclipse.wst.validation.internal.delegates.ValidatorDelegateDescriptor;
+import org.eclipse.wst.validation.internal.delegates.ValidatorDelegatesRegistry;
+import org.eclipse.wst.validation.internal.model.FilterGroup;
+import org.eclipse.wst.validation.internal.model.FilterRule;
+import org.eclipse.wst.validation.internal.model.ValidatorHelper;
+import org.eclipse.wst.validation.ui.internal.AdapterFactory;
+import org.eclipse.wst.validation.ui.internal.ValUIMessages;
+
+/**
+ * Display a filter dialog for a particular Validator, that is a list of all the filters that are active for
+ * the validator.
+ * 
+ * @author karasiuk
+ *
+ */
+public final class FilterDialog extends Dialog {
+	
+	/** 
+	 * If we are doing project level filters this will point to the project. This is null if we are doing
+	 * workspace level filters. 
+	 */
+	private IProject	_project;
+	
+	private ValidatorMutable 	_validator;
+	
+	private TreeViewer		_tree;
+	private Combo			_delegating;
+	private IAdapterFactory _adaptorFactory = new AdapterFactory();
+	
+	private Button		_addGroupInclude;
+	private Button		_addGroupExclude;
+	private Button		_addRule;
+	private Button		_remove;
+	private ISelectionChangedListener	_nodeChangedListener;
+	
+	/** The currently selected group. If a rule is selected instead, then this will be null. */
+	private FilterGroup	_selectedGroup;
+	
+	/** The currently selected rule. If a group is selected instead, then this will be null. */
+	private FilterRule	_selectedRule;
+	
+	private Combo[]		_messageSev;
+	
+	private static String[] _messages = new String[]{
+		ValMessages.SevError, ValMessages.SevWarning, ValMessages.SevIgnore};
+	
+	private Shell		_shell;
+	
+	/**
+	 * Create a dialog that knows how to change a validator's filters.
+	 * 
+	 * @param shell
+	 * 
+	 * @param validator the validator that is being updated.
+	 * 
+	 * @param project the project that the filters are being added to. If these are workspace
+	 * level filters, then this must be null. 
+	 */
+	public FilterDialog(Shell shell, ValidatorMutable validator, IProject project){
+		super(shell);
+		_shell = shell;
+		setShellStyle(getShellStyle() | SWT.CLOSE|SWT.MIN|SWT.MAX|SWT.RESIZE);
+		_validator = validator;
+		_project = project;
+	}
+	
+	protected void configureShell(Shell newShell) {
+		super.configureShell(newShell);
+		newShell.setText(NLS.bind(ValUIMessages.fdTitle, _validator.getName()));
+	}
+	
+	protected Control createDialogArea(Composite parent) {
+		Composite c = (Composite)super.createDialogArea(parent);
+		c.setLayout(new GridLayout(2, false));
+		if (!_validator.isV2Validator()){
+			new Label(c, SWT.NONE).setText(ValUIMessages.fdNoFilters);
+		}
+		else {
+			Label blurb = new Label(c, SWT.LEFT | SWT.WRAP);
+			blurb.setLayoutData(new GridData(SWT.FILL, SWT.TOP, true, false, 2, 1));
+			blurb.setText(ValUIMessages.FilterHelp);
+			
+			_tree = new TreeViewer(c, SWT.SINGLE | SWT.H_SCROLL | SWT.V_SCROLL | SWT.BORDER);
+			_tree.getControl().setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
+			Platform.getAdapterManager().registerAdapters(_adaptorFactory, ValidatorMutable.class);
+			Platform.getAdapterManager().registerAdapters(_adaptorFactory, FilterGroup.class);
+			Platform.getAdapterManager().registerAdapters(_adaptorFactory, FilterRule.class);
+			_tree.setContentProvider(new BaseWorkbenchContentProvider());
+			_tree.setLabelProvider(new WorkbenchLabelProvider());
+			_tree.setInput(_validator);
+			_tree.expandAll();
+			
+			addButtons(c);
+			
+			String delegatingId = _validator.getDelegatingId();
+			if (delegatingId != null){
+				addDelegatorSelection(c);
+			}
+				
+			_nodeChangedListener = new ISelectionChangedListener(){
+
+				public void selectionChanged(SelectionChangedEvent event) {
+					_selectedGroup = null;
+					_selectedRule = null;
+					if (event.getSelection() instanceof IStructuredSelection){
+						IStructuredSelection sel = (IStructuredSelection)event.getSelection();
+						if (sel.getFirstElement() instanceof FilterGroup){
+							_selectedGroup = (FilterGroup)sel.getFirstElement();
+						}
+						else if (sel.getFirstElement() instanceof FilterRule){
+							_selectedRule = (FilterRule)sel.getFirstElement();
+						}
+					}
+					updateButtons();
+				}
+				
+			};
+			
+			_tree.addSelectionChangedListener(_nodeChangedListener);
+			
+			addMessageMappings(c);
+		}
+		return c;
+	}
+
+	private void addButtons(Composite c) {
+		Composite buttons = new Composite(c, SWT.TOP);
+		GridData gd = new GridData(SWT.LEFT, SWT.TOP, false, false, 1, 1);
+		buttons.setLayoutData(gd);
+		buttons.setLayout(new GridLayout(1, true));
+		_addGroupInclude = new Button(buttons, SWT.PUSH | SWT.FILL | SWT.CENTER);
+		_addGroupInclude.setText(ValUIMessages.ButtonAddGroupInclude);
+		_addGroupInclude.setLayoutData(new GridData(SWT.FILL, SWT.TOP, true, false, 1, 1));
+		
+		_addGroupInclude.addSelectionListener(new SelectionListener(){
+
+			public void widgetDefaultSelected(SelectionEvent e) {
+				addGroup(false);				
+			}
+
+			public void widgetSelected(SelectionEvent e) {
+				addGroup(false);						
+			}
+			
+		});
+			
+		_addGroupExclude = new Button(buttons, SWT.PUSH | SWT.FILL | SWT.CENTER);
+		_addGroupExclude.setText(ValUIMessages.ButtonAddGroupExclude);
+		_addGroupExclude.setLayoutData(new GridData(SWT.FILL, SWT.TOP, true, false, 1, 1));
+		
+		_addGroupExclude.addSelectionListener(new SelectionListener(){
+
+			public void widgetDefaultSelected(SelectionEvent e) {
+				addGroup(true);				
+			}
+
+			public void widgetSelected(SelectionEvent e) {
+				addGroup(true);						
+			}
+			
+		});
+
+		_addRule = new Button(buttons, SWT.PUSH | SWT.FILL | SWT.CENTER);
+		_addRule.setText(ValUIMessages.ButtonAddRule);
+		_addRule.setLayoutData(new GridData(SWT.FILL, SWT.TOP, true, false, 1, 1));
+		_addRule.addSelectionListener(new SelectionListener(){
+
+			public void widgetDefaultSelected(SelectionEvent e) {
+				doIt();
+			}
+
+			public void widgetSelected(SelectionEvent e) {
+				doIt();
+			}
+			
+			private void doIt(){
+				NewFilterRule nfr = new NewFilterRule(_project);
+				WizardDialog wd = new WizardDialog(_shell, nfr);
+				wd.setBlockOnOpen(true);
+				int rc = wd.open();
+				if (rc == WizardDialog.CANCEL)return;
+				
+				FilterRule rule = nfr.getRule();
+				if (rule != null){
+					FilterGroup newGroup = FilterGroup.addRule(_selectedGroup, rule);
+					_validator.replaceFilterGroup(_selectedGroup, newGroup);
+					_selectedGroup = newGroup;
+					refresh();
+				}
+			}
+			
+		});
+
+		_remove = new Button(buttons, SWT.PUSH | SWT.FILL | SWT.CENTER);
+		_remove.setLayoutData(new GridData(SWT.FILL, SWT.TOP, true, false, 1, 1));
+		_remove.setText(ValUIMessages.ButtonRemove);
+		_remove.addSelectionListener(new SelectionListener(){
+
+			public void widgetDefaultSelected(SelectionEvent e) {
+				remove();					
+			}
+
+			public void widgetSelected(SelectionEvent e) {
+				remove();						
+			}				
+		});
+		
+		Button restore = new Button(buttons, SWT.PUSH | SWT.FILL | SWT.CENTER);
+		restore.setLayoutData(new GridData(SWT.FILL, SWT.TOP, true, false, 1, 1));
+		String defaults = JFaceResources.getString("defaults"); //$NON-NLS-1$
+		restore.setText(defaults);
+		restore.addSelectionListener(new SelectionListener(){
+
+			public void widgetDefaultSelected(SelectionEvent e) {
+				restoreDefaults();					
+			}
+
+			public void widgetSelected(SelectionEvent e) {
+				restoreDefaults();						
+			}				
+		});
+	}
+	
+	private void restoreDefaults() {
+		if (_validator.isV2Validator()){
+			try {
+				String id = _validator.getId();
+				Validator[] vals = ValManager.getDefaultValidators();
+				for (Validator v : vals){
+					if (v.getId().equals(id)){
+						_validator = new ValidatorMutable(v);
+						_tree.setInput(_validator);
+						_tree.expandAll();
+						refresh();
+						return;
+					}
+				}
+			}
+			catch (InvocationTargetException e){
+				
+			}
+		}
+		
+	}
+
+
+	private void addMessageMappings(Composite c) {
+		if (!_validator.isV2Validator())return;
+		Map<String,MessageSeveritySetting> mappings = _validator.getMessageSettings();
+		if (mappings == null || mappings.size() == 0)return;
+		
+		Group group = new Group(c, SWT.NONE);
+		group.setText(ValUIMessages.FrMsgSev);
+		group.setLayoutData(new GridData(SWT.FILL, SWT.TOP, true, false, 2, 1));
+		group.setLayout(new GridLayout(2, false));
+		
+//		Label heading = new Label(c, SWT.LEFT);
+//		heading.setText(ValUIMessages.ErrorsWarnings);
+//		heading.setFont(JFaceResources.getHeaderFont());
+//		heading.setLayoutData(new GridData(SWT.FILL, SWT.TOP, true, false, 2, 1));
+		
+		_messageSev = new Combo[mappings.size()];
+		int i= 0;
+		for (MessageSeveritySetting ms : mappings.values()){
+			Label label = new Label(group, SWT.LEFT);
+			label.setText("   " + ms.getLabel() + ":"); //$NON-NLS-1$ //$NON-NLS-2$
+			
+			Combo sev = new Combo(group, SWT.RIGHT);
+			_messageSev[i++] = sev;
+			sev.setItems(_messages);
+			sev.select(ms.getCurrent().ordinal());
+			sev.setData(ms);
+			sev.addSelectionListener(new SelectionListener(){
+
+				public void widgetDefaultSelected(SelectionEvent e) {
+					select(e);
+				}
+
+				public void widgetSelected(SelectionEvent e) {
+					select(e);
+				}
+				
+				private void select(SelectionEvent e){
+					Combo w = (Combo)e.widget;
+					MessageSeveritySetting ms = (MessageSeveritySetting)w.getData();
+					int i = w.getSelectionIndex();
+					if (ms.setCurrent(MessageSeveritySetting.Severity.values()[i]))
+						_validator.bumpChangeCountMessages();
+				}
+				
+			});
+		}
+	}
+		
+	/**
+	 * Add a combo box so that the user can change which delegating validator to call.
+	 */
+	private void addDelegatorSelection(Composite c) {
+		Map map = ValidatorDelegatesRegistry.getInstance().getDelegateDescriptors(_validator.getValidatorClassname());
+		if (map == null)return;
+		
+		Composite line = new Composite(c, SWT.NONE);
+		line.setLayout(new RowLayout(SWT.HORIZONTAL));
+		line.setLayoutData(new GridData(SWT.FILL, SWT.TOP, true, false, 2, 1));
+
+		Label label = new Label(line, SWT.CENTER);
+		label.setText(ValUIMessages.DelegatesComboLabel);
+
+				
+		_delegating = new Combo(line, SWT.READ_ONLY);
+		String[] items = new String[map.size()];
+		final String ids[] = new String[map.size()];
+		String selected = null;
+		Iterator it = map.values().iterator();
+		for (int i=0; i<items.length;i++){
+			ValidatorDelegateDescriptor vd = (ValidatorDelegateDescriptor)it.next();
+			items[i] = vd.getName();
+			ids[i] = vd.getId();
+			if (vd.getId().equals(_validator.getDelegatingId())){
+				selected = vd.getName();
+			}
+		}
+		_delegating.setItems(items);
+		_delegating.setText(selected);
+		_delegating.addSelectionListener(new SelectionListener(){
+
+			public void widgetDefaultSelected(SelectionEvent e) {
+			}
+
+			public void widgetSelected(SelectionEvent e) {
+				int sel = _delegating.getSelectionIndex();
+				_validator.setDelegatingId(ids[sel]);
+			}
+			
+		});
+	}
+
+	/**
+	 * Add a new filter group to the validator.
+	 * @param exclude
+	 */
+	private void addGroup(boolean exclude){
+		if (!_validator.isV2Validator())return;
+		FilterRule[] rules = new FilterRule[0];
+		_validator.add(FilterGroup.create(exclude, rules));
+		refresh();
+		
+	}
+	
+	private void refresh(){
+		_tree.refresh();
+		_tree.expandAll();
+		updateButtons();		
+	}
+	
+	/**
+	 * Remove the current selection from the validator.
+	 */
+	private void remove(){
+		if (_selectedRule != null){
+			FilterGroup group = findGroup(_selectedRule);
+			if (group != null){
+				FilterGroup newGroup = FilterGroup.removeRule(group, _selectedRule);
+				_validator.replaceFilterGroup(group, newGroup);
+				refresh();
+			}
+		}
+		
+		if (_selectedGroup != null){
+			_validator.remove(_selectedGroup);
+			refresh();
+			return;
+		}
+	}
+	
+	/**
+	 * Find the group in the current validator that has this rule.
+	 * @param rule The rule that we are searching for.
+	 * @return null if we can not find the group.
+	 */
+	private FilterGroup findGroup(FilterRule rule) {
+		for (FilterGroup group : _validator.getGroups()){
+			for (FilterRule fr : group.getRules()){
+				if (fr.equals(rule))return group;
+			}
+		}
+		return null;
+	}
+
+	private void updateButtons() {
+		if (_validator.isV2Validator()){
+			_addGroupExclude.setEnabled(!ValidatorHelper.hasExcludeGroup(_validator));
+		}
+		_addRule.setEnabled(_selectedGroup != null);
+		_remove.setEnabled(_selectedGroup != null || _selectedRule != null);
+		if (_messageSev != null){
+			Map<String,MessageSeveritySetting> msgs = _validator.getMessageSettings();
+			if (msgs != null && _messageSev.length == msgs.size()){
+				int i = 0;
+				for (MessageSeveritySetting ms : msgs.values()){
+					_messageSev[i++].select(ms.getCurrent().ordinal());
+				}
+			}
+		}
+	}
+
+
+	public boolean close() {
+		Platform.getAdapterManager().unregisterAdapters(_adaptorFactory);
+		if (_tree != null)_tree.removeSelectionChangedListener(_nodeChangedListener);
+		return super.close();
+	}
+	
+	protected Point getInitialSize() {
+		return new Point(600, 475);
+	}
+
+	public ValidatorMutable getValidator() {
+		return _validator;
+	}
+}
diff --git a/plugins/org.eclipse.wst.validation.ui/vf2/org/eclipse/wst/validation/ui/internal/dialog/NewFilterRule.java b/plugins/org.eclipse.wst.validation.ui/vf2/org/eclipse/wst/validation/ui/internal/dialog/NewFilterRule.java
new file mode 100644
index 0000000..5c7e53b
--- /dev/null
+++ b/plugins/org.eclipse.wst.validation.ui/vf2/org/eclipse/wst/validation/ui/internal/dialog/NewFilterRule.java
@@ -0,0 +1,663 @@
+/*******************************************************************************
+ * Copyright (c) 2005, 2011 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.wst.validation.ui.internal.dialog;
+
+import java.util.Map;
+import java.util.Set;
+import java.util.TreeMap;
+
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IProjectNatureDescriptor;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.Path;
+import org.eclipse.core.runtime.Platform;
+import org.eclipse.core.runtime.content.IContentType;
+import org.eclipse.jface.wizard.IWizardPage;
+import org.eclipse.jface.wizard.Wizard;
+import org.eclipse.jface.wizard.WizardPage;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.ModifyEvent;
+import org.eclipse.swt.events.ModifyListener;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.events.SelectionListener;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Button;
+import org.eclipse.swt.widgets.Combo;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.DirectoryDialog;
+import org.eclipse.swt.widgets.FileDialog;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Text;
+import org.eclipse.ui.PlatformUI;
+import org.eclipse.wst.common.project.facet.core.IProjectFacet;
+import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
+import org.eclipse.wst.common.project.facet.core.internal.ProjectFacet;
+import org.eclipse.wst.validation.internal.model.FilterRule;
+import org.eclipse.wst.validation.internal.model.ValidatorHelper;
+import org.eclipse.wst.validation.ui.internal.HelpContextIds;
+import org.eclipse.wst.validation.ui.internal.ValUIMessages;
+
+/**
+ * A wizard that adds new rules to validators.
+ * @author karasiuk
+ *
+ */
+public class NewFilterRule extends Wizard {
+	
+	private Page1 			_page1;
+	private IWizardPage		_page2;
+	
+	private IProject		_project;
+	
+	private FilterRule		_rule;
+	
+	public NewFilterRule(IProject project){
+		_project = project;
+		setWindowTitle(ValUIMessages.FrWizard);
+		_page1 = new Page1(project);
+		addPage(_page1);
+		setForcePreviousAndNextButtons(true);
+	}
+	
+	public boolean canFinish() {	
+		if (_page2 != null)return _page2.isPageComplete();
+		return false;
+	}
+		
+	public FilterRule getRule(){
+		return _rule;
+	}
+	
+	public boolean performFinish() {
+		if (_page2 == null)return false;
+		FilterWizardPage page = (FilterWizardPage)_page2;
+		_rule = page.getFilterRule();
+		return _rule != null;
+	}
+	
+	public IWizardPage getNextPage(IWizardPage page) {
+		if (page == _page1){
+			setForcePreviousAndNextButtons(false);
+			_page2 = returnOrBuildPage(_page1.getSelectedFilter());
+			return _page2;
+		}
+		return null;
+	}
+	
+	private IWizardPage returnOrBuildPage(int selectedFilter) {
+			IWizardPage page =  null;
+			if (_project != null){
+				if(selectedFilter == 2) selectedFilter = 4;
+				else if(selectedFilter == 3) selectedFilter = 5;
+			}
+			
+			switch (selectedFilter){
+			case 0:
+				page = new FileExtPage();
+				break;
+			case 1:
+				page = new FilePage(_project);
+				break;
+			case 2:
+				page = new ProjectPage();
+				break;
+			case 3:
+				page = new FacetPage();
+				break;
+			case 4:
+				page = new ContentTypePage();
+				break;
+			case 5:
+				page = new TargetRuntimePage();
+				break;
+			}
+		addPage(page);
+		return page;
+	}
+
+	public static class Page1 extends WizardPage {
+		
+		private int 		_selectedFilter;
+		private IProject	_project;
+
+		
+		public Page1(IProject project){
+			super("page1", ValUIMessages.FrSelectFilterType, null); //$NON-NLS-1$
+			setPageComplete(true);
+			_project = project;
+		}
+		
+		public void createControl(Composite parent) {
+			String helpId = _project == null ? HelpContextIds.FilterRule : HelpContextIds.ProjectFilterRule;
+			PlatformUI.getWorkbench().getHelpSystem().setHelp(parent, helpId);
+			String[] labels = null;
+			String[] desc = null;
+			if (_project != null){
+				labels = new String[]{ValUIMessages.LabelExtension, ValUIMessages.LabelFile,
+						ValUIMessages.LabelContentType, ValUIMessages.LabelTargetRuntime};
+				
+				desc = new String[]{ValUIMessages.DescExtension, ValUIMessages.DescFile,
+						ValUIMessages.DescContentType, ValUIMessages.DescTargetRuntime};
+			}
+			else {
+				labels = new String[]{ValUIMessages.LabelExtension, ValUIMessages.LabelFile,
+						ValUIMessages.LabelProjects, ValUIMessages.LabelFacets,
+						ValUIMessages.LabelContentType, ValUIMessages.LabelTargetRuntime};
+				
+				desc = new String[]{ValUIMessages.DescExtension, ValUIMessages.DescFile,
+						ValUIMessages.DescProjects, ValUIMessages.DescFacets, 
+						ValUIMessages.DescContentType, ValUIMessages.DescTargetRuntime};
+			}
+			
+			Composite control = new Composite(parent, SWT.NONE);
+			control.setLayout(new GridLayout(2, false));
+
+			SelectionListener listener = new SelectionListener(){
+
+				public void widgetDefaultSelected(SelectionEvent e) {
+					doIt(e);
+				}
+
+				public void widgetSelected(SelectionEvent e) {
+					doIt(e);
+				}
+				
+				private void doIt(SelectionEvent e){
+					if (e.getSource() instanceof Button){
+						Button b = (Button)e.getSource();
+						if (b.getData() instanceof Integer) {
+							Integer index = (Integer) b.getData();
+							setSelectedFilter(index.intValue());
+						}
+					}
+				}
+				
+			};
+			for (int i=0; i<labels.length; i++){
+				Button button = new Button(control, SWT.RADIO);
+				button.setText(labels[i]);
+				button.setData(new Integer(i));			
+				button.addSelectionListener(listener);
+				(new Text(control, SWT.WRAP|SWT.READ_ONLY)).setText(desc[i]);
+				if (i == 0)button.setSelection(true);				
+			}			
+			setControl(control);			
+		}
+
+		public int getSelectedFilter() {
+			return _selectedFilter;
+		}
+
+		public void setSelectedFilter(int selectedFilter) {
+			_selectedFilter = selectedFilter;
+			getContainer().updateButtons();
+		}
+						
+	}
+	
+	public static class FileExtPage extends WizardPage implements FilterWizardPage {
+		
+		private Text 	_pattern;
+		private Button	_case;
+		
+		public FileExtPage(){
+			super("fileext", ValUIMessages.FrFileExtension, null); //$NON-NLS-1$
+		}
+
+		public void createControl(Composite parent) {
+			PlatformUI.getWorkbench().getHelpSystem().setHelp(parent, HelpContextIds.FRFileExt);
+			Composite control = new Composite(parent, SWT.NONE);
+			setControl(control);
+			control.setLayout(new GridLayout(2, false));
+			(new Label(control, SWT.NONE)).setText(ValUIMessages.FrFileExtensionLabel);
+			_pattern = new Text(control, SWT.BORDER);
+			_pattern.setFocus();
+			_pattern.addModifyListener(new ModifyListener(){
+
+				public void modifyText(ModifyEvent e) {
+					getContainer().updateButtons();
+				}
+				
+			});
+			
+			_case = new Button(control, SWT.CHECK);
+			_case.setText(ValUIMessages.FrCaseSensitive);
+			_case.setSelection(false);
+			_case.setLayoutData(new GridData(SWT.BEGINNING, SWT.BEGINNING,false, false, 2, 1));
+			
+		}
+
+		public FilterRule getFilterRule() {
+			if (!isPageComplete())return null;
+			return FilterRule.FileExt.createFileExt(_pattern.getText(), _case.getSelection());
+		}
+		
+		public boolean isPageComplete() {
+			return _pattern != null && _pattern.getText().trim().length() > 0;
+		}
+		
+		
+	}
+	
+	public static class FilePage extends WizardPage implements FilterWizardPage {
+		
+		private Text 	_pattern;
+		private Button	_browseFile;
+		private Button	_browseFolder;
+		private Button	_case;
+		private Button	_simpleFileName;
+		
+		private IProject	_project;
+		private int			_type = FilterRule.File.FileTypeFile;
+		private IPath		_fullFileName;
+		private String		_root;
+		
+		public FilePage(IProject project){
+			super("file", ValUIMessages.FrFolderOrFile, null); //$NON-NLS-1$
+			_project = project;
+		}
+
+		public void createControl(Composite parent) {
+			PlatformUI.getWorkbench().getHelpSystem().setHelp(parent, HelpContextIds.FRName);
+			final Composite control = new Composite(parent, SWT.NONE);
+			setControl(control);
+			control.setLayout(new GridLayout(4, false));
+			(new Label(control, SWT.NONE)).setText(ValUIMessages.FrFolderOrFileLabel);
+			_pattern = new Text(control, SWT.BORDER);
+			_pattern.setFocus();
+			_pattern.setLayoutData(new GridData(300, SWT.DEFAULT));
+			_pattern.addModifyListener(new ModifyListener(){
+
+				public void modifyText(ModifyEvent e) {
+					getContainer().updateButtons();
+				}
+				
+			});
+
+			_root = null;
+			IPath base = _project == null ? ResourcesPlugin.getWorkspace().getRoot().getLocation() :
+				_project.getLocation();
+			if (base != null)_root = base.toOSString();
+						
+			_browseFile = new Button(control, SWT.PUSH);
+			_browseFile.setText(ValUIMessages.FrBrowseFile);
+			_browseFile.setEnabled(_root != null);
+			_browseFile.addSelectionListener(new SelectionListener(){
+
+				public void widgetDefaultSelected(SelectionEvent e) {
+					browse();
+				}
+
+				public void widgetSelected(SelectionEvent e) {
+					browse();
+				}
+				
+				private void browse(){
+					FileDialog fd = new FileDialog(control.getShell(), SWT.OPEN);
+					fd.setText(ValUIMessages.FrFileFilter);
+					fd.setFilterPath(_root);
+					
+					String file = fd.open();
+					if (file != null){
+						if (file.startsWith(_root))file = file.substring(_root.length()+1);
+						else file = null;
+					}
+					if (file != null){
+						_fullFileName = new Path(file);
+						if (_project == null)_fullFileName = _fullFileName.removeFirstSegments(1);
+
+						if (_simpleFileName.getSelection()){
+							_type = FilterRule.File.FileTypeFile;
+							_pattern.setText(_fullFileName.lastSegment());
+						}
+						else {
+							_type = FilterRule.File.FileTypeFull;
+							_pattern.setText(_fullFileName.toPortableString());
+						}
+					}
+					else {
+						_fullFileName = null;
+						_pattern.setText(""); //$NON-NLS-1$
+					}
+				}				
+			});
+			
+			_browseFolder = new Button(control, SWT.PUSH);
+			_browseFolder.setText(ValUIMessages.FrBrowseFolder);
+			_browseFolder.setEnabled(_root != null);
+			_browseFolder.addSelectionListener(new SelectionListener(){
+
+				public void widgetDefaultSelected(SelectionEvent e) {
+					browse();
+				}
+
+				public void widgetSelected(SelectionEvent e) {
+					browse();
+				}
+				
+				private void browse(){
+					DirectoryDialog fd = new DirectoryDialog(control.getShell());
+					fd.setMessage(ValUIMessages.FrFolderFilter);
+					fd.setFilterPath(_root);
+					String dir = fd.open();
+					if (dir != null){
+						_fullFileName = null;
+						_type = FilterRule.File.FileTypeFolder;
+						if (dir.startsWith(_root) && dir.length() > _root.length()){
+							dir = dir.substring(_root.length()+1);
+							IPath path = new Path(dir);
+							if (_project == null)path = path.removeFirstSegments(1);
+							_pattern.setText(path.toPortableString());
+						}
+						else {
+							_pattern.setText(""); //$NON-NLS-1$
+						}
+					}
+				}
+				
+			});
+			
+			_case = new Button(control, SWT.CHECK);
+			_case.setText(ValUIMessages.FrCaseSensitive);
+			_case.setSelection(false);
+			_case.setLayoutData(new GridData(SWT.BEGINNING, SWT.BEGINNING,false, false, 4, 1));
+			
+			addSimpleFileNameButton(control);
+		}
+
+		private void addSimpleFileNameButton(final Composite control) {
+			_simpleFileName = new Button(control, SWT.CHECK);
+			_simpleFileName.setText(ValUIMessages.FrSimpleFileName);
+			_simpleFileName.setSelection(_type == FilterRule.File.FileTypeFile);
+			_simpleFileName.setLayoutData(new GridData(SWT.BEGINNING, SWT.BEGINNING,false, false, 4, 1));
+			
+			_simpleFileName.addSelectionListener(new SelectionListener(){
+
+				public void widgetDefaultSelected(SelectionEvent e) {
+				}
+
+				public void widgetSelected(SelectionEvent e) {
+					if (_type == FilterRule.File.FileTypeFolder)return;
+					if (_simpleFileName.getSelection()){
+						if (_fullFileName != null)_pattern.setText(_fullFileName.lastSegment());
+						_type = FilterRule.File.FileTypeFile;
+					}
+					else {
+						if (_fullFileName != null)_pattern.setText(_fullFileName.toPortableString());
+						_type = FilterRule.File.FileTypeFull;					}
+					}				
+				});
+		}
+
+		public FilterRule getFilterRule() {
+			if (!isPageComplete())return null;
+			return FilterRule.createFile(_pattern.getText(), _case.getSelection(), _type);
+		}
+		
+		public boolean isPageComplete() {
+			if (_pattern == null)return false;
+			if (_pattern.getText() == null)return false;
+			return _pattern.getText().trim().length() > 0;
+		}
+		
+	}
+	
+	public static class ProjectPage extends WizardPage implements FilterWizardPage{
+		
+		private Combo		_natures;
+		private String[]	_ids;
+		
+		public ProjectPage(){
+			super("project", ValUIMessages.FrProjectNature, null); //$NON-NLS-1$
+		}
+
+		public void createControl(Composite parent) {
+			PlatformUI.getWorkbench().getHelpSystem().setHelp(parent, HelpContextIds.FRProjectNature);
+			Composite control = new Composite(parent, SWT.NONE);
+			setControl(control);
+			control.setLayout(new GridLayout(2, false));
+			(new Label(control, SWT.NONE)).setText(ValUIMessages.FrProjectNatureLabel);
+			
+			IProjectNatureDescriptor[] pn = ResourcesPlugin.getWorkspace().getNatureDescriptors();
+			String items[] = new String[pn.length];
+			_ids = new String[pn.length];
+			String natureLabel = null;
+			for (int i=0; i<pn.length; i++){
+				natureLabel = pn[i].getLabel();
+				_ids[i] = pn[i].getNatureId();
+				items[i] = natureLabel.length() == 0 ? _ids[i] : natureLabel + " - " + _ids[i]; //$NON-NLS-1$
+			}
+			_natures = new Combo(control, SWT.DROP_DOWN);
+			_natures.setItems(items);
+			_natures.addModifyListener(new ModifyListener(){
+
+				public void modifyText(ModifyEvent e) {
+					getContainer().updateButtons();					
+				}
+				
+			});
+						
+		}
+
+		public FilterRule getFilterRule() {
+			if (!isPageComplete())return null;
+			int i = _natures.getSelectionIndex();
+			if (i == -1)return null;
+			
+			return FilterRule.createProject(_ids[i]);
+		}
+		
+		public boolean isPageComplete() {
+			if (_natures == null)return false;
+			if (_natures.getText() == null)return false;
+			return _natures.getText().trim().length() > 0;
+		}
+	
+	}
+	
+	public static class FacetPage extends WizardPage implements FilterWizardPage {
+		
+		private Combo facets;
+		private String [] ids;
+		
+		public FacetPage(){
+			super("facet", ValUIMessages.FrFacit, null); //$NON-NLS-1$
+		}
+
+		public void createControl(Composite parent) {
+			PlatformUI.getWorkbench().getHelpSystem().setHelp(parent, HelpContextIds.FRFacet);
+			Composite control = new Composite(parent, SWT.NONE);
+			setControl(control);
+			control.setLayout(new GridLayout(2, false));
+			(new Label(control, SWT.NONE)).setText(ValUIMessages.FrNewFacitLabel);
+			
+			Set<IProjectFacet> projectFacets = ProjectFacetsManager.getProjectFacets();
+			
+			Object[] projectFacetsArray = projectFacets.toArray();
+			String items[] = new String[projectFacetsArray.length];
+			ids = new String[projectFacetsArray.length];
+			
+			for(int i = 0; i < projectFacetsArray.length; i++)
+			{
+				ProjectFacet facet = (ProjectFacet)projectFacetsArray[i];
+				ids[i] = facet.getId();
+				items[i] = facet.getLabel() + " - " + ids[i]; //$NON-NLS-1$
+			}
+			
+			facets = new Combo(control, SWT.DROP_DOWN);
+			facets.setItems(items);
+			facets.addModifyListener(new ModifyListener(){
+
+				public void modifyText(ModifyEvent e) {
+					getContainer().updateButtons();
+				}
+				
+			});
+		}
+
+		public FilterRule getFilterRule() {
+			if (!isPageComplete())return null;
+			
+			int i = facets.getSelectionIndex();
+			if (i == -1) return null;
+			
+			FilterRule rule = FilterRule.createFacet(ids[i]);
+			return rule;
+		}
+		
+		public boolean isPageComplete() {
+			if (facets == null)return false;
+			if (facets.getText() == null)return false;
+			return facets.getText().trim().length() > 0;
+		}
+		
+	}
+	
+	public static class ContentTypePage extends WizardPage implements FilterWizardPage {
+		private Combo	_pattern;
+		private Button	_exactMatch;
+		private Map<String, IContentType> _map;
+		
+		public ContentTypePage(){
+			super("contentType", ValUIMessages.FrContentType, null); //$NON-NLS-1$
+		}
+
+		public void createControl(Composite parent) {
+			PlatformUI.getWorkbench().getHelpSystem().setHelp(parent, HelpContextIds.FRContentType);
+			Composite control = new Composite(parent, SWT.NONE);
+			setControl(control);
+			control.setLayout(new GridLayout(2, false));
+			(new Label(control, SWT.NONE)).setText(ValUIMessages.FrContentTypeLabel);
+			
+			IContentType[] types = Platform.getContentTypeManager().getAllContentTypes();
+			_map = new TreeMap<String, IContentType>();
+			for (IContentType type : types){
+				String name = type.getName();
+				if (name == null)name = type.getId();
+				else
+					name = name + " - " + type.getId(); //$NON-NLS-1$
+				_map.put(name, type);
+			}
+			String items[] = new String[_map.size()];
+			int i = 0;
+			for (String label : _map.keySet()){
+				items[i++] = label;
+			}
+			_pattern = new Combo(control, SWT.DROP_DOWN | SWT.READ_ONLY);
+			_pattern.setFocus();
+			_pattern.setLayoutData(new GridData(300, SWT.DEFAULT));
+			_pattern.setVisibleItemCount(20);
+			_pattern.setItems(items);
+			_pattern.addModifyListener(new ModifyListener(){
+
+				public void modifyText(ModifyEvent e) {
+					getContainer().updateButtons();
+				}
+				
+			});
+			
+			_exactMatch = new Button(control, SWT.CHECK);
+			_exactMatch.setText(ValUIMessages.FrExactMatch);
+			_exactMatch.setSelection(false);
+			_exactMatch.setLayoutData(new GridData(SWT.BEGINNING, SWT.BEGINNING,false, false, 2, 1));
+
+		}
+
+		public FilterRule getFilterRule() {
+			if (!isPageComplete())return null;
+			IContentType type = _map.get(_pattern.getText());
+			if (type == null)return null;
+			FilterRule rule = FilterRule.createContentType(type.getId(), _exactMatch.getSelection());
+			return rule;
+		}
+		
+		public boolean isPageComplete() {
+			if (_pattern == null)return false;
+			if (_pattern.getText() == null)return false;
+			return _pattern.getText().trim().length() > 0;
+		}
+		
+	}
+	
+	public static class TargetRuntimePage extends WizardPage implements FilterWizardPage {
+		
+		private Combo	_pattern;
+		private String [] ids;
+		
+		public TargetRuntimePage(){
+			super("targetRuntime", ValUIMessages.FrTargetRuntimeLabel, null); //$NON-NLS-1$
+		}
+
+		public void createControl(Composite parent) {
+			PlatformUI.getWorkbench().getHelpSystem().setHelp(parent, HelpContextIds.FRContentType);
+			Composite control = new Composite(parent, SWT.NONE);
+			setControl(control);
+			control.setLayout(new GridLayout(2, false));
+			(new Label(control, SWT.NONE)).setText("Target Runtime"); //$NON-NLS-1$
+
+			Object[] targetRuntimes = ValidatorHelper.getRuntimes();
+			
+			String items[] = new String[targetRuntimes.length];			
+			ids = new String[targetRuntimes.length];
+			
+			for(int i = 0; i < targetRuntimes.length; i++)
+			{
+								
+				ids[i] = ValidatorHelper.getRuntimeID(targetRuntimes[i]);
+				items[i] = ValidatorHelper.getRuntimeName(targetRuntimes[i]);
+			}
+			
+			_pattern = new Combo(control, SWT.DROP_DOWN | SWT.READ_ONLY);
+			_pattern.setFocus();
+			_pattern.setLayoutData(new GridData(300, SWT.DEFAULT));
+			_pattern.setVisibleItemCount(20);
+			_pattern.setItems(items);
+			_pattern.addModifyListener(new ModifyListener(){
+
+				public void modifyText(ModifyEvent e) {
+					getContainer().updateButtons();
+				}
+				
+			});
+		}
+		
+		public FilterRule getFilterRule() {
+			if (!isPageComplete())return null;
+			
+			int i = _pattern.getSelectionIndex();
+			if (i == -1) return null;
+			
+			FilterRule rule = FilterRule.createTargetRuntime(ids[i]);
+			return rule;
+		}
+		
+		
+		public boolean isPageComplete() {
+			if (_pattern == null)return false;
+			if (_pattern.getText() == null)return false;
+			return _pattern.getText().trim().length() > 0;
+		}
+		
+	}
+	
+	interface FilterWizardPage {
+		/**
+		 * Answer the rule that was created.
+		 * 
+		 * @return null if the user didn't create a new rule.
+		 */
+		FilterRule getFilterRule();
+	}
+
+
+}
diff --git a/plugins/org.eclipse.wst.validation.ui/vf2/org/eclipse/wst/validation/ui/internal/dialog/ResultsDialog.java b/plugins/org.eclipse.wst.validation.ui/vf2/org/eclipse/wst/validation/ui/internal/dialog/ResultsDialog.java
new file mode 100644
index 0000000..3534eb7
--- /dev/null
+++ b/plugins/org.eclipse.wst.validation.ui/vf2/org/eclipse/wst/validation/ui/internal/dialog/ResultsDialog.java
@@ -0,0 +1,162 @@
+/*******************************************************************************
+ * Copyright (c) 2008 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.wst.validation.ui.internal.dialog;
+
+
+import org.eclipse.jface.dialogs.ErrorDialog;
+import org.eclipse.jface.dialogs.IDialogConstants;
+import org.eclipse.jface.dialogs.IconAndMessageDialog;
+import org.eclipse.jface.layout.GridDataFactory;
+import org.eclipse.osgi.util.NLS;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.widgets.Button;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Shell;
+import org.eclipse.wst.validation.internal.Misc;
+import org.eclipse.wst.validation.internal.ValManager;
+import org.eclipse.wst.validation.internal.ValPrefManagerGlobal;
+import org.eclipse.wst.validation.internal.ValidationResultSummary;
+import org.eclipse.wst.validation.internal.model.GlobalPreferences;
+import org.eclipse.wst.validation.internal.model.GlobalPreferencesValues;
+import org.eclipse.wst.validation.internal.ui.ValidationUIMessages;
+import org.eclipse.wst.validation.ui.internal.ValUIMessages;
+
+/**
+ * A dialog for displaying the results of a manual validation.
+ * @author karasiuk
+ *
+ */
+public class ResultsDialog extends IconAndMessageDialog {
+	
+	private ValidationResultSummary 	_result;
+	private long				_time;
+	private int					_resourceCount;
+	private Button _hideButton;
+
+	/**
+	 * Create a dialog for displaying validation results.
+	 * 
+	 * @param parentShell this can be null
+	 * @param results the results of the validation
+	 * @param time the time that the validation took in milliseconds
+	 * @param resourceCount the number of resources that were validated
+	 */
+	public ResultsDialog(Shell parentShell, ValidationResultSummary results, long time, int resourceCount) {
+		super(parentShell);
+		_result = results;
+		_time = time;
+		_resourceCount = resourceCount;
+	}
+	
+	@Override
+	protected void okPressed() {
+		if(_hideButton!=null) {
+			ValManager vm = ValManager.getDefault();
+			GlobalPreferences gp = vm.getGlobalPreferences();
+			GlobalPreferencesValues gpv = gp.asValues();
+			gpv.confirmDialog = !_hideButton.getSelection();
+			int changes = vm.replace(gpv);
+			if (changes != 0)ValPrefManagerGlobal.getDefault().savePreferences();
+		}
+		super.okPressed();
+	}
+	
+	@Override
+	public int open() {
+		if (!ErrorDialog.AUTOMATED_MODE) {
+			return super.open();
+		}
+		setReturnCode(OK);
+		return OK;
+	}
+	
+	@Override
+	protected Image getImage() {
+		if (_result.getSeverityError() > 0)return getErrorImage();
+		if (_result.getSeverityWarning() > 0)return getWarningImage();
+		return getInfoImage();
+	}
+	
+	@Override
+	protected Control createDialogArea(Composite parent) {
+		message = getMessage();
+		createMessageArea(parent);
+				
+		new Label(parent, SWT.NONE).setLayoutData(GridDataFactory.swtDefaults().span(2, 1).create());		
+		addHideCheckbox(parent);
+
+		Control c = super.createDialogArea(parent);
+		return c;
+	}
+	
+	private void addHideCheckbox(Composite parent) {
+		_hideButton = new Button(parent, SWT.CHECK);
+		GridDataFactory.swtDefaults().align(SWT.BEGINNING, SWT.BEGINNING).span(2, 1).applyTo(_hideButton);
+		_hideButton.setText(ValUIMessages.DoNotShowResults);
+		if (ValManager.getDefault().getGlobalPreferences().getConfirmDialog() && _hideButton.getSelection()) {
+			// tell the user where to re-enable it?
+		}
+		_hideButton.setSelection(!ValManager.getDefault().getGlobalPreferences().getConfirmDialog());
+	}
+
+	
+	@Override
+	protected void configureShell(Shell newShell) {
+		super.configureShell(newShell);
+		newShell.setText(ValidationUIMessages.ValResults);
+	}
+	
+	@Override
+	protected void createButtonsForButtonBar(Composite parent) {
+		Button ok = createButton(parent, IDialogConstants.OK_ID, IDialogConstants.OK_LABEL, false);
+		ok.setFocus();
+	}
+
+	private String getMessage(){
+		if (_resourceCount > 1) {
+			if (_result.getSeverityError() > 1)
+				return NLS.bind(ValidationUIMessages.ValErrorsResources, new Object[]{_result.getSeverityError(), _resourceCount, Misc.getTimeMS(_time)});
+			if (_result.getSeverityError() == 1)
+				return NLS.bind(ValidationUIMessages.ValError1Resources, _resourceCount, Misc.getTimeMS(_time));
+
+			if (_result.getSeverityWarning() > 1)
+				return NLS.bind(ValidationUIMessages.ValWarnResources, new Object[]{_result.getSeverityWarning(), _resourceCount, Misc.getTimeMS(_time)});
+			if (_result.getSeverityWarning() == 1)
+				return NLS.bind(ValidationUIMessages.ValWarn1Resources, _resourceCount, Misc.getTimeMS(_time));
+
+			if (_result.getSeverityInfo() > 1)
+				return NLS.bind(ValidationUIMessages.ValInfoResources, new Object[]{_result.getSeverityInfo(), _resourceCount, Misc.getTimeMS(_time)});
+			if (_result.getSeverityInfo() == 1)
+				return NLS.bind(ValidationUIMessages.ValInfo1Resources, _resourceCount, Misc.getTimeMS(_time));
+		}
+		else if (_resourceCount == 1) {
+			if (_result.getSeverityError() > 1)
+				return NLS.bind(ValidationUIMessages.ValErrorsResource1, _result.getSeverityError(), Misc.getTimeMS(_time));
+			if (_result.getSeverityError() == 1)
+				return NLS.bind(ValidationUIMessages.ValError1Resource1, Misc.getTimeMS(_time));
+
+			if (_result.getSeverityWarning() > 1)
+				return NLS.bind(ValidationUIMessages.ValWarnResource1, _result.getSeverityWarning(), Misc.getTimeMS(_time));
+			if (_result.getSeverityWarning() == 1)
+				return NLS.bind(ValidationUIMessages.ValWarn1Resource1, Misc.getTimeMS(_time));
+
+			if (_result.getSeverityInfo() > 1)
+				return NLS.bind(ValidationUIMessages.ValInfoResource1, _result.getSeverityInfo(), Misc.getTimeMS(_time));
+			if (_result.getSeverityInfo() == 1)
+				return NLS.bind(ValidationUIMessages.ValInfo1Resource1, Misc.getTimeMS(_time));
+		}
+		return ValidationUIMessages.ValSuccess;
+	}
+}
diff --git a/plugins/org.eclipse.wst.validation.ui/vf2/org/eclipse/wst/validation/ui/internal/preferences/ValidationPreferencePage.java b/plugins/org.eclipse.wst.validation.ui/vf2/org/eclipse/wst/validation/ui/internal/preferences/ValidationPreferencePage.java
new file mode 100644
index 0000000..2f1da24
--- /dev/null
+++ b/plugins/org.eclipse.wst.validation.ui/vf2/org/eclipse/wst/validation/ui/internal/preferences/ValidationPreferencePage.java
@@ -0,0 +1,838 @@
+/*******************************************************************************
+ * Copyright (c) 2001, 2009 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ * IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.wst.validation.ui.internal.preferences;
+
+import java.lang.reflect.InvocationTargetException;
+import java.util.LinkedList;
+import java.util.List;
+
+import org.eclipse.jface.dialogs.MessageDialog;
+import org.eclipse.jface.layout.GridDataFactory;
+import org.eclipse.jface.preference.PreferencePage;
+import org.eclipse.jface.viewers.IStructuredContentProvider;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.ITableLabelProvider;
+import org.eclipse.jface.viewers.LabelProvider;
+import org.eclipse.jface.viewers.TableViewer;
+import org.eclipse.jface.viewers.Viewer;
+import org.eclipse.jface.viewers.ViewerSorter;
+import org.eclipse.jface.window.Window;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.custom.ScrolledComposite;
+import org.eclipse.swt.events.FocusAdapter;
+import org.eclipse.swt.events.FocusEvent;
+import org.eclipse.swt.events.MenuAdapter;
+import org.eclipse.swt.events.MenuEvent;
+import org.eclipse.swt.events.MouseAdapter;
+import org.eclipse.swt.events.MouseEvent;
+import org.eclipse.swt.events.SelectionAdapter;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.graphics.Point;
+import org.eclipse.swt.graphics.Rectangle;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Button;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Menu;
+import org.eclipse.swt.widgets.MenuItem;
+import org.eclipse.swt.widgets.MessageBox;
+import org.eclipse.swt.widgets.Shell;
+import org.eclipse.swt.widgets.Table;
+import org.eclipse.swt.widgets.TableColumn;
+import org.eclipse.swt.widgets.TableItem;
+import org.eclipse.ui.IWorkbench;
+import org.eclipse.ui.IWorkbenchPreferencePage;
+import org.eclipse.ui.PlatformUI;
+import org.eclipse.wst.validation.Validator;
+import org.eclipse.wst.validation.internal.ConfigurationManager;
+import org.eclipse.wst.validation.internal.FullBuildJob;
+import org.eclipse.wst.validation.internal.GlobalConfiguration;
+import org.eclipse.wst.validation.internal.ValManager;
+import org.eclipse.wst.validation.internal.ValPrefManagerGlobal;
+import org.eclipse.wst.validation.internal.ValidatorMetaData;
+import org.eclipse.wst.validation.internal.ValidatorMutable;
+import org.eclipse.wst.validation.internal.model.GlobalPreferences;
+import org.eclipse.wst.validation.internal.model.GlobalPreferencesValues;
+import org.eclipse.wst.validation.internal.ui.DelegatingValidatorPreferencesDialog;
+import org.eclipse.wst.validation.internal.ui.plugin.ValidationUIPlugin;
+import org.eclipse.wst.validation.ui.internal.HelpContextIds;
+import org.eclipse.wst.validation.ui.internal.ImageNames;
+import org.eclipse.wst.validation.ui.internal.ValUIMessages;
+import org.eclipse.wst.validation.ui.internal.dialog.FilterDialog;
+
+/**
+ * From this page the user can configure individual validators.
+ * <p>
+ * This class and its inner classes are not intended to be subclassed outside of
+ * the validation framework.
+ * </p>
+ */
+public class ValidationPreferencePage extends PreferencePage implements	IWorkbenchPreferencePage {
+
+	private IValidationPage _pageImpl = null;
+	private Shell _shell;
+
+	public interface IValidationPage {
+		
+		Composite createPage(Composite parent) throws InvocationTargetException;
+		boolean performOk() throws InvocationTargetException;
+		boolean performDefaults() throws InvocationTargetException;
+		Composite getControl();
+		void dispose();
+		void loseFocus();
+		void gainFocus();
+	}
+
+	public final class InvalidPage implements IValidationPage {
+		private Composite page = null;
+
+		private Composite composite = null;
+		private GridLayout layout = null;
+		private Label messageLabel = null;
+
+		public InvalidPage(Composite parent) {
+			page = createPage(parent);
+		}
+
+		/**
+		 * This page is added to the Properties guide if some internal problem
+		 * occurred; for example, the highlighted item in the workbench is not
+		 * an IProject (according to this page's plugin.xml, this page is only
+		 * valid when an IProject is selected).
+		 */
+		public Composite createPage(Composite parent) {
+			// Don't create the default and apply buttons.
+			noDefaultAndApplyButton();
+
+			final ScrolledComposite sc1 = new ScrolledComposite(parent,	SWT.H_SCROLL | SWT.V_SCROLL);
+			sc1.setLayoutData(new GridData(GridData.FILL_BOTH));
+			composite = new Composite(sc1, SWT.NONE);
+			sc1.setContent(composite);
+			layout = new GridLayout();
+			composite.setLayout(layout);
+
+			messageLabel = new Label(composite, SWT.NONE);
+			messageLabel.setText(ValUIMessages.VBF_EXC_INVALID_REGISTER);
+
+			composite.setSize(composite.computeSize(SWT.DEFAULT, SWT.DEFAULT));
+
+			return composite;
+		}
+
+		public boolean performDefaults() {
+			return true;
+		}
+
+		/**
+		 * Since this page occurs under invalid circumstances, there is nothing
+		 * to save.
+		 */
+		public boolean performOk() {
+			return true;
+		}
+
+		public Composite getControl() {
+			return page;
+		}
+
+		public void dispose() {
+			messageLabel.dispose();
+			// layout.dispose();
+			composite.dispose();
+		}
+
+		public void loseFocus() {
+			// This page does not depend on the contents of any other page in
+			// the wizard, so do nothing.
+		}
+
+		public void gainFocus() {
+			// This page does not depend on the contents of any other page in
+			// the wizard, so do nothing.
+		}
+	}
+
+	private final class ValidatorListPage implements IValidationPage {
+		private Composite _page;
+		private TableViewer _validatorList;
+		private Button _enableAllButton;
+		private Button _disableAllButton;
+		private Button _override;
+		private Button _suspend;
+		private Button _autoSave;
+		private Button _confirmButton;
+		private Label _listLabel;
+		private Table _validatorsTable;
+		private GlobalPreferencesValues 	_globalPreferences = ValManager.getDefault().getGlobalPreferences().asValues();
+		private GlobalConfiguration _globalConfig;
+		private ValidatorMutable[] _validators;
+		
+		private int _changeCount;
+
+		/**
+		 * This class is provided for the CheckboxTableViewer in the
+		 * ValidationPropertiesPage$ValidatorListPage class.
+		 */
+		public class ValidationContentProvider implements IStructuredContentProvider {
+			public void dispose() {
+			}
+
+			public Object[] getElements(Object inputElement) {
+				if (inputElement instanceof ValidatorMutable[]) {
+					return (ValidatorMutable[]) inputElement;
+				}
+				return new Object[0];
+			}
+
+			public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
+			}
+		}
+
+		/**
+		 * This class is provided for
+		 * ValidationPropertiesPage$ValidatorListPage's checkboxTableViewer element.
+		 */
+		public class ValidationLabelProvider extends LabelProvider implements ITableLabelProvider {
+			public String getText(Object element) {
+				if (element == null)return ""; //$NON-NLS-1$
+				else if (element instanceof ValidatorMutable)
+					return ((ValidatorMutable) element).getName();
+				else
+					return super.getText(element);
+			}
+
+			private Image getImage(String imageName) {
+				boolean isDisabled = !_validatorsTable.isEnabled();
+				if (isDisabled)imageName = imageName + ImageNames.disabled;
+
+				return ValidationUIPlugin.getPlugin().getImage(imageName);
+			}
+
+			public Image getColumnImage(Object element, int columnIndex) {
+				ValidatorMutable v = (ValidatorMutable) element;
+				if (columnIndex == 1) {
+					return getImage(v.isManualValidation() ? ImageNames.okTable : ImageNames.failTable);
+				} else if (columnIndex == 2) {
+					return getImage(v.isBuildValidation() ? ImageNames.okTable : ImageNames.failTable);
+				} else if (columnIndex == 3) {
+					if (hasSettings(v))return getImage(ImageNames.settings);
+					return  null;
+
+				}
+				return null;
+			}
+
+			public String getColumnText(Object element, int columnIndex) {
+				if (columnIndex == 0)return ((ValidatorMutable) element).getName();
+				return null;
+			}
+		}
+
+		/**
+		 * This class is used to sort the CheckboxTableViewer elements.
+		 */
+		public class ValidationViewerSorter extends ViewerSorter {
+			public int compare(Viewer viewer, Object e1, Object e2) {
+				// Can't instantiate ViewerSorter because it's abstract, so use this
+				// inner class to represent it.
+				return super.compare(viewer, e1, e2);
+			}
+		}
+
+		public ValidatorListPage(Composite parent) throws InvocationTargetException {
+			_page = createPage(parent);
+		}
+
+		private void setupTableColumns(Table table) {
+			TableColumn validatorColumn = new TableColumn(table, SWT.NONE);
+			validatorColumn.setText(ValUIMessages.VALIDATOR);
+			validatorColumn.setWidth(245);
+			TableColumn manualColumn = new TableColumn(table, SWT.CENTER);
+			manualColumn.setText(ValUIMessages.MANUAL);
+			manualColumn.pack();
+			TableColumn buildColumn = new TableColumn(table, SWT.CENTER);
+			buildColumn.setText(ValUIMessages.BUILD);
+			buildColumn.pack();
+			TableColumn settingsColumn = new TableColumn(table, SWT.CENTER);
+			settingsColumn.setText(ValUIMessages.SETTINGS);
+			settingsColumn.pack();
+		}
+		
+		private ValidatorMutable[] getDefaultValidators(){
+			Validator[] vals = ValManager.getDefault().getValidators();
+			ValidatorMutable[] vms = new ValidatorMutable[vals.length];
+			for (int i=0; i<vals.length; i++)vms[i] = new ValidatorMutable(vals[i]);
+			return vms;
+		}
+
+		public Composite createPage(Composite parent) throws InvocationTargetException {
+			_globalConfig = new GlobalConfiguration(ConfigurationManager.getManager().getGlobalConfiguration());
+			_validators = getDefaultValidators();
+			
+			Composite validatorGroup = new Composite(parent, SWT.NONE);
+
+			GridLayout validatorGroupLayout = new GridLayout();
+			validatorGroupLayout.numColumns = 2;
+			validatorGroup.setLayout(validatorGroupLayout);
+			GridDataFactory.fillDefaults().grab(true, true).applyTo(validatorGroup);
+			
+			new Label(validatorGroup, SWT.NONE).setLayoutData(new GridData());
+
+			addOverride(validatorGroup);
+			addSuspend(validatorGroup);
+			addAutoSave(validatorGroup);
+			addConfirm(validatorGroup);
+
+			_listLabel = new Label(validatorGroup, SWT.NONE);
+			GridData listLabelData = new GridData(GridData.FILL_HORIZONTAL);
+			listLabelData.horizontalSpan = 2;
+			_listLabel.setLayoutData(listLabelData);
+			_listLabel.setText(ValUIMessages.PREF_VALLIST_TITLE);
+			
+			_validatorsTable = new Table(validatorGroup, SWT.SINGLE | SWT.BORDER | SWT.FULL_SELECTION);
+			Point preferredSize = _validatorsTable.computeSize(SWT.DEFAULT, SWT.DEFAULT);
+			GridDataFactory.fillDefaults().grab(true, true).hint(preferredSize)
+				.span(2,1).applyTo(_validatorsTable);
+						
+
+			_validatorsTable.setHeaderVisible(true);
+			_validatorsTable.setLinesVisible(true);
+
+			_validatorList = new TableViewer(_validatorsTable);			
+//			_validatorsTable.setLayoutData(validatorListData);
+//			_validatorList.getTable().setLayoutData(validatorListData);
+			_validatorList.setLabelProvider(new ValidationLabelProvider());
+			_validatorList.setContentProvider(new ValidationContentProvider());
+			_validatorList.setSorter(new ValidationViewerSorter());
+			setupTableColumns(_validatorsTable);
+
+			_validatorList.setInput(_validators);
+			_validatorsTable.addMouseListener(new MouseAdapter() {
+
+				public void mouseDown(MouseEvent e) {
+					if (e.button != 1)return;
+
+					TableItem tableItem = _validatorsTable.getItem(new Point(e.x, e.y));
+					if (tableItem == null || tableItem.isDisposed())return;
+					int columnNumber;
+					int columnsCount = _validatorsTable.getColumnCount();
+					if (columnsCount == 0) {
+						// If no TableColumn, Table acts as if it has a single
+						// column which takes the whole width.
+						columnNumber = 0;
+					} else {
+						columnNumber = -1;
+						for (int i = 0; i < columnsCount; i++) {
+							Rectangle bounds = tableItem.getBounds(i);
+							if (bounds.contains(e.x, e.y)) {
+								columnNumber = i;
+								break;
+							}
+						}
+						if (columnNumber == -1)return;
+					}
+
+					columnClicked(columnNumber);
+				}
+			});
+
+			_validatorsTable.setMenu(createContextMenu());
+			_validatorsTable.addFocusListener(new FocusAdapter() {
+
+				public void focusGained(FocusEvent e) {
+					super.focusGained(e);
+					if (_validatorsTable.getSelectionCount() == 0) {
+						_validatorsTable.select(0);
+					}
+				}
+			});
+
+			addEnableDisable(validatorGroup);
+
+			updateWidgets();
+
+			applyDialogFont(validatorGroup);
+			validatorGroup.setSize(validatorGroup.computeSize(SWT.DEFAULT, SWT.DEFAULT));
+			return validatorGroup;
+		}
+
+		private void addEnableDisable(Composite validatorGroup) {
+			_enableAllButton = new Button(validatorGroup, SWT.PUSH);
+			_enableAllButton.setLayoutData(new GridData());
+			_enableAllButton.setText(ValUIMessages.PREF_BUTTON_ENABLEALL);
+			_enableAllButton.addSelectionListener(new SelectionAdapter() {
+				public void widgetSelected(SelectionEvent e) {
+					try {
+						performEnableAll();
+					} catch (InvocationTargetException exc) {
+						displayAndLogError(ValUIMessages.VBF_EXC_INTERNAL_TITLE,
+							ValUIMessages.VBF_EXC_INTERNAL_PAGE, exc);
+					}
+				}
+			});
+
+			_disableAllButton = new Button(validatorGroup, SWT.PUSH);
+			_disableAllButton.setLayoutData(new GridData());
+			_disableAllButton.setText(ValUIMessages.PREF_BUTTON_DISABLEALL);
+			_disableAllButton.addSelectionListener(new SelectionAdapter() {
+				public void widgetSelected(SelectionEvent e) {
+					try {
+						performDisableAll();
+					} catch (InvocationTargetException exc) {
+						displayAndLogError(ValUIMessages.VBF_EXC_INTERNAL_TITLE,
+							ValUIMessages.VBF_EXC_INTERNAL_PAGE, exc);
+					}
+				}
+			});
+		}
+		
+		private void addConfirm(Composite validatorGroup) {
+			GridData gd;
+			gd = new GridData(GridData.FILL_HORIZONTAL);
+			gd.horizontalSpan = 2;
+			_confirmButton = new Button(validatorGroup, SWT.CHECK);
+			_confirmButton.setLayoutData(gd);
+			_confirmButton.setText(ValUIMessages.PrefPageConfirmDialog);
+			_confirmButton.setSelection(_globalPreferences.confirmDialog);
+			_confirmButton.addSelectionListener(new SelectionAdapter() {
+				public void widgetSelected(SelectionEvent e) {
+					// do not increment the _changeCount as this by itself should not trigger a build prompt
+					_globalPreferences.confirmDialog = _confirmButton.getSelection();
+					_confirmButton.setFocus();
+				}
+			});
+		}
+
+		private void addAutoSave(Composite validatorGroup) {
+			GridData gd;
+			gd = new GridData(GridData.FILL_HORIZONTAL);
+			gd.horizontalSpan = 2;
+			_autoSave = new Button(validatorGroup, SWT.CHECK);
+			_autoSave.setLayoutData(gd);
+			_autoSave.setText(ValUIMessages.PrefPage_always_save);
+			_autoSave.setSelection(_globalPreferences.saveAutomatically);
+			_autoSave.addSelectionListener(new SelectionAdapter() {
+				public void widgetSelected(SelectionEvent e) {
+					// do not increment the _changeCount as this by itself should not trigger a build prompt
+					_globalPreferences.saveAutomatically = _autoSave.getSelection();
+					_autoSave.setFocus();
+				}
+			});
+		}
+
+		private void addSuspend(Composite validatorGroup) {
+			GridData gd;
+			gd = new GridData(GridData.FILL_HORIZONTAL);
+			gd.horizontalSpan = 2;
+			
+			_suspend = new Button(validatorGroup, SWT.CHECK);
+			_suspend.setLayoutData(gd);
+			_suspend.setText(ValUIMessages.DISABLE_VALIDATION);
+			_suspend.setSelection(_globalPreferences.disableAllValidation);
+			_suspend.addSelectionListener(new SelectionAdapter() {
+				public void widgetSelected(SelectionEvent e) {
+					_suspend.setFocus();
+					_validatorsTable.setEnabled(!_suspend.getSelection());
+					_enableAllButton.setEnabled(!_suspend.getSelection());
+					_disableAllButton.setEnabled(!_suspend.getSelection());
+					_validatorList.refresh();
+				}
+			});
+		}
+
+		private void addOverride(Composite validatorGroup) {
+			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
+			gd.horizontalSpan = 2;
+			
+			_override = new Button(validatorGroup, SWT.CHECK);
+			_override.setLayoutData(gd);
+			_override.setText(ValUIMessages.PREF_BUTTON_OVERRIDE);
+			_override.setEnabled(true);
+			_override.setSelection(_globalPreferences.override);
+			_override.addSelectionListener(new SelectionAdapter() {
+				public void widgetSelected(SelectionEvent e) {
+					_globalPreferences.override = _override.getSelection();
+					_override.setFocus();
+					
+				}
+			});
+		}
+
+		protected Menu createContextMenu() {
+			final Menu menu = new Menu(_validatorsTable.getShell(), SWT.POP_UP);
+			final MenuItem manualItem = new MenuItem(menu, SWT.CHECK);
+			manualItem.setText(ValUIMessages.PREF_MNU_MANUAL);
+			final MenuItem buildItem = new MenuItem(menu, SWT.CHECK);
+			buildItem.setText(ValUIMessages.PREF_MNU_BUILD);
+			final MenuItem settingsItem = new MenuItem(menu, SWT.PUSH);
+			settingsItem.setText(ValUIMessages.PREF_MNU_SETTINGS);
+
+			class MenuItemListener extends SelectionAdapter {
+				public void widgetSelected(SelectionEvent e) {
+					MenuItem menuItem = (MenuItem) e.getSource();
+					int index = menu.indexOf(menuItem) + 1;
+					columnClicked(index);
+				}
+			}
+			MenuItemListener listener = new MenuItemListener();
+			manualItem.addSelectionListener(listener);
+			buildItem.addSelectionListener(listener);
+			settingsItem.addSelectionListener(listener);
+
+			menu.addMenuListener(new MenuAdapter() {
+				public void menuShown(MenuEvent e) {
+					IStructuredSelection selection = (IStructuredSelection) _validatorList.getSelection();
+					ValidatorMutable vw = (ValidatorMutable) selection.getFirstElement();
+					manualItem.setSelection(vw.isManualValidation());
+					buildItem.setSelection(vw.isBuildValidation());
+					settingsItem.setEnabled(hasSettings(vw));
+				}
+			});
+
+			return menu;
+		}
+
+		protected void columnClicked(int columnToEdit) {
+			IStructuredSelection selection = (IStructuredSelection) _validatorList.getSelection();
+			ValidatorMutable val = (ValidatorMutable) selection.getFirstElement();
+
+			switch (columnToEdit) {
+			case 1:
+				_changeCount++;
+				val.setManualValidation(!val.isManualValidation());
+				break;
+			case 2:
+				_changeCount++;
+				val.setBuildValidation(!val.isBuildValidation());
+				break;
+			case 3:
+				if (val.isV2Validator()){
+					ValidatorMutable newVal = new ValidatorMutable(val);
+					FilterDialog fd = new FilterDialog(_shell, newVal, null);
+					if (Window.OK == fd.open()){
+						_changeCount++;
+						newVal = fd.getValidator();
+						int i = findit(val);
+						if (i != -1)_validators[i] = newVal;
+					}
+				}
+				else {
+					handleOldDelegate(val);
+				}
+
+				break;
+			default:
+				break;
+			}
+			_validatorList.refresh();
+		}
+
+		private int findit(ValidatorMutable val) {
+			for (int i=0; i<_validators.length; i++)if (_validators[i] == val)return i;
+			return -1;
+		}
+
+		private void handleOldDelegate(ValidatorMutable val) {
+			if (!val.isV1Validator())return;
+			
+			ValidatorMetaData vmd = val.getVmd();
+		    if (!vmd.isDelegating())return;
+		    
+		    String delegateID = _globalConfig.getDelegateUniqueName(vmd);
+		    Shell shell = Display.getCurrent().getActiveShell();
+		    DelegatingValidatorPreferencesDialog dialog = 
+		    	new DelegatingValidatorPreferencesDialog(shell, vmd, delegateID);
+		
+		    dialog.setBlockOnOpen(true);
+		    dialog.create();
+		
+		    int result = dialog.open();
+	        if (result == Window.OK){
+	        	_changeCount++;
+	        	_globalConfig.setDelegateUniqueName(vmd, dialog.getDelegateID());
+	        }
+		}
+		
+		/**
+		 * Does this validator have extra settings that can be configured?
+		 * @param v
+		 * @return true if it does
+		 */
+		boolean hasSettings(ValidatorMutable v){
+			if (v.isV2Validator())return true;
+			if (v.getDelegatingId() != null)return true;
+			return false;
+		}
+
+		protected void updateWidgets() throws InvocationTargetException {
+			// Need to update even the widgets that do not change based on another
+			// widgets because of performDefaults(). If performDefaults() is
+			// selected, then the pagePreferences values are reset, and these widgets
+			// might also need to be updated.
+			updateAllWidgets();
+			updateHelp();
+		}
+
+		private void updateAllWidgets() throws InvocationTargetException {
+			_suspend.setSelection(_globalPreferences.disableAllValidation);
+			_autoSave.setSelection(_globalPreferences.saveAutomatically);
+			_confirmButton.setSelection(_globalPreferences.confirmDialog);
+			_override.setSelection(_globalPreferences.override);
+			_validatorsTable.setEnabled(!_suspend.getSelection());
+			_enableAllButton.setEnabled(!_suspend.getSelection());
+			_disableAllButton.setEnabled(!_suspend.getSelection());
+			_validatorList.setInput(_validators);
+			_validatorList.refresh();
+		}
+
+		public boolean performOk() throws InvocationTargetException {
+			_globalPreferences.disableAllValidation = _suspend.getSelection();
+			_globalPreferences.saveAutomatically = _autoSave.getSelection();
+			ValManager vm = ValManager.getDefault();
+			int changes = vm.replace(_globalPreferences);
+			if ((changes & GlobalPreferences.BuildChangeMask) != 0)_changeCount++;
+			
+			ValPrefManagerGlobal vpm = ValPrefManagerGlobal.getDefault();
+			vpm.savePreferences(vm.getGlobalPreferences(), _validators, null);
+			saveV1Preferences();
+			
+			if (_changeCount > 0 && 
+				MessageDialog.openQuestion(_shell, ValUIMessages.RebuildTitle, ValUIMessages.RebuildMsg)){
+				
+				FullBuildJob fbj = new FullBuildJob();
+				fbj.schedule();
+			}
+			return true;
+		}
+		
+		/**
+		 * Save the V1 preferences, so that the old validators continue to work.
+		 */
+		private void saveV1Preferences(){
+			try {
+				GlobalConfiguration gc = ConfigurationManager.getManager().getGlobalConfiguration();
+				gc.setDisableAllValidation(_globalPreferences.disableAllValidation);
+				gc.setEnabledManualValidators(getEnabledManualValidators());				
+				gc.setEnabledBuildValidators(getEnabledBuildValidators());
+	
+				gc.passivate();
+				gc.store();
+			}
+			catch (InvocationTargetException e){
+				ValidationUIPlugin.getPlugin().handleException(e);
+			}			
+		}
+
+		/**
+		 * Answer all the V1 validators that are manually enabled.
+		 * @return
+		 */
+		private ValidatorMetaData[] getEnabledManualValidators() {
+			List<ValidatorMetaData> list = new LinkedList<ValidatorMetaData>();
+			for (ValidatorMutable v : _validators){
+				if (v.isManualValidation() && v.isV1Validator())list.add(v.getVmd());
+			}
+			ValidatorMetaData[] result = new ValidatorMetaData[list.size()];
+			list.toArray(result);
+			return result;
+		}
+
+		/**
+		 * Answer all the V1 validators that are enabled for build.
+		 * @return
+		 */
+		private ValidatorMetaData[] getEnabledBuildValidators() {
+			List<ValidatorMetaData> list = new LinkedList<ValidatorMetaData>();
+			for (ValidatorMutable v : _validators){
+				if (v.isBuildValidation() && v.isV1Validator())list.add(v.getVmd());
+			}
+			ValidatorMetaData[] result = new ValidatorMetaData[list.size()];
+			list.toArray(result);
+			return result;
+		}
+
+		public boolean performDefaults() throws InvocationTargetException {
+			_changeCount++;
+			Validator[] vals = ValManager.getDefaultValidators();
+			_validators = new ValidatorMutable[vals.length];
+			for (int i=0; i<vals.length; i++)_validators[i] = new ValidatorMutable(vals[i]);
+			updateWidgets();
+			getDefaultsButton().setFocus();
+			return true;
+		}
+
+		public boolean performEnableAll() throws InvocationTargetException {
+			setAllValidators(true);
+			_enableAllButton.setFocus();
+			_validatorList.refresh();
+			return true;
+		}
+
+		public boolean performDisableAll() throws InvocationTargetException {
+			setAllValidators(false);
+			_disableAllButton.setFocus();
+			_validatorList.refresh();
+			return true;
+		}
+		
+		private void setAllValidators(boolean bool){
+			_changeCount++;
+			for (ValidatorMutable v : _validators){
+				v.setBuildValidation(bool);
+				v.setManualValidation(bool);
+			}
+		}
+
+		protected void updateHelp() {
+//			PlatformUI.getWorkbench().getHelpSystem().setHelp(_suspend, ContextIds.VALIDATION_PREFERENCE_PAGE_DISABLE_ALL_ENABLED);
+		}
+
+		/*
+		 * Store the current values of the controls into the preference store.
+		 */
+
+		public Composite getControl() {
+			return _page;
+		}
+
+		public void dispose() {
+			_autoSave.dispose();
+			_suspend.dispose();
+			_disableAllButton.dispose();
+			_enableAllButton.dispose();
+			_listLabel.dispose();
+			_suspend.dispose();
+			_validatorList.getTable().dispose();
+		}
+
+		public void loseFocus() {
+		}
+
+		public void gainFocus() {
+		}
+	}
+
+	/*
+	 * @see PreferencePage#createContents(Composite)
+	 */
+	protected Control createContents(Composite parent) {
+		PlatformUI.getWorkbench().getHelpSystem().setHelp(parent, HelpContextIds.PreferencePage);
+		try {
+			_shell = parent.getShell();
+			_pageImpl = new ValidatorListPage(parent);
+		} catch (Exception exc) {
+			_pageImpl = new InvalidPage(parent);
+			displayAndLogError(ValUIMessages.VBF_EXC_INTERNAL_TITLE, ValUIMessages.VBF_EXC_INTERNAL_PAGE, exc);
+		}
+
+		return _pageImpl.getControl();
+	}
+
+	public void init(IWorkbench workbench) {
+	}
+
+	/**
+	 * Performs special processing when this page's Defaults button has been
+	 * pressed.
+	 * <p>
+	 * This is a framework hook method for subclasses to do special things when
+	 * the Defaults button has been pressed. Subclasses may override, but should
+	 * call <code>super.performDefaults</code>.
+	 * </p>
+	 */
+	protected void performDefaults() {
+		super.performDefaults();
+
+		try {
+			_pageImpl.performDefaults();
+		} catch (Exception exc) {
+			displayAndLogError(ValUIMessages.VBF_EXC_INTERNAL_TITLE, ValUIMessages.VBF_EXC_INTERNAL_PAGE, exc);
+		}
+	}
+
+	/**
+	 * When the user presses the "OK" or "Apply" button on the Properties
+	 * Guide/Properties Page, respectively, some processing is performed by this
+	 * PropertyPage. If the page is found, and completes successfully, true is
+	 * returned. Otherwise, false is returned, and the guide doesn't finish.
+	 */
+	public boolean performOk() {
+		try {
+			return _pageImpl.performOk();
+		} 
+		catch (Exception exc) {
+			displayAndLogError(ValUIMessages.VBF_EXC_INTERNAL_TITLE, ValUIMessages.VBF_EXC_INTERNAL_PAGE, exc);
+			return false;
+		}
+	}
+
+	/**
+	 * Since the pages are inner classes of a child PreferencePage, not a
+	 * PreferencePage itself, DialogPage's automatic disposal of its children's
+	 * widgets cannot be used. Instead, dispose of each inner class' widgets
+	 * explicitly.
+	 */
+	public void dispose() {
+		super.dispose();
+		try {
+			if (_pageImpl != null) {
+				_pageImpl.dispose();
+				_pageImpl = null;
+			}
+
+			// TODO figure out what this thing did
+			// ExtensionManger.instance().getDelegate().disposePreferencePage();
+		} catch (Exception exc) {
+			displayAndLogError(ValUIMessages.VBF_EXC_INTERNAL_TITLE, ValUIMessages.VBF_EXC_INTERNAL_PAGE, exc);
+		}
+	}
+
+	private void logError(Throwable exc) {
+		ValidationUIPlugin.getPlugin().handleException(exc);
+	}
+
+	/*
+	 * package visibility because if this method is private, then the compiler
+	 * needs to create a synthetic accessor method for the internal classes, and
+	 * that can have performance implications.
+	 */
+	void displayAndLogError(String title, String message, Throwable exc) {
+		logError(exc);
+		displayMessage(title, message, org.eclipse.swt.SWT.ICON_ERROR);
+	}
+
+	private void displayMessage(String title, String message, int iIconType) {
+		MessageBox messageBox = new MessageBox(getShell(),
+				org.eclipse.swt.SWT.OK | iIconType	| org.eclipse.swt.SWT.APPLICATION_MODAL);
+		messageBox.setMessage(message);
+		messageBox.setText(title);
+		messageBox.open();
+	}
+
+	/**
+	 * @see org.eclipse.jface.dialogs.IDialogPage#setVisible(boolean)
+	 */
+	public void setVisible(boolean visible) {
+		super.setVisible(visible);
+
+		if (_pageImpl == null)return;
+		if (visible)_pageImpl.gainFocus();
+		else _pageImpl.loseFocus();
+	}
+
+	protected Button getDefaultsButton() {
+		return super.getDefaultsButton();
+	}
+}
diff --git a/plugins/org.eclipse.wst.validation.ui/vf2/org/eclipse/wst/validation/ui/internal/preferences/ValidationPropertyPage.java b/plugins/org.eclipse.wst.validation.ui/vf2/org/eclipse/wst/validation/ui/internal/preferences/ValidationPropertyPage.java
new file mode 100644
index 0000000..53c574a
--- /dev/null
+++ b/plugins/org.eclipse.wst.validation.ui/vf2/org/eclipse/wst/validation/ui/internal/preferences/ValidationPropertyPage.java
@@ -0,0 +1,879 @@
+/*******************************************************************************
+ * Copyright (c) 2001, 2009 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.wst.validation.ui.internal.preferences;
+
+import java.lang.reflect.InvocationTargetException;
+import org.eclipse.core.resources.ICommand;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IProjectDescription;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.jface.dialogs.MessageDialog;
+import org.eclipse.jface.layout.GridDataFactory;
+import org.eclipse.jface.viewers.IStructuredContentProvider;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.ITableLabelProvider;
+import org.eclipse.jface.viewers.LabelProvider;
+import org.eclipse.jface.viewers.TableViewer;
+import org.eclipse.jface.viewers.Viewer;
+import org.eclipse.jface.viewers.ViewerSorter;
+import org.eclipse.jface.window.Window;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.custom.ScrolledComposite;
+import org.eclipse.swt.events.FocusAdapter;
+import org.eclipse.swt.events.FocusEvent;
+import org.eclipse.swt.events.MenuAdapter;
+import org.eclipse.swt.events.MenuEvent;
+import org.eclipse.swt.events.MouseAdapter;
+import org.eclipse.swt.events.MouseEvent;
+import org.eclipse.swt.events.SelectionAdapter;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.events.SelectionListener;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.graphics.Point;
+import org.eclipse.swt.graphics.Rectangle;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.layout.RowLayout;
+import org.eclipse.swt.widgets.Button;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Link;
+import org.eclipse.swt.widgets.Menu;
+import org.eclipse.swt.widgets.MenuItem;
+import org.eclipse.swt.widgets.MessageBox;
+import org.eclipse.swt.widgets.Shell;
+import org.eclipse.swt.widgets.Table;
+import org.eclipse.swt.widgets.TableColumn;
+import org.eclipse.swt.widgets.TableItem;
+import org.eclipse.ui.PlatformUI;
+import org.eclipse.ui.dialogs.PreferencesUtil;
+import org.eclipse.ui.dialogs.PropertyPage;
+import org.eclipse.wst.validation.Validator;
+import org.eclipse.wst.validation.internal.ConfigurationManager;
+import org.eclipse.wst.validation.internal.GlobalConfiguration;
+import org.eclipse.wst.validation.internal.ProjectConfiguration;
+import org.eclipse.wst.validation.internal.ValManager;
+import org.eclipse.wst.validation.internal.ValPrefManagerProject;
+import org.eclipse.wst.validation.internal.ValidatorMetaData;
+import org.eclipse.wst.validation.internal.ValidatorMutable;
+import org.eclipse.wst.validation.internal.ValManager.UseProjectPreferences;
+import org.eclipse.wst.validation.internal.model.ProjectPreferences;
+import org.eclipse.wst.validation.internal.operations.ValidatorManager;
+import org.eclipse.wst.validation.internal.plugin.ValidationPlugin;
+import org.eclipse.wst.validation.internal.ui.DelegatingValidatorPreferencesDialog;
+import org.eclipse.wst.validation.internal.ui.plugin.ValidationUIPlugin;
+import org.eclipse.wst.validation.ui.internal.HelpContextIds;
+import org.eclipse.wst.validation.ui.internal.ImageNames;
+import org.eclipse.wst.validation.ui.internal.ValUIMessages;
+import org.eclipse.wst.validation.ui.internal.dialog.FilterDialog;
+
+/**
+ * From this page the user can configure individual validators on individual projects.
+ * 
+ * @author karasiuk
+ */
+public class ValidationPropertyPage extends PropertyPage  {
+
+	private IValidationPage _pageImpl;
+	private Shell 			_shell;
+
+	public interface IValidationPage {
+		
+		Composite createPage(Composite parent) throws InvocationTargetException;
+		boolean performOk() throws InvocationTargetException;
+		boolean performDefaults() throws InvocationTargetException;
+		Composite getControl();
+		void dispose();
+		void loseFocus();
+		void gainFocus();
+	}
+
+	public class InvalidPage implements IValidationPage {
+		
+		private Composite page = null;
+		private Composite composite = null;
+		private GridLayout layout = null;
+		private Label messageLabel = null;
+
+		public InvalidPage(Composite parent) {
+			page = createPage(parent);
+		}
+
+		/**
+		 * This page is added to the Properties guide if some internal problem
+		 * occurred; for example, the highlighted item in the workbench is not
+		 * an IProject (according to this page's plugin.xml, this page is only
+		 * valid when an IProject is selected).
+		 */
+		public Composite createPage(Composite parent) {
+			noDefaultAndApplyButton();
+
+			final ScrolledComposite sc1 = new ScrolledComposite(parent, SWT.H_SCROLL | SWT.V_SCROLL);
+			sc1.setLayoutData(new GridData(GridData.FILL_BOTH));
+			composite = new Composite(sc1, SWT.NONE);
+			sc1.setContent(composite);
+			layout = new GridLayout();
+			composite.setLayout(layout);
+
+			messageLabel = new Label(composite, SWT.NONE);
+			messageLabel.setText(ValUIMessages.VBF_EXC_INVALID_REGISTER);
+
+			composite.setSize(composite.computeSize(SWT.DEFAULT, SWT.DEFAULT));
+
+			return composite;
+		}
+
+		public boolean performDefaults() {
+			return true;
+		}
+
+		/**
+		 * Since this page occurs under invalid circumstances, there is nothing
+		 * to save.
+		 */
+		public boolean performOk() {
+			return true;
+		}
+
+		public Composite getControl() {
+			return page;
+		}
+
+		public void dispose() {
+			messageLabel.dispose();
+			// layout.dispose();
+			composite.dispose();
+		}
+
+		public void loseFocus() {
+		}
+
+		public void gainFocus() {
+		}
+	}
+
+	private final class ValidatorListPage implements IValidationPage {
+		private Composite 		_page;
+
+		private TableViewer 	_validatorList;
+		private Button 			_enableAllButton;
+		private Button 			_disableAllButton;
+		private Button 			_override;
+		private Button 			_suspend;
+		private Link			_configLink;
+		private Button			_addValidationBuilder;
+		private Table 			_validatorsTable;
+		private ValidatorMutable[]		_validators;
+		
+		/** Number of things that may have changed. */
+		private int				_changes;
+
+		/**
+		 * This class is provided for the CheckboxTableViewer in the
+		 * ValidationPropertiesPage$ValidatorListPage class.
+		 */
+		public class ValidationContentProvider implements IStructuredContentProvider {
+			public void dispose() {
+			}
+
+			public Object[] getElements(Object inputElement) {
+				if (inputElement instanceof ValidatorMutable[]) {
+					return (ValidatorMutable[]) inputElement;
+				}
+				return new Object[0];
+			}
+
+			public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
+			}
+		}
+
+		/**
+		 * This class is provided for
+		 * ValidationPropertiesPage$ValidatorListPage's checkboxTableViewer
+		 * element.
+		 */
+		public class ValidationLabelProvider extends LabelProvider implements ITableLabelProvider {
+			public String getText(Object element) {
+				if (element == null)return ""; //$NON-NLS-1$
+				else if (element instanceof Validator)
+					return ((ValidatorMutable) element).getName();
+				else
+					return super.getText(element);
+			}
+
+			private Image getImage(String imageName) {
+				boolean isDisabled = !_validatorsTable.isEnabled();
+				if (isDisabled)
+					imageName = imageName + ImageNames.disabled;
+
+				return ValidationUIPlugin.getPlugin().getImage(imageName);
+			}
+
+			public Image getColumnImage(Object element, int columnIndex) {
+				ValidatorMutable v = (ValidatorMutable) element;
+				if (columnIndex == 1) {
+					return getImage(v.isManualValidation() ? ImageNames.okTable
+							: ImageNames.failTable);
+				} else if (columnIndex == 2) {
+					return getImage(v.isBuildValidation() ? ImageNames.okTable
+							: ImageNames.failTable);
+				} else if (columnIndex == 3) {
+					if (hasSettings(v))return getImage(ImageNames.settings);
+					return  null;
+				}
+				return null;
+			}
+
+			public String getColumnText(Object element, int columnIndex) {
+				if (columnIndex == 0)return ((ValidatorMutable) element).getName();
+				return null;
+			}
+		}
+
+		public ValidatorListPage(Composite parent) throws InvocationTargetException {
+			_page = createPage(parent);
+		}
+
+		private void setupTableColumns(Table table) {
+			TableColumn validatorColumn = new TableColumn(table, SWT.NONE);
+			validatorColumn.setText(ValUIMessages.VALIDATOR);
+			validatorColumn.setWidth(245);
+			TableColumn manualColumn = new TableColumn(table, SWT.CENTER);
+			manualColumn.setText(ValUIMessages.MANUAL);
+			manualColumn.pack();
+			TableColumn buildColumn = new TableColumn(table, SWT.CENTER);
+			buildColumn.setText(ValUIMessages.BUILD);
+			buildColumn.pack();
+			TableColumn settingsColumn = new TableColumn(table, SWT.CENTER);
+			settingsColumn.setText(ValUIMessages.SETTINGS);
+			settingsColumn.pack();
+		}
+
+		public Composite createPage(Composite parent) throws InvocationTargetException {
+			Validator[] vals = ValManager.getDefault()
+				.getValidatorsConfiguredForProject(getProject(), UseProjectPreferences.MustUse);
+			_validators = new ValidatorMutable[vals.length];
+			for (int i=0; i<vals.length; i++)_validators[i] = new ValidatorMutable(vals[i]);
+
+			Composite validatorGroup = new Composite(parent, SWT.NONE);
+
+			GridLayout validatorGroupLayout = new GridLayout();
+			validatorGroupLayout.numColumns = 2;
+			validatorGroup.setLayout(validatorGroupLayout);
+			GridDataFactory.fillDefaults().grab(true, true).applyTo(validatorGroup);
+
+			addOverride(validatorGroup);
+			addConfigLink(validatorGroup);
+			//
+			addLine(validatorGroup);
+			addSuspend(validatorGroup);
+			addValidationBuilder(validatorGroup);
+			new Label(validatorGroup, SWT.NONE).setLayoutData(new GridData());
+
+			Label listLabel = new Label(validatorGroup, SWT.NONE);
+			GridData listLabelData = new GridData(GridData.FILL_HORIZONTAL);
+			listLabelData.horizontalSpan = 2;
+			listLabel.setLayoutData(listLabelData);
+			listLabel.setText(ValUIMessages.PREF_VALLIST_TITLE);
+			
+			_validatorsTable = new Table(validatorGroup, SWT.BORDER | SWT.FULL_SELECTION);
+			Point preferredSize = _validatorsTable.computeSize(SWT.DEFAULT, SWT.DEFAULT);
+			GridDataFactory.fillDefaults().grab(true, true).hint(preferredSize)
+				.span(2,1).applyTo(_validatorsTable);
+
+			_validatorsTable.setHeaderVisible(true);
+			_validatorsTable.setLinesVisible(true);
+
+			_validatorList = new TableViewer(_validatorsTable);
+			_validatorList.setLabelProvider(new ValidationLabelProvider());
+			_validatorList.setContentProvider(new ValidationContentProvider());
+			_validatorList.setSorter(new ViewerSorter());
+			setupTableColumns(_validatorsTable);
+
+			_validatorList.setInput(_validators);
+			_validatorsTable.addMouseListener(new MouseAdapter() {
+
+				public void mouseDown(MouseEvent e) {
+					if (e.button != 1)return;
+
+					TableItem tableItem = _validatorsTable.getItem(new Point(e.x, e.y));
+					if (tableItem == null || tableItem.isDisposed()) {
+						// item no longer exists
+						return;
+					}
+					int columnNumber;
+					int columnsCount = _validatorsTable.getColumnCount();
+					if (columnsCount == 0) {
+						// If no TableColumn, Table acts as if it has a single column
+						// which takes the whole width.
+						columnNumber = 0;
+					} else {
+						columnNumber = -1;
+						for (int i = 0; i < columnsCount; i++) {
+							Rectangle bounds = tableItem.getBounds(i);
+							if (bounds.contains(e.x, e.y)) {
+								columnNumber = i;
+								break;
+							}
+						}
+						if (columnNumber == -1)return;
+					}
+
+					columnClicked(columnNumber);
+				}
+			});
+
+			_validatorsTable.setMenu(createContextMenu());
+			_validatorsTable.addFocusListener(new FocusAdapter() {
+
+				public void focusGained(FocusEvent e) {
+					super.focusGained(e);
+					if (_validatorsTable.getSelectionCount() == 0) {
+						_validatorsTable.select(0);
+					}
+				}
+			});
+			
+			addButtons(validatorGroup);
+
+			updateWidgets();
+
+			applyDialogFont(validatorGroup);
+			validatorGroup.setSize(validatorGroup.computeSize(SWT.DEFAULT, SWT.DEFAULT));
+
+			return validatorGroup;
+		}
+
+		private void addButtons(Composite validatorGroup) {
+			
+			Composite buttons = new Composite(validatorGroup, SWT.NONE);
+			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
+			gd.horizontalSpan = 2;
+			buttons.setLayout(new RowLayout());
+			
+			_enableAllButton = new Button(buttons, SWT.PUSH);
+			_enableAllButton.setText(ValUIMessages.PREF_BUTTON_ENABLEALL);
+			_enableAllButton.addSelectionListener(new SelectionAdapter() {
+				public void widgetSelected(SelectionEvent e) {
+					try {
+						performEnableAll();
+					} catch (InvocationTargetException exc) {
+						displayAndLogError(ValUIMessages.VBF_EXC_INTERNAL_TITLE,ValUIMessages.VBF_EXC_INTERNAL_PAGE, exc);
+					}
+				}
+			});
+
+			_disableAllButton = new Button(buttons, SWT.PUSH);
+			_disableAllButton.setText(ValUIMessages.PREF_BUTTON_DISABLEALL);
+			_disableAllButton.addSelectionListener(new SelectionAdapter() {
+				public void widgetSelected(SelectionEvent e) {
+					try {
+						performDisableAll();
+					} catch (InvocationTargetException exc) {
+						displayAndLogError(ValUIMessages.VBF_EXC_INTERNAL_TITLE, ValUIMessages.VBF_EXC_INTERNAL_PAGE, exc);
+					}
+				}
+			});
+		}
+
+		private void addSuspend(Composite validatorGroup) {
+			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
+			gd.horizontalSpan = 2;
+			_suspend = new Button(validatorGroup, SWT.CHECK);
+			_suspend.setLayoutData(gd);
+			_suspend.setText(ValUIMessages.DISABLE_VALIDATION);
+			_suspend.setSelection(getProjectPreferences().getSuspend());
+			_suspend.addSelectionListener(new SelectionAdapter() {
+				public void widgetSelected(SelectionEvent e) {
+					_suspend.setFocus();
+					_changes++;
+					enableDisableWidgets();
+					_validatorList.refresh();
+				}
+			});
+		}
+		
+		//Add a line separator
+		private void addLine(Composite validatorGroup) {
+			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
+			gd.horizontalSpan = 2;
+			Label line = new Label(validatorGroup,SWT.SEPARATOR | SWT.SHADOW_OUT | SWT.HORIZONTAL);
+			line.setLayoutData(gd);
+			
+			
+		}
+		
+		private void addConfigLink(Composite validatorGroup){
+			_configLink = new Link(validatorGroup,SWT.None);
+			GridData layout = new GridData(GridData.HORIZONTAL_ALIGN_END);
+			_configLink.setLayoutData(layout);
+			_configLink.setText("<A>"+ //$NON-NLS-1$
+				ValUIMessages.ConfigWsSettings+"</A>"); //$NON-NLS-1$
+			_configLink.addSelectionListener(new SelectionListener() {
+				public static final String DATA_NO_LINK = "PropertyAndPreferencePage.nolink"; //$NON-NLS-1$
+
+				public void doLinkActivated(Link e) {
+					String id = getPreferencePageID();
+					PreferencesUtil.createPreferenceDialogOn(getShell(), id, new String[]{id}, DATA_NO_LINK).open();
+					try {
+						updateWidgets();
+					} catch (InvocationTargetException ie) {
+
+					}
+				}
+
+				private String getPreferencePageID() {
+					return "ValidationPreferencePage"; //$NON-NLS-1$
+				}
+
+				public void widgetDefaultSelected(SelectionEvent e) {
+					doLinkActivated((Link) e.widget);					
+				}
+
+				public void widgetSelected(SelectionEvent e) {
+					doLinkActivated((Link) e.widget);					
+				}
+			});
+			
+		}
+		
+		/**
+		 * If the current project doesn't have the validation builder configured on it, 
+		 * and the user has asked us to add a builder, add the builder. 
+		 * Otherwise return without doing anything.
+		 */
+		private void addBuilder() {
+			if (_addValidationBuilder != null && _addValidationBuilder.getSelection())
+				ValidatorManager.addProjectBuildValidationSupport(getProject());
+		}
+
+		
+		private void addValidationBuilder(Composite validatorGroup) {
+			if (hasValidationBuilder())return;
+			
+			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
+			gd.horizontalSpan = 2;
+			_addValidationBuilder = new Button(validatorGroup, SWT.CHECK);
+			_addValidationBuilder.setLayoutData(gd);
+			_addValidationBuilder.setText(ValUIMessages.ADD_VALIDATION_BUILDER);
+			_addValidationBuilder.setSelection(false);
+		}
+				
+		/**
+		 * Does this validator have extra settings that can be configured?
+		 * @param v
+		 * @return true if it does
+		 */
+		boolean hasSettings(ValidatorMutable v){
+			if (v.isV2Validator())return true;
+			if (v.getDelegatingId() != null)return true;
+			return false;
+		}
+
+		/**
+		 * Answer if this project has a validator builder assigned to it.
+		 */
+		private boolean hasValidationBuilder(){
+			try {
+				IProjectDescription description = getProject().getDescription();
+				ICommand[] commands = description.getBuildSpec();
+				for (int i = 0; i < commands.length; i++) {
+					if (commands[i].getBuilderName().equals(ValidationPlugin.VALIDATION_BUILDER_ID))
+						return true;
+				}
+				return false;
+			}
+			catch (CoreException e){
+				ValidationPlugin.getPlugin().handleException(e);
+			}
+			return false;
+		}
+
+
+		private void addOverride(Composite validatorGroup) {
+			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
+//			gd.horizontalSpan = 2;
+			_override = new Button(validatorGroup, SWT.CHECK);
+			_override.setLayoutData(gd);
+			_override.setText(ValUIMessages.LabelEnableProjectSpecific);
+			_override.setSelection(getProjectPreferences().getOverride());
+			_override.addSelectionListener(new SelectionAdapter() {
+				public void widgetSelected(SelectionEvent e) {
+					_override.setFocus();
+					_changes++;
+					ValManager vm = ValManager.getDefault();
+					if (vm.getGlobalPreferences().getOverride()){
+//						IProject project = getProject();
+//						UseProjectPreferences useProject = UseProjectPreferences.Normal;
+//						if (_override.getSelection())useProject = UseProjectPreferences.MustUse;
+//						_validators = copyValidators(vm.getValidatorsConfiguredForProject(project, useProject));
+//						_validatorList.setInput(_validators);
+						enableDisableWidgets();
+						_validatorList.refresh();
+					}
+					else {
+						MessageDialog.openWarning(_shell, ValUIMessages.Validation, 
+							ValUIMessages.ProjectOverridesNotAllowed);						
+					}
+				}
+
+			});
+		}
+
+		protected Menu createContextMenu() {
+			final Menu menu = new Menu(_validatorsTable.getShell(), SWT.POP_UP);
+			final MenuItem manualItem = new MenuItem(menu, SWT.CHECK);
+			manualItem.setText(ValUIMessages.PREF_MNU_MANUAL);
+			final MenuItem buildItem = new MenuItem(menu, SWT.CHECK);
+			buildItem.setText(ValUIMessages.PREF_MNU_BUILD);
+			final MenuItem settingsItem = new MenuItem(menu, SWT.PUSH);
+			settingsItem.setText(ValUIMessages.PREF_MNU_SETTINGS);
+
+			class MenuItemListener extends SelectionAdapter {
+				public void widgetSelected(SelectionEvent e) {
+					MenuItem menuItem = (MenuItem) e.getSource();
+					int index = menu.indexOf(menuItem) + 1;
+					columnClicked(index);
+				}
+			}
+			MenuItemListener listener = new MenuItemListener();
+			manualItem.addSelectionListener(listener);
+			buildItem.addSelectionListener(listener);
+			settingsItem.addSelectionListener(listener);
+
+			menu.addMenuListener(new MenuAdapter() {
+				public void menuShown(MenuEvent e) {
+					IStructuredSelection selection = (IStructuredSelection) _validatorList.getSelection();
+					ValidatorMutable val = (ValidatorMutable) selection.getFirstElement();
+					manualItem.setSelection(val.isManualValidation());
+					buildItem.setSelection(val.isBuildValidation());
+					settingsItem.setEnabled(hasSettings(val));
+				}
+			});
+
+			return menu;
+		}
+
+		protected void columnClicked(int columnToEdit) {
+			IStructuredSelection selection = (IStructuredSelection) _validatorList.getSelection();
+			ValidatorMutable val = (ValidatorMutable) selection.getFirstElement();
+
+			switch (columnToEdit) {
+			case 1:
+				val.setManualValidation(!val.isManualValidation());
+				break;
+			case 2:
+				val.setBuildValidation(!val.isBuildValidation());
+				break;
+			case 3:
+				if (val.isV2Validator()){
+					ValidatorMutable newVal = new ValidatorMutable(val);
+					FilterDialog fd = new FilterDialog(_shell, newVal, getProject());
+					if (Window.OK == fd.open()){
+						_changes++;
+						newVal = fd.getValidator();
+						int i = findit(val);
+						if (i != -1)_validators[i] = newVal;
+					}
+				}
+				else {
+					handleOldDelegate(val);
+				}
+
+				break;
+			default:
+				break;
+			}
+			_validatorList.refresh();
+		}
+
+		private int findit(ValidatorMutable val) {
+			for (int i=0; i<_validators.length; i++)if (_validators[i] == val)return i;
+			return -1;
+		}
+		
+		private void handleOldDelegate(ValidatorMutable val) {
+			try {
+				if (!val.isV1Validator())return;
+				
+				ValidatorMetaData vmd = val.getVmd();
+			    if (!vmd.isDelegating())return;
+			    
+			    GlobalConfiguration gc = ConfigurationManager.getManager().getGlobalConfiguration();
+			    String delegateID = gc.getDelegateUniqueName(vmd);
+			    Shell shell = Display.getCurrent().getActiveShell();
+			    DelegatingValidatorPreferencesDialog dialog = 
+			    	new DelegatingValidatorPreferencesDialog(shell, vmd, delegateID);
+			
+			    dialog.setBlockOnOpen(true);
+			    dialog.create();
+			
+			    int result = dialog.open();
+		        if (result == Window.OK){
+		        	_changes++;
+		        	gc.setDelegateUniqueName(vmd, dialog.getDelegateID());
+		        }
+			}
+			catch (InvocationTargetException e){
+				
+			}
+		}
+
+		protected void updateWidgets() throws InvocationTargetException {
+			// Need to update even the widgets that do not change based on another
+			// widgets because of performDefaults(). If performDefaults() is selected,
+			// then the pagePreferences values are reset, and these widgets
+			// might also need to be updated.
+			updateAllWidgets();
+			updateHelp();
+		}
+
+		protected void updateWidgetsForDefaults() throws InvocationTargetException {
+			_suspend.setSelection(false);
+			_override.setSelection(false);
+			enableDisableWidgets();
+			_validatorList.setInput(_validators);
+			_validatorList.refresh();
+		}
+
+		private void updateAllWidgets() throws InvocationTargetException {
+			_suspend.setSelection(getProjectPreferences().getSuspend());
+			_override.setSelection(getProjectPreferences().getOverride());
+			enableDisableWidgets();
+			_validatorList.setInput(_validators);
+			_validatorList.refresh();
+		}
+
+		public boolean performOk() throws InvocationTargetException {
+			
+			addBuilder();
+			for (ValidatorMutable vm : _validators)if (vm.isChanged())_changes++;
+			if (_changes == 0)return true;
+			// [213631] this warning should only be shown if the user actually tried to override
+			// the validators
+			if (!ValManager.getDefault().getGlobalPreferences().getOverride() && _override.getSelection()){
+				MessageDialog.openWarning(_shell, ValUIMessages.Validation, ValUIMessages.ProjectOverridesNotAllowed);
+				return false;
+			}
+			updateV1ProjectSettings();
+			IProject project = getProject();
+			ProjectPreferences pp = new ProjectPreferences(project, _override.getSelection(), _suspend.getSelection(), null);
+			ValPrefManagerProject vpm = new ValPrefManagerProject(project);
+			vpm.savePreferences(pp, _validators);
+			return true;
+		}
+		
+		/**
+		 * Update the version 1 project settings.
+		 */
+		private void updateV1ProjectSettings() {
+			try {
+				ProjectConfiguration pc = ConfigurationManager.getManager().getProjectConfiguration(getProject());
+				pc.setDoesProjectOverride(_override.getSelection());
+				pc.setDisableAllValidation(_suspend.getSelection());
+			}
+			catch (InvocationTargetException e){
+				ValidationPlugin.getPlugin().handleException(e);
+			}			
+		}
+
+		/**
+		 * Answer the specific project preferences. If the project didn't have any specific project
+		 * preferences, then create a default set.
+		 * @return
+		 */
+		private ProjectPreferences getProjectPreferences(){
+			return ValManager.getDefault().getProjectPreferences(getProject());
+		}
+
+		public boolean performDefaults() throws InvocationTargetException {
+			Validator[] vals = ValManager.getDefault()
+				.getValidatorsConfiguredForProject(getProject(), UseProjectPreferences.MustNotUse);
+			_validators = new ValidatorMutable[vals.length];
+			for (int i=0; i<vals.length; i++)_validators[i] = new ValidatorMutable(vals[i]);
+
+			_changes++;
+			updateWidgetsForDefaults();
+			getDefaultsButton().setFocus();
+			return true;
+		}
+
+		public boolean performEnableAll() throws InvocationTargetException {
+			setAllValidators(true);
+			_enableAllButton.setFocus();
+			_validatorList.refresh();
+			return true;
+		}
+
+		private void setAllValidators(boolean bool) {
+			for (TableItem item : _validatorsTable.getItems()) {
+				ValidatorMutable val = (ValidatorMutable) item.getData();
+				val.setManualValidation(bool);
+				val.setBuildValidation(bool);
+			}
+		}
+
+		public boolean performDisableAll() throws InvocationTargetException {
+			setAllValidators(false);
+			_disableAllButton.setFocus();
+			_validatorList.refresh();
+			return true;
+		}
+
+		protected void updateHelp() {
+//			PlatformUI.getWorkbench().getHelpSystem().setHelp(_suspend, ContextIds.VALIDATION_PREFERENCE_PAGE_DISABLE_ALL_ENABLED);
+		}
+
+		/*
+		 * Store the current values of the controls into the preference store.
+		 */
+
+		public Composite getControl() {
+			return _page;
+		}
+
+		public void dispose() {
+			_override.dispose();
+			_suspend.dispose();
+			_configLink.dispose();
+			_disableAllButton.dispose();
+			_enableAllButton.dispose();
+			_validatorList.getTable().dispose();
+		}
+		
+		/**
+		 * Enable or disable the widgets based on some top level preferences. 
+		 */
+		private void enableDisableWidgets() {
+			boolean globalOverride = ValManager.getDefault().getGlobalPreferences().getOverride();
+			boolean enable = !_suspend.getSelection() & _override.getSelection() & globalOverride;
+			_suspend.setEnabled(_override.getSelection() & globalOverride);
+			_validatorsTable.setEnabled(enable);
+			_enableAllButton.setEnabled(enable);
+			_disableAllButton.setEnabled(enable);
+			_configLink.setEnabled(!globalOverride || !_override.getSelection());
+		}
+
+		public void loseFocus() {
+			// This page does not need to cache anything before it loses focus.
+		}
+
+		public void gainFocus() {
+		}
+	}
+
+	protected Control createContents(Composite parent) {
+		try {
+			PlatformUI.getWorkbench().getHelpSystem().setHelp(parent, HelpContextIds.ProjectPage);
+			_shell = parent.getShell();
+			_pageImpl = new ValidatorListPage(parent);
+		} catch (Exception exc) {
+			_pageImpl = new InvalidPage(parent);
+			displayAndLogError(ValUIMessages.VBF_EXC_INTERNAL_TITLE, ValUIMessages.VBF_EXC_INTERNAL_PAGE, exc);
+		}
+
+		return _pageImpl.getControl();
+	}
+
+	protected void performDefaults() {
+		super.performDefaults();
+
+		try {
+			_pageImpl.performDefaults();
+		} catch (Exception exc) {
+			displayAndLogError(ValUIMessages.VBF_EXC_INTERNAL_TITLE, ValUIMessages.VBF_EXC_INTERNAL_PAGE, exc);
+		}
+	}
+
+	public boolean performOk() {
+		try {
+			return _pageImpl.performOk();
+		} catch (Exception exc) {
+			displayAndLogError(ValUIMessages.VBF_EXC_INTERNAL_TITLE, ValUIMessages.VBF_EXC_INTERNAL_PAGE, exc);
+			return false;
+		}
+	}
+
+	/**
+	 * Since the pages are inner classes of a child PreferencePage, not a
+	 * PreferencePage itself, DialogPage's automatic disposal of its children's
+	 * widgets cannot be used. Instead, dispose of each inner class' widgets
+	 * explicitly.
+	 */
+	public void dispose() {
+		super.dispose();
+		try {
+			if (_pageImpl != null) {
+				_pageImpl.dispose();
+				_pageImpl = null;
+			}
+		} catch (Exception exc) {
+			displayAndLogError(ValUIMessages.VBF_EXC_INTERNAL_TITLE, ValUIMessages.VBF_EXC_INTERNAL_PAGE, exc);
+		}
+	}
+
+	private void logError(Throwable exc) {
+		ValidationUIPlugin.getPlugin().handleException(exc);
+	}
+
+	/*
+	 * package visibility because if this method is private, then the compiler
+	 * needs to create a synthetic accessor method for the internal classes, and
+	 * that can have performance implications.
+	 */
+	void displayAndLogError(String title, String message, Throwable exc) {
+		logError(exc);
+		displayMessage(title, message, org.eclipse.swt.SWT.ICON_ERROR);
+	}
+
+	private void displayMessage(String title, String message, int iIconType) {
+		MessageBox messageBox = new MessageBox(getShell(),
+			org.eclipse.swt.SWT.OK | iIconType | org.eclipse.swt.SWT.APPLICATION_MODAL);
+		messageBox.setMessage(message);
+		messageBox.setText(title);
+		messageBox.open();
+	}
+
+	/**
+	 * @see org.eclipse.jface.dialogs.IDialogPage#setVisible(boolean)
+	 */
+	public void setVisible(boolean visible) {
+		super.setVisible(visible);
+
+		if (_pageImpl == null)return;
+		if (visible)_pageImpl.gainFocus();
+		else _pageImpl.loseFocus();
+	}
+
+	/**
+	 * @see org.eclipse.jface.preference.PreferencePage#getDefaultsButton()
+	 */
+	protected Button getDefaultsButton() {
+		return super.getDefaultsButton();
+	}
+	
+	/**
+	 * Returns the selected project.
+	 */
+	public IProject getProject() {
+		IAdaptable selectedElement = getElement();
+		if (selectedElement == null)return null;
+		if (selectedElement instanceof IProject)return (IProject) selectedElement;
+
+		Object adaptedObject = selectedElement.getAdapter(IProject.class);
+		if (adaptedObject instanceof IProject)return (IProject) adaptedObject;
+		return null;
+
+	}
+}
diff --git a/plugins/org.eclipse.wst.common.emf/.classpath b/plugins/org.eclipse.wst.validation/.classpath
similarity index 70%
rename from plugins/org.eclipse.wst.common.emf/.classpath
rename to plugins/org.eclipse.wst.validation/.classpath
index 302a786..64ae09a 100644
--- a/plugins/org.eclipse.wst.common.emf/.classpath
+++ b/plugins/org.eclipse.wst.validation/.classpath
@@ -1,12 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" path="wtpemf/"/>
-	<classpathentry kind="src" path="workbench/"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+	<classpathentry kind="src" path="validate"/>
+	<classpathentry kind="src" path="validate_core"/>
+	<classpathentry kind="src" path="property_files"/>
+	<classpathentry kind="src" path="vf2"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins">
 		<accessrules>
 			<accessrule kind="accessible" pattern="org/eclipse/wst/common/**"/>
 		</accessrules>
 	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/plugins/org.eclipse.wst.validation/.cvsignore b/plugins/org.eclipse.wst.validation/.cvsignore
new file mode 100644
index 0000000..e936909
--- /dev/null
+++ b/plugins/org.eclipse.wst.validation/.cvsignore
@@ -0,0 +1,11 @@
+bin
+temp.folder
+validate.jar
+build.xml
+common.jar
+validatesrc.zip
+commonsrc.zip
+src.zip
+org.eclipse.wst.validation_1.0.0.zip
+@dot
+javaCompiler...args
diff --git a/plugins/org.eclipse.wst.validation/.options b/plugins/org.eclipse.wst.validation/.options
new file mode 100644
index 0000000..e0cc192
--- /dev/null
+++ b/plugins/org.eclipse.wst.validation/.options
@@ -0,0 +1,35 @@
+org.eclipse.wst.validation/debug=true
+
+# Set this to true if you wish performance information to be logged
+org.eclipse.wst.validation/timings=false
+
+# set this to true if you want version 1 validator tracing
+org.eclipse.wst.validation/v1=false
+
+# Set this to a file name, if you wish the results to be logged to a file, otherwise
+# they will be written to stderr. When logged to a file the results are in a
+# CSV (comma separated values) form. When logged to stderr they are in a more 
+# human readable form.
+org.eclipse.wst.validation/timings/tracefile=
+
+# By default times that are written to the trace file are in milliseconds for elapsed
+# time and nanoseconds for cpu time. If you find these times easier to read as seconds
+# as expressed by a double, the following flag can be turned on.
+org.eclipse.wst.validation/timings/useDoubles=false
+
+# If extra detail is needed for a particular validator it's id can be specified here.
+# For example, if you wanted more detail on the XML validator you would use
+# org.eclipse.wst.xml.core.xml 
+org.eclipse.wst.validation/extraValDetail=
+
+# To make debugging easier, you can make it appear is if only one validator has been 
+# registered via the extension points. You do this by setting the following filter
+# to validator id of the one validator that you want registered.
+#
+# As an example, you could use this plug-in id for a v1 validator: org.eclipse.jst.j2ee.ejb.EJBValidator
+# and org.eclipse.wst.html.ui.HTMLValidator for a v2 validator
+org.eclipse.wst.validation/filter/allExcept=
+
+# The tracing level. If not supplied a default of zero is used. The higher the number the
+# more verbose the tracing.
+org.eclipse.wst.validation/trace/level=
diff --git a/plugins/org.eclipse.wst.common.emf/.project b/plugins/org.eclipse.wst.validation/.project
similarity index 89%
rename from plugins/org.eclipse.wst.common.emf/.project
rename to plugins/org.eclipse.wst.validation/.project
index 5b5f0fe..846dae7 100644
--- a/plugins/org.eclipse.wst.common.emf/.project
+++ b/plugins/org.eclipse.wst.validation/.project
@@ -1,9 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>org.eclipse.wst.common.emf</name>
+	<name>org.eclipse.wst.validation</name>
 	<comment></comment>
-	<projects>
-	</projects>
 	<buildSpec>
 		<buildCommand>
 			<name>org.eclipse.jdt.core.javabuilder</name>
diff --git a/plugins/org.eclipse.wst.validation/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.wst.validation/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000..58507dd
--- /dev/null
+++ b/plugins/org.eclipse.wst.validation/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,78 @@
+#Fri Apr 11 07:15:44 EDT 2008
+eclipse.preferences.version=1
+org.eclipse.jdt.core.codeComplete.argumentPrefixes=
+org.eclipse.jdt.core.codeComplete.argumentSuffixes=
+org.eclipse.jdt.core.codeComplete.fieldPrefixes=_
+org.eclipse.jdt.core.codeComplete.fieldSuffixes=
+org.eclipse.jdt.core.codeComplete.localPrefixes=
+org.eclipse.jdt.core.codeComplete.localSuffixes=
+org.eclipse.jdt.core.codeComplete.staticFieldPrefixes=_
+org.eclipse.jdt.core.codeComplete.staticFieldSuffixes=
+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=warning
+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.discouragedReference=warning
+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.fatalOptionalError=enabled
+org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
+org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
+org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
+org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
+org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
+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=warning
+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=warning
+org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=warning
+org.eclipse.jdt.core.compiler.problem.nullReference=ignore
+org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
+org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
+org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore
+org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
+org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
+org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore
+org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore
+org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
+org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
+org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
+org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
+org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
+org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
+org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
+org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
+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.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
+org.eclipse.jdt.core.compiler.problem.unusedImport=error
+org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
+org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
+org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
+org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
+org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
+org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
+org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
+org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
+org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
+org.eclipse.jdt.core.compiler.source=1.5
diff --git a/plugins/org.eclipse.wst.validation/.settings/org.eclipse.jdt.ui.prefs b/plugins/org.eclipse.wst.validation/.settings/org.eclipse.jdt.ui.prefs
new file mode 100644
index 0000000..76ddc11
--- /dev/null
+++ b/plugins/org.eclipse.wst.validation/.settings/org.eclipse.jdt.ui.prefs
@@ -0,0 +1,7 @@
+#Mon Jun 11 14:58:22 EDT 2007
+eclipse.preferences.version=1
+org.eclipse.jdt.ui.exception.name=e
+org.eclipse.jdt.ui.gettersetter.use.is=true
+org.eclipse.jdt.ui.javadoc=false
+org.eclipse.jdt.ui.keywordthis=false
+org.eclipse.jdt.ui.overrideannotation=true
diff --git a/plugins/org.eclipse.wst.validation/META-INF/MANIFEST.MF b/plugins/org.eclipse.wst.validation/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..29989b2
--- /dev/null
+++ b/plugins/org.eclipse.wst.validation/META-INF/MANIFEST.MF
@@ -0,0 +1,24 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %Bundle-Name.0
+Bundle-SymbolicName: org.eclipse.wst.validation; singleton:=true
+Bundle-Version: 1.2.303.qualifier
+Bundle-Activator: org.eclipse.wst.validation.internal.plugin.ValidationPlugin
+Bundle-Vendor: %Bundle-Vendor.0
+Bundle-Localization: plugin
+Export-Package: org.eclipse.wst.validation,
+ org.eclipse.wst.validation.internal;x-friends:="org.eclipse.wst.common.tests.validation",
+ org.eclipse.wst.validation.internal.core;x-friends:="org.eclipse.wst.common.tests.validation",
+ org.eclipse.wst.validation.internal.delegates;x-internal:=true,
+ org.eclipse.wst.validation.internal.model;x-internal:=true,
+ org.eclipse.wst.validation.internal.operations;x-friends:="org.eclipse.wst.common.tests.validation",
+ org.eclipse.wst.validation.internal.plugin;x-friends:="org.eclipse.wst.common.tests.validation",
+ org.eclipse.wst.validation.internal.provisional;x-internal:=true,
+ org.eclipse.wst.validation.internal.provisional.core
+Require-Bundle: org.eclipse.core.resources;bundle-version="[3.4.0,4.0.0)",
+ org.eclipse.wst.common.frameworks;bundle-version="[1.1.200,2.0.0)",
+ org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
+ org.eclipse.wst.common.project.facet.core;bundle-version="[1.3.0,2.0.0)",
+ org.eclipse.core.expressions;bundle-version="[3.4.0,4.0.0)"
+Bundle-ActivationPolicy: lazy
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/plugins/org.eclipse.wst.common.emf/about.html b/plugins/org.eclipse.wst.validation/about.html
similarity index 100%
rename from plugins/org.eclipse.wst.common.emf/about.html
rename to plugins/org.eclipse.wst.validation/about.html
diff --git a/plugins/org.eclipse.wst.common.emf/build.properties b/plugins/org.eclipse.wst.validation/build.properties
similarity index 75%
rename from plugins/org.eclipse.wst.common.emf/build.properties
rename to plugins/org.eclipse.wst.validation/build.properties
index ed37cff..167d165 100644
--- a/plugins/org.eclipse.wst.common.emf/build.properties
+++ b/plugins/org.eclipse.wst.validation/build.properties
@@ -1,5 +1,5 @@
 ###############################################################################
-# Copyright (c) 2003, 2006 IBM Corporation and others.
+# Copyright (c) 2001, 2008 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,14 +9,17 @@
 # IBM Corporation - initial API and implementation
 ###############################################################################
 bin.includes = plugin.xml,\
+               plugin.properties,\
                META-INF/,\
                about.html,\
-               plugin.properties,\
                .,\
-               schema/
+               .options,\
+               xsds/
 jars.compile.order = .
 src.includes = component.xml,\
-               schema/
+               xsds/
 output.. = bin/
-source.. = wtpemf/,\
-           workbench/
+source.. = validate_core/,\
+           property_files/,\
+           validate/,\
+           vf2/
diff --git a/plugins/org.eclipse.wst.validation/component.xml b/plugins/org.eclipse.wst.validation/component.xml
new file mode 100644
index 0000000..21011d7
--- /dev/null
+++ b/plugins/org.eclipse.wst.validation/component.xml
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><component  xmlns="http://eclipse.org/wtp/releng/tools/component-model" name="org.eclipse.wst.validation"><component-depends unrestricted="true"></component-depends><plugin id="org.eclipse.wst.validation" fragment="false"/><plugin id="org.eclipse.wst.validation.ui" fragment="false"/><package name="org.eclipse.wst.validation.core"></package><package name="org.eclipse.wst.validation.plugin"></package></component>
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.validation/plugin.properties b/plugins/org.eclipse.wst.validation/plugin.properties
new file mode 100644
index 0000000..0fcb3b5
--- /dev/null
+++ b/plugins/org.eclipse.wst.validation/plugin.properties
@@ -0,0 +1,27 @@
+###############################################################################
+# Copyright (c) 2001, 2008 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
+###############################################################################
+
+VALIDATION_BUILDER_NAME=Validation
+VALIDATION_PROBLEMMARKER_NAME=Validation Message
+ProblemMarkerV2=Validation Message
+
+VALIDATION_PROJECTMARKER_NAME=Enabled Validators
+VALIDATION_PREFERENCEMARKER_NAME=Validation Preferences
+Validator=Validator
+ReferencialFileValidator=ReferencialFileValidator
+validationSelectionHandler=validationSelectionHandler
+ValidatorDelegates=Validator Delegates
+
+Bundle-Name.0 = Validation Framework
+Bundle-Vendor.0 = Eclipse Web Tools Platform
+
+Extension.validator=Validator (Version 2)
+removeV2Validator=Remove V2 Validator
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.validation/plugin.xml b/plugins/org.eclipse.wst.validation/plugin.xml
new file mode 100644
index 0000000..b8a430a
--- /dev/null
+++ b/plugins/org.eclipse.wst.validation/plugin.xml
@@ -0,0 +1,132 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.0"?>
+<plugin>
+  
+<!-- Validation extension points -->
+   <extension-point id="validator" name="%Validator" schema="xsds/validatorExtSchema.exsd"/>
+   <extension-point id="validatorV2" name="%Extension.validator" schema="xsds/validator.exsd"/>
+   <extension-point id="referencialFileValidator" name="%ReferencialFileValidator" schema="xsds/referencialFileExtSchema.exsd"/>
+   <extension-point id="validationSelectionHandler" name="%validationSelectionHandler" schema="xsds/validationSelectionHandler.exsd"/>
+   <extension-point id="validationHelper" name="validationHelper" schema="xsds/validationHelper.exsd"/>
+   <extension-point id="validatorDelegates" name="%ValidatorDelegates" schema="xsds/validatorDelegates.exsd"/>   
+   <extension-point id="validatorGroup" name="Validator Group" schema="xsds/validatorgroup.exsd"/>   
+   <extension-point id="exclude" name="Validator Exclusions" schema="xsds/exclude.exsd"/>
+   <extension-point id="removeV2Validator" name="%removeV2Validator" schema="xsds/removeV2Validator.exsd"/>   
+   
+<!--============================-->
+<!-- Validation Contributions   -->
+<!--============================-->
+   <extension
+         id="validationbuilder"
+         name="%VALIDATION_BUILDER_NAME"
+         point="org.eclipse.core.resources.builders">
+      <builder>
+         <run
+               class="org.eclipse.wst.validation.internal.operations.ValidationBuilder">
+         </run>
+      </builder>
+   </extension>
+<!-- Problem markers must be a subtype of problemmarker to be displayed in the task view -->
+   <extension
+         id="problemmarker"
+         name="%VALIDATION_PROBLEMMARKER_NAME"
+         point="org.eclipse.core.resources.markers">
+      <super
+            type="org.eclipse.core.resources.problemmarker">
+      </super>
+      <persistent
+            value="true">
+      </persistent>
+      <attribute
+            name="owner">
+      </attribute>
+      <attribute
+            name="validationSeverity">
+      </attribute>
+      <attribute
+            name="targetObject">
+      </attribute>
+      <attribute
+            name="groupName">
+      </attribute>
+      <attribute
+            name="messageId">
+      </attribute>
+   </extension>
+<!-- Don't want to display this marker in the task view -->
+   <extension
+         id="projectmarker"
+         name="%VALIDATION_PROJECTMARKER_NAME"
+         point="org.eclipse.core.resources.markers">
+      <super
+            type="org.eclipse.core.resources.textmarker">
+      </super>
+      <persistent
+            value="true">
+      </persistent>
+      <attribute
+            name="enabledValidatorList">
+      </attribute>
+      <attribute
+            name="autoValidate">
+      </attribute>
+      <attribute
+            name="runWhenBuild">
+      </attribute>
+      <attribute
+            name="maxNumMessages">
+      </attribute>
+      <attribute
+            name="overrideGlobalPreferences">
+      </attribute>
+      <attribute
+            name="version">
+      </attribute>
+   </extension>
+<!-- Don't want to display this marker in the task view -->
+   <extension
+         id="preferencemarker"
+         name="%VALIDATION_PREFERENCEMARKER_NAME"
+         point="org.eclipse.core.resources.markers">
+      <super
+            type="org.eclipse.core.resources.textmarker">
+      </super>
+      <persistent
+            value="true">
+      </persistent>
+      <attribute
+            name="enabledValidatorList">
+      </attribute>
+      <attribute
+            name="autoValidate">
+      </attribute>
+      <attribute
+            name="runWhenBuild">
+      </attribute>
+      <attribute
+            name="maxNumMessages">
+      </attribute>
+      <attribute
+            name="projectsCanOverride">
+      </attribute>
+      <attribute
+            name="version">
+      </attribute>
+   </extension>
+   <!-- GRK - I added a new problem marker so that we can keep the v2 changes separate from the v1 framework. -->
+   <extension
+         id="problemmarker2"
+         name="%ProblemMarkerV2"
+         point="org.eclipse.core.resources.markers">
+      <super
+            type="org.eclipse.core.resources.problemmarker">
+      </super>
+      <persistent
+            value="true">
+      </persistent>
+      <attribute
+            name="owner">
+      </attribute>
+  </extension>
+
+</plugin>
diff --git a/plugins/org.eclipse.wst.validation/property_files/org/eclipse/wst/validation/internal/messages.properties b/plugins/org.eclipse.wst.validation/property_files/org/eclipse/wst/validation/internal/messages.properties
new file mode 100644
index 0000000..26b62fb
--- /dev/null
+++ b/plugins/org.eclipse.wst.validation/property_files/org/eclipse/wst/validation/internal/messages.properties
@@ -0,0 +1,79 @@
+###############################################################################
+# Copyright (c) 2005, 2011 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
+###############################################################################
+ErrConfig=IWAE0100E Extension configuration error. An internal error has happened, the validator {0} has incorrectly configured the validation extension point.
+ErrGroupName=IWAE0101E Invalid element, expect either the element "include" or "exclude".
+ErrFilterRule=IWAE0102E An invalid filter rule has been encountered. Contributing plug-in: {0}, element name: {1}
+
+ErrGroupNoType=IWAE0103E Groups must have a valid type, no type was returned
+ErrGroupInvalidType=IWAE0104E Groups must have a valid type, the following invalid type was returned: {0}
+ErrDependencyVersion=IWAE0105E Only version {0} is supported
+
+ErrPatternAttrib=IWAE0106E The pattern attribute must be supplied
+ErrTypeReq=IWAE0107E Type is a required attribute for file filters
+
+VbfExcSyntaxNoValClass=IWAE0016E Validator cannot be created because no "class" attribute is specified in the <run> element of the plugin.xml file for the validator named {0}. Cannot create a validator unless a <run> element exists that specifies the "class" attribute. The value of the "class" attribute should be the name of the class that implements the IWorkbenchHelper interface.
+VbfExcSyntaxNoValRun=IWAE0015E Validator cannot be created because no <run> element is specified in the plugin.xml file for the validator named {0}. Cannot create a validator unless a <run> element exists that specifies the "class" attribute. The value of the "class" attribute should be the name of the class that implements the IWorkbenchHelper interface.
+VbfExcSyntaxNoValNull=IWAE0018E Validator class {0} could not be created. IConfigurationElement.createExecutableExtension(String) returned null.
+
+ErrType=The value of the type attribute is incorrect. It was specified as {0} but the only valid values are: {1}, {2}, {3}
+ConfigError=It appears that validator {0} (with id {1}) has been configured incorrectly, it produced {2} messages while validating {3}. It has been disabled. Try restoring the defaults for this validator.
+
+DecodeError1=IWAE0019E There was a problem deserializing a string. A boolean was expected but not found. 
+Error20=IWAE0020E Internal error, the incoming validator must be a v2 validator
+Error21=The following dependency could not be restored because the following resource {0} could no longer be found.
+GroupInclude=Include Group
+GroupExclude=Exclude Group
+
+TypeInclude=include
+TypeExclude=exclude
+
+JobName=Validation
+JobNameWithProjectName=Validating {0}
+JobNameMonitor=Validation Monitor
+JobIndexSave=Index Save
+
+MigrationJobName=Validation Setup
+
+RuleProjectNature=Project nature
+RuleFileExt=File extension
+RuleFile=File
+RuleContentType=Content Type
+RuleFacet=Facet
+RuleFolder=Folder
+RuleFull=Qualified File
+RulePattern=Pattern
+RuleTargetRuntime=Target Runtime
+
+FileExtWithCase={0}: {1} (case sensitive)
+FileExtWithoutCase={0}: {1}
+
+ContentTypeExact={0}: {1} (excludes subtypes)
+ContentTypeNotExact={0}: {1} (includes subtypes)
+
+LogValStart={0} starting to validate: {1}
+LogValEnd={0} finished validating: {1}
+LogValEndTime=Validator {0} with id {1} finished validating: {2} in {3}
+LogValSummary=Validator {0} with id {1} validated {2} resources in {3}
+LogValSummary2=Validator {0} with id {1} validated {2} resources in {3} using {4} of CPU time
+LogSession=Session started on: {0}
+
+SevError=Error
+SevWarning=Warning
+SevIgnore=Ignore
+
+TimeUnder=under a second
+TimeNano={0} nanoseconds
+TimeMicro={0} microseconds
+TimeSec={0} seconds
+TimeMin={0} minutes
+
+RogueValidator=Rogue validator delegate from contributor {0}
+
diff --git a/plugins/org.eclipse.wst.validation/property_files/validate_base.properties b/plugins/org.eclipse.wst.validation/property_files/validate_base.properties
new file mode 100644
index 0000000..9e2583d
--- /dev/null
+++ b/plugins/org.eclipse.wst.validation/property_files/validate_base.properties
@@ -0,0 +1,140 @@
+###############################################################################
+# Copyright (c) 2001, 2008 IBM Corporation and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+# IBM Corporation - initial API and implementation
+###############################################################################
+# To avoid name collisions, each extension point should preface their property names with an identifier.
+#
+#     *************************************************************************
+#     * Code oriented instructions:
+#     *
+#     * In the string, you may see the following special sequences:
+#     * a) {n}  where n is a number. These are replaceable parameters.
+#     * b) ''  In .properties files, in order to see one apostrophe (') in the final
+#     *    string, sometimes two apostrophes must be entered in the string. In the translated
+#     *    string, if there is at least one {n} in the string, then to show one apostrophe
+#     *    to the user, put two apostrophes in the string. If there are no {n} in the string,
+#     *    then put one apostrophe.
+#     *    For example, say that you want the user to read "George's file". 
+#     *        GEORGE=George's file was on the desk.
+#     *        GEORGE2=George''s file and {0} were on the desk.
+#     *    GEORGE uses one apostrophe because there are no {n} and GEORGE2
+#     *    uses two apostrophes because there is a {n}.
+#     * c) '' text '' where text can be any word(s). The text between the double
+#     *    apostrophes should not be translated. 
+#     * d) <text> where text can be any word(s). The text between the angle
+#     *    brackets should NOT be translated.
+#     * e) "text" where text can be any word(s). The text between the quotation 
+#     *    marks should NOT be translated.
+#     *    
+#     *************************************************************************
+#     * Other instructions
+#     * a) Do not translate any text that is on a line which begins with a comment 
+#     *    symbol (#).
+#     * b) Do not translate these words: 
+#     *        schema, EJB, RDB, JAR, RMI, BMP, CMP, OOSQL
+#     * c) Please return the .properties files using the same directory structure.
+#     *    This is necessary because two of the files have the same name.
+#     *
+#     *************************************************************************
+# Any other comments to the translators are on lines which start like this:  # 2TC:
+#
+# Version 1.14
+#
+#
+# ID:
+#    VBF - Validation Builder Framework
+#       VBF_EXC=Exception or error text
+#       VBF_STATUS=Status message
+#       VBF_TASK=Task list message
+#
+
+# 
+# Begin Validation Builder Framework Strings
+#
+# IDs:
+#    VBF_EXC=Exception or error text
+#    VBF_STATUS=Status message
+#    VBF_TASK=Task list message
+#
+VBF_EXC_CANNOT_ADD_MARKER=IWAE0001E The marker cannot be added to resource {0} in the task list.
+VBF_EXC_CANNOT_REMOVE_MARKER=IWAE0002E The marker cannot be removed from resource {0} in the task list.
+
+VBF_EXC_HELPER_MISSING=IWAE0003E Unable to load {0} because it did not specify a <helper>. Each validator must identify the helper class that loads its MOF model.
+VBF_EXC_HELPER_CANNOTLOAD=IWAE0004E Unable to load {0} because its <helper>, {1}, could not be loaded. Ensure that the case-sensitive file name is spelled correctly.
+
+VBF_EXC_INTERNAL=IWAE0005E An internal error occurred during validation. Validation was being run on project {0} with validator {1}. The message thrown was {2}.
+
+# 2TC: In the following string, "type" is a noun
+VBF_EXC_INVALID_TYPE_FILTER=IWAE0006E Invalid type filter; {0} must be an instance of {1}.
+VBF_EXC_INVALID_RESOURCE=IWAE0007E Cannot add message "{0}" with target object "{1}" because no file, folder, or project can be found with which to associate the message.
+
+VBF_EXC_MISSING_VALIDATOR_EP=IWAE0008E The validator framework could not be started. The extension point named \"{0}\" could not be found. Save all log files and contact your IBM representative.
+VBF_EXC_MISSING_PROJECTNATURE_ID=IWAE0009E A projectNature must have an associated ID. Validation is ignoring this tag and continuing.
+
+VBF_EXC_RUNTIME=IWAE0010E Run-time exception {0} occurred during validation. The validator being run was {1} and the message thrown was {2}.
+
+VBF_EXC_SYNTAX_NO_HELPER=IWAE0012E No <helper> element is specified in the plugin.xml file for validator {0}. Since the helper cannot be created, the validator will not be loaded.
+VBF_EXC_SYNTAX_NO_HELPER_CLASS=IWAE0013E No "class" attribute in the <helper> element is specified in the plugin.xml file for validator {0}. The helper cannot be created without the name of the class that implements it. Since the helper cannot be created, the validator will not be loaded.
+VBF_EXC_SYNTAX_NO_HELPER_THROWABLE=IWAE0014E The helper {0} cannot be created because a Throwable was caught.
+VBF_EXC_SYNTAX_NO_VAL_THROWABLE=IWAE0017E Cannot create validator {0} because a Throwable was caught.
+
+VBF_EXC_DISABLEV=IWAE0019E Cannot instantiate validator {0}. Disabling the validator; read the log for details.
+VBF_EXC_DISABLEH=IWAE0020E Cannot instantiate helper {0}. Disabling validator {1}; read the log for details.
+VBF_EXC_ORPHAN_IVALIDATOR=IWAE0021E Cannot locate meta-data for validator {0}.
+
+VBF_EXC_VALIDATORNAME_IS_NULL=IWAE0022E The plugin with ID {0} has been disabled because its getName() method returns null. The method must return a value.
+
+VBF_EXC_NULLCREATE=IWAE0023E Cannot create a validation configuration on a null resource.
+VBF_EXC_NULLSAVE=IWAE0024E Cannot save a validation configuration on a null resource.
+VBF_EXC_SAVE=IWAE0025E Could not save the validation configuration on resource {0}.
+VBF_EXC_NULLRETRIEVE=IWAE0026E Cannot retrieve the validation configuration because resource is null.
+VBF_EXC_RETRIEVE=IWAE0027E Could not retrieve the validation configuration for resource {0}.
+
+VBF_EXC_BADVMD=IWAE0028E ValidatorMetaData[] must not be null or empty.
+VBF_EXC_OPENPRJ=IWAE0029E Project {0} must be open.
+VBF_EXC_EXISTPRJ=IWAE0030E Project {0} must exist.
+VBF_EXC_BADPRJ=IWAE0031E Project {0} must be the project that contains the resources in the IResource[].
+VBF_EXC_MULTIPRJ=IWAE0032E All IResource instances in the IResource[] must be part of the same IProject instance. The resources come from the following projects: {0}.
+VBF_EXC_BADVAL=IWAE0033E Validator {0} must be configured on {1};
+
+VBF_STATUS_INITIALIZING=Initializing {0}.
+
+VBF_STATUS_VALIDATOR_CLEANUP=Performing cleanup on {0} before termination.
+
+VBF_STATUS_PROGRESSMONITOR_TITLE=Validating
+VBF_STATUS_NULL_DELTA=Last build state of {0} could not be retrieved. Performing a full validation.
+
+VBF_STATUS_VALIDATOR_TERMINATED=Validation of {0} using {1} was cancelled.
+
+VBF_STATUS_START_REMOVING_OLD_MESSAGES=Removing {0} messages on {1} has started...
+VBF_STATUS_FINISH_REMOVING_OLD_MESSAGES=Messages removed.
+
+VBF_STATUS_STARTING_VALIDATION=Validation of {0} by {1} has started...
+VBF_STATUS_ENDING_VALIDATION=Validation of {0} by {1} is complete. All known problems have been reported.
+VBF_STATUS_ENDING_VALIDATION_ABNORMALLY=Validation of {0} by {1} ended abnormally. The list of problems may be incomplete. Please check the information messages for the cause of the abnormal termination.
+
+VBF_STATUS_LOOKING=Looking for validation messages owned by uninstalled validators...
+VBF_STATUS_LOOKINGDONE=Looking for validation messages owned by uninstalled validators...done.
+VBF_STATUS_REMOVING=Removing validation messages owned by uninstalled validators...
+VBF_STATUS_REMOVINGDONE=Removing validation messages owned by uninstalled validators...done.
+
+VBF_WRONG_CONTEXT_FOR_DELEGATE=The validator {0} is a being invoked with a wrong context. Please use an IProjectValidationContext.
+VBF_NO_DELEGATE=The validator {0} is a delegating validator but no delegate can found for it.
+VBF_CANNOT_INSTANTIATE_DELEGATE=The validator delegate {0} registered for {1} cannot be instantiated.
+
+# The following message will be deleted soon.
+VBF_TASK_WARN_MESSAGE_LIMIT_ABORT=IWAE0034W IWAD3000I: {1} terminated validation of {0} because the maximum number of messages were reported. Some messages may be missing.
+
+VBF_TASK_WARN_MESSAGE_LIMIT_VAL=IWAE0035W IWAD3000I: Some messages may be missing because the maximum number of messages has been reported. Increase the maximum number of messages and try again.
+VBF_VALIDATION_JOB_MSG=Waiting for build
+
+#
+# End Validation Builder Framework Strings
+#
+
diff --git a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/ConfigurationConstants.java b/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/ConfigurationConstants.java
new file mode 100644
index 0000000..16aef08
--- /dev/null
+++ b/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/ConfigurationConstants.java
@@ -0,0 +1,86 @@
+/*******************************************************************************
+ * Copyright (c) 2001, 2008 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.wst.validation.internal;
+
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.runtime.QualifiedName;
+import org.eclipse.wst.validation.internal.plugin.ValidationPlugin;
+
+/**
+ * Validation constants needed to implement the marker extension point and the user's preferences.
+ * 
+ * Only the validation framework should use this interface.
+ */
+public interface ConfigurationConstants {
+	String DISABLE_ALL_VALIDATION_SETTING = "disableAllValidation"; //$NON-NLS-1$ // boolean
+	String SAVE_AUTOMATICALLY_SETTING = "saveAutomatically"; //$NON-NLS-1$ // boolean
+
+	// Defaults for the preference and project values
+	
+	String CURRENT_VERSION = (String) ValidationPlugin.getPlugin().getBundle().getHeaders().get(org.osgi.framework.Constants.BUNDLE_VERSION);  // this is a constant, so it should be intern
+	boolean DEFAULT_ASYNC = true;
+	boolean DEFAULT_DISABLE_VALIDATION_SETTING = false;
+	ValidatorMetaData[] DEFAULT_ENABLED_VALIDATORS = ValidationRegistryReader.getReader().getValidatorMetaDataArrayEnabledByDefault();  // store a copy here so that we don't modify the original and don't create a copy every time we need this value
+	int DEFAULT_MAXNUMMESSAGES = 50;
+	int DEPTH_INFINITE = IResource.DEPTH_INFINITE;
+	int DEPTH_ZERO = IResource.DEPTH_ZERO;
+	String ELEMENT_SEPARATOR = ";"; //$NON-NLS-1$ // separates the name of one IValidator from the next in the list of enabled validators for a project or preference
+	String DELEGATES_SEPARATOR = "="; //$NON-NLS-1$ // Separates the delegating validator id from the delegate validator id in the list of delegates
+
+	// The following values must match the attributes in the preference marker as shown in plugin.xml
+	// Even though the plugin.xml values are not used to create new Preference or Project markers,
+	// maintaining one local name ensures that there's no confusion writing the migration code.
+	// These are the QualifiedNames used to persist the user's settings.
+	String ENABLED_MANUAL_VALIDATORS = "enabledManualValidatorList"; //$NON-NLS-1$ // String
+	String ENABLED_BUILD_VALIDATORS = "enabledBuildValidatorList"; //$NON-NLS-1$ // String
+	String DELEGATE_VALIDATORS = "delegateValidatorList"; //$NON-NLS-1$ // String
+	String J2EE_PLUGIN_ID = "org.eclipse.jst.j2ee"; //$NON-NLS-1$ // For 4.03, this is the plugin id that the validation constants were declared in.
+	String MAXNUMMESSAGES = "maxNumMessages"; //$NON-NLS-1$ // integer
+	String PLUGIN_ID = ValidationPlugin.PLUGIN_ID;
+	String PREF_PROJECTS_CAN_OVERRIDE = "projectsCanOverride"; //$NON-NLS-1$ // boolean
+	// end validation message marker constants
+
+	// Preference and Project constants
+	String PREFERENCE_MARKER = PLUGIN_ID + ".preferencemarker"; //$NON-NLS-1$
+	String PRJ_MARKER = PLUGIN_ID + ".projectmarker"; //$NON-NLS-1$ // The extension which saves user validation preferences for a particular project (e.g. which validators run on the project)
+	String PRJ_MARKER_403 = J2EE_PLUGIN_ID + ".projectmarker"; //$NON-NLS-1$ // The extension which saves user validation preferences for a particular project (e.g. which validators run on the project)
+	String PRJ_OVERRIDEGLOBAL = "overrideGlobalPreferences"; //$NON-NLS-1$ // boolean (Use the global preferences or override)
+
+	QualifiedName USER_PREFERENCE = new QualifiedName(PLUGIN_ID, "ValidationConfiguration"); //$NON-NLS-1$ // ValidationConfiguration for the IResource
+	QualifiedName USER_MANUAL_PREFERENCE = new QualifiedName(PLUGIN_ID, "ValidationManualConfiguration"); //$NON-NLS-1$ // ValidationConfiguration for the IResource
+	QualifiedName USER_BUILD_PREFERENCE = new QualifiedName(PLUGIN_ID, "ValidationBuildConfiguration"); //$NON-NLS-1$ // ValidationConfiguration for the IResource
+	QualifiedName DELEGATES_PREFERENCE = new QualifiedName(PLUGIN_ID, "ValidationDelegatesConfiguration"); //$NON-NLS-1$ // ValidationConfiguration for the IResource
+
+	// Validation message marker constants
+	
+	/** 
+	 * org.eclipse.wst.validation.problemmarker - The marker id which is used to add v1 validation markers 
+	 * to the task list */
+	String VALIDATION_MARKER = PLUGIN_ID + ".problemmarker"; //$NON-NLS-1$ 
+	
+	/** For incremental validation, this field associates a message with a group, so that a subset of messages may be removed from a file. */
+	String VALIDATION_MARKER_GROUP = "groupName"; //$NON-NLS-1$
+	
+	/**  Persist the message id of the message, not just the translated text. */
+	String VALIDATION_MARKER_MESSAGEID = "messageId"; //$NON-NLS-1$
+	
+	// The following values must match the attributes in the validation message marker as shown in plugin.xml
+	String VALIDATION_MARKER_OWNER = "owner"; //$NON-NLS-1$ // The IValidator who owns the IMarker on the task list
+	String VALIDATION_MARKER_SEVERITY = "validationSeverity"; //$NON-NLS-1$ // one of the SeverityEnum values
+	String VALIDATION_MARKER_TARGETOBJECT = "targetObject"; //$NON-NLS-1$ // When more than one target object resolves to the same IResource, this field identifies which targetObject owns a particular message.
+	String VERSION = "version"; //$NON-NLS-1$
+
+	// WSAD versions which created markers of these types
+	String VERSION4_03 = "4.03"; //$NON-NLS-1$
+	String VERSION5_0 = "5.0"; //$NON-NLS-1$
+	String VERSION5_01 = "5.0.1"; //$NON-NLS-1$
+	// end preference and project defaults
+}
diff --git a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/ConfigurationManager.java b/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/ConfigurationManager.java
new file mode 100644
index 0000000..2baad42
--- /dev/null
+++ b/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/ConfigurationManager.java
@@ -0,0 +1,256 @@
+/*******************************************************************************
+ * Copyright (c) 2001, 2009 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.wst.validation.internal;
+
+import java.lang.reflect.InvocationTargetException;
+
+import org.eclipse.core.resources.IMarker;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IWorkspaceRoot;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.wst.validation.internal.plugin.ValidationPlugin;
+
+
+/**
+ * Only the validation framework can use this class.
+ */
+public final class ConfigurationManager implements ConfigurationConstants {
+	private static ConfigurationManager _instance = null;
+
+	private ConfigurationManager() {}
+
+	public static ConfigurationManager getManager() {
+		if (_instance == null) {
+			_instance = new ConfigurationManager();
+		}
+		return _instance;
+	}
+
+	/**
+	 * Given a validation marker, return the fully-qualified class name of the validator who owns
+	 * the message. If the validator cannot be found or if the marker is not a validation marker,
+	 * return null.
+	 */
+	public String getValidator(IMarker marker) {
+		if (marker == null)return null;
+
+		try {
+			if (!marker.getType().equals(VALIDATION_MARKER))return null;
+
+			Object attrib = marker.getAttribute(VALIDATION_MARKER_OWNER);
+			if (attrib == null)return null;
+			return attrib.toString();
+		} catch (CoreException e) {
+			ValidationPlugin.getPlugin().handleException(e);
+			return null;
+		}
+	}
+
+	/**
+	 * Return true if the given marker is a validation marker. Otherwise return false.
+	 */
+	public boolean isValidationMarker(IMarker marker) {
+		if (marker == null)return false;
+
+		try {
+			return marker.getType().equals(VALIDATION_MARKER);
+		} catch (CoreException e) {
+			ValidationPlugin.getPlugin().handleException(e);
+			return false;
+		}
+	}
+
+	/**
+	 * This method is for use by the TVT Validation plug-in ONLY!!! No code should access the
+	 * validation markers in the list directly except for the validation framework and the TVT
+	 * Validation plug-in.
+	 */
+	public void removeAllValidationMarkers(IProject project) {
+		if ((project == null) || (!project.isOpen()))return;
+
+		try {
+			project.deleteMarkers(VALIDATION_MARKER, false, DEPTH_INFINITE); // false means only
+			// consider VALIDATION_MARKER, not variants of VALIDATION_MARKER. 
+			//Since addTask only adds VALIDATION_MARKER, we don't need to consider its subtypes.
+		} catch (CoreException e) {
+			ValidationPlugin.getPlugin().handleException(e);
+		}
+	}
+
+	/**
+	 * This method returns the global preferences for the workspace.
+	 */
+	public GlobalConfiguration getGlobalConfiguration() throws InvocationTargetException {
+		IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot();
+		GlobalConfiguration gp = null;
+		try {
+			gp = (GlobalConfiguration) root.getSessionProperty(USER_PREFERENCE);
+			if (gp == null)gp = getGlobalConfiguration(root);
+		} catch (CoreException exc) {
+			throw new InvocationTargetException(exc, ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_EXC_RETRIEVE, new String[]{root.getName()}));
+		}
+		return gp;
+	}
+	
+	private synchronized GlobalConfiguration getGlobalConfiguration(IWorkspaceRoot root) throws InvocationTargetException {
+		GlobalConfiguration gp = null;
+		try {
+			gp = (GlobalConfiguration) root.getSessionProperty(USER_PREFERENCE);
+			if (gp == null) {
+				gp = new GlobalConfiguration(root);
+//				PreferencesWrapper prefs = PreferencesWrapper.getPreferences(null, null);
+//				prefs.addPropertyChangeListener(gp);
+				
+				gp.getVersion(); // initialize the configuration's version attribute
+				gp.load(); // initialize this instance from the stored values
+				gp.passivate(); // store this instance as a property on the IResource
+			}
+			return gp;
+		} catch (CoreException exc) {
+			throw new InvocationTargetException(exc, ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_EXC_RETRIEVE, new String[]{root.getName()}));
+		}
+	}
+
+	public ProjectConfiguration getProjectConfiguration(IProject project) throws InvocationTargetException {
+		ProjectConfiguration prjp = null;
+		try {
+			prjp = (ProjectConfiguration) project.getSessionProperty(USER_PREFERENCE);
+			if (prjp == null || !prjp.getResource().exists()) {
+				prjp = new ProjectConfiguration(project);
+				prjp.getVersion(); // initialize the configuration's version attribute
+				prjp.load(); // initialize this instance from the stored values
+				prjp.passivate(); // store this instance as a property on the IResource
+			}
+			return prjp;
+		} catch (CoreException exc) {
+			throw new InvocationTargetException(exc, ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_EXC_RETRIEVE, new String[]{project.getName()}));
+		}
+	}
+
+	public ProjectConfiguration getProjectConfigurationWithoutMigrate(IProject project) throws InvocationTargetException {
+		ProjectConfiguration prjp = null;
+		try {
+			prjp = (ProjectConfiguration) project.getSessionProperty(USER_PREFERENCE);
+			if (prjp == null || !prjp.getResource().exists()) {
+				prjp = new ProjectConfiguration(project);
+				prjp.getVersion(); // initialize the configuration's version attribute
+				prjp.load(); // initialize this instance from the stored values
+				prjp.passivate(); // store this instance as a property on the IResource
+			}
+			return prjp;
+		} catch (CoreException exc) {
+			throw new InvocationTargetException(exc, ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_EXC_RETRIEVE, new String[]{project.getName()}));
+		}
+	}
+
+
+	/**
+	 * The nature of the project has changed; update the enabled validators on the project.
+	 * 
+	 * @deprecated this method doesn't do anything.
+	 */
+	public void resetProjectNature(IProject project) throws InvocationTargetException {
+	}
+
+	public void closing(IProject project) {
+		try {
+			if (isMigrated(project)) {
+				ProjectConfiguration prjp = ConfigurationManager.getManager().getProjectConfiguration(project);
+				if(!prjp.useGlobalPreference())prjp.store();
+			}
+		} catch (InvocationTargetException e) {
+			ValidationPlugin.getPlugin().handleException(e);
+			if (e.getTargetException() != null)
+				ValidationPlugin.getPlugin().handleException(e.getTargetException());
+		}
+	}
+
+	/**
+	 * @deprecated this method does not do anything.
+	 * @param project
+	 */
+	public void deleting(IProject project) {
+	}
+
+	/**
+	 * @deprecated this method does not do anything.
+	 * @param project
+	 */
+	public void opening(IProject project) {
+		// Do not load or migrate the project in this method; let the getConfiguration(IProject)
+		// method do that. Do not load the project before it's necessary.
+	}
+
+	/**
+	 * Return true if the global preferences are at the current level of metadata, false otherwise.
+	 */
+	public boolean isGlobalMigrated() throws InvocationTargetException {
+		IWorkspaceRoot root = ValidationConfiguration.getRoot();
+		if (root == null)return false;
+
+		try {
+			GlobalConfiguration gp = (GlobalConfiguration) root.getSessionProperty(USER_PREFERENCE);
+			if (gp != null) {
+				return gp.isVersionCurrent();
+			}
+
+			String serializedPrjp = root.getPersistentProperty(USER_PREFERENCE);
+			if (serializedPrjp != null) {
+				gp = new GlobalConfiguration(root);
+				gp.getVersion(); // initialize the configuration's version attribute
+				return gp.isVersionCurrent();
+			}
+		} catch (CoreException exc) {
+			throw new InvocationTargetException(exc, ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_EXC_RETRIEVE, new String[]{root.getName()}));
+		}
+
+		return false;
+	}
+
+	/**
+	 * Return true if the given project has the current level of metadata, false otherwise.
+	 */
+	public boolean isMigrated(IProject project) throws InvocationTargetException {
+		if (project == null)return false;
+		
+		try {
+			if (project.isAccessible()) {
+				ProjectConfiguration prjp = (ProjectConfiguration) project.getSessionProperty(USER_PREFERENCE);
+				if (prjp != null)return prjp.isVersionCurrent();
+				
+				String serializedPrjp = project.getPersistentProperty(USER_PREFERENCE);
+				if (serializedPrjp != null) {
+					prjp = new ProjectConfiguration(project);
+					prjp.getVersion(); 
+					return prjp.isVersionCurrent();
+				}
+			}
+		} catch (CoreException exc) {
+			throw new InvocationTargetException(exc, ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_EXC_RETRIEVE, new String[]{project.getName()}));
+		}
+		return false;
+	}
+
+	/**
+	 * Answer the appropriate configuration based on whether the project has overridden the configuration
+	 * or not. If the project exists and is allowed to override the global configuration answer the
+	 * project configuration, otherwise answer the global configuration.
+	 * @param project it can be null
+	 */
+	public ValidationConfiguration getConfiguration(IProject project) throws InvocationTargetException {
+		if (project == null)return getGlobalConfiguration();
+		ProjectConfiguration pc = getProjectConfiguration(project);
+		if (pc != null && !pc.useGlobalPreference())return pc;
+		return getGlobalConfiguration();
+	}
+
+}
diff --git a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/EventManager.java b/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/EventManager.java
new file mode 100644
index 0000000..d603b8d
--- /dev/null
+++ b/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/EventManager.java
@@ -0,0 +1,358 @@
+/*******************************************************************************
+ * Copyright (c) 2001, 2008 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.wst.validation.internal;
+
+import java.lang.reflect.InvocationTargetException;
+import java.util.Set;
+import java.util.concurrent.CopyOnWriteArraySet;
+
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.resources.IResourceChangeEvent;
+import org.eclipse.core.resources.IResourceChangeListener;
+import org.eclipse.core.resources.IResourceDelta;
+import org.eclipse.core.resources.IResourceDeltaVisitor;
+import org.eclipse.core.resources.IWorkspace;
+import org.eclipse.core.resources.IWorkspaceRoot;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.wst.validation.internal.operations.IWorkbenchContext;
+import org.eclipse.wst.validation.internal.plugin.ValidationPlugin;
+
+/**
+ * This class manages resource change events for the validation framework.
+ */
+public class EventManager implements IResourceChangeListener {
+	private static EventManager _inst;
+	
+	// false means that eclipse is not shutting down, and true means that it is shutting down. 
+	private boolean _shutdown; 
+
+	private IResourceDeltaVisitor _postAutoBuildVisitor;
+	private boolean _isActive; // has the registry been read?
+	
+	private Set<IProjectChangeListener> _listeners = new CopyOnWriteArraySet<IProjectChangeListener>();
+
+	private EventManager() {
+	}
+
+	public static EventManager getManager() {
+		if (_inst == null)_inst = new EventManager();
+		return _inst;
+	}
+	
+	public void addProjectChangeListener(IProjectChangeListener listener){
+		Tracing.log("EventManager-03: add listener: ", listener); //$NON-NLS-1$
+		_listeners.add(listener);
+	}
+	
+	public void removeProjectChangeListener(IProjectChangeListener listener){
+		_listeners.remove(listener);
+	}
+	
+	private void signal(IProject project, int type){
+		if (Tracing.isLogging()){
+			String name = "Null"; //$NON-NLS-1$
+			if (project != null)name = project.getName();
+			Tracing.log("EventManager-02: signal project: " + name + ", IProjectChangeListener type: " + type); //$NON-NLS-1$ //$NON-NLS-2$
+		}
+		for (IProjectChangeListener pcl : _listeners){
+			try {
+				pcl.projectChanged(project, type);
+			}
+			catch (Exception e){
+				ValidationPlugin.getPlugin().handleException(e);
+			}
+		}
+	}
+
+	public void opening(IProject project) {
+		if (project == null || !ValidationPlugin.isActivated())return;
+		
+		signal(project, IProjectChangeListener.ProjectOpened);
+
+		// When the project is opened, check for any orphaned tasks or tasks whose owners need to be updated.
+//		ConfigurationManager.getManager().opening(project);
+	}
+
+	public void closing(IProject project) {
+		if (project == null || !ValidationPlugin.isActivated())return;
+		
+		signal(project, IProjectChangeListener.ProjectClosed);
+		
+		try {
+			boolean isMigrated = ConfigurationManager.getManager().isMigrated(project);
+			// If it's not migrated, then it hasn't been loaded, and we don't want to load the
+			// validator and its prerequisite plug-ins until they're needed.
+			if (isMigrated) {
+				ValidatorMetaData[] vmds = ConfigurationManager.getManager().getProjectConfiguration(project).getValidators();
+				for (ValidatorMetaData vmd : vmds) {
+
+					if (!vmd.isActive()) {
+						// If this validator has not been activated, or if it has been shut down,
+						// don't activate it again.
+						continue;
+					}
+
+					IWorkbenchContext helper = null;
+					try {
+						helper = vmd.getHelper(project);
+						helper.closing();
+					} catch (InstantiationException e) {
+						// Remove the vmd from the reader's list
+						ValidationRegistryReader.getReader().disableValidator(vmd);
+
+						ValidationPlugin.getPlugin().handleException(e);
+					} catch (Exception e) {
+						// If there is a problem with this particular helper, log the error and
+						// continue with the next validator.
+						ValidationPlugin.getPlugin().handleException(e);
+					}
+				}
+
+				ConfigurationManager.getManager().closing(project);
+			}
+		} catch (InvocationTargetException e) {
+			ValidationPlugin.getPlugin().handleException(e);
+			if (e.getTargetException() != null)
+				ValidationPlugin.getPlugin().handleException(e.getTargetException());
+		}
+	}
+
+	public void deleting(IProject project) {
+		if (project == null)return;
+		
+		signal(project, IProjectChangeListener.ProjectDeleted);
+
+		try {
+			boolean isMigrated = ConfigurationManager.getManager().isMigrated(project);
+			// If it's not migrated, then it hasn't been loaded, and we don't want to load the
+			// validator and its prerequisite plug-ins until they're needed.
+			if (isMigrated) {
+				ValidatorMetaData[] vmds = ConfigurationManager.getManager().getProjectConfiguration(project).getValidators();
+				for (ValidatorMetaData vmd : vmds) {
+
+					if (!vmd.isActive()) {
+						// If this validator has not been activated, or if it has been shut down,
+						// don't activate it again.
+						continue;
+					}
+
+					IWorkbenchContext helper = null;
+					try {
+						helper = vmd.getHelper(project);
+						helper.deleting();
+					} catch (InstantiationException e) {
+						// Remove the vmd from the reader's list
+						ValidationRegistryReader.getReader().disableValidator(vmd);
+						ValidationPlugin.getPlugin().handleException(e);
+						continue;
+					} catch (Exception e) {
+						// If there is a problem with this particular helper, log the error and
+						// continue with the next validator.
+						ValidationPlugin.getPlugin().handleException(e);
+						continue;
+					}
+				}
+
+//				ConfigurationManager.getManager().deleting(project);
+			}
+		} catch (InvocationTargetException e) {
+			ValidationPlugin.getPlugin().handleException(e);
+			if (e.getTargetException() != null)
+				ValidationPlugin.getPlugin().handleException(e.getTargetException());
+
+		}
+	}
+
+	/**
+	 * If a project's description changes, The project may have changed its nature. Update the cache
+	 * to reflect the new natures. The project could be opening. Migrate.
+	 */
+	private void postAutoChange(IResourceDelta delta) {
+		if (_postAutoBuildVisitor == null) {
+			_postAutoBuildVisitor = new IResourceDeltaVisitor() {
+				public boolean visit(IResourceDelta subdelta) throws CoreException {
+					if (subdelta == null)return false;
+
+					IResource resource = subdelta.getResource();
+					if (resource instanceof IWorkspaceRoot)return true;
+					if (resource instanceof IProject) {
+						IProject project = (IProject) resource;
+						if ((subdelta.getFlags() & IResourceDelta.DESCRIPTION) == IResourceDelta.DESCRIPTION) {
+							signal(project, IProjectChangeListener.ProjectChanged);
+							return false;
+						}
+
+						if ((subdelta.getFlags() & IResourceDelta.OPEN) == IResourceDelta.OPEN) {
+							if (project.isOpen()) {
+								// Project was just opened. If project.isOpen() had returned false,
+								// project would just have been closed.
+								opening(project);
+							}
+							return false;
+						}
+						
+						if ((subdelta.getFlags() & IResourceDelta.ADDED) == IResourceDelta.ADDED) {
+							signal(project, IProjectChangeListener.ProjectAdded);
+							return false;
+						}
+					}
+
+					return false;
+				}
+			};
+		}
+
+		try {
+			delta.accept(_postAutoBuildVisitor, true);
+		} catch (CoreException exc) {
+			ValidationPlugin.getPlugin().handleException(exc);
+		}
+	}
+
+	/**
+	 * Notifies this manager that some resource changes have happened on the platform. If the change
+	 * is a project deletion, that project should be removed from the cache.
+	 * 
+	 * @see IResourceDelta
+	 * @see IResource
+	 */
+	public void resourceChanged(IResourceChangeEvent event) {
+		if (_shutdown && !isActive()) {
+			// If we're shutting down, and nothing has been activated, don't need to do anything.
+			return;
+		}
+
+		if (Tracing.isLogging()){
+			Tracing.log("Eventmanager-01: IResourceChangeEvent type=" + //$NON-NLS-1$
+				Misc.resourceChangeEventType(event.getType()) + 
+				", resource=" +  //$NON-NLS-1$
+				event.getResource() + ", source=" + event.getSource() + ", delta=" +   //$NON-NLS-1$//$NON-NLS-2$
+				event.getDelta());				
+		}
+		
+		if (event.getSource() instanceof IWorkspace) {
+			boolean isProject = event.getResource() instanceof IProject;
+			if ((event.getType() == IResourceChangeEvent.PRE_DELETE) && isProject) {
+				deleting((IProject) event.getResource());
+			} else if ((event.getType() == IResourceChangeEvent.PRE_CLOSE) && isProject) {
+				closing((IProject) event.getResource());
+			} else if (event.getType() == IResourceChangeEvent.POST_BUILD) {
+				postAutoChange(event.getDelta());
+			}
+		}
+	}
+
+	/**
+	 * Notifies this manager that the ValidationPlugin is shutting down. (Usually implies that
+	 * either the plug-in could not load, or that the workbench is shutting down.)
+	 * <p>
+	 * The manager will then notify all active helpers of the shutdown, so that they may perform any
+	 * last-minute writes to disk, cleanup, etc.
+	 */
+	public void shutdown() {
+		try {
+			// resourceChanged(IResourceChangeEvent) needs to know when a shutdown has started.
+			_shutdown = true;
+
+			// If the validators are loaded, then for every project in the workbench,
+			// we must see if it has been loaded. If it has, every enabled IWorkbenchContext
+			// must be called to clean up. If the project hasn't been loaded, then no
+			// IWorkbenchContext built anything, and there's nothing to clean up.
+			IWorkspace workspace = ResourcesPlugin.getWorkspace();
+			IWorkspaceRoot workspaceRoot = workspace.getRoot();
+			IProject[] projects = workspaceRoot.getProjects();
+			ProjectConfiguration prjp = null;
+			for (IProject project : projects) {
+				if (!project.isOpen()) {
+					// If the project isn't opened, there's nothing to clean up.
+					// If the project was opened, it would have been migrated, and there's something
+					// to clean up.
+					continue;
+				}
+
+				try {
+					boolean isMigrated = ConfigurationManager.getManager().isMigrated(project);
+					// If it's not migrated, then it hasn't been loaded, and we don't want to load
+					// the validator and its prerequisite plug-ins until they're needed.
+					if (isMigrated) {
+						prjp = ConfigurationManager.getManager().getProjectConfiguration(project);
+
+						ValidatorMetaData[] vmdList = prjp.getEnabledValidators();
+						// if vmdList is null, IProject has never been loaded, so nothing to clean up
+						if (vmdList != null) {
+							for (int j = 0; j < vmdList.length; j++) {
+								ValidatorMetaData vmd = vmdList[j];
+
+								if (!vmd.isActive()) {
+									// If this validator has not been activated, or if it has been
+									// shut down, don't activate it again.
+									continue;
+								}
+
+								IWorkbenchContext helper = vmd.getHelper(project);
+								if (helper != null) {
+									try {
+										helper.shutdown();
+									} catch (Exception exc) {
+										// Since we're shutting down, ignore the exception.
+									}
+								}
+							}
+						}
+					}
+				} catch (InvocationTargetException e) {
+					ValidationPlugin.getPlugin().handleException(e);
+					if (e.getTargetException() != null)
+						ValidationPlugin.getPlugin().handleException(e.getTargetException());
+
+				}
+			}
+		} catch (Exception exc) {
+			// Since we're shutting down, ignore the exception.
+		}
+	}
+
+	public boolean isActive() {
+		// Have to use this convoluted technique for the shutdown problem.
+		// i.e., when eclipse is shut down, if validation plug-in hasn't been loaded,
+		// the EventManager is activated for the first time, and it
+		// sends many exceptions to the .log. At first, I wrote a
+		// static method on ValidationRegistryReader, which returned true
+		// if the registry had been read, and false otherwise. However,
+		// that didn't solve the exception problem, because eclipse's
+		// class loader failed to load the ValidationRegistryReader class.
+		//
+		// The fix is to keep all shutdown mechanisms in this class.
+		// Track everything in here.
+		return _isActive;
+	}
+
+	/**
+	 * This method should only be called by the ValidationRegistryReader once the registry has been
+	 * read.
+	 */
+	public void setActive(boolean b) {
+		_isActive = b;
+	}
+
+	/**
+	 * This method should be used to determine if the workbench is running in UI or Headless.
+	 * 
+	 * @deprecated This plug-in no longer depends on jem. If you need this function use the jem
+	 * code directly.
+	 */
+	public static boolean isHeadless() {
+		//return UIContextDetermination.getCurrentContext() == UIContextDetermination.HEADLESS_CONTEXT;
+		return false;
+	}
+}
diff --git a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/FilterUtil.java b/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/FilterUtil.java
new file mode 100644
index 0000000..39a36bc
--- /dev/null
+++ b/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/FilterUtil.java
@@ -0,0 +1,658 @@
+/*******************************************************************************
+ * Copyright (c) 2001, 2008 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.wst.validation.internal;
+
+
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.resources.IResourceDelta;
+import org.eclipse.core.resources.IResourceDeltaVisitor;
+import org.eclipse.core.resources.IResourceVisitor;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.core.runtime.OperationCanceledException;
+import org.eclipse.wst.validation.internal.core.IFileDelta;
+import org.eclipse.wst.validation.internal.operations.IWorkbenchContext;
+import org.eclipse.wst.validation.internal.operations.WorkbenchFileDelta;
+import org.eclipse.wst.validation.internal.plugin.ValidationPlugin;
+
+/**
+ * Utility class for the ValidationOperation hierarchy.
+ */
+public final class FilterUtil {
+	private static VMDDeltaVisitor _deltaVisitor = null;
+	private static VMDResourceVisitor _resourceVisitor = null;
+
+	private interface VMDRecorder {
+		public Map<ValidatorMetaData, Set<IFileDelta>> getResult();
+
+		public void setEnabledValidators(Set<ValidatorMetaData> enabledValidators);
+
+		public void setProgressMonitor(IProgressMonitor monitor);
+
+		public IProgressMonitor getProgressMonitor();
+	}
+
+	private interface VMDDeltaVisitor extends VMDRecorder, IResourceDeltaVisitor {
+	}
+
+	private interface VMDResourceVisitor extends VMDRecorder, IResourceVisitor {
+	}
+
+	private FilterUtil() {
+	}
+
+	/**
+	 * Given a Set of enabled ValidatorMetaData, create a Map with each ValidatorMetaData as a key
+	 * with an associated null value.
+	 */
+	static Map<ValidatorMetaData, Set<IFileDelta>> wrapInMap(Set<ValidatorMetaData> enabledValidators) {
+		Map<ValidatorMetaData, Set<IFileDelta>> result = new HashMap<ValidatorMetaData, Set<IFileDelta>>();
+		if ((enabledValidators == null) || (enabledValidators.size() == 0))return result;
+
+		for (ValidatorMetaData vmd : enabledValidators)result.put(vmd, null);
+		return result;
+	}
+
+	static void checkCanceled(IProgressMonitor monitor) throws OperationCanceledException {
+		if (monitor == null)return;
+		else if (monitor.isCanceled())throw new OperationCanceledException(""); //$NON-NLS-1$
+	}
+
+	/**
+	 * Given a Map of VMD <=>Set(IFileDelta), either return the existing Set or create a Set and
+	 * return it.
+	 */
+	private static Set<IFileDelta> getResourceDeltas(Map<ValidatorMetaData, Set<IFileDelta>> enabledValidators, 
+			ValidatorMetaData vmd) {
+		Set<IFileDelta> fileDeltas = enabledValidators.get(vmd);
+		if (fileDeltas == null) {
+			fileDeltas = new HashSet<IFileDelta>();
+			enabledValidators.put(vmd, fileDeltas);
+		}
+		return fileDeltas;
+	}
+
+	/**
+	 * Given the IFileDelta type, return the corresponding IResourceDelta type.
+	 */
+	private static int getResourceDeltaType(int ifileDeltaType) {
+		switch (ifileDeltaType) {
+			case (IFileDelta.ADDED) : {
+				return IResourceDelta.ADDED;
+			}
+
+			case (IFileDelta.DELETED) : {
+				return IResourceDelta.REMOVED;
+			}
+
+			case (IFileDelta.CHANGED) :
+			default : {
+				return IResourceDelta.CHANGED;
+			}
+		}
+	}
+
+	/**
+	 * Given the IResourceDelta type, return the corresponding IFileDelta type.
+	 */
+	static int getFileDeltaType(int iresourceDeltaType) {
+		switch (iresourceDeltaType) {
+			case IResourceDelta.ADDED : // resource has been added to the workbench
+			{
+				return IFileDelta.ADDED;
+			}
+
+			case IResourceDelta.CHANGED : // resources has been changed in the workbench
+			{
+				return IFileDelta.CHANGED;
+			}
+
+			case IResourceDelta.REMOVED : // resource has been deleted from the workbench
+			{
+				return IFileDelta.DELETED;
+			}
+
+			case IResourceDelta.ADDED_PHANTOM : // incoming workbench resource
+			{
+				return IFileDelta.ADDED;
+			}
+
+			case IResourceDelta.REMOVED_PHANTOM : // outgoing workbench resource
+			{
+				return IFileDelta.DELETED;
+			}
+
+			default : {
+				return IFileDelta.CHANGED;
+			}
+		}
+	}
+
+
+	/**
+	 * Return the validators which are both configured on this type of project, (as stored in
+	 * getProject()), and enabled by the user on this project.
+	 */
+	static void addFileDelta(Map<ValidatorMetaData, Set<IFileDelta>> enabledValidators, 
+			ValidatorMetaData vmd, WorkbenchFileDelta fileDelta) {
+		Set<IFileDelta> fileDeltas = getResourceDeltas(enabledValidators, vmd);
+		fileDeltas.add(fileDelta);
+		enabledValidators.put(vmd, fileDeltas);
+	}
+
+	/**
+	 * Return a Map wrapper, with each VMD from enabledValidators as the key, and the value a Set of
+	 * IFileDelta wrapper around the changed Object[].
+	 * 
+	 * If filterIn is true, do not check if the resources are filtered in by the validator. If
+	 * filterIn is false, check if the resources are filtered in by the validator (recommended).
+	 */
+	public static Map<ValidatorMetaData, Set<IFileDelta>> 
+		getFileDeltas(Set<ValidatorMetaData> enabledValidators, Object[] changedResources, boolean filterIn) {
+		// by default assume that the resources have changed, i.e. not added or deleted
+		return getFileDeltas(enabledValidators, changedResources, IFileDelta.CHANGED, filterIn); 
+	}
+
+	/**
+	 * Return a Map wrapper, with each VMD from enabledValidators as the key, and the value a Set of
+	 * IFileDelta wrapper around the changed Object[], with each delta of type deltaType.
+	 */
+	public static Map<ValidatorMetaData, Set<IFileDelta>> 
+		getFileDeltas(Set<ValidatorMetaData> enabledValidators, Object[] changedResources, int ifileDeltaType) {
+		// by default check if the Objects are filtered in by the validator
+		return getFileDeltas(enabledValidators, changedResources, ifileDeltaType, false); 
+	}
+
+	/**
+	 * Return a Map wrapper, with each VMD from enabledValidators as the key, and the value a Set of
+	 * IFileDelta wrapper around the changed Object[].
+	 * <p>
+	 * If "force" is true, then don't check if the object is filtered in by the validator or not.
+	 * ValidatorSubsetOperation can use validators that don't filter in these particular resources,
+	 * but can use a defaultExtension's validators instead.
+	 */
+	public static Map<ValidatorMetaData, Set<IFileDelta>> getFileDeltas(Set<ValidatorMetaData> enabledValidators, 
+		Object[] changedResources, int ifileDeltaType, boolean force) {
+		
+		Map<ValidatorMetaData, Set<IFileDelta>> result = new HashMap<ValidatorMetaData, Set<IFileDelta>>();
+		if ((enabledValidators == null) || (enabledValidators.size() == 0)) {
+			return result;
+		}
+
+		boolean cannotLoad = false;
+		IWorkbenchContext helper = null;
+		for (ValidatorMetaData vmd : enabledValidators) {
+			try {
+				Set<IFileDelta> deltas = new HashSet<IFileDelta>();
+				IProgressMonitor monitor = new NullProgressMonitor();
+				for (int i = 0; i < changedResources.length; i++) {
+					Object obj = changedResources[i];
+					WorkbenchFileDelta wfd = null;
+					if (obj instanceof IResource) {
+						IResource res = (IResource) obj;
+						if (force || !filterOut(monitor, vmd, res, getResourceDeltaType(ifileDeltaType))) {
+							helper = vmd.getHelper(res.getProject());
+
+							wfd = getFileDelta(helper, vmd, res, getResourceDeltaType(ifileDeltaType));
+						}
+					} else {
+						wfd = new WorkbenchFileDelta(obj);
+					}
+
+					if (wfd != null) {
+						deltas.add(wfd);
+					}
+				}
+				result.put(vmd, deltas);
+			} catch (InstantiationException e) {
+				cannotLoad = true;
+
+				// Remove the vmd from the reader's list
+				ValidationRegistryReader.getReader().disableValidator(vmd);
+				ValidationPlugin.getPlugin().handleException(e);
+				continue;
+			}
+
+		}
+
+		if (cannotLoad) {
+			// Some of the validators should not be in the result set because either their
+			// validator class or helper class could not be instantiated.
+			Object[] vmds = enabledValidators.toArray();
+			for (int i = 0; i < vmds.length; i++) {
+				ValidatorMetaData vmd = (ValidatorMetaData) vmds[i];
+				if (vmd.cannotLoad()) {
+					result.remove(vmd);
+				}
+			}
+		}
+
+		return result;
+	}
+
+	public static WorkbenchFileDelta getFileDelta(IWorkbenchContext helper, ValidatorMetaData vmd, IResource resource, int iresourceDeltaType) {
+		// strip off the eclipse-specific information
+		String fileName = helper.getPortableName(resource);
+		if (fileName == null) {
+			// The resource is not contained in the current project.
+			// Can't see how this would happen, but check for it anyway.
+			
+			// [122960] null should be allowed
+//			String result = MessageFormat.format(ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_EXC_SYNTAX_NULL_NAME), 
+//				new Object[]{resource.getName(), vmd.getValidatorDisplayName()});
+//			ValidationPlugin.getPlugin().logMessage(IStatus.ERROR, result);
+
+			IPath resourcePath = resource.getFullPath();
+			if (resourcePath != null) {
+				// Since null file names are not allowed, default to the fully-qualified name of the
+				// resource.
+				fileName = resourcePath.toString();
+			} else {
+				ValidationPlugin.getPlugin().logMessage(IStatus.ERROR, 
+					"portableName is null and path is null for resource " + resource); //$NON-NLS-1$
+				return null;
+			}
+		}
+
+		int ifileDeltaType = getFileDeltaType(iresourceDeltaType);
+		return new WorkbenchFileDelta(fileName, ifileDeltaType, resource);
+	}
+
+
+	/**
+	 * Add the IResource to the vmd's list of resources to validate. Return true if the add was
+	 * successful or false if the add was not successful.
+	 */
+	static boolean addToFileList(Map<ValidatorMetaData, Set<IFileDelta>> enabledValidators, IWorkbenchContext helper, ValidatorMetaData vmd, IResource resource, int resourceDelta, boolean isFullBuild) {
+		if ((vmd == null) || (resource == null)) {
+			return false;
+		}
+
+		try {
+			helper.registerResource(resource);
+		} catch (Exception exc) {
+			ValidationPlugin.getPlugin().handleException(exc);
+			InternalValidatorManager.getManager().addInternalErrorTask(resource.getProject(), vmd, exc);
+
+			// Don't return ... even though the register threw an exception, that's not to say
+			// that the validator can't validate.
+		}
+
+		if (isFullBuild) {
+			// To indicate a full build to the validator, don't build up a list of files;
+			// pass in null instead. Given that the list of files should not be used,
+			// don't calculate it.
+			return true;
+		}
+
+
+		WorkbenchFileDelta newFileDelta = getFileDelta(helper, vmd, resource, resourceDelta);
+		if (newFileDelta != null) {
+			// if delta is null, getFileDelta will have logged the problem already
+			addFileDelta(enabledValidators, vmd, newFileDelta);
+		}
+
+		return true;
+	}
+
+	/**
+	 * Whether a full verification or a delta verification is in progress, both will call this
+	 * method to process the resource. This method calls the current Validator to filter the
+	 * resource (i.e., this method returns if the resource fails the filter test).
+	 * <code>process</code> also sends output to the <code>IProgressMonitor</code>, and calls
+	 * the current Validator to validate the resource.
+	 * 
+	 * To process a resource, there are several steps: 1. check if the resource is registered for
+	 * this validator (i.e., the validator has either specified it in a filter, or has not filtered
+	 * it out explicitly) 2. call <code>isValidationSource</code> on the current validator with
+	 * the current resource. This method performs further filtering by the Validator itself, in
+	 * addition to the static filtering done by the framework, based on the information in
+	 * plugin.xml. 3. If the resource passes both filters, call <code>validate</code> on the
+	 * validator, with the resource. 4. When complete (either by failing to pass a filter, or by the
+	 * completion of the <code>validate</code>), increment the IProgressMonitor's status by one
+	 * (i.e., one resource has been processed.)
+	 */
+	static boolean filterOut(IProgressMonitor monitor, ValidatorMetaData vmd, IResource resource, int resourceDelta) {
+		if (monitor == null) {
+			return false;
+		}
+
+		checkCanceled(monitor);
+		return !(vmd.isApplicableTo(resource, resourceDelta));
+	}
+
+	/**
+	 * Whether a full verification or a delta verification is in progress, both
+	 * will call this method to process the resource. This method calls the
+	 * current Validator to filter the resource (i.e., this method returns if
+	 * the resource fails the filter test). It also sends output to the
+	 * <code>IProgressMonitor</code>, and calls the current Validator to
+	 * validate the resource.
+	 * <p>
+	 * To process a resource, there are several steps:
+	 * <ol>
+	 * <li>Check if the resource is registered for this validator (i.e., the
+	 * validator has either specified it in a filter, or has not filtered it out
+	 * explicitly)
+	 * <li>Call <code>isValidationSource</code> on the current validator with
+	 * the current resource. This method performs further filtering by the
+	 * Validator itself, in addition to the static filtering done by the
+	 * framework, based on the information in the extension point.
+	 * <li>If the resource passes both filters, call <code>validate</code> on
+	 * the validator, with the resource.
+	 * <li>When complete (either by failing to pass a filter, or by the
+	 * completion of the <code>validate</code>), increment the
+	 * IProgressMonitor's status by one (i.e., one resource has been processed.)
+	 * </ol>
+	 */
+	static void filterOut(IProgressMonitor monitor, Map<ValidatorMetaData, Set<IFileDelta>> enabledValidators, 
+		IResource resource, int resourceDelta, boolean isFullBuild) {
+		if (monitor == null)return;
+
+		checkCanceled(monitor);
+
+		boolean cannotLoad = false;
+		for (ValidatorMetaData vmd : enabledValidators.keySet()) {
+			checkCanceled(monitor);
+
+			if (!filterOut(monitor, vmd, resource, resourceDelta)) {
+				try {
+					// Notify the helper that a resource is about to be filtered in
+					IWorkbenchContext helper = vmd.getHelper(resource.getProject());
+					addToFileList(enabledValidators, helper, vmd, resource, resourceDelta, isFullBuild);
+				} catch (InstantiationException e) {
+					cannotLoad = true;
+
+					// Remove the vmd from the reader's list
+					ValidationRegistryReader.getReader().disableValidator(vmd);
+					ValidationPlugin.getPlugin().handleException(e);
+				}
+			}
+		}
+
+		if (cannotLoad) {
+			// Some of the validators need to be removed from the set because the validator
+			// or helper cannot be instantiated.
+			Object[] vmds = enabledValidators.keySet().toArray();
+			for (int i = 0; i < vmds.length; i++) {
+				ValidatorMetaData vmd = (ValidatorMetaData) vmds[i];
+				if (vmd.cannotLoad()) {
+					enabledValidators.remove(vmd);
+				}
+			}
+		}
+	}
+
+	/**
+	 * Whether a full verification or a delta verification is in progress, both will call this
+	 * method to process the resource. This method calls the current Validator to filter the
+	 * resource (i.e., this method returns if the resource fails the filter test).
+	 * <code>process</code> also sends output to the <code>IProgressMonitor</code>, and calls
+	 * the current Validator to validate the resource.
+	 * 
+	 * This method is called during an incremental, not a full, validation. The full validation
+	 * fakes an IResourceDelta, and the incremental needs to check that the delta is one of the
+	 * deltas which is filtered in by the validation framework.
+	 * 
+	 * @see filterOut(IResourceDelta)
+	 * 
+	 * To process a resource, there are several steps: 1. check if the resource is registered for
+	 * this validator (i.e., the validator has either specified it in a filter, or has not filtered
+	 * it out explicitly) 2. call <code>isValidationSource</code> on the current validator with
+	 * the current resource. This method performs further filtering by the Validator itself, in
+	 * addition to the static filtering done by the framework, based on the information in
+	 * plugin.xml. 3. If the resource passes both filters, call <code>validate</code> on the
+	 * validator, with the resource. 4. When complete (either by failing to pass a filter, or by the
+	 * completion of the <code>validate</code>), increment the IProgressMonitor's status by one
+	 * (i.e., one resource has been processed.)
+	 */
+	static void filterOut(IProgressMonitor monitor, Map<ValidatorMetaData, Set<IFileDelta>> enabledValidators, 
+			IResource resource, IResourceDelta delta) {
+		// filter in only resources which have been added, deleted, or its content changed.
+		// moves will be registered as an add & delete combination
+		if (filterOut(delta))return;
+		
+		filterOut(monitor, enabledValidators, resource, delta.getKind(), false); // false =
+		// incremental
+		// build
+	}
+
+	/**
+	 * Filter out resource deltas which don't correspond to changes that validators can validate.
+	 * 
+	 * This method will filter in deltas only if the delta is an add, a delete, or if the content of
+	 * the file has changed.
+	 * 
+	 * Return true if the delta should be filtered out, and false if we should validate it.
+	 * 
+	 * @see IResourceDelta
+	 */
+	static boolean filterOut(IResourceDelta delta) {
+		if (delta == null) {
+			return true;
+		}
+
+		switch (delta.getKind()) {
+			case IResourceDelta.ADDED : // resource has been added to the workbench
+			{
+				return false;
+			}
+
+			case IResourceDelta.REMOVED : // resource has been deleted from the workbench
+			{
+				// If the delta is an IProject, and the IProject is getting deleted or closed, don't
+				// validate it or its children.
+				if (delta.getResource() instanceof IProject) {
+					return true;
+				}
+				return false;
+			}
+
+			case IResourceDelta.CHANGED : // resources has been changed in the workbench
+			{
+				// We want to add the enterprise bean only if its source file's
+				// contents have changed. (for example, if a folder has been
+				// added to the project, the IFile will be changed because
+				// its position has been changed, but the enterprise bean
+				// doesn't need to be redeployed. See IResourceDelta.getFlags()
+				// for more information.)
+				//
+				// Or, if ejb-jar.xml has changed, the EJBJar is destroyed & created
+				// from scratch, so the list of EnterpriseBean is new. Purge the old
+				// EJBJar from the EJBCache (since it will never be referenced again),
+				// and load the new EJBJar into the cache.
+				if ((delta.getResource() instanceof IFile) && ((delta.getFlags() & IResourceDelta.CONTENT) != 0)) {
+					return false;
+				}
+			}
+		}
+		return true;
+	}
+
+	/**
+	 * This method returns true if the given resource and its children should be processed by the
+	 * validators. That is, there are several types of changes which can occur to an IProject which
+	 * should not trigger a revalidation of the project or its children. (e.g. project is deleted or
+	 * closed.) For those cases, or if the IResourceDelta is invalid, this method will return false
+	 * (do not validate the IProject or its children). Otherwise, return true (validate the resource &
+	 * its children). If an IProject itself has not changed, but one of its children has
+	 * (delta.getKind() of NO_CHANGE), then return true so that the children are validated.
+	 */
+	static boolean shouldProcess(IResource resource, IResourceDelta delta) {
+		if ((resource != null) && !(resource instanceof IProject)) {
+			return true;
+		}
+
+		if (delta == null) {
+			return false;
+		}
+
+		switch (delta.getKind()) {
+			case IResourceDelta.ADDED : // resource has been deleted from the workbench; may be part
+			// of a move
+			{
+				if (0 != (delta.getFlags() & IResourceDelta.MOVED_FROM)) {
+					// If it's being moved, don't revalidate its children. If it's being added, fall
+					// through to the "return true;" at the end of this method.
+					return false;
+				}
+				break;
+			}
+
+			case IResourceDelta.REMOVED : // resource has been deleted from the workbench; may be
+			// part of a move
+			{
+				// Whether it's being deleted or moved, don't revalidate its children.
+				return false;
+			}
+
+			case IResourceDelta.CHANGED : // resource has been changed in the workbench; may be part
+			// of a move
+			{
+				if ((delta.getFlags() & IResourceDelta.OPEN) != 0) {
+					// Change is related to the OPEN bit. Whether the project was closed and is now
+					// open,
+					// or the project was open and is now closed, don't need to revalidate the
+					// children.
+					return false;
+				} else if ((delta.getFlags() & IResourceDelta.REPLACED) != 0) {
+					// project was moved
+					return false;
+				}
+
+				break;
+			}
+		}
+
+		return true;
+	}
+
+	private static VMDResourceVisitor getResourceVisitor(IProgressMonitor monitor, Set<ValidatorMetaData> enabledValidators) {
+		if (_resourceVisitor == null) {
+			_resourceVisitor = new VMDResourceVisitor() {
+				private Map<ValidatorMetaData, Set<IFileDelta>> _vmdDeltas = null;
+				private IProgressMonitor _progressMonitor = null;
+
+				public Map<ValidatorMetaData, Set<IFileDelta>> getResult() {
+					return _vmdDeltas;
+				}
+
+				public void setEnabledValidators(Set<ValidatorMetaData> validators) {
+					_vmdDeltas = wrapInMap(validators);
+				}
+
+				public IProgressMonitor getProgressMonitor() {
+					return _progressMonitor;
+				}
+
+				public void setProgressMonitor(IProgressMonitor m) {
+					_progressMonitor = m;
+				}
+
+				public boolean visit(IResource res) throws CoreException {
+					FilterUtil.checkCanceled(getProgressMonitor());
+
+					// We don't need to filter out anything, because a full validation
+					// is about to be performed.
+					filterOut(getProgressMonitor(), _vmdDeltas, res, IResourceDelta.CHANGED, true);
+
+					return true; // visit the resource's children as well
+				}
+			};
+		}
+		_resourceVisitor.setProgressMonitor(monitor);
+		_resourceVisitor.setEnabledValidators(enabledValidators);
+
+		return _resourceVisitor;
+	}
+
+	private static VMDDeltaVisitor getDeltaVisitor(IProgressMonitor monitor, Set<ValidatorMetaData> enabledValidators) {
+		if (_deltaVisitor == null) {
+			_deltaVisitor = new VMDDeltaVisitor() {
+				private Map<ValidatorMetaData, Set<IFileDelta>> _vmdDeltas = null;
+				private IProgressMonitor _progressMonitor = null;
+
+				public Map<ValidatorMetaData, Set<IFileDelta>> getResult() {
+					return _vmdDeltas;
+				}
+
+				public void setEnabledValidators(Set<ValidatorMetaData> validators) {
+					_vmdDeltas = wrapInMap(validators);
+				}
+
+				public IProgressMonitor getProgressMonitor() {
+					return _progressMonitor;
+				}
+
+				public void setProgressMonitor(IProgressMonitor m) {
+					_progressMonitor = m;
+				}
+
+				public boolean visit(IResourceDelta subdelta) throws CoreException {
+					checkCanceled(getProgressMonitor());
+					if (subdelta == null)
+						return true;
+
+					IResource resource = subdelta.getResource();
+
+					if (Tracing.isLogging(2)) {
+						StringBuffer buffer = new StringBuffer("FilterUtil-01: subdelta of "); //$NON-NLS-1$
+						buffer.append(resource.getName());
+						buffer.append(" has resource delta kind: "); //$NON-NLS-1$
+						buffer.append(subdelta.getKind());
+						buffer.append(" Does the resource exist? "); //$NON-NLS-1$
+						buffer.append(resource.exists());
+						buffer.append(" Is it a phantom? "); //$NON-NLS-1$
+						buffer.append(resource.isPhantom());
+						Tracing.log(buffer);
+					}
+
+					// If the delta is an IProject, and the IProject is getting deleted or closed,
+					// don't validate it or its children.
+					if (shouldProcess(resource, subdelta)) {
+						filterOut(getProgressMonitor(), _vmdDeltas, resource, subdelta);
+						return true; // visit the delta's children as well
+					}
+					return false; // do not visit the delta's children
+				}
+			};
+		}
+		_deltaVisitor.setProgressMonitor(monitor);
+		_deltaVisitor.setEnabledValidators(enabledValidators);
+
+		return _deltaVisitor;
+	}
+
+	public static Map<ValidatorMetaData, Set<IFileDelta>> loadDeltas(final IProgressMonitor monitor, 
+			final Set<ValidatorMetaData> enabledValidators,	IResourceDelta delta) throws CoreException {
+		VMDDeltaVisitor visitor = getDeltaVisitor(monitor, enabledValidators);
+		delta.accept(visitor, true); // true means include phantom resources
+		return visitor.getResult();
+	}
+
+	public static Map<ValidatorMetaData, Set<IFileDelta>> loadDeltas(final IProgressMonitor monitor, 
+			final Set<ValidatorMetaData> enabledValidators,	IProject project) throws CoreException {
+		VMDResourceVisitor visitor = getResourceVisitor(monitor, enabledValidators);
+		project.accept(visitor, IResource.DEPTH_INFINITE, true); // true means include phantom
+		// resources
+		return visitor.getResult();
+	}
+}
diff --git a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/GlobalConfiguration.java b/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/GlobalConfiguration.java
new file mode 100644
index 0000000..20c044f
--- /dev/null
+++ b/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/GlobalConfiguration.java
@@ -0,0 +1,197 @@
+/*******************************************************************************
+ * Copyright (c) 2001, 2008 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.wst.validation.internal;
+
+import java.lang.reflect.InvocationTargetException;
+
+import org.eclipse.core.resources.IMarker;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.resources.IWorkspaceRoot;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.wst.validation.internal.plugin.ValidationPlugin;
+
+
+/**
+ * This class represents the global Preferences as set on the Validation Preferences page.
+ */
+public class GlobalConfiguration extends ValidationConfiguration {
+	static final boolean PREF_PROJECTS_CAN_OVERRIDE_DEFAULT = true;
+	static final boolean PREF_SAVE_AUTOMATICALLY_DEFAULT = false;
+
+	private boolean _canProjectsOverride = getCanProjectsOverrideDefault();
+	private boolean _saveAutomatically = getSaveAutomaticallyDefault();
+
+	/**
+	 * This constructor should be used in all cases except for the Preference page's values.
+	 */
+	public GlobalConfiguration(IWorkspaceRoot root) throws InvocationTargetException {
+		super(root, convertToArray(ValidationRegistryReader.getReader().getAllValidators()));
+
+		// Can't put the call to load() and passivate() in the ValidationConfiguration constructor due
+		// to the order of initialization.
+		//    1. First the ValidationConfiguration constructor is called, and that loads the stored values.
+		//    2. Then this class's <init> method is called, and that initializes the "override" field
+		// 	  to the default, which may be different than the stored value.
+	}
+
+	/**
+	 * This constructor is provided only for the Preference page, so that the page can store values
+	 * without persisting them (i.e., if the user presses Cancel then nothing needs to be done.)
+	 */
+	public GlobalConfiguration(GlobalConfiguration original) throws InvocationTargetException {
+		super(original.getResource());
+		original.copyTo(this);
+	}
+
+	public boolean canProjectsOverride() {
+		return _canProjectsOverride;
+	}
+
+	public void setCanProjectsOverride(boolean can) {
+		_canProjectsOverride = can;
+	}
+	
+	public boolean getSaveAutomatically() {
+		return _saveAutomatically;
+	}
+	
+	public void setSaveAutomatically(boolean save) {
+		_saveAutomatically = save;
+	}
+
+	public void resetToDefault()  throws InvocationTargetException {
+		setDisableAllValidation(getDisableValidationDefault());
+		setEnabledValidators(getEnabledValidatorsDefault());
+		setEnabledManualValidators(getManualEnabledValidators());
+		setEnabledBuildValidators(getBuildEnabledValidators());
+		setCanProjectsOverride(getCanProjectsOverrideDefault());
+		setSaveAutomatically(getSaveAutomaticallyDefault());
+		setDefaultDelegates(getValidators());
+	}
+
+	/**
+	 * This method exists only for migration purposes. The root marker must be deleted after
+	 * migration is complete.
+	 */
+	protected IMarker[] getMarker() {
+		try {
+			IWorkspaceRoot root = getRoot();
+			IMarker[] markers = root.findMarkers(ConfigurationConstants.PREFERENCE_MARKER, false, IResource.DEPTH_ONE);
+
+			if (markers.length == 1) {
+				return markers;
+			}
+			// job is done. Nothing to migrate.
+			return null;
+
+		} catch (CoreException e) {
+			// Can't find the IMarker? Assume it's deleted.
+			ValidationPlugin.getPlugin().handleException(e);
+			return null;
+		}
+	}
+
+	protected void load(IMarker[] marker) throws InvocationTargetException {
+		// The 5.0 preferences were stored in an IMarker, and the current.preferences are stored in
+		// PersistentProperties on the IResource.
+		// A 5.0 root can have no marker values if the preference page, properties page, and
+		// validation were never viewed or run.
+		try {
+			IWorkspaceRoot root = getRoot();
+			if (marker == null) {
+				// There were no global preferences in 4.03, so the migration is to create some.
+				resetToDefault(); // assign the default values to the new Global Preference
+				return;
+			}
+
+			IMarker rootMarker = marker[0]; // getMarker() has already checked that there's a marker
+			// in the array
+//			ValidatorMetaData[] enabledValidators = null;
+//			String enabledValidatorsString = (String) getValue(rootMarker, ConfigurationConstants.ENABLED_VALIDATORS);
+//			if (enabledValidatorsString == null) {
+//				enabledValidators = ConfigurationConstants.DEFAULT_ENABLED_VALIDATORS;
+//			} else {
+//				enabledValidators = getStringAsEnabledElementsArray(enabledValidatorsString);
+//			}
+//
+//			setEnabledValidators(enabledValidators);
+			String enabledManualValidators = (String) getValue(rootMarker, ConfigurationConstants.ENABLED_MANUAL_VALIDATORS);
+			setEnabledManualValidators(getStringAsEnabledElementsArray(enabledManualValidators));
+			String enabledBuildValidators = (String) getValue(rootMarker, ConfigurationConstants.ENABLED_BUILD_VALIDATORS);
+			setEnabledManualValidators(getStringAsEnabledElementsArray(enabledBuildValidators));
+//			if (enabledManualValidators.equals(null) || enabledBuildValidators.equals(null)) 
+//				enabledValidators = ConfigurationConstants.DEFAULT_ENABLED_VALIDATORS;
+			setCanProjectsOverride(getValue(rootMarker, ConfigurationConstants.PREF_PROJECTS_CAN_OVERRIDE, PREF_PROJECTS_CAN_OVERRIDE_DEFAULT));
+			root.getWorkspace().deleteMarkers(marker);
+		} catch (CoreException e) {
+			ValidationPlugin.getPlugin().handleException(e);
+		}
+	}
+
+	protected void copyTo(GlobalConfiguration gp) throws InvocationTargetException {
+		super.copyTo(gp);
+
+		// Need to have a distinct method for this child class (i.e., the parameter
+		// is not a ValidationConfiguration) because if this initialization is
+		// called as part of ValidationConfiguration's constructor, then the value of
+		// this field is overwritten. Fields of this class are initialized to the
+		// default after the ValidationConfiguration parent is created.
+		gp.setCanProjectsOverride(canProjectsOverride());
+		gp.setSaveAutomatically(getSaveAutomatically());
+	}
+
+	public static boolean getCanProjectsOverrideDefault() {
+		return PREF_PROJECTS_CAN_OVERRIDE_DEFAULT;
+	}
+	
+	public static boolean getSaveAutomaticallyDefault() {
+		return PREF_SAVE_AUTOMATICALLY_DEFAULT;
+	}
+
+	/**
+	 * @see org.eclipse.wst.validation.internal.operations.internal.attribute.ValidationConfiguration#deserialize(String)
+	 */
+	public void deserialize(String storedConfiguration) throws InvocationTargetException {
+		super.deserialize(storedConfiguration);
+
+		if (storedConfiguration != null && storedConfiguration.length() > 0) {
+			// If it's null, then super.deserialize has already called resetToDefault to initialize
+			// this instance.
+			int canOverrideIndex = storedConfiguration.indexOf(ConfigurationConstants.PREF_PROJECTS_CAN_OVERRIDE);
+			int disableAllValidationIndex = storedConfiguration.indexOf(ConfigurationConstants.DISABLE_ALL_VALIDATION_SETTING);
+			int saveAutomaticallyIndex = storedConfiguration.indexOf(ConfigurationConstants.SAVE_AUTOMATICALLY_SETTING);
+			if (disableAllValidationIndex != -1) {
+				String canOverride = storedConfiguration.substring(canOverrideIndex + ConfigurationConstants.PREF_PROJECTS_CAN_OVERRIDE.length(), disableAllValidationIndex);
+				setCanProjectsOverride(Boolean.valueOf(canOverride).booleanValue());
+			}
+			if(saveAutomaticallyIndex != -1)
+			{
+				String saveAutomatically = storedConfiguration.substring(saveAutomaticallyIndex + ConfigurationConstants.SAVE_AUTOMATICALLY_SETTING.length(), canOverrideIndex);
+				setSaveAutomatically(Boolean.valueOf(saveAutomatically).booleanValue());
+			}
+		}
+	}
+
+	/**
+	 * @see org.eclipse.wst.validation.internal.operations.internal.attribute.ValidationConfiguration#serialize()
+	 */
+	public String serialize() throws InvocationTargetException {
+		StringBuffer buffer = new StringBuffer();
+		buffer.append(ConfigurationConstants.SAVE_AUTOMATICALLY_SETTING);
+		buffer.append(String.valueOf(getSaveAutomatically()));
+		buffer.append(ConfigurationConstants.PREF_PROJECTS_CAN_OVERRIDE);
+		buffer.append(String.valueOf(canProjectsOverride()));
+		buffer.append(super.serialize());
+		return buffer.toString();
+	}
+
+	
+}
diff --git a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/IProjectValidationHelper.java b/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/IProjectValidationHelper.java
new file mode 100644
index 0000000..959988e
--- /dev/null
+++ b/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/IProjectValidationHelper.java
@@ -0,0 +1,27 @@
+/*******************************************************************************
+ * Copyright (c) 2001, 2007 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.wst.validation.internal;
+
+import org.eclipse.core.resources.IContainer;
+import org.eclipse.core.resources.IProject;
+
+/**
+ * ValidatorHelper extensions must implement this interface.
+ */
+public interface IProjectValidationHelper {
+	
+	public IContainer[] getOutputContainers(IProject project);
+	
+	public IContainer[] getSourceContainers(IProject project);
+	
+	public void disposeInstance();
+
+}
diff --git a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/IValidationSelectionHandler.java b/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/IValidationSelectionHandler.java
new file mode 100644
index 0000000..38292b6
--- /dev/null
+++ b/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/IValidationSelectionHandler.java
@@ -0,0 +1,35 @@
+/*******************************************************************************
+ * Copyright (c) 2001, 2004 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ * IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.wst.validation.internal;
+
+import org.eclipse.core.resources.IResource;
+
+/**
+ * This is used by extensions to add valid validation types to the validate
+ * menu action.
+ */
+public interface IValidationSelectionHandler {
+
+	/**
+	 * Return a valid IResource type for the extensible object selection,
+	 * should be instance of IFolder, IFile, or IProject if this extension knows
+	 * how to handle the selection, otherwise it should return null
+	 */ 
+	public IResource getBaseValidationType(Object selection);
+	
+	/**
+	 * @return the classname of the validation type to register for validation
+	 */
+	public String getValidationTypeString();
+	
+	public void setValidationTypeString(String validationType);
+	
+}
diff --git a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/InternalValidatorManager.java b/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/InternalValidatorManager.java
new file mode 100644
index 0000000..5f9dba8
--- /dev/null
+++ b/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/InternalValidatorManager.java
@@ -0,0 +1,183 @@
+/*******************************************************************************
+ * Copyright (c) 2001, 2008 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.wst.validation.internal;
+
+
+import java.lang.reflect.InvocationTargetException;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.Set;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.Path;
+import org.eclipse.wst.validation.internal.core.Message;
+import org.eclipse.wst.validation.internal.operations.WorkbenchReporter;
+import org.eclipse.wst.validation.internal.plugin.ValidationPlugin;
+import org.eclipse.wst.validation.internal.provisional.core.IMessage;
+
+public final class InternalValidatorManager {
+	private static InternalValidatorManager _inst = null;
+	private static final String OP_GROUP = "ValidationOperation"; //$NON-NLS-1$ // when the ValidationOperation
+
+	// adds a message to the task
+	// list; e.g. cancel, or internal
+	// error, this group name is used
+	// to distinguish between the
+	// messages that the validator
+	// itself put, and the ones which
+	// the validator owns, but the
+	// operation put. //$NON-NLS-1$
+
+	private InternalValidatorManager() {
+		//default
+	}
+
+	public static InternalValidatorManager getManager() {
+		if (_inst == null) {
+			_inst = new InternalValidatorManager();
+		}
+		return _inst;
+	}
+
+	/**
+	 * Return a new Set that contains all of the elements from the array.
+	 */
+	public static Set<ValidatorMetaData> wrapInSet(ValidatorMetaData[] vmds) {
+		Set<ValidatorMetaData> result = new HashSet<ValidatorMetaData>();
+		if ((vmds == null) || (vmds.length == 0))return result;
+
+		for (ValidatorMetaData vmd : vmds)result.add(vmd);
+
+		return result;
+	}
+
+	/**
+	 * If the current validator throws a Throwable, log the internal error to the task list.
+	 * 
+	 * This method is for use by the validation framework only.
+	 */
+	public void addInternalErrorTask(IProject project, ValidatorMetaData vmd, Throwable exc) {
+		addOperationTask(project, vmd, ResourceConstants.VBF_EXC_INTERNAL, new String[]{project.getName(), vmd.getValidatorDisplayName(), ((exc.getMessage() == null) ? "" : exc.getMessage())}); //$NON-NLS-1$
+	}
+
+	/**
+	 * If the user is cancelling validation on the current project/resource, Add an information task
+	 * to the task list informing the user that validation has not been run on the current project.
+	 * 
+	 * If the current validator throws a Throwable, log the internal error to the task list.
+	 */
+	public void addOperationTask(IProject project, ValidatorMetaData vmd, String messageId, String[] parms) {
+		Message message = ValidationPlugin.getMessage();
+		message.setSeverity(IMessage.LOW_SEVERITY);
+		message.setId(messageId);
+		message.setParams(parms);
+		message.setGroupName(OP_GROUP);
+
+		// Although the message is owned by the validator, the string of the message has to be
+		// loaded by this class' ClassLoader
+		WorkbenchReporter.addMessage(project, vmd.getValidatorUniqueName(), getClass().getClassLoader(), message);
+	}
+
+
+	/**
+	 * If the user cancelled the previous validation with this validator, or if there was a
+	 * Throwable caught during the last execution of this validator, and the validator is in the
+	 * process of validating now, remove the former information task messages.
+	 */
+	public void removeOperationTasks(IProject project, ValidatorMetaData vmd) {
+		WorkbenchReporter.removeMessageSubset(project, vmd.getValidatorUniqueName(), OP_GROUP);
+	}
+
+	/**
+	 * Return an array of the fully-qualified names of the validator classes.
+	 */
+	public String[] getValidatorNames(ValidatorMetaData[] vmds) {
+		Set<String> temp = new HashSet<String>();
+		for (ValidatorMetaData vmd : vmds) {
+			for (String name : vmd.getValidatorNames()) {
+				temp.add(name);
+			}
+		}
+
+		String[] vmdNames = new String[temp.size()];
+		temp.toArray(vmdNames);
+		return vmdNames;
+	}
+
+	/**
+	 * Return an array of the fully-qualified names of the validator classes.
+	 */
+	public String[] getValidatorNames(Collection<ValidatorMetaData> vmds) {
+		Set<String> temp = new HashSet<String>();
+		for (ValidatorMetaData vmd : vmds) {
+			for (String name : vmd.getValidatorNames()) {
+				temp.add(name);
+			}
+		}
+
+		String[] vmdNames = new String[temp.size()];
+		temp.toArray(vmdNames);
+		return vmdNames;
+	}
+
+	/**
+	 * Return a list of validators that validate files with the given extension.
+	 */
+	public ValidatorMetaData[] getValidatorsForExtension(IProject project, String fileExtension) {
+		try {
+			ProjectConfiguration prjp = ConfigurationManager.getManager().getProjectConfiguration(project);
+
+			// Get all of the validators configured on the project for the given file extension
+			ValidatorMetaData[] vmds = prjp.getValidators();
+
+			// Construct a fake IFile type to represent a file with this extension.
+			StringBuffer buffer = new StringBuffer(project.getName());
+			buffer.append(IPath.SEPARATOR);
+			buffer.append(fileExtension);
+			IPath path = new Path(buffer.toString());
+			IFile file = ResourcesPlugin.getWorkspace().getRoot().getFile(path);
+
+			ValidatorMetaData[] temp = new ValidatorMetaData[vmds.length];
+			int count = 0;
+			for (int i = 0; i < vmds.length; i++) {
+				ValidatorMetaData vmd = vmds[i];
+				if (vmd.isApplicableTo(file)) {
+					temp[count++] = vmd;
+				}
+			}
+
+			ValidatorMetaData[] result = new ValidatorMetaData[count];
+			System.arraycopy(temp, 0, result, 0, count);
+			return result;
+		} catch (InvocationTargetException e) {
+			ValidationPlugin.getPlugin().handleException(e);
+			if (e.getTargetException() != null)
+				ValidationPlugin.getPlugin().handleException(e.getTargetException());
+			return new ValidatorMetaData[0];
+		}
+	}
+
+	/**
+	 * Return a list of validator names that validate files with the given extension.
+	 */
+	public String[] getValidatorNamesForExtension(IProject project, String fileExtension) {
+		ValidatorMetaData[] vmds = getValidatorsForExtension(project, fileExtension);
+
+		String[] names = new String[vmds.length];
+		for (int i = 0; i < names.length; i++) {
+			names[i] = vmds[i].getValidatorUniqueName();
+		}
+		return names;
+	}
+}
diff --git a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/ProjectConfiguration.java b/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/ProjectConfiguration.java
new file mode 100644
index 0000000..5f39ecf
--- /dev/null
+++ b/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/ProjectConfiguration.java
@@ -0,0 +1,659 @@
+/*******************************************************************************
+ * Copyright (c) 2001, 2009 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.wst.validation.internal;
+
+import java.lang.reflect.InvocationTargetException;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+import java.util.StringTokenizer;
+
+import org.eclipse.core.resources.IMarker;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.wst.validation.internal.delegates.ValidatorDelegateDescriptor;
+import org.eclipse.wst.validation.internal.plugin.ValidationPlugin;
+import org.osgi.service.prefs.BackingStoreException;
+
+/**
+ * This class represents the Project Preferences as set on the Project's Validation Properties page.
+ */
+public class ProjectConfiguration extends ValidationConfiguration {
+	
+	/** false - If the user has never set a preference before, this is the override default */
+	static final boolean PRJ_OVERRIDEGLOBAL_DEFAULT = false;
+	
+	/** default_value - the configuration is using the defaults. */
+	private static final String DefaultValue = "default_value"; //$NON-NLS-1$
+	
+	private boolean _doesProjectOverride = getDoesProjectOverrideDefault();
+
+	/**
+	 * This constructor should be used in all cases except for the Properties page's values.
+	 */
+	protected ProjectConfiguration(IProject project) throws InvocationTargetException {
+		// The extractProjectValidators method extracts just this project's validators from the
+		// global list.
+		super(project, extractProjectValidators(convertToArray(ValidationRegistryReader.getReader().getAllValidators()), project));
+
+		// Can't put the call to load() and passivate() in the ValidationConfiguration constructor due
+		// to the order of initialization.
+		//    1. First the ValidationConfiguration constructor is called, and that loads the stored values.
+		//    2. Then this class's <init> method is called, and that initializes the "override" field
+		//       to the default, which may be different than the stored value.
+	}
+
+	/**
+	 * This constructor is provided only for the Properties page, so that the page can store values
+	 * without persisting them (i.e., if the user presses Cancel then nothing needs to be done.)
+	 * 
+	 * @deprecated
+	 */
+	public ProjectConfiguration(ProjectConfiguration original) throws InvocationTargetException {
+		super(original.getResource());
+		original.copyTo(this);
+	}
+
+	/**
+	 * Return the ValidationConfiguration to use, whether global or project.
+	 */
+	public boolean useGlobalPreference() {
+		try {
+			GlobalConfiguration gp = ConfigurationManager.getManager().getGlobalConfiguration();
+			if (gp == null) {
+				return false;
+			}
+
+			if (!gp.canProjectsOverride()) {
+				// If project's can't override the global, use the global
+				return true;
+			}
+
+			// If the project overrides, then don't use the global.
+			// If the project does not override, use the global.
+			return !_doesProjectOverride;
+		} catch (InvocationTargetException e) {
+			ValidationPlugin.getPlugin().handleException(e);
+			return false;
+		}
+	}
+	
+	public boolean getDoesProjectOverride(){
+		return _doesProjectOverride;
+	}
+
+	public boolean doesProjectOverride() {
+		// If the global preference doesn't allow projects to override, it doesn't matter what the
+		// value of _doesProjectOverride is.
+		return !useGlobalPreference();
+	}
+
+	public void setDoesProjectOverride(boolean does) {
+		_doesProjectOverride = does;
+	}
+
+	/**
+	 * If the preferences should be used then the preference settings are returned; otherwise return
+	 * the project settings.
+	 */
+	public ValidatorMetaData[] getEnabledValidators() throws InvocationTargetException {
+		if (useGlobalPreference()) {
+			return extractProjectValidators(ConfigurationManager.getManager().getGlobalConfiguration().getEnabledValidators(), getResource());
+		}
+		return super.getEnabledValidators();
+	}
+	
+	public ValidatorMetaData[] getManualEnabledValidators() throws InvocationTargetException  {
+		if (useGlobalPreference()) {
+			return extractProjectValidators(ConfigurationManager.getManager().getGlobalConfiguration().getManualEnabledValidators(), getResource());
+		}
+		return super.getManualEnabledValidators();
+	}
+	
+	public ValidatorMetaData[] getBuildEnabledValidators() throws InvocationTargetException {
+		if (useGlobalPreference()) {
+			return extractProjectValidators(ConfigurationManager.getManager().getGlobalConfiguration().getBuildEnabledValidators(), getResource());
+		}
+		return super.getBuildEnabledValidators();
+	}
+	
+
+	/**
+	 * @see org.eclipse.wst.validation.internal.operations.internal.preference.ValidationConfiguration#getDisabledValidators()
+	 */
+	public ValidatorMetaData[] getDisabledValidators() throws InvocationTargetException {
+		if (useGlobalPreference()) {
+			return extractProjectValidators(ConfigurationManager.getManager().getGlobalConfiguration().getDisabledValidators(), getResource());
+		}
+		return super.getDisabledValidators();
+	}
+
+	/**
+	 * @see org.eclipse.wst.validation.internal.operations.internal.preference.ValidationConfiguration#getValidators()
+	 */
+	public ValidatorMetaData[] getValidators() throws InvocationTargetException {
+		if (useGlobalPreference()) {
+			return extractProjectValidators(ConfigurationManager.getManager().getGlobalConfiguration().getValidators(), getResource());
+		}
+		return super.getValidators();
+	}
+
+  public Map<String,String> getDelegatingValidators() throws InvocationTargetException {
+    if (useGlobalPreference()) {
+      return ConfigurationManager.getManager().getGlobalConfiguration().getDelegatingValidators();
+    }
+    return super.getDelegatingValidators();
+  }
+
+	/**
+	 * @see org.eclipse.wst.validation.internal.operations.internal.attribute.ValidationConfiguration#getEnabledIncrementalValidators(boolean)
+	 */
+	public ValidatorMetaData[] getEnabledIncrementalValidators(boolean incremental) throws InvocationTargetException {
+		if (useGlobalPreference()) {
+			return extractProjectValidators(ConfigurationManager.getManager().getGlobalConfiguration().getEnabledIncrementalValidators(incremental), getResource());
+		}
+		return super.getEnabledIncrementalValidators(incremental);
+	}
+
+	/**
+	 * @see org.eclipse.wst.validation.internal.operations.internal.preference.ValidationConfiguration#isEnabled(ValidatorMetaData)
+	 */
+	public boolean isEnabled(ValidatorMetaData vmd) throws InvocationTargetException {
+		if (useGlobalPreference()) {
+			return ConfigurationManager.getManager().getGlobalConfiguration().isEnabled(vmd);
+		}
+		return super.isEnabled(vmd);
+	}
+
+	/**
+	 * @see org.eclipse.wst.validation.internal.operations.internal.preference.ValidationConfiguration#numberOfDisabledValidators()
+	 */
+	public int numberOfDisabledValidators() throws InvocationTargetException {
+		if (useGlobalPreference()) {
+			return ConfigurationManager.getManager().getGlobalConfiguration().numberOfDisabledValidators();
+		}
+		return super.numberOfDisabledValidators();
+	}
+
+	/**
+	 * @see org.eclipse.wst.validation.internal.operations.internal.preference.ValidationConfiguration#numberOfEnabledIncrementalValidators()
+	 */
+	public int numberOfEnabledIncrementalValidators() throws InvocationTargetException {
+		if (useGlobalPreference()) {
+			return ConfigurationManager.getManager().getGlobalConfiguration().numberOfEnabledIncrementalValidators();
+		}
+		return super.numberOfEnabledIncrementalValidators();
+	}
+
+	/**
+	 * @see org.eclipse.wst.validation.internal.operations.internal.preference.ValidationConfiguration#numberOfEnabledValidators()
+	 */
+	public int numberOfEnabledValidators() throws InvocationTargetException {
+		if (useGlobalPreference()) {
+			return ConfigurationManager.getManager().getGlobalConfiguration().numberOfEnabledValidators();
+		}
+		return super.numberOfEnabledValidators();
+	}
+
+	/**
+	 * @see org.eclipse.wst.validation.internal.operations.internal.preference.ValidationConfiguration#numberOfIncrementalValidators()
+	 */
+	public int numberOfIncrementalValidators() throws InvocationTargetException {
+		if (useGlobalPreference()) {
+			return ConfigurationManager.getManager().getGlobalConfiguration().numberOfIncrementalValidators();
+		}
+		return super.numberOfIncrementalValidators();
+	}
+
+	/**
+	 * @see org.eclipse.wst.validation.internal.operations.internal.preference.ValidationConfiguration#numberOfValidators()
+	 */
+	public int numberOfValidators() throws InvocationTargetException {
+		if (useGlobalPreference()) {
+			return ConfigurationManager.getManager().getGlobalConfiguration().numberOfValidators();
+		}
+		return super.numberOfValidators();
+	}
+
+	/**
+	 * This method could be called with the project's values, or with the global preference values.
+	 * Validators that are not configured on this project will be ignored.
+	 */
+	public void setEnabledValidators(ValidatorMetaData[] vmds) {
+		super.setEnabledValidators(extractProjectValidators(vmds, getResource()));
+	}
+
+	/**
+	 * This method could be called with the project's values, or with the global preference values.
+	 * Validators that are not configured on this project will be ignored.
+	 */
+	public void setValidators(ValidatorMetaData[] vmds) {
+		super.setValidators(extractProjectValidators(vmds, getResource()));
+	}
+
+	/**
+	 * Given a set of validators, usually the global preference set, change the set so that it
+	 * contains only the validators configured on this project.
+	 */
+	private static ValidatorMetaData[] extractProjectValidators(ValidatorMetaData[] vmds, IResource resource) {
+		ValidationRegistryReader reader = ValidationRegistryReader.getReader();
+		int length = (vmds == null) ? 0 : vmds.length;
+		ValidatorMetaData[] temp = new ValidatorMetaData[length];
+		if (length == 0) {
+			return temp;
+		}
+
+		int count = 0;
+		IProject project = (IProject) resource;
+		for (int i = 0; i < vmds.length; i++) {
+			ValidatorMetaData vmd = vmds[i];
+			if (reader.isConfiguredOnProject(vmd, project)) {
+				temp[count++] = vmd;
+			}
+		}
+
+		ValidatorMetaData[] result = new ValidatorMetaData[count];
+		System.arraycopy(temp, 0, result, 0, count);
+		temp = null;
+
+		return result;
+	}
+
+	public void resetToDefault() throws InvocationTargetException {
+		// The default values of the project is whatever the preference values are
+		GlobalConfiguration gp = ConfigurationManager.getManager().getGlobalConfiguration();
+
+		setEnabledManualValidators(gp.getManualEnabledValidators());
+		setEnabledBuildValidators(gp.getBuildEnabledValidators());
+		setDelegatingValidators(gp.getDelegatingValidators());
+		
+		// except for this field, which is unique to the project preferences
+		setDoesProjectOverride(getDoesProjectOverrideDefault());
+	}
+
+	public void resetToDefaultForProjectDescriptionChange() throws InvocationTargetException {
+		// The default values of the project is whatever the preference values are
+		GlobalConfiguration gp = ConfigurationManager.getManager().getGlobalConfiguration();
+		setEnabledManualValidators(gp.getManualEnabledValidators());
+		setEnabledBuildValidators(gp.getBuildEnabledValidators());
+		setDelegatingValidators(gp.getDelegatingValidators());
+	}
+
+	/**
+	 * The project's nature has changed, so recalculate the validators that are configured on the
+	 * project, and reset the values of the project to the default.
+	 * 
+	 * @deprecated this method doesn't do anything
+	 */
+	public void resetProjectNature() {
+		/*
+		 * We do not want to perform the resetting the of the validators as the nature never gets
+		 * reset due to change in the project references - VKB GlobalConfiguration gp =
+		 * ConfigurationManager.getManager().getGlobalConfiguration();
+		 * setValidators(gp.getValidators()); // Reset the validators that are configured on the
+		 * project (the ProjectConfiguration automatically saves only the validators that are
+		 * configured on the project). resetToDefault(); // Given that the project is "new", reset
+		 * its values to the Preferences.
+		 */
+	}
+
+	/**
+	 * This method exists only for migration purposes. The project marker must be deleted after
+	 * migration is complete.
+	 */
+	protected IMarker[] getMarker() {
+		try {
+			// First try to find the 4.03 project marker.
+			IMarker[] allMarkers = getResource().findMarkers(ConfigurationConstants.PRJ_MARKER_403, false, IResource.DEPTH_ZERO);
+
+			// If it doesn't exist, then this might be a 5.0 project marker.
+			if ((allMarkers == null) || (allMarkers.length == 0)) {
+				allMarkers = getResource().findMarkers(ConfigurationConstants.PRJ_MARKER, false, IResource.DEPTH_ZERO);
+			}
+
+			// There should be only one projectmarker.
+			if (allMarkers.length == 1) {
+				return allMarkers;
+			}
+			// Job is done. Nothing to migrate.
+			return null;
+		} catch (CoreException e) {
+			ValidationPlugin.getPlugin().handleException(e);
+			return null;
+		}
+	}
+
+	protected void load(IMarker[] marker) {
+		// 4.03 project preferences are different from the current in the following ways:
+		//    1. Only preferences that could be set were the enabled validators and the auto-validate
+		// option.
+		//    2. The preferences were stored in an IMarker instead of a PersistentProperty.
+		// The 5.0 project settings were stored in an IMarker, and the current settings are stored
+		// in a PersistentProperty.
+		// A 5.0 project could have a null validation marker if the validation page was never
+		// opened on it, and if validation was never run.
+		try {
+			if (marker == null) {
+				// Assume default values
+				resetToDefault();
+				return;
+			}
+
+			IMarker prjMarker = marker[0]; // getProjectMarker() has already checked that there's a
+			// marker in the array
+//			GlobalConfiguration gp = ConfigurationManager.getManager().getGlobalConfiguration();
+
+//			String enabledValStr = (String) getValue(prjMarker, ConfigurationConstants.ENABLED_VALIDATORS);
+//			ValidatorMetaData[] enabledVal = null;
+//			if (enabledValStr == null) {
+//				enabledVal = gp.getEnabledValidators();
+//			} else {
+//				enabledVal = getStringAsEnabledElementsArray(enabledValStr);
+//			}
+//			setEnabledValidators(enabledVal);
+			
+			ValidatorMetaData[] enabledManaualVal = null;
+			ValidatorMetaData[] enabledBuildVal = null;
+			String enabledManualValStr = (String) getValue(prjMarker, ConfigurationConstants.ENABLED_MANUAL_VALIDATORS);
+			String enabledBuildValStr = (String) getValue(prjMarker, ConfigurationConstants.ENABLED_BUILD_VALIDATORS);
+//			ValidatorMetaData[] enabledVal = null;
+//			if (enabledManualValStr.equals(null) || enabledBuildValStr.equals(null)) {
+//				enabledVal = gp.getEnabledValidators();
+//			} else {
+			if (!enabledManualValStr.equals(null) && !enabledBuildValStr.equals(null)) {
+				enabledManaualVal = getStringAsEnabledElementsArray(enabledManualValStr);
+				setEnabledManualValidators(enabledManaualVal);
+				enabledBuildVal = getStringAsEnabledElementsArray(enabledManualValStr);
+				setEnabledBuildValidators(enabledBuildVal);
+			}
+			
+			String version = loadVersion(marker); // In 4.03, every project had its own validators &
+			// auto-validate settings.
+			Boolean boolVal = (Boolean) getValue(prjMarker, ConfigurationConstants.PRJ_OVERRIDEGLOBAL);
+			if ((boolVal == null) && (version.equals(ConfigurationConstants.VERSION4_03))) {
+				// Different default for 4.03. In 4.03, all projects overrode the global, because
+				// the
+				// global preferences didn't exist.
+				setDoesProjectOverride(true);
+			} else if (boolVal == null) {
+				setDoesProjectOverride(getDoesProjectOverrideDefault());
+			} else {
+				setDoesProjectOverride(boolVal.booleanValue());
+			}
+
+			getResource().getWorkspace().deleteMarkers(marker);
+		} catch (CoreException e) {
+			ValidationPlugin.getPlugin().handleException(e);
+		} catch (InvocationTargetException e) {
+			ValidationPlugin.getPlugin().handleException(e);
+		}
+	}
+
+	protected void copyTo(ProjectConfiguration prjp) throws InvocationTargetException {
+		super.copyTo(prjp);
+
+		// Need to have a distinct method for this child class (i.e., the parameter
+		// is not a ValidationConfiguration) because if this initialization is
+		// called as part of ValidationConfiguration's constructor, then the value of
+		// this field is overwritten. Fields of this class are initialized to the
+		// default after the ValidationConfiguration parent is created.
+		prjp.setDoesProjectOverride(doesProjectOverride());
+	}
+
+	public static boolean getDoesProjectOverrideDefault() {
+		return PRJ_OVERRIDEGLOBAL_DEFAULT;
+	}
+
+	/**
+	 * Return true if the enabled validators have not changed since this ValidationConfiguration was
+	 * constructed, false otherwise. (This method is needed for the Properties and Preference pages;
+	 * if the list of validators hasn't changed, then there is no need to update the task list;
+	 * updating the task list is a costly operation.)
+	 * 
+	 * The "allow" parameter represents whether or not the global "allow projects to override" has
+	 * been changed: - TRUE means that the preference "allow" parameter has been changed - FALSE
+	 * means that the preference "allow" paramter has not been changed
+	 */
+	public boolean hasEnabledValidatorsChanged(ValidatorMetaData[] oldEnabledVmd, boolean allow) throws InvocationTargetException {
+		// First check the obvious: is every enabled validator still enabled, and is
+		// the number of enabled validators the same as it was before? If not, return true.
+		if (super.hasEnabledValidatorsChanged(oldEnabledVmd)) {
+			return true;
+		}
+
+
+		// If the global preference validators have changed, does the task list need to be updated?
+		// PREF | PROJ | UPDATE
+		// ALLOW | OVERRIDE | TASK LIST
+		//------------------------------
+		//     0 | 0 | 1
+		//     0 | 1 | 1
+		//     1 | 0 | 1
+		//     1 | 1 | 0
+		//
+		// If the global "allow" preference changes from "allow" to "don't allow", or vice versa,
+		// and the project overrides the preferences, and the validators differ between the project
+		// and the preferences, then the task list must be updated.
+		if (allow) {
+			// "allow" has changed, so see if the preference and the project validators match.
+			ValidatorMetaData[] projEnabledVmd = super.getEnabledValidators(); // bypass the check
+			// for whether the global preferences are to be used or not
+			GlobalConfiguration gp = ConfigurationManager.getManager().getGlobalConfiguration();
+			return gp.hasEnabledValidatorsChanged(projEnabledVmd);
+		}
+
+		return false;
+	}
+
+  public boolean haveDelegatesChanged(Map<String, String> oldDelegates, boolean allow) throws InvocationTargetException {
+
+    if (super.haveDelegatesChanged(oldDelegates)) {
+      return true;
+    }
+
+    if (allow) {
+      Map<String, String> projDelegates = super.getDelegatingValidators(); 
+      GlobalConfiguration gp = ConfigurationManager.getManager().getGlobalConfiguration();
+      return gp.haveDelegatesChanged(projDelegates);
+    }
+      
+    return false;
+  }
+
+
+	public void deserialize(String storedConfiguration) throws InvocationTargetException {
+		if (storedConfiguration == null || storedConfiguration.length() == 0 || storedConfiguration.equals(DefaultValue)) {
+			resetToDefault();
+		} else if (storedConfiguration != null) {
+			int prjOverrideIndex = storedConfiguration.indexOf(ConfigurationConstants.PRJ_OVERRIDEGLOBAL);
+			int disableAllValidationIndex = storedConfiguration.indexOf(ConfigurationConstants.DISABLE_ALL_VALIDATION_SETTING);
+			int versionIndex = storedConfiguration.indexOf(ConfigurationConstants.VERSION);
+			if (disableAllValidationIndex != -1) {
+				String disableAllValidation = storedConfiguration.substring(disableAllValidationIndex + ConfigurationConstants.DISABLE_ALL_VALIDATION_SETTING.length(), versionIndex);
+				setDisableAllValidation(Boolean.valueOf(disableAllValidation).booleanValue());
+			} else {
+				setDisableAllValidation(false);
+			}
+			// project doesn't override the global
+			if (disableAllValidationIndex != -1) {
+				String prjOverride = storedConfiguration.substring(prjOverrideIndex + ConfigurationConstants.PRJ_OVERRIDEGLOBAL.length(), disableAllValidationIndex);
+				setDoesProjectOverride(Boolean.valueOf(prjOverride).booleanValue());
+			}
+		}
+	}
+
+	public String serialize() throws InvocationTargetException {
+		StringBuffer buffer = new StringBuffer();
+		buffer.append(ConfigurationConstants.PRJ_OVERRIDEGLOBAL);
+		buffer.append(String.valueOf(doesProjectOverride()));
+		if (doesProjectOverride()) {
+			// Store common values for the Project configuration only if they differ from the global
+			buffer.append(super.serialize());
+		}
+		return buffer.toString();
+	}
+
+	public ValidatorMetaData[] getEnabledFullBuildValidators(boolean fullBuild) throws InvocationTargetException {
+		if (useGlobalPreference()) {
+			return extractProjectValidators(ConfigurationManager.getManager().getGlobalConfiguration().getEnabledFullBuildValidators(fullBuild), getResource());
+		}
+		return super.getEnabledFullBuildValidators(fullBuild);
+	}
+
+	/**
+	 * Given a set of validators, usually the global preference set, change the set so that it
+	 * contains only the validators configured on this project.
+	 */
+	private static ValidatorMetaData[] extractProjectValidators(ValidatorMetaData[] vmds, IResource resource, boolean onlyReferenced) {
+		ValidationRegistryReader reader = ValidationRegistryReader.getReader();
+		int length = (vmds == null) ? 0 : vmds.length;
+		ValidatorMetaData[] temp = new ValidatorMetaData[length];
+		if (length == 0) {
+			return temp;
+		}
+
+		int count = 0;
+		IProject project = (IProject) resource;
+		for (int i = 0; i < vmds.length; i++) {
+			ValidatorMetaData vmd = vmds[i];
+			if (reader.isConfiguredOnProject(vmd, project)) {
+				if (!onlyReferenced || vmd.isDependentValidator())
+					temp[count++] = vmd;
+			}
+		}
+
+		ValidatorMetaData[] result = new ValidatorMetaData[count];
+		System.arraycopy(temp, 0, result, 0, count);
+		temp = null;
+
+		return result;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see org.eclipse.wst.validation.internal.operations.internal.attribute.ValidationConfiguration#getEnabledFullBuildValidators(boolean)
+	 */
+	public ValidatorMetaData[] getEnabledFullBuildValidators(boolean fullBuild, boolean onlyReferenced) throws InvocationTargetException {
+		if (useGlobalPreference()) {
+			return extractProjectValidators(ConfigurationManager.getManager().getGlobalConfiguration().getEnabledFullBuildValidators(fullBuild), getResource(), onlyReferenced);
+		}
+		return super.getEnabledFullBuildValidators(fullBuild, onlyReferenced);
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see org.eclipse.wst.validation.internal.operations.internal.attribute.ValidationConfiguration#getIncrementalValidators()
+	 */
+	public ValidatorMetaData[] getIncrementalValidators() throws InvocationTargetException {
+		if (useGlobalPreference()) {
+			return extractProjectValidators(ConfigurationManager.getManager().getGlobalConfiguration().getIncrementalValidators(), getResource());
+		}
+		return super.getIncrementalValidators();
+	}
+
+	public int numberOfManualValidators() throws InvocationTargetException {
+		if (useGlobalPreference()) {
+			return ConfigurationManager.getManager().getGlobalConfiguration().numberOfManualEnabledValidators();
+		}
+		return super.numberOfManualEnabledValidators();
+	}
+	public boolean isDisableAllValidation() throws InvocationTargetException{
+		if (useGlobalPreference()) {
+			return ConfigurationManager.getManager().getGlobalConfiguration().isDisableAllValidation();
+		}
+		return super.isDisableAllValidation();
+	}	
+
+  public ValidatorDelegateDescriptor getDelegateDescriptor(ValidatorMetaData vmd) throws InvocationTargetException {
+    if (useGlobalPreference()) {
+      return ConfigurationManager.getManager().getGlobalConfiguration().getDelegateDescriptor(vmd);
+    }
+    
+    return super.getDelegateDescriptor(vmd);
+  }
+  
+  public void store() throws InvocationTargetException {
+		IProject project = (IProject) getResource();
+		final PreferencesWrapper pref = PreferencesWrapper.getPreferences(project, null);
+		if (pref != null) {
+			try {
+				pref.put(ValidationConfiguration.UserPreference, serialize());
+				pref.put(ValidationConfiguration.UserManualPreference, serializeManualSetting());
+				pref.put(ValidationConfiguration.UserBuildPreference, serializeBuildSetting());
+				pref.put(ValidationConfiguration.DelegatesPreference, serializeDelegatesSetting());
+				pref.flush();
+			} catch (BackingStoreException e) {
+				// A common error is that the project has been closed, in which case there
+				// is nothing that we can do.
+				if (project.isAccessible())ValidationPlugin.getPlugin().handleException(e);
+			}
+		}
+	}
+  
+  protected void loadPreference() throws InvocationTargetException {
+		IProject project = (IProject) getResource();
+		final PreferencesWrapper prefs = PreferencesWrapper.getPreferences(project, null);
+		if (prefs.nodeExists()) { 
+			String storedConfig = prefs.get(ValidationConfiguration.UserPreference, DefaultValue);
+			deserialize(storedConfig);
+			String storedManualConfig = prefs.get(ValidationConfiguration.UserManualPreference, DefaultValue);
+			deserializeManual(storedManualConfig);
+			String storedBuildConfig = prefs.get(ValidationConfiguration.UserBuildPreference, DefaultValue);
+			deserializeBuild(storedBuildConfig);
+			String storedDelegatesConfiguration = prefs.get(ValidationConfiguration.DelegatesPreference, DefaultValue);
+			deserializeDelegates(storedDelegatesConfiguration);
+		}
+	}
+  
+  /**
+   * Answer the validator id's that have been enabled for manual validation.
+   * @return null if they are all enabled
+   */
+  Set<String> getEnabledManualValidators(){
+	  return getIds(ValidationConfiguration.UserManualPreference, ConfigurationConstants.ENABLED_MANUAL_VALIDATORS);
+  }
+  
+  /**
+   * Answer the validator id's that have been enabled for build validation.
+   * @return null if they are all enabled
+   */
+  Set<String> getEnabledBuildlValidators(){
+	  return getIds(ValidationConfiguration.UserBuildPreference, ConfigurationConstants.ENABLED_BUILD_VALIDATORS);
+  }
+  
+  /**
+   * A helper method to extract some validator id's from a preference store field.
+   * 
+   * @return null if all the validators are enabled.
+   */
+  private Set<String> getIds(String prefKey, String enabledPhrase){
+	IProject project = (IProject) getResource();
+	final PreferencesWrapper prefs = PreferencesWrapper.getPreferences(project, null);
+	if (prefs == null)return null;
+	
+	String storedConfig = prefs.get(prefKey, DefaultValue);
+	if (storedConfig == null || storedConfig.length() == 0 || storedConfig.equals(DefaultValue))return null;
+	int validationIndex = storedConfig.indexOf(enabledPhrase);
+
+	String ids = storedConfig.substring(validationIndex + enabledPhrase.length(),storedConfig.length());
+
+	StringTokenizer tokenizer = new StringTokenizer(ids, ConfigurationConstants.ELEMENT_SEPARATOR);
+	Set<String> set = new HashSet<String>(20);
+	while (tokenizer.hasMoreTokens())set.add(tokenizer.nextToken());
+	if (set.size() == 0)return null;
+	  
+	return set;
+	  
+  }
+}
diff --git a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/ReferencialFileValidatorExtension.java b/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/ReferencialFileValidatorExtension.java
new file mode 100644
index 0000000..d638d0a
--- /dev/null
+++ b/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/ReferencialFileValidatorExtension.java
@@ -0,0 +1,88 @@
+/*******************************************************************************
+ * Copyright (c) 2001, 2008 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
+ *******************************************************************************/
+/*
+ * Created on May 3, 2004
+ *
+ * To change the template for this generated file go to
+ * Window - Preferences - Java - Code Generation - Code and Comments
+ */
+package org.eclipse.wst.validation.internal;
+
+import org.eclipse.core.runtime.IConfigurationElement;
+import org.eclipse.wst.validation.internal.operations.ReferencialFileValidator;
+import org.eclipse.wst.validation.internal.plugin.ValidationPlugin;
+
+/**
+ * @author vijayb
+ */
+public class ReferencialFileValidatorExtension {
+	private String id = null;
+	private ReferencialFileValidator instance;
+	private boolean errorCondition = false;
+	private IConfigurationElement element;
+	
+	/** referencialFileValidator */
+	public static final String REF_FILE_VALIDATOR_EXTENSION = "referencialFileValidator"; //$NON-NLS-1$
+	
+	/** run */
+	public static final String RUN = "run"; //$NON-NLS-1$
+	
+	/** id */
+	public static final String ATT_ID = "id"; //$NON-NLS-1$
+	
+	/** class */
+	public static final String ATT_CLASS = "class"; //$NON-NLS-1$
+
+	public ReferencialFileValidatorExtension() {
+		super();
+	}
+
+	public ReferencialFileValidator getInstance() {
+		try {
+			if (instance == null && !errorCondition)
+				instance = (ReferencialFileValidator) element.createExecutableExtension(RUN);
+		} catch (Exception e) {
+			ValidationPlugin.getPlugin().handleException(e);
+			errorCondition = true;
+		}
+		return instance;
+	}
+
+	public ReferencialFileValidatorExtension(IConfigurationElement element) {
+		if(!REF_FILE_VALIDATOR_EXTENSION.equals(element.getName()))
+			throw new IllegalArgumentException("Extensions must be of the type \"" + REF_FILE_VALIDATOR_EXTENSION + "\"."); //$NON-NLS-1$ //$NON-NLS-2$
+		this.element = element;
+		init();
+	}
+
+	private void init() {
+		this.id = this.element.getAttribute(ATT_ID);
+	}
+
+	/**
+	 * @return Returns the id.
+	 */
+	public String getId() {
+		return id;
+	}
+	
+	public IConfigurationElement getElement() {
+		return element;
+	}
+
+	/**
+	 * @param id
+	 *            The id to set.
+	 */
+	public void setId(String id) {
+		this.id = id;
+	}
+}
diff --git a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/ReferencialFileValidatorRegistryReader.java b/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/ReferencialFileValidatorRegistryReader.java
new file mode 100644
index 0000000..c9233ef
--- /dev/null
+++ b/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/ReferencialFileValidatorRegistryReader.java
@@ -0,0 +1,150 @@
+/*******************************************************************************
+ * Copyright (c) 2001, 2008 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
+ *******************************************************************************/
+/*
+ * Created on May 3, 2004
+ *
+ * To change the template for this generated file go to
+ * Window - Preferences - Java - Code Generation - Code and Comments
+ */
+package org.eclipse.wst.validation.internal;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.eclipse.core.runtime.IConfigurationElement;
+import org.eclipse.core.runtime.IExtension;
+import org.eclipse.core.runtime.IExtensionPoint;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Platform;
+import org.eclipse.wst.validation.internal.operations.ReferencialFileValidator;
+import org.eclipse.wst.validation.internal.plugin.ValidationPlugin;
+
+/**
+ * @author vijayb
+ */
+public class ReferencialFileValidatorRegistryReader {
+	static ReferencialFileValidatorRegistryReader instance;
+	
+	private static final String Id = "id"; //$NON-NLS-1$
+	private static final String ExtensionPoint = "referencialFileValidator"; //$NON-NLS-1$
+	
+	protected List<ReferencialFileValidatorExtension> referencialFileValidationExtensions;
+
+	public ReferencialFileValidatorRegistryReader() {
+	}
+	
+	/**
+	 * Read the extension point and parse it.
+	 */
+	public void readRegistry() {
+		IExtensionPoint point = Platform.getExtensionRegistry().getExtensionPoint(Id, ExtensionPoint);
+		if (point == null)return;
+		IConfigurationElement[] elements = point.getConfigurationElements();
+		for (int i = 0; i < elements.length; i++) {
+			internalReadElement(elements[i]);
+		}
+	}
+	
+	private void internalReadElement(IConfigurationElement element) {
+		boolean recognized = this.readElement(element);
+		if (!recognized) {
+			logError(element, "Error processing extension: " + element); //$NON-NLS-1$
+		}
+	}
+
+	/*
+	 * Logs the error in the desktop log using the provided text and the information in the configuration element.
+	 */
+	protected void logError(IConfigurationElement element, String text) {
+		IExtension extension = element.getDeclaringExtension();
+		StringBuffer buf = new StringBuffer();
+		buf.append("Plugin " + extension.getContributor().getName() + ", extension " + extension.getExtensionPointUniqueIdentifier()); //$NON-NLS-1$ //$NON-NLS-2$
+		buf.append("\n" + text); //$NON-NLS-1$
+		ValidationPlugin.getPlugin().logMessage(IStatus.ERROR, buf.toString());
+	}
+
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see org.eclipse.wst.common.frameworks.internal.RegistryReader#readElement(org.eclipse.core.runtime.IConfigurationElement)
+	 */
+	public boolean readElement(IConfigurationElement element) {
+		if (ReferencialFileValidatorExtension.REF_FILE_VALIDATOR_EXTENSION.equals(element.getName())) {
+			addExtension(element);
+			return true;
+		}
+		return false;
+	}
+
+	/**
+	 * Sets the extension point.
+	 * 
+	 * @param newExtension
+	 *            The extensions to set
+	 */
+	protected void addExtension(IConfigurationElement newExtension) {
+
+    	//add to the list of post validator extensions only if the extension is not added yet
+    	boolean containsExt = true;
+    	for(ReferencialFileValidatorExtension ext : getReferencialFileValidationExtensions()) {
+    		if(!ext.getElement().getAttribute(Id).equals(newExtension.getAttribute(Id)))containsExt = false;
+    	}
+    	if(!containsExt ||getReferencialFileValidationExtensions().isEmpty())
+    		getReferencialFileValidationExtensions().add(new ReferencialFileValidatorExtension(newExtension));
+    
+		getReferencialFileValidationExtensions().add(new ReferencialFileValidatorExtension(newExtension));
+	}
+
+	/**
+	 * Sets the extension point.
+	 * 
+	 * @param newExtension
+	 *            The extensions to set
+	 */
+	protected void addExtensionPoint(ReferencialFileValidatorExtension newExtension) {
+		if (referencialFileValidationExtensions == null)
+			referencialFileValidationExtensions = new ArrayList<ReferencialFileValidatorExtension>();
+		referencialFileValidationExtensions.add(newExtension);
+	}
+
+	/**
+	 * @return the appropriate handler for the project based on priorities of those which are
+	 *         available and enabled
+	 */
+	public ReferencialFileValidator getReferencialFileValidator() {
+		for (ReferencialFileValidatorExtension refFileValExt: getReferencialFileValidationExtensions()) {
+			return refFileValExt.getInstance();
+		}
+		return null;
+	}
+
+	/**
+	 * Gets the singleton instance.
+	 */
+	public static ReferencialFileValidatorRegistryReader getInstance() {
+		if (instance == null) {
+			instance = new ReferencialFileValidatorRegistryReader();
+			instance.readRegistry();
+		}
+		return instance;
+	}
+
+	/**
+	 * @return Returns the handlerExtensions.
+	 */
+	protected List<ReferencialFileValidatorExtension> getReferencialFileValidationExtensions() {
+		if (referencialFileValidationExtensions == null)
+			referencialFileValidationExtensions = new ArrayList<ReferencialFileValidatorExtension>();
+		return referencialFileValidationExtensions;
+	}
+
+}
diff --git a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/RegistryConstants.java b/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/RegistryConstants.java
new file mode 100644
index 0000000..140240a
--- /dev/null
+++ b/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/RegistryConstants.java
@@ -0,0 +1,153 @@
+/*******************************************************************************
+ * Copyright (c) 2001, 2010 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.wst.validation.internal;
+
+
+import org.eclipse.wst.validation.internal.operations.IRuleGroup;
+import org.eclipse.wst.validation.internal.plugin.ValidationPlugin;
+
+
+/**
+ * Validation constants needed to declare an extension point, and to implement an extension.
+ */
+public interface RegistryConstants {
+	String PLUGIN_ID = ValidationPlugin.PLUGIN_ID;
+	
+	/** validator - extension point declaration of the validator */
+	String VALIDATOR_EXT_PT_ID = "validator"; //$NON-NLS-1$
+
+	/** run - identifies the Validator class */
+	String TAG_RUN_CLASS = "run"; //$NON-NLS-1$
+	
+	/** 
+	 * filter - identifies a filter -- type and/or name -- used to filter out resources which are
+	 * not to be validated. (i.e., if the resource doesn't pass this filter test, don't validate it.) 
+	 */ 
+	String TAG_FILTER = "filter"; //$NON-NLS-1$
+	
+	/**
+	 * identifies a filter -- type and/or name -- used to filter out resources which are not to be validated. (i.e., if the resource doesn't pass this filter test, don't validate it.)
+	 */
+	String TAG_CONTENTTYPE = "contentTypeBinding"; //$NON-NLS-1$ 
+	
+	/**
+	 *  identifies a type
+	 */
+	String ATT_CONTENTTYPEID = "contentTypeId"; //$NON-NLS-1$ 
+	/** helper - IValidationContext which loads the MOF model for the IValidator */ 
+	String TAG_HELPER_CLASS = "helper"; //$NON-NLS-1$
+	
+	/** projectNature - identifies the projects which the validator should run on */
+	String TAG_PROJECT_NATURE = "projectNature"; //$NON-NLS-1$
+	
+	/** 
+	 * aggregateValidator - identifies a validator(s) which this validator aggregates. This value is used 
+	 * to remove all messages owned by a particular validator. Aggregate validators cannot be shared. 
+	 * only one validator may use an aggregate of that type. */
+	String TAG_AGGREGATE_VALIDATORS = "aggregateValidator"; //$NON-NLS-1$ 
+
+	/** runStrategy - identifies the run strategy of  Validator*/
+	String TAG_RUN_STRATEGY = "runStrategy"; //$NON-NLS-1$
+	
+	/** objectClass - identifies a type */ 
+	String ATT_OBJECT_CLASS = "objectClass"; //$NON-NLS-1$
+	
+	/** nameFilter - identifies a name (may include the '*' wildcard anywhere in the name) */
+	String ATT_NAME_FILTER = "nameFilter"; //$NON-NLS-1$
+	
+	/** id - identifies a unique id to filter on */
+	String ATT_ID = "id"; //$NON-NLS-1$
+	
+	/** class - identifies a class name of a tag, e.g. "helper class", or "run class" */
+	String ATT_CLASS = "class"; //$NON-NLS-1$
+	
+	/** action - identifies the incremental validation actions for which a resource should be filtered in */ 
+	String ATT_ACTION_FILTER = "action"; //$NON-NLS-1$
+	
+	/** 
+	 * incremental - identifies whether or not the validator supports incremental build validation. 
+	 * Default is true (i.e., incremental builds are supported). 
+	 */
+	String ATT_INCREMENTAL = "incremental"; //$NON-NLS-1$
+	
+	/** true - The incremental default. */
+	boolean ATT_INCREMENTAL_DEFAULT = true;
+	
+	/** 
+	 * fullBuild - identifies whether or not the validator supports full build validation. 
+	 * Default is true (i.e., full build validation is supported).
+	 */ 
+	String ATT_FULLBUILD = "fullBuild"; //$NON-NLS-1$ 
+	
+	/** true - The build default. */
+	boolean ATT_FULLBUILD_DEFAULT = true;
+	
+	/** enabled - identifies whether or not the validator is enabled by default. Default is "true" (enabled). */ 
+	String ATT_ENABLED = "enabled"; //$NON-NLS-1$
+	
+	/** true - The "enabled" default. */
+	boolean ATT_ENABLED_DEFAULT = true;
+	
+	/** include - Include projects with this nature */
+	String ATT_INCLUDE = "include"; //$NON-NLS-1$
+	
+	/** 
+	 * true - By default, if "include" is not specified in the projectNature element, 
+	 * then assume that the nature is included. */
+	boolean ATT_INCLUDE_DEFAULT = true;
+	
+	/** 
+	 * ruleGroup - identifies the different validation passes which this validator recognizes. 
+	 * The values are identified in IRuleGroup.
+	 */
+	String ATT_RULE_GROUP = "ruleGroup"; //$NON-NLS-1$
+	
+	/** the default pass includes only the FAST PASS. FULL can be invoked only explicitly by an operation. */
+	int ATT_RULE_GROUP_DEFAULT = IRuleGroup.PASS_FAST;
+	
+	/** caseSensitive */
+	String ATT_CASE_SENSITIVE = "caseSensitive"; //$NON-NLS-1$
+	
+	/** async - Is the validator thread-safe? */
+	String ATT_ASYNC = "async"; //$NON-NLS-1$
+	
+	/** false - The "can validator run asynchronously" default. In the future this may be changed to true. */
+	boolean ATT_ASYNC_DEFAULT = false;
+
+	/** 
+	 * project - identifies whether or not the validator is called per project. 
+	 * Default is false (i.e. the validator is called per resource). 
+	 */
+	String ATT_PROJECT = "project"; //$NON-NLS-1$
+	
+	/** false - The project default. */
+	boolean ATT_PROJECT_DEFAULT = false;
+	
+	
+	/** migrate - the "migrate" section of the validator */
+	String TAG_MIGRATE = "migrate"; //$NON-NLS-1$
+	
+	/** validator - the "validator" element of the "migrate" section */
+	String TAG_VALIDATOR = "validator"; //$NON-NLS-1$
+	
+	/** from - the fully-qualified class name of the former validator class */
+	String ATT_FROM = "from"; //$NON-NLS-1$
+	
+	/** to - the fully-qualified class name of the current validator class */
+	String ATT_TO = "to"; //$NON-NLS-1$
+	String DEP_VALIDATOR = "dependentValidator"; //$NON-NLS-1$
+	String DEP_VAL_VALUE = "depValValue"; //$NON-NLS-1$
+	String MARKER_ID = "markerId"; //$NON-NLS-1$
+	String MARKER_ID_VALUE = "markerIdValue"; //$NON-NLS-1$
+	boolean DEP_VAL_VALUE_DEFAULT = false;
+	String FACET = "facet"; //$NON-NLS-1$
+	String FACET_ID ="facetId"; //$NON-NLS-1$
+}
diff --git a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/ResourceConstants.java b/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/ResourceConstants.java
new file mode 100644
index 0000000..62f8a08
--- /dev/null
+++ b/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/ResourceConstants.java
@@ -0,0 +1,119 @@
+/*******************************************************************************
+ * Copyright (c) 2001, 2008 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.wst.validation.internal;
+
+
+
+/**
+ * Constants used to access the string resources associated with the plug-in.
+ * 
+ * See the plugin.properties file, in the plugin's directory, for the contents of the strings.
+ */
+public interface ResourceConstants {
+	// A marker cannot be added to the task list.
+	String VBF_EXC_CANNOT_ADD_MARKER = "VBF_EXC_CANNOT_ADD_MARKER"; //$NON-NLS-1$ 
+
+	// A marker cannot be removed from the task list.
+	String VBF_EXC_CANNOT_REMOVE_MARKER = "VBF_EXC_CANNOT_REMOVE_MARKER"; //$NON-NLS-1$ 
+
+	// Internal error has occurred.
+	String VBF_EXC_INTERNAL = "VBF_EXC_INTERNAL"; //$NON-NLS-1$ 
+
+	// If the validator cannot be loaded because it didn't specify a helper
+	String VBF_EXC_HELPER_MISSING = "VBF_EXC_HELPER_MISSING"; //$NON-NLS-1$ 
+
+	// If the validator cannot be loaded because its helper cannot be loaded
+	String VBF_EXC_HELPER_CANNOTLOAD = "VBF_EXC_HELPER_CANNOTLOAD"; //$NON-NLS-1$ 
+
+	// A java.lang.Runtime error has occurred during the build.
+	String VBF_EXC_RUNTIME = "VBF_EXC_RUNTIME"; //$NON-NLS-1$ 
+
+	// If the "Validator" extension point has been removed from the plugin.xml file.
+	String VBF_EXC_MISSING_VALIDATOR_EP = "VBF_EXC_MISSING_VALIDATOR_EP"; //$NON-NLS-1$ 
+
+	// If the user has specified an invalid type filter in their plugin.xml file.
+	// i.e., it isn't an instance of IResource.
+	String VBF_EXC_INVALID_TYPE_FILTER = "VBF_EXC_INVALID_TYPE_FILTER"; //$NON-NLS-1$ 
+
+	// The validator extension has made a mistake in its plugin.xml's projectNature tag
+	String VBF_EXC_MISSING_PROJECTNATURE_ID = "VBF_EXC_MISSING_PROJECTNATURE_ID"; //$NON-NLS-1$ 
+
+	// The validator extension has made a mistake in its plugin.xml's syntax.
+	String VBF_EXC_VALIDATORNAME_IS_NULL = "VBF_EXC_VALIDATORNAME_IS_NULL"; //$NON-NLS-1$ 
+
+	// Title for the IProgressMonitor.
+	String VBF_STATUS_PROGRESSMONITOR_TITLE = "VBF_STATUS_PROGRESSMONITOR_TITLE"; //$NON-NLS-1$ 
+
+	// Status line for the IProgressMonitor
+	String VBF_STATUS_INITIALIZING = "VBF_STATUS_INITIALIZING"; //$NON-NLS-1$ 
+
+	// If the user has cancelled validation, each validator might have cleanup to do. This message
+	// is shown to tell the user which validator is being cleaned up at the moment.
+	String VBF_STATUS_VALIDATOR_CLEANUP = "VBF_STATUS_VALIDATOR_CLEANUP"; //$NON-NLS-1$ 
+
+	// If the user cancelled validation, remove all of the validator's tasks from the task list, and
+	// put an entry saying that validation on {project} using {validator} was cancelled.
+	String VBF_STATUS_VALIDATOR_TERMINATED = "VBF_STATUS_VALIDATOR_TERMINATED"; //$NON-NLS-1$ 
+
+	// Before a validator is begun, this message informs the user that validation, using a
+	// particular validator, has begun
+	String VBF_STATUS_STARTING_VALIDATION = "VBF_STATUS_STARTING_VALIDATION"; //$NON-NLS-1$ 
+
+	// After a validator is finished, this message informs the user that validation, using a
+	// particular validator, has completed.
+	String VBF_STATUS_ENDING_VALIDATION = "VBF_STATUS_ENDING_VALIDATION"; //$NON-NLS-1$ 
+
+	// If a validator throws an unchecked exception, this message is displayed to the user.
+	String VBF_STATUS_ENDING_VALIDATION_ABNORMALLY = "VBF_STATUS_ENDING_VALIDATION_ABNORMALLY"; //$NON-NLS-1$ 
+
+	// If the build's getDelta(getProject()) method returns null, let the user know that a full
+	// validation will be performed because there's no delta information.
+	String VBF_STATUS_NULL_DELTA = "VBF_STATUS_NULL_DELTA"; //$NON-NLS-1$ 
+
+	String VBF_EXC_SYNTAX_NO_HELPER = "VBF_EXC_SYNTAX_NO_HELPER"; //$NON-NLS-1$ 
+	String VBF_EXC_SYNTAX_NO_HELPER_CLASS = "VBF_EXC_SYNTAX_NO_HELPER_CLASS"; //$NON-NLS-1$ 
+	String VBF_EXC_SYNTAX_NO_HELPER_THROWABLE = "VBF_EXC_SYNTAX_NO_HELPER_THROWABLE"; //$NON-NLS-1$ 
+	String VBF_EXC_SYNTAX_NO_VAL_THROWABLE = "VBF_EXC_SYNTAX_NO_VAL_THROWABLE"; //$NON-NLS-1$ 
+	String VBF_EXC_INVALID_RESOURCE = "VBF_EXC_INVALID_RESOURCE"; //$NON-NLS-1$ 
+
+	String VBF_EXC_NULLCREATE = "VBF_EXC_NULLCREATE"; //$NON-NLS-1$ 
+	String VBF_EXC_NULLSAVE = "VBF_EXC_NULLSAVE"; //$NON-NLS-1$ 
+	String VBF_EXC_SAVE = "VBF_EXC_SAVE"; //$NON-NLS-1$ 
+	String VBF_EXC_NULLRETRIEVE = "VBF_EXC_NULLRETRIEVE"; //$NON-NLS-1$ 
+	String VBF_EXC_RETRIEVE = "VBF_EXC_RETRIEVE"; //$NON-NLS-1$ 
+
+	String VBF_EXC_BADVMD = "VBF_EXC_BADVMD"; //$NON-NLS-1$ 
+	String VBF_EXC_OPENPRJ = "VBF_EXC_OPENPRJ"; //$NON-NLS-1$ 
+	String VBF_EXC_EXISTPRJ = "VBF_EXC_EXISTPRJ"; //$NON-NLS-1$ 
+	String VBF_EXC_BADPRJ = "VBF_EXC_BADPRJ"; //$NON-NLS-1$ 
+	String VBF_EXC_MULTIPRJ = "VBF_EXC_MULTIPRJ"; //$NON-NLS-1$ 
+	String VBF_EXC_BADVAL = "VBF_EXC_BADVAL"; //$NON-NLS-1$ 
+
+	String VBF_STATUS_START_REMOVING_OLD_MESSAGES = "VBF_STATUS_START_REMOVING_OLD_MESSAGES"; //$NON-NLS-1$ 
+	String VBF_STATUS_FINISH_REMOVING_OLD_MESSAGES = "VBF_STATUS_FINISH_REMOVING_OLD_MESSAGES"; //$NON-NLS-1$ 
+
+	String VBF_TASK_WARN_MESSAGE_LIMIT_VAL = "VBF_TASK_WARN_MESSAGE_LIMIT_VAL"; //$NON-NLS-1$
+	
+	String VBF_VALIDATION_JOB_MSG = "VBF_VALIDATION_JOB_MSG"; //$NON-NLS-1$
+
+	String VBF_EXC_DISABLEV = "VBF_EXC_DISABLEV"; //$NON-NLS-1$ 
+	String VBF_EXC_DISABLEH = "VBF_EXC_DISABLEH"; //$NON-NLS-1$ 
+	String VBF_EXC_ORPHAN_IVALIDATOR = "VBF_EXC_ORPHAN_IVALIDATOR"; //$NON-NLS-1$ 
+
+	String VBF_STATUS_LOOKING = "VBF_STATUS_LOOKING"; //$NON-NLS-1$ 
+	String VBF_STATUS_LOOKINGDONE = "VBF_STATUS_LOOKINGDONE"; //$NON-NLS-1$ 
+	String VBF_STATUS_REMOVING = "VBF_STATUS_REMOVING"; //$NON-NLS-1$ 
+	String VBF_STATUS_REMOVINGDONE = "VBF_STATUS_REMOVINGDONE"; //$NON-NLS-1$
+  
+	String VBF_WRONG_CONTEXT_FOR_DELEGATE = "VBF_WRONG_CONTEXT_FOR_DELEGATE"; //$NON-NLS-1$
+	String VBF_NO_DELEGATE = "VBF_NO_DELEGATE"; //$NON-NLS-1$
+	String VBF_CANNOT_INSTANTIATE_DELEGATE = "VBF_CANNOT_INSTANTIATE_DELEGATE"; //$NON-NLS-1$  
+}
diff --git a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/ResourceHandler.java b/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/ResourceHandler.java
new file mode 100644
index 0000000..c3d2f7e
--- /dev/null
+++ b/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/ResourceHandler.java
@@ -0,0 +1,76 @@
+/*******************************************************************************
+ * Copyright (c) 2001, 2008 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.wst.validation.internal;
+
+import java.util.MissingResourceException;
+import java.util.ResourceBundle;
+
+import org.eclipse.wst.validation.internal.plugin.ValidationPlugin;
+
+
+/**
+ * This class retrieves the Strings from the .properties file appropriate for the machine's Locale.
+ */
+public class ResourceHandler {
+	//TODO Make this class final once the public ResourceHandler has been deleted.
+	private static ResourceBundle _bundle = null;
+
+	protected ResourceHandler() {
+		//TODO Make this method private once the public ResourceHandler has been deleted.
+		super();
+	}
+
+	/**
+	 * Return the resource bundle which contains the messages, as identified by
+	 */
+	public static ResourceBundle getBundle() {
+		if (_bundle == null) {
+			try {
+				_bundle = ResourceBundle.getBundle(ValidationPlugin.getBundlePropertyFileName());
+			} catch (MissingResourceException exc) {
+				_bundle = null;
+				if (Tracing.isLogging()) {
+					Tracing.log("ResourceHandler-01", "Cannot find bundle " + ValidationPlugin.getBundlePropertyFileName()); //$NON-NLS-1$ //$NON-NLS-2$
+				}
+			}
+		}
+		return _bundle;
+	}
+
+	public static String getExternalizedMessage(String key) {
+		try {
+			ResourceBundle bundle = getBundle();
+			if (bundle == null) {
+				Tracing.log("ResourceHandler-02: ", "Resource bundle is null"); //$NON-NLS-1$ //$NON-NLS-2$
+				return key;
+			}
+
+			return bundle.getString(key);
+		} catch (NullPointerException exc) {
+			Tracing.log("ResourceHandler-03: ", "Cannot find message id ", key); //$NON-NLS-1$ //$NON-NLS-2$
+		}
+		return key;
+	}
+
+	public static String getExternalizedMessage(String key, String[] parms) {
+		String res = ""; //$NON-NLS-1$
+		try {
+			res = java.text.MessageFormat.format(getExternalizedMessage(key), (Object[])parms);
+		} catch (MissingResourceException exc) {
+			Tracing.log("ResourceHandler-04: ", "Cannot find message id ", key); //$NON-NLS-1$ //$NON-NLS-2$
+		} catch (NullPointerException exc) {
+			if (Tracing.isLogging()) {
+				Tracing.log("ResourceHandler-05: Cannot format message id " + key + " with " + parms.length + " parameters."); //$NON-NLS-1$  //$NON-NLS-2$  //$NON-NLS-3$
+			}
+		}
+		return res;
+	}
+}
diff --git a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/TaskListUtility.java b/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/TaskListUtility.java
new file mode 100644
index 0000000..1cae3c1
--- /dev/null
+++ b/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/TaskListUtility.java
@@ -0,0 +1,451 @@
+/*******************************************************************************
+ * Copyright (c) 2001, 2008 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.wst.validation.internal;
+
+import java.util.Map;
+
+import org.eclipse.core.resources.IMarker;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.resources.IWorkspaceRoot;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.wst.validation.internal.plugin.ValidationPlugin;
+import org.eclipse.wst.validation.internal.provisional.core.IMessage;
+
+/**
+ * This class must be called only by the validation framework.
+ * 
+ * This singleton interacts with the eclipse workbench's Task list. TaskListUtility adds and removes
+ * tasks from the list.
+ * 
+ * This class must not be called outside of an IWorkspaceRunnable or IRunnableWithProgress. Many
+ * resource deltas can be generated by the methods in this class.
+ */
+public class TaskListUtility implements ConfigurationConstants {
+	protected static final int DEPTH_INFINITE = IResource.DEPTH_INFINITE;
+	protected static final int DEPTH_ZERO = IResource.DEPTH_ZERO;
+	protected static final String VALIDATION_MARKER_TARGETOBJECT = "targetObject"; //$NON-NLS-1$
+	private final static IMarker[] NO_MARKERS = new IMarker[0];
+
+	public static IWorkspaceRoot getRoot() {
+		IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot();
+		return root;
+	}
+
+	/**
+	 * This method is here for use by the SABER validator's reporter instance ONLY. Do not use. See
+	 * defect 260144 for details.
+	 */
+	@SuppressWarnings("unchecked")
+	public static IMarker setPriority(IMarker item, int priority) throws CoreException {
+		Map attrib = item.getAttributes();
+		attrib.put(IMarker.PRIORITY, new Integer(priority));
+		item.setAttributes(attrib);
+		return item;
+	}
+	
+	/**
+	 * This method adds a message to a resource in the task list.
+	 */
+	public static IMarker addTask(String pluginId, IResource resource, String location, 
+		String messageId, String message, int markerType, String markerName, String targetObjectName, 
+		String groupName, int offset, int length) throws CoreException {
+		
+		if ((message == null) || (resource == null) || (!resource.exists())) {
+			return null;
+		}
+
+		int severity = getSeverity(markerType);
+
+		// Allow duplicate entries in the task list.
+		// Prior to a full validation, the validation framework will remove all messages owned
+		// by a validator before it is executed.
+		// Prior to an incremental validation, the validation framework will remove all messages,
+		// on each of the changed resources, owned by a validator before it is invoked.
+		// 
+		// It is up to the validator to make sure that it is not adding the same message
+		// in more than one place, and also to clear out any old messages which are not cleared
+		// by the validation framework.
+		IMarker item = null;
+		MarkerManager.getDefault().hook(resource);
+		if(markerName != null && markerName.length() >0 )
+			 item = resource.createMarker(markerName); // add a validation marker
+		else
+		     item = resource.createMarker(VALIDATION_MARKER); // add a validation marker
+
+		// For performance reasons, replace the multiple setAttribute
+		// calls above with a single setAttributes call.
+		boolean offsetSet = ((offset != IMessage.OFFSET_UNSET) && (length != IMessage.OFFSET_UNSET));
+		int size = (offsetSet) ? 10 : 8; // add CHAR_START, CHAR_END only if the offset is set. If
+		// the offset is set, it takes precendence over the line
+		// number. (eclipse's rule, not mine.)
+		String[] attribNames = new String[size];
+		Object[] attribValues = new Object[size];
+
+		// Very first thing, add the owner. That way, if the code dies
+		// before things are persisted, hopefully this marker will be persisted.
+		// Hopefully, eclipse WILL persist this field, as requested.
+		attribNames[0] = VALIDATION_MARKER_OWNER;
+		attribValues[0] = pluginId;
+		attribNames[1] = VALIDATION_MARKER_SEVERITY; // this validation severity is stored, in
+		// addition to the marker severity, to enable
+		// more than one severity of message to be
+		// displayed. e.g. ERROR | WARNING (using
+		// binary OR). The IMarker constants are
+		// regular decimal constants.
+		attribValues[1] = new Integer(markerType);
+		attribNames[2] = VALIDATION_MARKER_TARGETOBJECT; // to distinguish between messages which
+		// are registered on an IResource, but
+		// against different target objects
+		attribValues[2] = ((targetObjectName == null) ? "" : targetObjectName); //$NON-NLS-1$
+		attribNames[3] = VALIDATION_MARKER_GROUP;
+		attribValues[3] = ((groupName == null) ? "" : groupName); //$NON-NLS-1$
+		attribNames[4] = IMarker.MESSAGE;
+		attribValues[4] = message;
+		attribNames[5] = VALIDATION_MARKER_MESSAGEID;
+		attribValues[5] = messageId;
+
+		attribNames[6] = IMarker.SEVERITY; // IMarker.SEVERITY_ERROR, IMarker.SEVERITY_WARNING,
+		// IMarker.SEVERITY_INFO
+		attribValues[6] = new Integer(severity);
+		try {
+			// If the location is a line number, store it as a line number
+			Integer lineNumber = Integer.valueOf(location);
+			attribNames[7] = IMarker.LINE_NUMBER;
+			attribValues[7] = lineNumber;
+		} catch (NumberFormatException exc) {
+			// Otherwise, store it as a text location
+			attribNames[7] = IMarker.LOCATION;
+			attribValues[7] = location;
+		}
+
+		if (offsetSet) {
+			attribNames[8] = IMarker.CHAR_START;
+			attribValues[8] = new Integer(offset);
+			attribNames[9] = IMarker.CHAR_END;
+			attribValues[9] = new Integer(offset + length);
+		}
+
+		item.setAttributes(attribNames, attribValues);
+
+		return item;
+	}
+
+	/**
+	 * This method adds a message to a resource in the task list.
+	 */
+	public static IMarker addTask(String pluginId, IResource resource, String location, 
+		String messageId, String message, int markerType, String targetObjectName, 
+		String groupName, int offset, int length) throws CoreException {
+		
+		return addTask(pluginId, resource, location, messageId, 
+				message, markerType, null, targetObjectName, groupName, offset, length);
+	}
+
+	/**
+	 * Given one of the SeverityEnum severities, return the IMarker severity int that is its
+	 * equivalent.
+	 * 
+	 * This method was made public for the SaberReporter. No one other than TaskListUtility, or the
+	 * SaberReporter, should use this method!
+	 *  
+	 */
+	private static int getSeverity(int severityEnumValue) {
+		switch (severityEnumValue) {
+			case (IMessage.HIGH_SEVERITY) : {
+				return IMarker.SEVERITY_ERROR;
+			}
+
+			case (IMessage.LOW_SEVERITY) : {
+				return IMarker.SEVERITY_INFO;
+			}
+
+			case (IMessage.NORMAL_SEVERITY) : {
+				return IMarker.SEVERITY_WARNING;
+			}
+
+			case (IMessage.ALL_MESSAGES) :
+			case (IMessage.ERROR_AND_WARNING) :
+			default : {
+				// assume it's a warning.
+				return IMarker.SEVERITY_WARNING;
+			}
+		}
+	}
+
+	private static int getDepth(IResource resource) {
+		if (resource instanceof IProject) {
+			return DEPTH_INFINITE; // DEPTH_INFINITE means get this project's markers, and the
+			// markers belonging to the project's children.
+		} else if (resource instanceof IWorkspaceRoot) {
+			// Needed for the ValidationMigrator when it checks for orphan tasks.
+			return DEPTH_INFINITE; // DEPTH_INFINITE means get all of the markers in the workspace
+		}
+
+		return DEPTH_ZERO; // DEPTH_ZERO means just this resource, not its children
+	}
+
+	public static IMarker[] getValidationTasks(int severity, IProject project) {
+		// DEPTH_INFINITE means get this project's markers, and the markers
+		// belonging to the project's children.
+		return getValidationTasks(project, severity);
+	}
+
+	public static IMarker[] getValidationTasks(IResource resource, int severity) {
+		return getValidationTasks(resource, severity, getDepth(resource));
+	}
+
+	/**
+	 * Return true if the marker is owned by the ownerId.
+	 */
+	public static boolean isOwner(IMarker marker, String ownerId) {
+		try {
+			Object owner = marker.getAttribute(VALIDATION_MARKER_OWNER);
+			if ((owner == null) || !(owner instanceof String)) {
+				// The ValidationMigrator will remove any "unowned" validation markers.
+				return false;
+			}
+
+			return ((String) owner).equals(ownerId);
+		} catch (CoreException e) {
+			ValidationPlugin.getPlugin().handleException(e);
+			return false;
+		}
+	}
+
+	private static IMarker[] getValidationTasks(IResource resource, int severity, int depth) {
+		IMarker[] tempMarkers = null;
+		int validCount = 0;
+		IMarker[] allMarkers = null;
+		try {
+			allMarkers = resource.findMarkers(VALIDATION_MARKER, true, depth);
+		} catch (CoreException e) {
+			if (Tracing.isLogging())ValidationPlugin.getPlugin().handleException(e);
+			return NO_MARKERS;
+		}
+
+		// Now filter in the markers, based on severity type.
+		if (allMarkers.length != 0) {
+			tempMarkers = new IMarker[allMarkers.length];
+			for (IMarker marker : allMarkers) {
+				Integer filterSeverity = null;
+				try {
+					filterSeverity = (Integer) marker.getAttribute(VALIDATION_MARKER_SEVERITY);
+				}
+				catch (CoreException e){
+					// Someone may have deleted the marker on us. All we can do is skip it.
+					continue;
+				}
+				if (filterSeverity == null) {
+					// odd...marker wasn't created correctly. How could this happen?
+					// Default to the current severity and add it to the list.
+					try {
+						// 226541 - I was seeing markers with valid severities being reset, so I added this
+						// additional test.
+						if (marker.getAttribute(IMarker.SEVERITY, -1) == -1)
+							marker.setAttribute(IMarker.SEVERITY, getSeverity(severity));
+					} catch (Exception e) {
+						ValidationPlugin.getPlugin().handleException(e);
+						continue;
+					}
+				} else if ((severity & filterSeverity.intValue()) == 0) {
+					continue;
+				}
+				tempMarkers[validCount++] = marker;
+			}
+		}
+
+		if (validCount == 0) {
+			return NO_MARKERS;
+		}
+
+		IMarker[] validMarkers = new IMarker[validCount];
+		System.arraycopy(tempMarkers, 0, validMarkers, 0, validCount);
+		return validMarkers;
+	}
+
+	public static IMarker[] getValidationTasks(IResource resource, String messageOwner) {
+		return getValidationTasks(resource, new String[]{messageOwner}, getDepth(resource));
+	}
+
+	public static IMarker[] getValidationTasks(IResource resource, String[] messageOwners) {
+		return getValidationTasks(resource, messageOwners, getDepth(resource));
+	}
+
+	private static IMarker[] getValidationTasks(IResource resource, String[] messageOwners, int depth) {
+		IMarker[] markers = getValidationTasks(resource, IMessage.ALL_MESSAGES, depth);
+		if (markers.length == 0)return NO_MARKERS;
+
+		IMarker[] temp = new IMarker[markers.length];
+		int validCount = 0;
+		for (IMarker marker : markers) {
+			Object owner = null;
+			try {
+				owner = marker.getAttribute(VALIDATION_MARKER_OWNER);
+			} catch (CoreException e) {
+				// eat it -- if it no longer exists there is nothing we can do about it
+			}
+			
+			if ((owner == null) || !(owner instanceof String)) {
+				// The ValidationMigrator will remove any "unowned" validation markers.
+				continue;
+			}
+
+			for (String messageOwner : messageOwners) {
+				if (((String) owner).equals(messageOwner)) {
+					temp[validCount++] = marker;
+					break;
+				}
+			}
+		}
+		
+		if (validCount == 0)return NO_MARKERS;
+
+		IMarker[] result = new IMarker[validCount];
+		System.arraycopy(temp, 0, result, 0, validCount);
+		return result;
+	}
+
+	/**
+	 * This method retrieves all validation tasks from the resource. If depth is INFINITE, child
+	 * tasks are returned as well. Only the tasks which are owned by the specified messageOwner, and
+	 * apply to the named IMessage's target object (objectName) will be returned.
+	 */
+	private static IMarker[] getValidationTasks(IResource resource, String[] messageOwner, String objectName, String groupName, int depth) throws CoreException {
+		if ((messageOwner == null) || (resource == null)) {
+			return NO_MARKERS;
+		}
+
+		int validCount = 0;
+		IMarker[] validList = null;
+		IMarker[] markers = getValidationTasks(resource, messageOwner, depth);
+		if (markers != null) {
+			validList = new IMarker[markers.length];
+			for (int i = 0; i < markers.length; i++) {
+				IMarker marker = markers[i];
+
+				// If more than one target object resolves to the same resource, removing one
+				// target's
+				// messages should not remove the other target object's messages.
+				if (objectName != null) {
+					Object targetObject = marker.getAttribute(VALIDATION_MARKER_TARGETOBJECT);
+					if ((targetObject == null) || !(targetObject instanceof String) || !(((String) targetObject).equals(objectName))) {
+						continue;
+					}
+				}
+
+				if (groupName != null) {
+					Object group = marker.getAttribute(VALIDATION_MARKER_GROUP);
+					if ((group == null) || !(group instanceof String) || !(((String) group).equals(groupName))) {
+						continue;
+					}
+				}
+
+				validList[validCount++] = marker;
+			}
+		}
+
+		if (validCount == 0) {
+			return NO_MARKERS;
+		}
+
+		IMarker[] result = new IMarker[validCount];
+		System.arraycopy(validList, 0, result, 0, validCount);
+		return result;
+	}
+
+	/**
+	 * Remove all validation messages from the resource and its children.
+	 */
+	public static void removeAllTasks(IResource resource) {
+		if (resource == null) {
+			return;
+		}
+
+		try {
+			IMarker[] markers = getValidationTasks(resource, IMessage.ALL_MESSAGES);
+			ResourcesPlugin.getWorkspace().deleteMarkers(markers);
+		} catch (CoreException e) {
+			ValidationPlugin.getPlugin().handleException(e);
+		}
+	}
+
+	/**
+	 * This method removes all tasks from the resource. If the resource is an IProject, all tasks
+	 * are also removed from the project's children.
+	 */
+	public static void removeAllTasks(IResource resource, String[] owners) throws CoreException {
+		removeAllTasks(resource, owners, null); // null means remove messages from all target
+		// objects
+	}
+
+	/**
+	 * This method removes all messages from a resource in the task list.
+	 */
+	public static void removeAllTasks(IResource resource, String owner, String objectName) throws CoreException {
+		removeAllTasks(resource, new String[]{owner}, objectName);
+	}
+
+	public static void removeAllTasks(IResource resource, String[] owners, String objectName) throws CoreException {
+		removeAllTasks(resource, owners, objectName, getDepth(resource));
+	}
+
+	protected static void removeAllTasks(IResource resource, String[] owners, String objectName, int depth) throws CoreException {
+		removeTaskSubset(resource, owners, objectName, null, depth); // null means no group name
+	}
+
+	/**
+	 * This method removes a subset of tasks from the project, including child tasks. Every task
+	 * which belongs to the group, identified by groupName, will be removed.
+	 */
+	public static void removeTaskSubset(IResource resource, String[] owners, String objectName, String groupName) throws CoreException {
+		removeTaskSubset(resource, owners, objectName, groupName, getDepth(resource));
+	}
+
+	/**
+	 * This method removes a subset of tasks from the project, including child tasks. Every task
+	 * which belongs to the group, identified by groupName, will be removed.
+	 */
+	protected static void removeTaskSubset(IResource resource, String[] owners, String objectName, String groupName, int depth) throws CoreException {
+		if ((owners == null) || (resource == null)) {
+			return;
+		}
+
+		IMarker[] allTasks = getValidationTasks(resource, owners, objectName, groupName, depth);
+		if (allTasks.length > 0) {
+			ResourcesPlugin.getWorkspace().deleteMarkers(allTasks);
+		}
+	}
+
+	/**
+	 * This method changes all validator markers which are owned by "from" to make their owner "to".
+	 */
+	public static void updateOwner(String from, String to) throws CoreException {
+		updateOwner(from, to, getRoot());
+	}
+
+	/**
+	 * This method changes all validator markers on the IResource and its children. All markers
+	 * owned by "from" have their owner reassigned to "to".
+	 */
+	public static void updateOwner(String from, String to, IResource resource) throws CoreException {
+		IMarker[] ownedMarkers = getValidationTasks(resource, from);
+		if (ownedMarkers == null) {
+			return;
+		}
+
+		for (int i = 0; i < ownedMarkers.length; i++) {
+			IMarker marker = ownedMarkers[i];
+			marker.setAttribute(VALIDATION_MARKER_OWNER, to);
+		}
+	}
+}
diff --git a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/VThreadManager.java b/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/VThreadManager.java
new file mode 100644
index 0000000..e9d9b7e
--- /dev/null
+++ b/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/VThreadManager.java
@@ -0,0 +1,152 @@
+/*******************************************************************************
+ * Copyright (c) 2001, 2008 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.wst.validation.internal;
+
+
+import java.util.Vector;
+
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.wst.validation.internal.plugin.ValidationPlugin;
+
+
+/**
+ * This class manages (queue, invoke, etc.) the Runnables that perform the validation for a
+ * particular validator.
+ */
+public class VThreadManager {
+	private static VThreadManager _manager = null;
+	private static final int MAX_NUM_OF_RESTART = 5; // the maximum number of times that the thread
+	// should attempt to ignore a Throwable and
+	// carry on
+
+	private Thread _validationThread = null; // This thread checks if the current Runnable is
+	// finished, and if so, loads the first Runnable off of
+	// the queue and starts it.
+	volatile int restart = 0; // how many times has the thread been restarted?
+	volatile Jobs _jobs = null;
+
+	private VThreadManager() {
+		_jobs = new Jobs();
+
+		// Start the validation thread to check for queued ValidationOperation
+		Runnable validationRunnable = new Runnable() {
+			public void run() {
+				while (true) {
+					try {
+						if (restart > MAX_NUM_OF_RESTART) {
+							// something has gone seriously, seriously wrong
+							String message = "restart = " + restart; //$NON-NLS-1$
+							ValidationPlugin.getPlugin().logMessage(IStatus.ERROR, message);
+							break;
+						}
+
+						Runnable job = getJobs().dequeue(); // If currentRunnable is null, there's
+						// nothing on the queue. Shouldn't
+						// happen with a semaphore.
+						if (job != null) {
+							getJobs().setActive(true);
+							job.run();
+							getJobs().setActive(false);
+						}
+					} catch (Exception e) {
+						restart++;
+						getJobs().setActive(false);
+						ValidationPlugin.getPlugin().handleException(e);
+					} finally {
+						//do nothing
+					}
+				}
+			}
+		};
+
+		_validationThread = new Thread(validationRunnable, "ValidationThread"); //$NON-NLS-1$
+		_validationThread.start();
+	}
+
+	public static VThreadManager getManager() {
+		if (_manager == null) {
+			_manager = new VThreadManager();
+		}
+		return _manager;
+	}
+
+	Jobs getJobs() {
+		return _jobs;
+	}
+
+	public void queue(Runnable runnable) {
+		getJobs().queue(runnable);
+	}
+
+	/**
+	 * Return true if all of the Runnables have been run.
+	 */
+	public boolean isDone() {
+		return getJobs().isDone();
+	}
+
+	private class Jobs {
+		private Vector<Runnable> _queuedJobs; // The queued Runnables that need to be run.
+		private boolean _isActive; // Is a job being run in the validation thread?
+
+		public Jobs() {
+			_queuedJobs = new Vector<Runnable>();
+		}
+
+		public synchronized void queue(Runnable runnable) {
+			// If there is a thread running already, then it must finish before another validation
+			// thread is launched, or the validation messages could reflect the last thread
+			// finished,
+			// instead of the last state of changes.
+
+			// Have to wait for the current Runnable to finish, so add this to the end of the queue
+			_queuedJobs.add(runnable);
+			notifyAll();
+		}
+
+		/**
+		 * Pop the Runnable off of the head of the queue.
+		 */
+		synchronized Runnable dequeue() {
+			while (_queuedJobs.size() == 0) {
+				try {
+					wait();
+				} catch (InterruptedException exc) {
+					//Ignore
+				}
+			} // Block on the semaphore; break when a job has been added to the queue.
+
+			Runnable job = null;
+			if (_queuedJobs.size() > 0) {
+				job = _queuedJobs.get(0);
+				if (job != null) {
+					_queuedJobs.remove(0);
+				}
+			}
+			return job;
+		}
+
+		public synchronized boolean isActive() {
+			return _isActive;
+		}
+
+		public synchronized void setActive(boolean active) {
+			_isActive = active;
+		}
+
+		/**
+		 * Return true if all of the Runnables have been run.
+		 */
+		public synchronized boolean isDone() {
+			return ((_queuedJobs.size() == 0) && !isActive());
+		}
+	}
+}
diff --git a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/ValidationConfiguration.java b/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/ValidationConfiguration.java
new file mode 100644
index 0000000..3ddb087
--- /dev/null
+++ b/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/ValidationConfiguration.java
@@ -0,0 +1,1078 @@
+/*******************************************************************************
+ * Copyright (c) 2001, 2009 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.wst.validation.internal;
+
+import java.lang.reflect.InvocationTargetException;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.StringTokenizer;
+
+import org.eclipse.core.resources.IMarker;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.resources.IWorkspaceRoot;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.Preferences;
+import org.eclipse.core.runtime.Preferences.IPropertyChangeListener;
+import org.eclipse.core.runtime.Preferences.PropertyChangeEvent;
+import org.eclipse.wst.validation.internal.delegates.ValidatorDelegateDescriptor;
+import org.eclipse.wst.validation.internal.delegates.ValidatorDelegatesRegistry;
+import org.eclipse.wst.validation.internal.plugin.ValidationPlugin;
+import org.osgi.service.prefs.BackingStoreException;
+
+/**
+ * This class represents the user's preference or project settings.
+ * 
+ * This class is populated from the multiple persistent properties, and is kept as a session
+ * property while the resource is open.
+ */
+public abstract class ValidationConfiguration implements IPropertyChangeListener {
+	private final IResource 	_resource;
+	private boolean 	disableAllValidation = getDisableAllValidation();
+	private String 		_version;
+	
+	/**
+	 * Map of all validators configured on the project or installed globally. The value of true
+	 * means that the VMD is enabled, and a value of false means that the VMD is disabled.
+	 */
+	private Map<ValidatorMetaData, Boolean>		_validators = new HashMap<ValidatorMetaData, Boolean>();
+	protected Map<ValidatorMetaData, Boolean> 	manualValidators;
+	protected Map<ValidatorMetaData, Boolean> 	buildValidators;
+	
+	protected static final String UserPreference = "USER_PREFERENCE"; //$NON-NLS-1$
+	protected static final String UserBuildPreference = "USER_BUILD_PREFERENCE"; //$NON-NLS-1$
+	protected static final String UserManualPreference = "USER_MANUAL_PREFERENCE"; //$NON-NLS-1$
+	protected static final String DelegatesPreference = "DELEGATES_PREFERENCE"; //$NON-NLS-1$
+	
+	// GRK - I am keeping these "constants" in the off chance that they were used somewhere outside the framework
+	protected String USER_PREFERENCE 		= UserPreference;
+	protected String USER_MANUAL_PREFERENCE = UserManualPreference;
+	protected String USER_BUILD_PREFERENCE 	= UserBuildPreference;
+	protected String DELEGATES_PREFERENCE 	= DelegatesPreference;
+	
+	/**
+	 * The key is the target id, that is the id of the place holder validator. The value is the id 
+	 * of the real validator. 
+	 */
+	private Map<String, String> _delegatesByTarget = new HashMap<String, String>();
+	
+	private static final String DefaultValue = "default_value"; //$NON-NLS-1$
+
+	public static String getEnabledElementsAsString(Set<ValidatorMetaData> elements) {
+		if (elements == null)return null;
+
+		StringBuffer buffer = new StringBuffer();
+		for (ValidatorMetaData vmd : elements) {
+			buffer.append(vmd.getValidatorUniqueName());
+			buffer.append(ConfigurationConstants.ELEMENT_SEPARATOR);
+		}
+		return buffer.toString();
+	}
+
+	private boolean getDisableAllValidation() {
+		return false;
+	}
+
+	public static String getEnabledElementsAsString(ValidatorMetaData[] elements) {
+		StringBuffer buffer = new StringBuffer();
+		for (ValidatorMetaData vmd : elements) {
+			buffer.append(vmd.getValidatorUniqueName());
+			buffer.append(ConfigurationConstants.ELEMENT_SEPARATOR);
+		}
+		return buffer.toString();
+	}
+
+	public static Set<ValidatorMetaData> getStringAsEnabledElements(String elements) {
+		if (elements == null)return null;
+
+		Set<ValidatorMetaData> result = new HashSet<ValidatorMetaData>();
+		StringTokenizer tokenizer = new StringTokenizer(elements, ConfigurationConstants.ELEMENT_SEPARATOR);
+		while (tokenizer.hasMoreTokens()) {
+			String elem = tokenizer.nextToken();
+			ValidatorMetaData vmd = ValidationRegistryReader.getReader().getValidatorMetaData(elem);
+			if (vmd != null)result.add(vmd);
+		}
+		return result;
+	}
+
+	public static ValidatorMetaData[] getStringAsEnabledElementsArray(String elements) {
+		if (elements == null)return null;
+
+		StringTokenizer tokenizer = new StringTokenizer(elements, ConfigurationConstants.ELEMENT_SEPARATOR);
+		ValidatorMetaData[] result = new ValidatorMetaData[tokenizer.countTokens()];
+		int count = 0;
+		while (tokenizer.hasMoreTokens()) {
+			String elem = tokenizer.nextToken();
+			ValidatorMetaData vmd = ValidationRegistryReader.getReader().getValidatorMetaData(elem);
+			if (vmd != null)result[count++] = vmd;
+		}
+
+		if (count != result.length) {
+			ValidatorMetaData[] trimResult = new ValidatorMetaData[count];
+			System.arraycopy(result, 0, trimResult, 0, count);
+			return trimResult;
+		}
+
+		return result;
+	}
+	
+	/**
+	 * Answer the validators
+	 * @return
+	 */
+	public static Set<String> getValidatorIdsManual(){
+		PreferencesWrapper prefs = PreferencesWrapper.getPreferences(null, null);
+		String config = prefs.get(UserManualPreference, null);
+		return getValidatorIds(config);
+	}
+	
+	public static Set<String> getValidatorIdsBuild(){
+		PreferencesWrapper prefs = PreferencesWrapper.getPreferences(null, null);
+		String config = prefs.get(UserBuildPreference, null);
+		return getValidatorIds(config);
+	}
+	
+	private static Set<String> getValidatorIds(String elements){
+		Set<String> set = new HashSet<String>(50);
+		if (elements != null){
+			StringTokenizer tokenizer = new StringTokenizer(elements, ConfigurationConstants.ELEMENT_SEPARATOR);
+			while (tokenizer.hasMoreTokens())set.add(tokenizer.nextToken());
+		}
+		return set;
+	}
+
+	public static IWorkspaceRoot getRoot() {
+		return ResourcesPlugin.getWorkspace().getRoot();
+	}
+	
+	protected ValidationConfiguration(IResource resource){
+		_resource = resource;
+	}
+
+	protected ValidationConfiguration(IResource resource, ValidatorMetaData[] validators) throws InvocationTargetException {
+		if (resource == null) {
+			throw new InvocationTargetException(null, ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_EXC_NULLCREATE));
+		}
+
+		_resource = resource;
+		setValidators(validators);
+	}
+	
+	public boolean isDisableAllValidation() throws InvocationTargetException {
+		return disableAllValidation;
+	}
+
+	public void setDisableAllValidation(boolean allValidation) {
+		disableAllValidation = allValidation;
+	}
+
+	public ValidatorMetaData[] getEnabledValidators() throws InvocationTargetException {
+		return getValidators(true);
+	}
+	
+	/**
+	 * If "incremental" is true, return the enabled incremental validators. If "incremental" is
+	 * false, return the enabled non-incremental validators.
+	 */
+	public ValidatorMetaData[] getEnabledIncrementalValidators(boolean incremental) throws InvocationTargetException {
+		return getEnabledFullBuildValidators(!incremental);
+	}
+
+	/**
+	 * If "fullBuild" is true, return the enabled validators that support full builds. If
+	 * "fullBuild" is false, return the enabled validators that do not support full builds.
+	 */
+	public ValidatorMetaData[] getEnabledFullBuildValidators(boolean fullBuild) throws InvocationTargetException {
+		return getEnabledFullBuildValidators(fullBuild, false);
+	}
+
+	public ValidatorMetaData[] getEnabledFullBuildValidators(boolean fullBuild, boolean onlyReferenced) throws InvocationTargetException {
+
+		int count = 0;
+		ValidatorMetaData[] result = null;
+		 
+		if( !isDisableAllValidation() ){
+			Set<ValidatorMetaData> set = getBuildEnabledValidatorsMap().keySet();
+			ValidatorMetaData[] temp = new ValidatorMetaData[set.size()];
+			for (ValidatorMetaData vmd : set) {
+				Boolean bvalue = getBuildEnabledValidatorsMap().get(vmd);
+				if (bvalue) {
+					// If the validator is enabled
+					if (vmd == null)continue;
+					if ( vmd.isBuildValidation() ) {
+						if (!onlyReferenced || vmd.isDependentValidator())
+							temp[count++] = vmd;
+					}
+				}
+			}
+			result = new ValidatorMetaData[count];
+			System.arraycopy(temp, 0, result, 0, count);
+		}
+		else {
+			 result = new ValidatorMetaData[0];
+		}
+		return result;
+	}
+
+	public void setEnabledValidators(ValidatorMetaData[] vmds) {
+		// First, "disable" all validators
+		Map<ValidatorMetaData, Boolean> all = getValidatorMetaData();
+		for (ValidatorMetaData vmd : all.keySet()) {
+			all.put(vmd, Boolean.FALSE);
+		}
+
+		// Then enable only the validators in the array
+		if ((vmds == null) || (vmds.length == 0))return;
+		
+		for (ValidatorMetaData vmd : vmds) {
+			all.put(vmd, Boolean.TRUE);
+		}
+	}
+	
+	public void setEnabledManualValidators(ValidatorMetaData[] vmds) throws InvocationTargetException {
+		Set<ValidatorMetaData> manualEnabledVMDs = new HashSet<ValidatorMetaData>(vmds.length);
+		for (ValidatorMetaData vmd : vmds)manualEnabledVMDs.add(vmd);
+		
+		for(ValidatorMetaData data : getValidators()) {
+			if(manualEnabledVMDs.contains(data))
+				getManualEnabledValidatorsMap().put(data, Boolean.TRUE);
+			else
+				getManualEnabledValidatorsMap().put(data, Boolean.FALSE);			
+		}
+	}
+	
+	/**
+	 * Update the list of validators that have been enabled for manual validation.
+	 * 
+	 * @param vmds the validators that are enabled for manual validation.
+	 * @throws InvocationTargetException
+	 */
+	public void setEnabledManualValidators(Set<ValidatorMetaData> vmds) throws InvocationTargetException {
+		for(ValidatorMetaData data : getValidators()) {
+			if(vmds.contains(data))getManualEnabledValidatorsMap().put(data, Boolean.TRUE);
+			else getManualEnabledValidatorsMap().put(data, Boolean.FALSE);			
+		}
+	}
+	
+	public void setEnabledBuildValidators(ValidatorMetaData[] vmds) throws InvocationTargetException {
+		Set<ValidatorMetaData> buildEnabledVMDs = new HashSet<ValidatorMetaData>(vmds.length);
+		for (ValidatorMetaData vmd : vmds)buildEnabledVMDs.add(vmd);
+		for(ValidatorMetaData data : getValidators()) {
+			if(buildEnabledVMDs.contains(data))
+				getBuildEnabledValidatorsMap().put(data, Boolean.TRUE);
+			else
+				getBuildEnabledValidatorsMap().put(data, Boolean.FALSE);			
+		}
+	}
+	
+	/**
+	 * Update the list of validators that have been enabled for build validation.
+	 * 
+	 * @param vmds the validators that are enabled for build validation.
+	 * @throws InvocationTargetException
+	 */
+	public void setEnabledBuildValidators(Set<ValidatorMetaData> vmds) throws InvocationTargetException {
+		for(ValidatorMetaData data : getValidators()) {
+			if(vmds.contains(data))getBuildEnabledValidatorsMap().put(data, Boolean.TRUE);
+			else getBuildEnabledValidatorsMap().put(data, Boolean.FALSE);			
+		}
+	}
+
+	private Map<ValidatorMetaData, Boolean> getValidatorMetaData() {
+		return _validators;
+	}
+	
+
+	public ValidatorMetaData[] getDisabledValidators() throws InvocationTargetException {
+		return getValidators(false);
+	}
+
+	/**
+	 * Return an array of ValidatorMetaData - if value is false, return the disabled validators; if
+	 * value is true, return the enabled validators.
+	 */
+	private ValidatorMetaData[] getValidators(boolean value) throws InvocationTargetException {
+		ValidatorMetaData[] temp = new ValidatorMetaData[numberOfValidators()];
+		int count = 0;
+		for (ValidatorMetaData vmd : getValidatorMetaData().keySet()) {
+			Boolean bvalue = getValidatorMetaData().get(vmd);
+			if (bvalue.booleanValue() == value) {
+				temp[count++] = vmd;
+			}
+		}
+
+		ValidatorMetaData[] result = new ValidatorMetaData[count];
+		System.arraycopy(temp, 0, result, 0, count);
+		return result;
+	}
+	
+	public ValidatorMetaData[] getManualEnabledValidators() throws InvocationTargetException {
+		Map<ValidatorMetaData, Boolean> map = getManualEnabledValidatorsMap();
+		if (!map.isEmpty()) {
+			List<ValidatorMetaData> list = new LinkedList<ValidatorMetaData>();
+			for (Map.Entry<ValidatorMetaData, Boolean> me : map.entrySet()) {
+				Boolean obj = me.getValue();
+				if (obj != null && obj)list.add(me.getKey());
+			}
+			return (ValidatorMetaData[]) list.toArray(new ValidatorMetaData[list.size()]);
+		}
+		return getEnabledValidators();
+	}	
+	
+	public  ValidatorMetaData[] getBuildEnabledValidators() throws InvocationTargetException {
+		Map<ValidatorMetaData, Boolean> map = getBuildEnabledValidatorsMap();
+		List<ValidatorMetaData> list = new LinkedList<ValidatorMetaData>();
+		if (!map.isEmpty()) {
+			for (Map.Entry<ValidatorMetaData, Boolean> me : map.entrySet()) {
+				Boolean obj = me.getValue();
+				if (obj != null && obj)list.add(me.getKey());
+			}
+			return (ValidatorMetaData[]) list.toArray(new ValidatorMetaData[list.size()]);
+		}
+		return getEnabledValidators();
+	}
+	
+	/**
+	 * Answer the map of the validators that have been enabled for build validation, 
+	 * creating it if necessary.
+	 */
+	protected  Map<ValidatorMetaData, Boolean> getBuildEnabledValidatorsMap() {
+		if(buildValidators == null)buildValidators = new HashMap<ValidatorMetaData, Boolean>();
+		return buildValidators;
+	}	
+	
+	/**
+	 * Answer the map of the validators that have been enabled for manual validation, 
+	 * creating it if necessary.
+	 */
+	protected  Map<ValidatorMetaData, Boolean> getManualEnabledValidatorsMap() {
+		if(manualValidators == null)manualValidators = new HashMap<ValidatorMetaData, Boolean>();
+		return manualValidators;
+	}	
+
+	/**
+	 * Return all incremental validators for this preference; either every installed validator
+	 * (global) or every validator configured on the project (project).
+	 */
+	public ValidatorMetaData[] getIncrementalValidators() throws InvocationTargetException {
+		ValidatorMetaData[] temp = new ValidatorMetaData[numberOfValidators()];
+		int count = 0;
+		for (ValidatorMetaData vmd : getValidatorMetaData().keySet()) {
+			Boolean bvalue = getValidatorMetaData().get(vmd);
+			if (bvalue && vmd.isIncremental())temp[count++] = vmd;
+		}
+
+		ValidatorMetaData[] result = new ValidatorMetaData[count];
+		System.arraycopy(temp, 0, result, 0, count);
+		return result;
+	}
+
+	/**
+	 * Return all validators for this preference; either every installed validator (global) or every
+	 * validator configured on the project (project).
+	 */
+	public ValidatorMetaData[] getValidators() throws InvocationTargetException {
+		return convertToArray(_validators.keySet());
+	}
+	
+	public void setValidators(ValidatorMetaData[] vmds) {
+		_validators.clear();
+		for (ValidatorMetaData vmd : vmds) {
+			if (vmd == null)continue;
+			_validators.put(vmd, (vmd.isEnabledByDefault() ? Boolean.TRUE : Boolean.FALSE));
+		}
+	}
+	
+  public void setDefaultDelegates(ValidatorMetaData[] vmds) throws InvocationTargetException {
+    _delegatesByTarget.clear();
+    for (ValidatorMetaData vmd : vmds) {
+      if (vmd == null)continue;
+      
+      String targetID = vmd.getValidatorUniqueName();
+      String delegateID = ValidatorDelegatesRegistry.getInstance().getDefaultDelegate(targetID);
+      if (delegateID == null)continue;
+      _delegatesByTarget.put(targetID, ValidatorDelegatesRegistry.getInstance().getDefaultDelegate(targetID));
+    }
+  }
+
+	/**
+	 * Returns the number of configured validators on the given project or installed validators in
+	 * the workspace.
+	 */
+	public int numberOfValidators() throws InvocationTargetException {
+		return _validators.size();
+	}
+
+	public int numberOfEnabledIncrementalValidators() throws InvocationTargetException {
+		return numberOfIncrementalValidators(getEnabledValidators());
+	}
+
+	public int numberOfIncrementalValidators() throws InvocationTargetException {
+		return numberOfIncrementalValidators(getValidators());
+	}
+
+	private static int numberOfIncrementalValidators(ValidatorMetaData[] vmds) {
+		int count = 0;
+		for (ValidatorMetaData vmd : vmds) {
+			if (vmd.isIncremental())count++;
+		}
+		return count;
+	}
+
+	/**
+	 * Returns the number of enabled validators on the project or workspace.
+	 */
+	public int numberOfEnabledValidators() throws InvocationTargetException {
+		return getEnabledValidators().length;
+	}
+
+	/**
+	 * Returns the number of disabled validators on the project or workspace.
+	 */
+	public int numberOfDisabledValidators() throws InvocationTargetException {
+		return getDisabledValidators().length;
+	}
+
+	/**
+	 * The value returned from this method is guaranteed to be non-null.
+	 */
+	public final String getVersion() throws InvocationTargetException {
+		if (_version == null)loadVersion();
+		return _version;
+	}
+
+	private void setVersion(String version) {
+		_version = version;
+	}
+
+	/**
+	 * This preference has been migrated; change the version to the current version.
+	 * @deprecated dead code.
+	 */
+	public void markVersionCurrent() {
+		// The version should not be marked current until the migration is complete
+		// (i.e., ValidationMigrator has been invoked.) Migrating the user's configuration
+		// is only the first step of the migration.
+		setVersion(ConfigurationConstants.CURRENT_VERSION);
+	}
+
+	public boolean isVersionCurrent() throws InvocationTargetException {
+		return getVersion().equals(ConfigurationConstants.CURRENT_VERSION);
+	}
+
+	// IResource could be an IProject or an IWorkspaceRoot
+	public IResource getResource() {
+		return _resource;
+	}
+
+	/**
+	 * Return true if the validator is enabled on this preference.
+	 */
+	public boolean isEnabled(String validatorClassName) throws InvocationTargetException {
+		if (validatorClassName == null) {
+			return false;
+		}
+
+		ValidatorMetaData vmd = ValidationRegistryReader.getReader().getValidatorMetaData(validatorClassName);
+		return isEnabled(vmd);
+	}
+
+	/**
+	 * Return true if the validator is enabled on this preference.
+	 */
+	public boolean isEnabled(ValidatorMetaData vmd) throws InvocationTargetException {
+		if (vmd == null)return false;
+
+		Boolean value = getValidatorMetaData().get(vmd);
+		if (value == null)return false;
+
+		return value.booleanValue();
+	}
+
+	/**
+	 * Once all of the fields have been updated on this ValidationConfiguration instance, this
+	 * preference should be stored back on the IResource for later use. This method must be called
+	 * manually by the validation framework once the fields of this type have been updated.
+	 */
+	public final void passivate() throws InvocationTargetException {
+		try {
+			if (getResource() == null) {
+				throw new InvocationTargetException(null, ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_EXC_NULLSAVE));
+			}
+			getResource().setSessionProperty(ConfigurationConstants.USER_PREFERENCE, this);
+		} catch (CoreException exc) {
+			throw new InvocationTargetException(exc, ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_EXC_SAVE, new String[]{getResource().getName()}));
+		}
+	}
+
+	/**
+	 * Reset the values to the default values.
+	 */
+	public abstract void resetToDefault() throws InvocationTargetException;
+
+	protected Boolean convertToBoolean(boolean value) {
+		return (value == true ? Boolean.TRUE : Boolean.FALSE);
+	}
+
+	protected Integer convertToInteger(int value) {
+		return new Integer(value);
+	}
+
+	protected boolean convertToBoolean(String value) {
+		Boolean b = Boolean.valueOf(value);
+		return b.booleanValue();
+	}
+
+	protected int convertToInt(String value) {
+		Integer t = Integer.valueOf(value);
+		return t.intValue();
+	}
+
+	public static ValidatorMetaData[] convertToArray(Collection<ValidatorMetaData> c) {
+		int length = (c == null) ? 0 : c.size();
+		ValidatorMetaData[] result = new ValidatorMetaData[length];
+		if (length == 0)return result;
+
+		int count = 0;
+		for (ValidatorMetaData vmd : c)result[count++] = vmd;
+
+		return result;
+	}
+
+	public static ValidatorMetaData[] convertToArray(Object[] c) {
+		int length = (c == null) ? 0 : c.length;
+		ValidatorMetaData[] result = new ValidatorMetaData[length];
+		if (length == 0)return result;
+
+		System.arraycopy(c, 0, result, 0, length);
+		return result;
+	}
+	
+	/**
+	 * Save the values of these fields before the project or workspace is closed.
+	 */
+	public void store() throws InvocationTargetException {
+		store(null);
+	}
+
+	/**
+	 * Save the values of these fields before the project or workspace is closed.
+	 */
+	public void store(Boolean persist) throws InvocationTargetException {
+		PreferencesWrapper pref = PreferencesWrapper.getPreferences(null, persist);
+		pref.put(ValidationConfiguration.UserPreference, serialize());
+		pref.put(ValidationConfiguration.UserManualPreference, serializeManualSetting());
+		pref.put(ValidationConfiguration.UserBuildPreference, serializeBuildSetting());
+		pref.put(ValidationConfiguration.DelegatesPreference, serializeDelegatesSetting());
+		try {
+			pref.flush();
+		}
+		catch (BackingStoreException e){
+			throw new InvocationTargetException(e);
+		}
+	}
+
+	/**
+	 * Load and store the version number, but nothing else. The version isn't a preference, but it's
+	 * stored and loaded as if it is. Because the load mechanism is different between an IProject
+	 * and the IWorkspaceRoot, keep the load mechanism inside the ValidationConfiguration
+	 * implementation, but initialize only the minimum at first. After the project has been
+	 * migrated, load the other fields (loading the other fields before the migration may overwrite
+	 * the values of those fields).
+	 */
+	protected final void loadVersion() throws InvocationTargetException {
+		if (getResource() == null) {
+			throw new InvocationTargetException(null, ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_EXC_NULLRETRIEVE));
+		}
+
+		IMarker[] marker = getMarker();
+		String version = null;
+		if (marker == null) {
+			// either a new workspace or already migrated; proceed as normal
+			version = loadVersion(getResource());
+		} else {
+			// migrate
+			version = loadVersion(marker);
+		}
+		setVersion(version);
+	}
+
+	protected final String loadVersion(IMarker[] marker) throws InvocationTargetException {
+		String version = (String) getValue(marker[0], ConfigurationConstants.VERSION);
+		if (version == null)	return ConfigurationConstants.VERSION4_03;
+
+		return version;
+	}
+
+	protected final String loadVersion(IResource resource) throws InvocationTargetException {
+		try {
+			// This method will be called in one of two situations:
+			//    1. This is a new workspace and no preferences exist.
+			//    2. This is a migrated workspace and the old preferences have already been created as
+			// persistent properties.
+			String storedConfiguration = resource.getPersistentProperty(ConfigurationConstants.USER_PREFERENCE);
+			String version = null;
+			if (storedConfiguration == null) {
+				version = getVersionDefault();
+			} else {
+				int versionIndex = storedConfiguration.indexOf(ConfigurationConstants.VERSION);
+				if (versionIndex != -1)
+					version = storedConfiguration.substring(versionIndex + ConfigurationConstants.VERSION.length());
+			}
+
+			if (version == null) {
+				return getVersionDefault();
+			}
+
+			return version;
+		} catch (CoreException exc) {
+			throw new InvocationTargetException(exc, ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_EXC_RETRIEVE, new String[]{getResource().getName()}));
+		}
+	}
+
+	/**
+	 * Load the values of these fields when the project or workspace is opened.
+	 */
+	protected final void load() throws InvocationTargetException {
+		try {
+			if (getResource() == null) {
+				throw new InvocationTargetException(null, ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_EXC_NULLRETRIEVE));
+			}
+
+			IMarker[] marker = getMarker();
+			if (marker == null) {
+				// either a new workspace or already migrated; proceed as normal
+				loadPreference();
+			} else {
+				// migrate
+				load(marker);
+			}
+		} catch (InvocationTargetException exc) {
+			throw exc;
+		} catch (Exception exc) {
+			String resourceName = (getResource() == null) ? "null" : getResource().getName(); //$NON-NLS-1$
+			throw new InvocationTargetException(exc, ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_EXC_RETRIEVE, new String[]{resourceName}));
+		}
+	}
+
+	/**
+	 * Return the IMarker that used to store the preference information, if the marker exists. (If
+	 * it doesn't exist, then it's already been migrated.)
+	 */
+	protected abstract IMarker[] getMarker();
+
+	protected abstract void load(IMarker[] marker) throws InvocationTargetException;
+
+	protected Object getValue(IMarker marker, String attribName) {
+		if (marker == null)return null;
+
+		try {
+			return marker.getAttribute(attribName);
+		} catch (CoreException e) {
+			ValidationPlugin.getPlugin().handleException(e);
+			return null;
+		}
+	}
+
+	protected boolean getValue(IMarker marker, String attribName, boolean defaultValue) {
+		Boolean bool = (Boolean) getValue(marker, attribName);
+		if (bool == null)return defaultValue;
+
+		return bool.booleanValue();
+	}
+
+	protected int getValue(IMarker marker, String attribName, int defaultValue) {
+		Integer integer = (Integer) getValue(marker, attribName);
+		if (integer == null)return defaultValue;
+
+		return integer.intValue();
+	}
+
+	protected String getValue(IMarker marker, String attribName, String defaultValue) {
+		String string = (String) getValue(marker, attribName);
+		if (string == null)return defaultValue;
+
+		return string;
+	}
+
+	protected void loadPreference() throws InvocationTargetException {
+		// This method will be called in one of two situations:
+		// 1. This is a new workspace and no preferences exist.
+		// 2. This is a migrated workspace and the old preferences have already been created as
+		// persistent properties.
+		PreferencesWrapper prefs = PreferencesWrapper.getPreferences(null, null);
+		deserializeAllPrefs(prefs);
+	}
+
+	/**
+	 * @param prefs
+	 * @throws InvocationTargetException
+	 */
+	private void deserializeAllPrefs(PreferencesWrapper prefs) throws InvocationTargetException {
+		String storedConfig = prefs.get(ValidationConfiguration.UserPreference, null);
+		deserialize(storedConfig);
+		String storedManualConfig = prefs.get(ValidationConfiguration.UserManualPreference, null);
+		deserializeManual(storedManualConfig);
+		String storedBuildConfig = prefs.get(ValidationConfiguration.UserBuildPreference, null);
+		deserializeBuild(storedBuildConfig);
+		String storedDelegatesConfiguration = prefs.get(ValidationConfiguration.DelegatesPreference, null);
+		deserializeDelegates(storedDelegatesConfiguration);
+	}
+	
+	public void propertyChange(PropertyChangeEvent event) {
+		Preferences prefs = (Preferences) event.getSource();
+		if (prefs != null && !event.getOldValue().equals(event.getNewValue())) {
+			try {
+				deserializeAllPrefs(event);
+				passivate();
+			 } catch (InvocationTargetException e) {
+				 ValidationPlugin.getPlugin().handleException(e);
+			}
+		}
+	}
+
+	private void deserializeAllPrefs(PropertyChangeEvent event) throws InvocationTargetException {
+		String storedConfig = (String)event.getNewValue();
+		if( event.getProperty().equals(ValidationConfiguration.UserPreference) ){
+			deserialize(storedConfig);
+		}else if(event.getProperty().equals(ValidationConfiguration.UserManualPreference)){
+			deserializeManual(storedConfig);
+		}else if(event.getProperty().equals(ValidationConfiguration.UserBuildPreference)){
+			deserializeBuild(storedConfig);
+		}else if(event.getProperty().equals(ValidationConfiguration.DelegatesPreference)){
+			deserializeDelegates(storedConfig);
+		}
+	}
+	
+	
+	protected void deserializeBuild(String storedConfiguration) throws InvocationTargetException {
+		if (storedConfiguration == null || storedConfiguration.length() == 0 || storedConfiguration.equals(DefaultValue)) {
+			// Assume that the configuration has never been set (new workspace).
+			resetToDefault();
+			return;
+		}
+		int buildValidationIndex = storedConfiguration.indexOf(ConfigurationConstants.ENABLED_BUILD_VALIDATORS);
+
+		String manualValidation = storedConfiguration.substring(buildValidationIndex + ConfigurationConstants.ENABLED_BUILD_VALIDATORS.length(),storedConfiguration.length());
+		setEnabledBuildValidators(getStringAsEnabledElementsArray(manualValidation));
+	}
+
+	protected void deserializeManual(String storedConfiguration) throws InvocationTargetException {
+		if (storedConfiguration == null || storedConfiguration.length() == 0 || storedConfiguration.equals(DefaultValue)) {
+			// Assume that the configuration has never been set (new workspace).
+			resetToDefault();
+			return;
+		}
+		int manualValidationIndex = storedConfiguration.indexOf(ConfigurationConstants.ENABLED_MANUAL_VALIDATORS);
+
+		String manualValidation = storedConfiguration.substring(manualValidationIndex + ConfigurationConstants.ENABLED_MANUAL_VALIDATORS.length(),storedConfiguration.length());
+		setEnabledManualValidators(getStringAsEnabledElementsArray(manualValidation));
+	}
+
+	protected void deserializeDelegates(String storedConfiguration) throws InvocationTargetException {
+
+    if (storedConfiguration == null || storedConfiguration.length() == 0 || storedConfiguration.equals(DefaultValue)) {
+	    // Assume that the configuration has never been set (new workspace).
+	    resetToDefault();
+	    return;
+	  }
+
+	  int delegatesIndex = storedConfiguration.indexOf(ConfigurationConstants.DELEGATE_VALIDATORS);
+
+	  String delegates = storedConfiguration.substring(delegatesIndex + ConfigurationConstants.DELEGATE_VALIDATORS.length(),storedConfiguration.length());
+
+	  if (delegates == null) {
+	    return;
+	  }
+
+	  StringTokenizer tokenizer = new StringTokenizer(delegates, ConfigurationConstants.ELEMENT_SEPARATOR);
+	  while (tokenizer.hasMoreTokens()) {
+	    String delegateConfiguration = tokenizer.nextToken();
+	    int separatorIndex = delegateConfiguration.indexOf(ConfigurationConstants.DELEGATES_SEPARATOR);
+	    String targetID = delegateConfiguration.substring(0, separatorIndex);
+	    String delegateID = delegateConfiguration.substring(separatorIndex + 1);
+      _delegatesByTarget.put(targetID, delegateID);
+	  }
+	}
+
+	protected void copyTo(ValidationConfiguration up) throws InvocationTargetException {
+		up.setVersion(getVersion());
+		up.setValidators(getValidators());
+		up.setDisableAllValidation(isDisableAllValidation());
+		up.setEnabledValidators(getEnabledValidators());
+		up.setEnabledManualValidators(getManualEnabledValidators());
+		up.setEnabledBuildValidators(getBuildEnabledValidators());
+    up.setDelegatingValidators(getDelegatingValidators());
+	}
+
+	/**
+	 * The key is the id of the place holder validator, and the value is the id of validator
+	 * that will perform the validation. 
+	 */
+	public Map<String, String> getDelegatingValidators() throws InvocationTargetException {
+		return _delegatesByTarget;
+	}
+
+	public void setDelegatingValidators(Map<String, String> source)
+	{
+		// It is safe to copy this map as it contains only immutable strings.
+		_delegatesByTarget.putAll(source);
+	}
+
+  /**
+	 * Return true if the enabled validators have not changed since this ValidationConfiguration was
+	 * constructed, false otherwise. (This method is needed for the Properties and Preference pages;
+	 * if the list of validators hasn't changed, then there is no need to update the task list;
+	 * updating the task list is a costly operation.)
+	 */
+	protected boolean hasEnabledValidatorsChanged(ValidatorMetaData[] oldEnabledVmd) throws InvocationTargetException {
+		// First check the obvious: is every enabled validator still enabled, and is
+		// the number of enabled validators the same as it was before? If not, return true.
+		if (oldEnabledVmd == null) {
+			// Something's gone wrong...
+			return true;
+		}
+
+		for (int i = 0; i < oldEnabledVmd.length; i++) {
+			ValidatorMetaData vmd = oldEnabledVmd[i];
+			if (!isEnabled(vmd)) {
+				return true;
+			}
+		}
+
+		// Everything that was enabled is still enabled; have any additional
+		// validators been enabled?
+		if (numberOfEnabledValidators() != oldEnabledVmd.length) {
+			return true;
+		}
+
+		return false;
+	}
+  
+  /**
+   * Determines if there has been a change in the list of delegate validators.
+   * @param oldDelegates a Map with the old delegates ID by target ID.
+   * @return true if there has been a change, false otherwise.
+   * @throws InvocationTargetException
+   */
+  protected boolean haveDelegatesChanged(Map<String, String> oldDelegates) throws InvocationTargetException {
+    
+    if (oldDelegates == null)return true;
+    
+    for (String targetID : oldDelegates.keySet()) {
+      String oldDelegateID = oldDelegates.get(targetID);
+      String newDelegateID = _delegatesByTarget.get(targetID);
+      
+      if (oldDelegateID == null || newDelegateID == null)return true;
+        
+      if (!newDelegateID.equals(oldDelegateID))return true;
+    }
+    
+    if (oldDelegates.size() != _delegatesByTarget.size())return true;
+    
+    return false;
+  }
+
+	protected String serialize() throws InvocationTargetException {
+		StringBuffer buffer = new StringBuffer();
+		buffer.append(ConfigurationConstants.DISABLE_ALL_VALIDATION_SETTING);
+		buffer.append(String.valueOf(isDisableAllValidation()));
+		buffer.append(ConfigurationConstants.VERSION);
+		buffer.append(getVersion());
+		return buffer.toString();
+	}
+	
+	protected String serializeManualSetting() throws InvocationTargetException {
+		StringBuffer buffer = new StringBuffer();
+		buffer.append(ConfigurationConstants.ENABLED_MANUAL_VALIDATORS);
+		buffer.append(getEnabledElementsAsString(getManualEnabledValidators()));
+		return buffer.toString();
+	}
+	
+	protected String serializeBuildSetting() throws InvocationTargetException {
+		StringBuffer buffer = new StringBuffer();
+		buffer.append(ConfigurationConstants.ENABLED_BUILD_VALIDATORS);
+		buffer.append(getEnabledElementsAsString(getBuildEnabledValidators()));
+		return buffer.toString();
+	}
+
+  protected String serializeDelegatesSetting() throws InvocationTargetException {
+    StringBuffer buffer = new StringBuffer();
+    buffer.append(ConfigurationConstants.DELEGATE_VALIDATORS);
+    buffer.append(getDelegatesAsString(getValidatorMetaData()));
+    return buffer.toString();
+  }
+
+  /**
+   * Provides a String which contains pairs of targetID=delegateID separated by a semicolon.
+   * @param validatorMetaData a Map with the currently configured validators.
+   * @return a String.
+   */
+  private String getDelegatesAsString(Map<ValidatorMetaData, Boolean> validatorMetaData) {
+    
+    StringBuffer buffer = new StringBuffer();
+    for (ValidatorMetaData vmd : validatorMetaData.keySet()) {    
+      String targetID = vmd.getValidatorUniqueName();
+      String delegateID = getDelegateUniqueName(vmd);
+      
+      if (delegateID == null)continue;
+
+      // Write out pairs targetID=delegateID
+
+      buffer.append(targetID);
+      buffer.append(ConfigurationConstants.DELEGATES_SEPARATOR);
+      buffer.append(delegateID);
+      buffer.append(ConfigurationConstants.ELEMENT_SEPARATOR);
+    }
+    
+    return buffer.toString();
+  }
+  
+  /**
+   * Provides the delegate's ID of the validator delegate configured in this configuration for 
+   * a given delegating validator. That is answer the id of validator that is going to do the real work.
+   * 
+   * @param vmd the delegating validator's meta data. Must not be null.
+   * @return a String with the id of the validator delegate, null if there isn't one.
+   */
+  public String getDelegateUniqueName(ValidatorMetaData vmd) {
+    String targetID = vmd.getValidatorUniqueName();    
+    return _delegatesByTarget.get(targetID);
+  }
+  
+  /**
+   * Provides the delegate's ID of the validator delegate configured in this configuration for 
+   * a given delegating validator. That is answer the id of validator that is going to do the real work.
+   * 
+   * @param targetId the id of the target (or place holder) validator. Must not be null.
+   * @return a String with the id of the validator delegate, null if there isn't one.
+   */
+  public String getDelegateForTarget(String targetId){
+	  return _delegatesByTarget.get(targetId);
+  }
+
+  /**
+   * Sets the delegate's ID of the validator delegate to be used in this configuration for the
+   * given delegating validator.
+   * 
+   * @param vmd the delegating validator's metadata. Must not be null.
+   * @param delegateID a String with the unique name (ID) of the validator delegate. Must not be null.
+   */
+  public void setDelegateUniqueName(ValidatorMetaData vmd, String delegateID) {
+    String targetID = vmd.getValidatorUniqueName();    
+    _delegatesByTarget.put(targetID, delegateID);
+  }
+
+  /**
+	 * Deserialize everything except the version number; the version is deserialized first, in the
+	 * loadVersion() method.
+	 */
+	protected void deserialize(String storedConfiguration) throws InvocationTargetException {
+		if (storedConfiguration == null || storedConfiguration.length() == 0 || storedConfiguration.equals(DefaultValue)) {
+			// Assume that the configuration has never been set (new workspace).
+			resetToDefault();
+			return;
+		}
+		int disableAllValidationIndex = storedConfiguration.indexOf(ConfigurationConstants.DISABLE_ALL_VALIDATION_SETTING);
+		int versionIndex = storedConfiguration.indexOf(ConfigurationConstants.VERSION);
+		if(disableAllValidationIndex != -1) {
+				String disableAllValidation = storedConfiguration.substring(disableAllValidationIndex + ConfigurationConstants.DISABLE_ALL_VALIDATION_SETTING.length(),versionIndex);
+				setDisableAllValidation(Boolean.valueOf(disableAllValidation).booleanValue());
+		} else {
+				setDisableAllValidation(false);
+		}
+		
+	}
+
+	public static boolean getDisableValidationDefault() {
+		return ConfigurationConstants.DEFAULT_DISABLE_VALIDATION_SETTING;
+	}
+
+	public static ValidatorMetaData[] getEnabledValidatorsDefault() {
+		return ConfigurationConstants.DEFAULT_ENABLED_VALIDATORS;
+	}
+
+	public static int getMaximumNumberOfMessagesDefault() {
+		return ConfigurationConstants.DEFAULT_MAXNUMMESSAGES;
+	}
+
+	public static String getVersionDefault() {
+		// If the version can't be retrieved, assume that it's a new workspace. (A null version
+		// could also mean a 4.03 workspace, but that's taken care of in the load(IMarker[])
+		// method.)
+		return ConfigurationConstants.CURRENT_VERSION;
+	}
+	
+	public boolean isManualEnabled(ValidatorMetaData vmd) {
+		if (vmd == null)return false;
+		Boolean value = getManualEnabledValidatorsMap().get(vmd);
+		if (value == null)return false;
+		return value;
+	}
+
+	public boolean isBuildEnabled(ValidatorMetaData vmd) {
+		if (vmd == null)return false;
+		Boolean value = getBuildEnabledValidatorsMap().get(vmd);
+		if (value == null)return false;
+		return value;
+	}
+	
+	public int numberOfManualEnabledValidators() throws InvocationTargetException {
+		return getManualEnabledValidators().length;
+	}
+	
+	public void enableSingleValidator(ValidatorMetaData  vmd){
+		getValidatorMetaData().put(vmd, Boolean.TRUE);
+	}
+	
+	
+	public void disableSingleValidator(ValidatorMetaData  vmd){
+		getValidatorMetaData().put(vmd, Boolean.FALSE);
+	}
+	
+	public void enableSingleManualValidator(ValidatorMetaData  vmd){
+		getManualEnabledValidatorsMap().put(vmd, Boolean.TRUE);
+	}
+	
+	
+	public void disableSingleManualValidator(ValidatorMetaData  vmd){
+		getManualEnabledValidatorsMap().put(vmd, Boolean.FALSE);
+	}
+
+	
+	public void enableSingleBuildValidator(ValidatorMetaData  vmd){
+		getBuildEnabledValidatorsMap().put(vmd, Boolean.TRUE);
+	}
+	
+	
+	public void disableSingleBuildValidator(ValidatorMetaData  vmd){
+		getBuildEnabledValidatorsMap().put(vmd, Boolean.FALSE);
+	}
+	
+  /**
+   * Provides the delegate validator descriptor of the validator delegate configured 
+   * for the given delegating validator in the context of this configuration. 
+   * @param vmd the delegating validator's meta data. Must not be null.
+   * @return a ValidatorDelegateDescriptor for the given delegating validator.
+   */
+  public ValidatorDelegateDescriptor getDelegateDescriptor(ValidatorMetaData vmd)  throws InvocationTargetException {
+    String targetID = vmd.getValidatorUniqueName();
+    String delegateID = getDelegateUniqueName(vmd);
+  
+    ValidatorDelegateDescriptor descriptor = ValidatorDelegatesRegistry.getInstance().getDescriptor(targetID, delegateID); 
+    return descriptor;    
+  }
+}
diff --git a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/ValidationFactoryImpl.java b/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/ValidationFactoryImpl.java
new file mode 100644
index 0000000..1ba2ed1
--- /dev/null
+++ b/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/ValidationFactoryImpl.java
@@ -0,0 +1,36 @@
+/*******************************************************************************
+ * Copyright (c) 2001, 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
+ *******************************************************************************/
+package org.eclipse.wst.validation.internal;
+
+import org.eclipse.wst.validation.internal.provisional.ValidationFactory;
+import org.eclipse.wst.validation.internal.provisional.core.IValidator;
+
+public class ValidationFactoryImpl implements ValidationFactory {
+	static ValidationFactory inst = null;
+	
+	public ValidationFactoryImpl() {
+		super();
+	}
+
+	public static ValidationFactory getInstance() {
+		if(inst == null)
+			inst = new ValidationFactoryImpl();
+		return inst;
+	}
+
+
+
+	public IValidator getValidator(String validatorUniqueId) throws InstantiationException {
+		ValidationRegistryReader reader = ValidationRegistryReader.getReader();
+		return reader.getValidator(validatorUniqueId);
+	}
+
+}
diff --git a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/ValidationRegistryReader.java b/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/ValidationRegistryReader.java
new file mode 100644
index 0000000..03910e7
--- /dev/null
+++ b/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/ValidationRegistryReader.java
@@ -0,0 +1,1370 @@
+/*******************************************************************************
+ * Copyright (c) 2001, 2010 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.wst.validation.internal;
+
+
+import java.text.MessageFormat;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Set;
+import java.util.StringTokenizer;
+
+import org.eclipse.core.expressions.EvaluationContext;
+import org.eclipse.core.expressions.EvaluationResult;
+import org.eclipse.core.expressions.Expression;
+import org.eclipse.core.expressions.ExpressionConverter;
+import org.eclipse.core.expressions.ExpressionTagNames;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IWorkspaceRoot;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IConfigurationElement;
+import org.eclipse.core.runtime.IExtension;
+import org.eclipse.core.runtime.IExtensionPoint;
+import org.eclipse.core.runtime.IExtensionRegistry;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Platform;
+import org.eclipse.osgi.util.NLS;
+import org.eclipse.wst.common.project.facet.core.IFacetedProject;
+import org.eclipse.wst.common.project.facet.core.IProjectFacet;
+import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
+import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
+import org.eclipse.wst.validation.internal.delegates.ValidatorDelegatesRegistry;
+import org.eclipse.wst.validation.internal.operations.IRuleGroup;
+import org.eclipse.wst.validation.internal.operations.IWorkbenchContext;
+import org.eclipse.wst.validation.internal.plugin.ValidationPlugin;
+import org.eclipse.wst.validation.internal.provisional.core.IValidator;
+import org.osgi.framework.Bundle;
+
+/**
+ * ValidationRegistryReader is a singleton who reads the plugin registry for Validator extensions.
+ * The read is done once (in the constructor), and the list of validators can be accessed by calling
+ * "getValidatorMetaData(String)" on this class. The read is triggered by a call from
+ * ValidatorManager's loadValidatorMetaData(IProject) method. ValidatorManager delegates the load
+ * call to this class, and if this class is null, the singleton is new'ed up, and the registry is
+ * read.
+ * <p>
+ * No Validator should need to know about this class. The only class which should call
+ * ValidationRegistryReader is ValidatorManager.
+ * </p>
+ * <p>
+ * The Validator itself is initialized in the "initializeValidator" method.
+ * </p>
+ */
+public final class ValidationRegistryReader implements RegistryConstants {
+	
+	 /* <extension point="org.eclipse.wst.validation.internal.provisional.core.core.validator" id="EJBValidator" name="EJB
+		 * Validator"> <validator><projectNature id="com.ibm.etools.j2ee.EJBNature" include="false"/>
+		 * <filter objectClass="org.eclipse.core.resources.IFile" nameFilter = "ejb-jar.xml"/> <filter
+		 * objectClass="org.eclipse.core.resources.IFile" nameFilter = "*.java"/> <helper
+		 * class="org.eclipse.wst.validation.internal.provisional.core.core.ejb.workbenchimpl.EJBHelper"/> <run
+		 * class="org.eclipse.wst.validation.internal.provisional.core.core.ejb.EJBValidator" incremental="false" enabled="false"
+		 * pass="fast,full" async="false"/> <aggregateValidator class="my.aggregate.ValidatorClass"/>
+		 * <migrate><validator from="old.class.name" to="new.class.name"/> </migrate> </validator>
+		 * </extension>
+		 */
+	
+	private static ValidationRegistryReader _inst = new ValidationRegistryReader();
+	
+	/** list of all validators registered, with their associated ValidatorMetaData, indexed by project nature id */
+	private final Map<String,Set<ValidatorMetaData>> _validators;
+	
+	// list of all validators, indexed by validator class name,
+	// with the validator's ValidatorMetaData as the value.
+	// Needed by the WorkbenchReporter, because sometimes the
+	// IValidator is not enough to remove all messages from the
+	// task list.
+	private final Map<String, ValidatorMetaData> _indexedValidators; 
+	
+	private final Set<ValidatorMetaData> _defaultEnabledValidators;
+	
+	// Since IProject's contents are all instances of IResource, every type filter for a validator
+	// must be an instance of IResource. This applies to both the rebuildCache pass and to the
+	// validation pass.
+	private static final String IRESOURCE = "org.eclipse.core.resources.IResource"; //$NON-NLS-1$
+
+	private static final String UNKNOWN_PROJECT = "UNKNOWN"; //$NON-NLS-1$ // This 'project nature id' is used as a key to get the validators which can run on a project type which hasn't been explicitly filtered in or out by any validator.
+	private static final String EXCLUDED_PROJECT = "EXCLUDED"; //$NON-NLS-1$ // This 'project nature id' is used as a key to get the validators which are excluded on certain projects.
+	
+	/** @deprecated this instance variable should not be public. */
+	public HashMap<IProject, Set<ValidatorMetaData>> projectValidationMetaData = new HashMap<IProject, Set<ValidatorMetaData>>();
+
+	/**
+	 * The registry is read once - when this class is instantiated.
+	 */
+	private ValidationRegistryReader() {
+
+		_validators = new HashMap<String,Set<ValidatorMetaData>>();
+		_indexedValidators = new HashMap<String, ValidatorMetaData>();
+		_defaultEnabledValidators = new HashSet<ValidatorMetaData>();
+		try {
+
+			// Read the registry and build a map of validators. The key into
+			// the map is the IValidator instance and the value is the ValidatorMetaData
+			// which describes the IValidator.
+			readRegistry();
+
+			// Once all of the validators have been read, the caches of the
+			// validators need to be updated.
+			buildCache();
+		} catch (Exception e) {
+			ValidationPlugin.getPlugin().handleException(e);
+		}
+	}
+
+	/**
+	 * Traverse over the list of VMDs which have been added and create copies of it. The copies are
+	 * created to increase runtime performance.
+	 */
+	private void buildCache() {
+		for (ValidatorMetaData vmd : _indexedValidators.values()) {
+			buildProjectNatureCache(vmd);
+			buildDefaultEnabledCache(vmd);
+		}
+
+		// Now add the validators which are configured on all projects,
+		// and all projects but X.
+		addRemainder();
+
+		// this temporary list isn't needed any more. All of the excluded
+		// projects have been added to the project natures which they don't exclude.
+		_validators.remove(EXCLUDED_PROJECT);
+
+		if (Tracing.isTraceV1()) {
+			Tracing.log("ValidationRegistryReader-01: ", debug()); //$NON-NLS-1$
+		}
+	}
+
+	/**
+	 * Build the cache of VMDs which is indexed by project nature ids. If the validator is
+	 * registered on all project types, the vmd's project nature filters will be null.
+	 */
+	private void buildProjectNatureCache(ValidatorMetaData vmd) {
+		// Build the cache with the identified project natures in validators'
+		// extensions.
+		ValidatorNameFilter[] projNatureIds = vmd.getProjectNatureFilters();
+		String[] facetFilters = vmd.getFacetFilters();
+		if (projNatureIds == null) {
+			if (facetFilters == null && vmd.getEnablementExpresion() == null) {
+				add(UNKNOWN_PROJECT, vmd);
+			}
+		} else {
+			boolean noneIncluded = true; // assume that the validator does not include any project
+			// natures
+			for (int i = 0; i < projNatureIds.length; i++) {
+				ValidatorNameFilter pn = projNatureIds[i];
+				if (pn.isInclude()) {
+					noneIncluded = false;
+					add(pn.getNameFilter(), vmd);
+				}
+			}
+
+			if (noneIncluded) {
+				// add it to the list of EXCLUDED projects
+				// (that is, a validator which excludes project natures but doesn't
+				// explicitly include any. This type of validator runs on any unrecognized (UNKNOWN)
+				// projects, but the rest of the cache needs to be built before this is added
+				// to the UNKNOWN list. See addExcludedRemainder().
+				add(EXCLUDED_PROJECT, vmd);
+			}
+		}
+	}
+	/**
+	 * Build the list of validators which are enabled by default.
+	 */
+	private void buildDefaultEnabledCache(ValidatorMetaData vmd) {
+		if (vmd == null)return;
+
+		if (vmd.isEnabledByDefault())_defaultEnabledValidators.add(vmd);
+	}
+
+	/**
+	 * Add vmd to the list of validators, indexed by validator class name
+	 */
+	private void add(ValidatorMetaData vmd) {
+		if (vmd == null) {
+			return;
+		}
+
+		_indexedValidators.put(vmd.getValidatorUniqueName(), vmd);
+	}
+
+	/*
+	 * Some validators can run on any type of project. In order to have a static list, add the "any
+	 * project" validators to each "project nature" validators' list. This avoids adding the "any
+	 * project" validators to the "project nature" validators at runtime, which results in
+	 * performance savings.
+	 * 
+	 * Some validators run on any type of project but X, where X is an excluded project nature.
+	 * Those validators should also be added via this method.
+	 */
+	private void addRemainder() {
+		// First, add all "can-run-on-any-project-type" to every registered project nature type in
+		// the cache.
+		addAnyRemainder();
+
+		// Then add the "can-run-on-any-project-type-but-X" to every non-X registered project nature
+		// type in the cache.
+		addExcludedRemainder();
+	}
+
+	private void addExcludedRemainder() {
+		Set<ValidatorMetaData> excludedProjVmds = _validators.get(EXCLUDED_PROJECT);
+		if (excludedProjVmds == null) {
+			// no excluded project natures
+			return;
+		}
+
+		for (ValidatorMetaData vmd : excludedProjVmds) {
+
+			// assume that, by default, if someone explicitly excludes
+			// a project nature then they don't include any project natures
+			boolean noneIncluded = true;
+			
+			// a project nature then they don't include any project natures
+			for (String projId : _validators.keySet()) {
+				if (projId.equals(UNKNOWN_PROJECT) || projId.equals(EXCLUDED_PROJECT)) {
+					// Don't add list to a project nature which is excluded or applicable to all.
+					continue;
+				}
+
+				ValidatorNameFilter filter = vmd.findProjectNature(projId);
+				if (filter != null) {
+					// Don't add list to itself (filter.isIncluded() == true) or
+					// to a list from which it's excluded (filter.isIncluded() == false)
+					if (filter.isInclude()) {
+						noneIncluded = false;
+					}
+					continue;
+				}
+
+				add(projId, vmd);
+			}
+
+			if (noneIncluded) {
+				// At this point, the "can-run-on-any-project" becomes
+				// "not-excluded-on-these-projects". That is, if the project
+				// nature id isn't in the list of _validators, then it isn't
+				// included or excluded by any validators, so all validators
+				// which can run on any project AND all validators which can
+				// run on any but certain excluded projects can run on the
+				// given IProject.
+				add(UNKNOWN_PROJECT, vmd);
+			}
+		}
+	}
+
+	private void addAnyRemainder() {
+		Set<ValidatorMetaData> anyProjVmds = _validators.get(UNKNOWN_PROJECT);
+		if (anyProjVmds == null) {
+			// no validators run on all projects
+			return;
+		}
+
+		for (String projId : _validators.keySet()) {
+			if (projId.equals(UNKNOWN_PROJECT) || projId.equals(EXCLUDED_PROJECT)) {
+				// Don't add list to itself or to a project nature which is excluded.
+				continue;
+			}
+
+			add(projId, anyProjVmds);
+		}
+	}
+
+	private void add(String projectNatureId, Set<ValidatorMetaData> vmdList) {
+		if ((vmdList == null) || (vmdList.size() == 0))return;
+
+		// whether the validator includes or excludes this
+		// project nature id, make sure that an entry is created for it in the table
+		Set<ValidatorMetaData> pnVal = createSet(projectNatureId); 
+		pnVal.addAll(vmdList);
+		_validators.put(projectNatureId, pnVal);
+	}
+
+	private void add(String projectNatureId, ValidatorMetaData vmd) {
+		if (vmd == null)return;
+
+		// whether the validator includes or excludes this
+		// project nature id, make sure that an entry is created for it in the table
+		Set<ValidatorMetaData> pnVal = createSet(projectNatureId); 
+		pnVal.add(vmd);
+		_validators.put(projectNatureId, pnVal);
+	}
+
+	/**
+	 * When a validator's class or helper class cannot be loaded, the vmd calls this method to
+	 * disable the validator. The validator will be removed from the preference page, properties
+	 * page, and enabled list of any project thereafter validated.
+	 */
+	public void disableValidator(ValidatorMetaData vmd) {
+		_indexedValidators.remove(vmd.getValidatorUniqueName());
+		_defaultEnabledValidators.remove(vmd);
+
+		// The whole "on-any-project" and "exclude-this-project-nature" would take
+		// a lot of processing time... Instead, traverse the list of proj nature ids,
+		// and search the Set of that proj nature id, and remove the vmd if it's in the
+		// Set.
+		for (String projId : _validators.keySet()) {
+			Set<ValidatorMetaData> value = _validators.get(projId);
+			if (value == null)continue;
+
+			if (value.contains(vmd)) {
+				value.remove(vmd);
+				_validators.put(projId, value);
+			}
+		}
+	}
+
+	private Set<ValidatorMetaData> createSet(String projNature) {
+		Set<ValidatorMetaData> v = _validators.get(projNature);
+		if (v == null) {
+			v = new HashSet<ValidatorMetaData>();
+		}
+		return v;
+	}
+
+	/**
+	 * Given an IConfigurationElement, if it has a project nature(s) specified, return the
+	 * ValidatorNameFilters which represent those natures. Otherwise return null.
+	 * 
+	 * A project nature can be specified in plugin.xml to indicate what types of IProjects a
+	 * validator can run on.
+	 */
+	private String[] getAggregateValidatorsNames(IConfigurationElement element) {
+		IConfigurationElement[] filters = element.getChildren(TAG_AGGREGATE_VALIDATORS);
+		if (filters.length == 0)
+			return null;
+
+		String[] names = new String[filters.length];
+		for (int i = 0; i < names.length; i++) {
+			// In order to speed up our String comparisons, load these
+			// names into Java's constants space. This way, we'll be able to
+			// use pointer comparison instead of the traditional
+			// character-by-character comparison. Since these names should
+			// never be set by anyone other than this class, and this class
+			// sets them only once, it is safe to declare these Strings
+			// constants.
+			//
+			// To load a String into the constants space, call intern() on the String.
+			//
+			String nameFilter = filters[i].getAttribute(ATT_CLASS);
+			if (nameFilter != null) {
+				nameFilter = nameFilter.intern();
+			}
+			names[i] = nameFilter;
+		}
+		return names;
+	}
+	
+	private String[] getContentTypeBindings(IConfigurationElement element){
+		IConfigurationElement[] bindings = element.getChildren(TAG_CONTENTTYPE);
+		if(bindings.length == 0)
+			return null;
+		String[] cTypeIDs = new String[bindings.length];
+		for (int i = 0; i < bindings.length; i ++){
+			
+			cTypeIDs[i] = bindings[i].getAttribute(ATT_CONTENTTYPEID);
+		}
+		
+		return cTypeIDs;
+		
+	}
+
+	/**
+	 * Given an IConfigurationElement from plugin.xml, if it has any filter tags, construct the
+	 * appropriate ValidatorFilters to represent those tags; else return null.
+	 * 
+	 * A filter can be specified in plugin.xml to filter out certain resources.
+	 */
+	private ValidatorFilter[] getFilters(IConfigurationElement element) {
+		IConfigurationElement[] filters = element.getChildren(TAG_FILTER);
+		if (filters.length == 0)
+			return null;
+
+		ValidatorFilter[] vf = new ValidatorFilter[filters.length];
+		for (int i = 0; i < filters.length; i++) {
+			vf[i] = new ValidatorFilter(IRESOURCE);
+
+			// In order to speed up our String comparisons, load these
+			// names into Java's constants space. This way, we'll be able to
+			// use pointer comparison instead of the traditional
+			// character-by-character comparison. Since these names should
+			// never be set by anyone other than this class, and this class
+			// sets them only once, it is safe to declare these Strings
+			// constants.
+			//
+			// To load a String into the constants space, call intern() on the String.
+			//
+			String nameFilter = filters[i].getAttribute(ATT_NAME_FILTER);
+			if (nameFilter != null) {
+				nameFilter = nameFilter.intern();
+			}
+			String isCaseSensitive = filters[i].getAttribute(ATT_CASE_SENSITIVE);
+			vf[i].setNameFilter(nameFilter, isCaseSensitive);
+
+			String objectClass = filters[i].getAttribute(ATT_OBJECT_CLASS);
+			if (objectClass != null) {
+				objectClass = objectClass.intern();
+			}
+			vf[i].setTypeFilter(objectClass);
+
+			String actionFilter = filters[i].getAttribute(ATT_ACTION_FILTER);
+			if (actionFilter != null) {
+				actionFilter = actionFilter.intern();
+			}
+			vf[i].setActionFilter(actionFilter);
+		}
+		return vf;
+	}
+
+	public boolean getDependentValidatorValue(IConfigurationElement element) {
+		IConfigurationElement[] depValidatorElement = element.getChildren(DEP_VALIDATOR);
+		if (depValidatorElement.length == 0)
+			return false;
+		String depValue = depValidatorElement[0].getAttribute(DEP_VAL_VALUE);
+		boolean depBoolValue = (new Boolean(depValue)).booleanValue();
+		return depBoolValue;
+	}
+
+	/**
+	 * Return the name of the marker ID associated with the IValidator.
+	 */
+	public String[] getMarkerIdsValue(IConfigurationElement element) {
+		IConfigurationElement[] markerId = element.getChildren(MARKER_ID);
+		if (markerId.length == 0)
+			return null;
+		String markerIds[] = new String[markerId.length];
+		for(int i = 0; i < markerIds.length; i++) {
+			markerIds[i] = markerId[i].getAttribute(MARKER_ID_VALUE);
+		}
+		return markerIds;
+	}
+	
+	public String[] getFacetIds(IConfigurationElement element) {
+		IConfigurationElement[] facets = element.getChildren(FACET);
+		if (facets.length == 0)
+			return null;
+		String[] facetIds = new String[facets.length];
+		for (int i = 0; i < facets.length; i++) {
+			facetIds[i] = facets[i].getAttribute(FACET_ID);
+		}
+		return facetIds;
+	}
+
+	/**
+	 * Return the name of the helper class associated with the IValidator.
+	 */
+	private String getHelperName(IConfigurationElement element) {
+		IConfigurationElement[] helpers = element.getChildren(TAG_HELPER_CLASS);
+		if (helpers.length == 0)
+			return null;
+
+		return helpers[0].getAttribute(ATT_CLASS);
+	}
+
+	static IWorkbenchContext createHelper(IConfigurationElement element, String helperClassName) {
+		IWorkbenchContext wh = null;
+		try {
+			wh = (IWorkbenchContext) element.createExecutableExtension(TAG_HELPER_CLASS);
+		} catch (Exception exc) {
+			ValidationPlugin.getPlugin().handleException(exc);
+			String result = MessageFormat.format(
+				ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_EXC_SYNTAX_NO_HELPER_THROWABLE), 
+				new Object[]{helperClassName});
+			ValidationPlugin.getPlugin().logMessage(IStatus.ERROR, result);	
+			return null;
+		}
+		return wh;
+	}
+
+	static IValidator createValidator(IConfigurationElement element, String validatorClassName) {
+		IValidator validator = null;
+		try {
+			validator = (IValidator) element.createExecutableExtension(ATT_CLASS);
+		} catch (Exception e) {
+			String result = MessageFormat.format(ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_EXC_SYNTAX_NO_VAL_THROWABLE), 
+				new Object[]{validatorClassName});
+			ValidationPlugin.getPlugin().logMessage(IStatus.ERROR, result);	
+			ValidationPlugin.getPlugin().handleException(e);
+		}
+
+		if (validator == null) {
+			if (Tracing.isTraceV1()) {
+				Tracing.log("ValidationRegistryReader-02: ",  //$NON-NLS-1$
+					NLS.bind(ValMessages.VbfExcSyntaxNoValNull, validatorClassName));
+			}
+			return null;
+		}
+
+		return validator;
+	}
+
+	/**
+	 * Given an IConfigurationElement from plugin.xml, return whether or not the validator is
+	 * enabled by default.
+	 * 
+	 * If no enabled attribute is specified, the default, true (i.e., enabled) is returned.
+	 */
+	private boolean getEnabledByDefault(IConfigurationElement element) {
+		IConfigurationElement[] runChildren = element.getChildren(TAG_RUN_CLASS);
+		// Don't need to check if runChildren is null or empty, because that was checked in the
+		// initializeValidator method.
+
+		String inc = runChildren[0].getAttribute(ATT_ENABLED);
+		if (inc == null) {
+			return RegistryConstants.ATT_ENABLED_DEFAULT;
+		}
+
+		return Boolean.valueOf(inc.trim().toLowerCase()).booleanValue(); // this will return true
+		// if, and only if, the
+		// attribute value is
+		// "true". For example,
+		// "yes" will be considered
+		// "false".
+	}
+
+	/**
+	 * Given an IConfigurationElement from plugin.xml, return whether or not the validator supports
+	 * incremental validation.
+	 * 
+	 * If no incremental attribute is specified, the default, true (i.e., incremental is supported)
+	 * is returned.
+	 */
+	private boolean getIncremental(IConfigurationElement element) {
+		IConfigurationElement[] runChildren = element.getChildren(TAG_RUN_CLASS);
+		// Don't need to check if runChildren is null or empty, because that was checked in the
+		// initializeValidator method.
+
+		String inc = runChildren[0].getAttribute(ATT_INCREMENTAL);
+		if (inc == null) {
+			return RegistryConstants.ATT_INCREMENTAL_DEFAULT;
+		}
+
+		return Boolean.valueOf(inc.trim().toLowerCase()).booleanValue(); // this will return true
+		// if, and only if, the
+		// attribute value is
+		// "true". For example,
+		// "yes" will be considered
+		// "false".
+	}
+
+	/**
+	 * Given an IConfigurationElement from plugin.xml, return whether or not the validator supports
+	 * full build validation.
+	 * 
+	 * If no incremental attribute is specified, the default, true (i.e., incremental is supported)
+	 * is returned.
+	 */
+	private boolean getFullBuild(IConfigurationElement element) {
+		IConfigurationElement[] runChildren = element.getChildren(TAG_RUN_CLASS);
+		// Don't need to check if runChildren is null or empty, because that was checked in the
+		// initializeValidator method.
+
+		String fb = runChildren[0].getAttribute(ATT_FULLBUILD);
+		if (fb == null) {
+			return RegistryConstants.ATT_FULLBUILD_DEFAULT;
+		}
+
+		return Boolean.valueOf(fb.trim().toLowerCase()).booleanValue(); // this will return true if,
+		// and only if, the
+		// attribute value is
+		// "true". For example,
+		// "yes" will be considered
+		// "false".
+	}
+
+	/**
+	 * Given an IConfigurationElement from plugin.xml, return whether or not the validator supports
+	 * asynchronous validation.
+	 * 
+	 * If no async attribute is specified, the default, true (i.e., the validator is thread-safe) is
+	 * returned.
+	 */
+	private boolean getAsync(IConfigurationElement element) {
+		IConfigurationElement[] runChildren = element.getChildren(TAG_RUN_CLASS);
+		// Don't need to check if runChildren is null or empty, because that was checked in the
+		// initializeValidator method.
+
+		String async = runChildren[0].getAttribute(ATT_ASYNC);
+		if (async == null) {
+			return RegistryConstants.ATT_ASYNC_DEFAULT;
+		}
+
+		return Boolean.valueOf(async.trim().toLowerCase()).booleanValue(); // this will return true
+		// if, and only if, the
+		// attribute value is
+		// "true". For example,
+		// "yes" will be
+		// considered "false".
+	}
+
+	/**
+	 * Given an IConfigurationElement from plugin.xml, return the types of validation passes, as
+	 * defined in IRuleGroup, that the validator performs.
+	 * 
+	 * If no pass attribute is specified, the default, IRuleGroup.PASS_FULL, is returned.
+	 */
+	private int getRuleGroup(IConfigurationElement element) {
+		IConfigurationElement[] runChildren = element.getChildren(TAG_RUN_CLASS);
+		// Don't need to check if runChildren is null or empty, because that was checked in the
+		// initializeValidator method.
+
+		String pass = runChildren[0].getAttribute(ATT_RULE_GROUP);
+		if (pass == null) {
+			return RegistryConstants.ATT_RULE_GROUP_DEFAULT;
+		}
+
+		final String COMMA = ","; //$NON-NLS-1$
+		StringTokenizer tokenizer = new StringTokenizer(pass, COMMA, false); // false means don't
+		// return the comma as
+		// part of the string
+		int result = 0; // no passes identified
+		while (tokenizer.hasMoreTokens()) {
+			String nextAction = tokenizer.nextToken().trim();
+			if (nextAction.equals(IRuleGroup.PASS_FAST_NAME)) {
+				result = result | IRuleGroup.PASS_FAST;
+			} else if (nextAction.equals(IRuleGroup.PASS_FULL_NAME)) {
+				result = result | IRuleGroup.PASS_FULL;
+			}
+		}
+
+		if (result == 0) {
+			// No recognized passes. Return the default.
+			return RegistryConstants.ATT_RULE_GROUP_DEFAULT;
+		}
+
+		return result;
+	}
+
+	private ValidatorMetaData.MigrationMetaData getMigrationMetaData(IConfigurationElement element) {
+		IConfigurationElement[] runChildren = element.getChildren(TAG_MIGRATE);
+		if ((runChildren == null) || (runChildren.length == 0)) {
+			return null;
+		}
+
+		// Only supposed to be one "migrate" section in a validator, so ignore the rest
+		IConfigurationElement migrate = runChildren[0];
+
+		// Now look for the "validator" elements. Zero or more can be specified.
+		IConfigurationElement[] migrateChildren = migrate.getChildren(TAG_VALIDATOR);
+		if ((migrateChildren == null) || (migrateChildren.length == 0)) {
+			return null;
+		}
+
+		ValidatorMetaData.MigrationMetaData mmd = new ValidatorMetaData.MigrationMetaData();
+		for (int i = 0; i < migrateChildren.length; i++) {
+			IConfigurationElement migrateChild = migrateChildren[i];
+			String from = migrateChild.getAttribute(ATT_FROM);
+			if (from == null) {
+				continue;
+			}
+
+			String to = migrateChild.getAttribute(ATT_TO);
+			if (to == null) {
+				continue;
+			}
+			mmd.addId(from, to);
+		}
+		return mmd;
+	}
+
+	/**
+	 * Given an IConfigurationElement, if it has a project nature(s) specified, return the
+	 * ValidatorNameFilters which represent those natures. Otherwise return null.
+	 * 
+	 * A project nature can be specified in plugin.xml to indicate what types of IProjects a
+	 * validator can run on.
+	 */
+	private ValidatorNameFilter[] getProjectNatureFilters(IConfigurationElement element) {
+		IConfigurationElement[] filters = element.getChildren(TAG_PROJECT_NATURE);
+		if (filters.length == 0) {
+			return null;
+		}
+
+		ValidatorNameFilter[] vf = new ValidatorNameFilter[filters.length];
+		for (int i = 0; i < filters.length; i++) {
+			vf[i] = new ValidatorNameFilter();
+			// In order to speed up our String comparisons, load these
+			// names into Java's constants space. This way, we'll be able to
+			// use pointer comparison instead of the traditional
+			// character-by-character comparison. Since these names should
+			// never be set by anyone other than this class, and this class
+			// sets them only once, it is safe to declare these Strings
+			// constants.
+			//
+			// To load a String into the constants space, call intern() on the String.
+			//
+			String nameFilter = filters[i].getAttribute(ATT_ID);
+			if (nameFilter != null) {
+				nameFilter = nameFilter.intern();
+			}
+			vf[i].setNameFilter(nameFilter);
+
+			String include = filters[i].getAttribute(ATT_INCLUDE);
+			vf[i].setInclude(include);
+		}
+		return vf;
+	}
+
+	/**
+	 * Returns the singleton ValidationRegistryReader.
+	 */
+	public static ValidationRegistryReader getReader() {
+		return _inst;
+	}
+
+	public static boolean isActivated() {
+		// Whether the registry has been read or not is kept in the EventManager
+		// class instead of this class in order to work around a shutdown problem.
+		// See the comment in the isActive() method of the EventManager class
+		// for details.
+		return EventManager.getManager().isActive();
+	}
+
+	/**
+	 * Returns the Validator extension point
+	 */
+	private IExtensionPoint getValidatorExtensionPoint() {
+		IExtensionRegistry registry = Platform.getExtensionRegistry();
+		IExtensionPoint extensionPoint = registry.getExtensionPoint(ValidationPlugin.PLUGIN_ID, VALIDATOR_EXT_PT_ID);
+		if (extensionPoint == null) {
+			// If this happens it means that someone removed the "validator" extension point
+			// declaration from our plugin.xml file.
+			if (Tracing.isTraceV1()) {
+				String result = MessageFormat.format(ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_EXC_MISSING_VALIDATOR_EP),
+						new Object[]{ValidationPlugin.PLUGIN_ID + "." + VALIDATOR_EXT_PT_ID}); //$NON-NLS-1$
+				Tracing.log("ValidationRegistryReader-03: ", result);		 //$NON-NLS-1$
+			}
+		}
+		return extensionPoint;
+	}
+
+	/**
+	 * It's okay to return a handle to the ValidatorMetaData because the vmd can't be modified by
+	 * any code not in this package.
+	 */
+	public ValidatorMetaData getValidatorMetaData(IValidator validator) {
+		// retrieval will be in log(n) time
+		if (validator == null) {
+				String message = ResourceHandler.getExternalizedMessage(
+					ResourceConstants.VBF_EXC_ORPHAN_IVALIDATOR, new String[]{"null"}); //$NON-NLS-1$
+				ValidationPlugin.getPlugin().logMessage(IStatus.ERROR, message);
+			return null;
+		}
+
+		String validatorClassName = validator.getClass().getName();
+		ValidatorMetaData vmd = getValidatorMetaData(validatorClassName);
+		if (vmd != null) {
+			return vmd;
+		}
+
+		// If we got here, then vmd is neither a root nor an aggregate validator,
+		// yet the IValidator exists. Internal error.
+		String message = ResourceHandler.getExternalizedMessage(
+				ResourceConstants.VBF_EXC_ORPHAN_IVALIDATOR, new String[]{validatorClassName});
+		ValidationPlugin.getPlugin().logMessage(IStatus.ERROR, message);
+		return null;
+	}
+
+	public Set<ValidatorMetaData> getValidatorMetaData(IWorkspaceRoot root) {
+		// Every validator on the Preferences page must be returned
+		Set<ValidatorMetaData> copy = new HashSet<ValidatorMetaData>();
+		clone(_indexedValidators.values(), copy);
+		return copy;
+	}
+
+	/**
+	 * Return a collection of Validators configured on a certain type of IProject (e.g. EJB Project
+	 * vs. Web Project).
+	 * 
+	 * This is a long-running process. If you can, cache the result.
+	 */
+	public Set<ValidatorMetaData> getValidatorMetaData(IProject project) {
+		Set<ValidatorMetaData> copy = new HashSet<ValidatorMetaData>();
+		getValidatorMetaData(project, copy);
+		return copy;
+	}
+
+	/**
+	 * Copy the set of configured validator metadata into the Set.
+	 */
+	public void getValidatorMetaData(IProject project, Set<ValidatorMetaData> vmds) {
+		if (vmds == null)return;
+		vmds.clear();
+//		int executionMap = 0x0;
+		try {
+			if (Tracing.isTraceV1()) {
+				Tracing.log("ValidationRegistryReader-04: IProject is " + String.valueOf(project)); //$NON-NLS-1$
+			}
+			if (project == null) {
+//				executionMap |= 0x1;
+				// vmds is already clear
+				return;
+			}
+			String[] projectNatures = null;
+			try {
+				projectNatures = project.getDescription().getNatureIds();
+			} catch (CoreException e) {
+//				executionMap |= 0x2;
+				// vmds is already clear
+				ValidationPlugin.getPlugin().handleException(e);
+				return;
+			}
+			// If there are no project natures on a particular project,
+			// or if this project nature has no validators configured
+			// on it, return the validators which are configured on all
+			// projects.
+			if ((projectNatures == null) || (projectNatures.length == 0)) {
+//				executionMap |= 0x4;
+				
+				// Also include the validators which are enabled through enablement
+				// expression for this project.
+				// Note that the API isFacetEnabled(vmd, project) works properly 
+				// only when the plugin containing the property tester is activated.
+				// forcePluginActivation="true" may be needed in the declaration of 
+				// the enablement in the validator extension point.
+		        // <enablement>
+		        //  <test forcePluginActivation="true" property="foo.testProperty"/>
+		        // </enablement> 
+				
+				Set<ValidatorMetaData> validatorsWithEnablementExpression = new HashSet<ValidatorMetaData>();
+				for (ValidatorMetaData vmd : getAllValidators()) {
+					if (isFacetEnabled(vmd, project)) {
+						validatorsWithEnablementExpression.add(vmd);
+					}
+				}
+				if(validatorsWithEnablementExpression.size() > 0 ){
+					validatorsWithEnablementExpression.addAll( getValidatorMetaDataUnknownProject());
+					clone(validatorsWithEnablementExpression, vmds);
+				}
+				else
+					clone(getValidatorMetaDataUnknownProject(), vmds);
+
+
+			} else {
+//				executionMap |= 0x8;
+				if (Tracing.isTraceV1()) {
+					Tracing.log("ValidationRegistryReader-05: ", projectNatures.toString()); //$NON-NLS-1$
+				}
+				calculateVmdsForNatureAndFacets(vmds, projectNatures,project);
+				// Now filter out the validators which must not run on this project
+				removeExcludedProjects(project, vmds);
+				if (vmds.size() == 0) {
+//					executionMap |= 0x20;
+					clone(getValidatorMetaDataUnknownProject(), vmds);
+				}
+			}
+		} finally {
+			if (Tracing.isTraceV1()) {
+				StringBuffer buffer = new StringBuffer();
+				for (ValidatorMetaData vmd : vmds) {
+					buffer.append(vmd.getValidatorUniqueName());
+					buffer.append("\n"); //$NON-NLS-1$
+				}
+				Tracing.log("ValidationRegistryReader-06: ", buffer.toString()); //$NON-NLS-1$
+			}
+		}
+	}
+
+	/**
+	 * @param project
+	 * @param vmds
+	 * @param projectNatures
+	 */
+	private void calculateVmdsForNatureAndFacets(Set<ValidatorMetaData> vmds, String[] projectNatures, IProject project) {
+		Set<ValidatorMetaData> projVmds;
+		String[] projectFacetIds = getProjectFacetIds(project);
+		for (ValidatorMetaData vmd : getAllValidators()) {
+			if (containsProjectFacet(vmd, projectFacetIds) || isFacetEnabled(vmd, project)) {
+				vmds.add(vmd);
+			}
+		}
+		for (String projectNatureId : projectNatures) {
+			projVmds = _validators.get(projectNatureId);
+			if (projVmds == null)continue;
+
+			for (ValidatorMetaData vmd : projVmds) {
+				if (!vmds.contains(vmd) && (vmd.getFacetFilters() == null || vmd.getFacetFilters().length == 0)) {
+					if (vmd.getEnablementExpresion() == null)vmds.add(vmd);
+					else if (isFacetEnabled(vmd, project))vmds.add(vmd);
+				}
+			}
+		}
+	}
+
+	private boolean containsProjectFacet(ValidatorMetaData vmd, String[] projectFacetIds) {
+		String[] validatorFacets = vmd.getFacetFilters();
+		if (validatorFacets != null && validatorFacets.length > 0) {
+			if (projectFacetIds != null && projectFacetIds.length > 0) {
+				if (Arrays.asList(projectFacetIds).containsAll(Arrays.asList(validatorFacets)))
+					return true;
+			}
+		}
+		return false;
+	}
+	
+	private boolean isFacetEnabled(ValidatorMetaData vmd, IProject project) {
+		try {
+			Expression expression = vmd.getEnablementExpresion();
+			if (expression != null) {
+				EvaluationContext context = new EvaluationContext(null, project);
+				context.setAllowPluginActivation(true);
+				EvaluationResult result = expression.evaluate(context);
+				return result == EvaluationResult.TRUE;
+			}
+		} catch (CoreException ce) {
+		}
+		return false;
+	}
+
+	private String[] getProjectFacetIds(IProject project) {
+		try {
+			IFacetedProject fProject = ProjectFacetsManager.create(project);
+			if (fProject != null) {
+				Object[] projectFacets = fProject.getProjectFacets().toArray();
+				String[] projectFacetIds = new String[projectFacets.length];
+				for (int i = 0; i < projectFacets.length; i++) {
+					IProjectFacet projectFacet = ((IProjectFacetVersion) projectFacets[i]).getProjectFacet();
+					projectFacetIds[i] = projectFacet.getId();
+				}
+				return projectFacetIds;
+			}
+		} catch (CoreException ce) {
+		}
+
+		return null;
+	}
+
+	/*
+	 * If one project nature on the project includes a particular validator, but another project
+	 * nature excludes that validator, then the validator needs to be removed from the vmd set.
+	 * 
+	 * For example, if AValidator can run on any java project but not on a J2EE project, which is an
+	 * instance of a java project, then the AValidator is included by the java nature and excluded
+	 * by the J2EE nature. The AValidator would have to be removed from the set.
+	 */
+	private void removeExcludedProjects(IProject project, Set<ValidatorMetaData> vmds) {
+		if (Tracing.isTraceV1()) {
+			StringBuffer buffer = new StringBuffer("\nValidationRegistryReader-12: before:\n"); //$NON-NLS-1$
+			for (ValidatorMetaData vmd : vmds) {
+				buffer.append(vmd.getValidatorUniqueName());
+				buffer.append("\n"); //$NON-NLS-1$
+			}
+			Tracing.log(buffer);
+		}
+
+		String[] projectNatures = null;
+		try {
+			projectNatures = project.getDescription().getNatureIds();
+		} catch (CoreException e) {
+			ValidationPlugin.getPlugin().handleException(e);
+			return;
+		}
+		if ((projectNatures == null) || (projectNatures.length == 0)) {
+			// nothing needs to be removed from the list
+			return;
+		}
+		for (int i = 0; i < projectNatures.length; i++) {
+			String nature = projectNatures[i];
+			Iterator<ValidatorMetaData> iterator = vmds.iterator();
+			while (iterator.hasNext()) {
+				ValidatorMetaData vmd = iterator.next();
+				ValidatorNameFilter[] natureFilters = vmd.getProjectNatureFilters();
+				if (natureFilters == null) {
+					// Can run on any project
+					continue;
+				}
+
+				for (ValidatorNameFilter pn : natureFilters) {
+					if (nature.equals(pn.getNameFilter()) && !pn.isInclude()) {
+						iterator.remove();
+						break;
+					}
+				}
+			}
+		}
+
+		if (Tracing.isTraceV1()) {
+			StringBuffer buffer = new StringBuffer("\nValidationRegistryReader-13: after:\n"); //$NON-NLS-1$
+			for (ValidatorMetaData vmd : vmds) {
+				buffer.append(vmd.getValidatorUniqueName());
+				buffer.append("\n"); //$NON-NLS-1$
+			}
+			Tracing.log(buffer);
+		}
+	}
+
+	@SuppressWarnings("unchecked")
+	private Collection clone(Collection input, Collection copy) {
+		if (input == null || copy == null)return null;
+		copy.clear();
+		copy.addAll(input);
+		return copy;
+	}
+
+	public String debug() {
+		StringBuffer buffer = new StringBuffer();
+		buffer.append("Project nature => validators configured"); //$NON-NLS-1$
+		buffer.append("\n"); //$NON-NLS-1$
+		for (String projId : _validators.keySet()) {
+			buffer.append("projId: "); //$NON-NLS-1$
+			buffer.append(projId);
+			buffer.append("\n"); //$NON-NLS-1$
+			Set<ValidatorMetaData> validators = _validators.get(projId);
+			for (ValidatorMetaData vmd : validators) {
+				buffer.append("\t"); //$NON-NLS-1$
+				buffer.append(vmd.getValidatorUniqueName());
+				buffer.append("\n"); //$NON-NLS-1$
+			}
+		}
+		buffer.append("\n"); //$NON-NLS-1$
+
+		buffer.append("Enable/disable validator by default"); //$NON-NLS-1$
+		buffer.append("\n"); //$NON-NLS-1$
+		for (ValidatorMetaData vmd : _indexedValidators.values()) {
+			buffer.append(vmd.getValidatorUniqueName());
+			buffer.append(" enabled? "); //$NON-NLS-1$
+			buffer.append(vmd.isEnabledByDefault());
+			buffer.append("\n"); //$NON-NLS-1$
+		}
+
+		return buffer.toString();
+	}
+
+	public boolean isConfiguredOnProject(ValidatorMetaData vmd, IProject project) {
+		Set<ValidatorMetaData> vmds = null;
+		synchronized(projectValidationMetaData){
+			vmds = projectValidationMetaData.get(project);
+		}
+		if (vmds != null) {
+			return vmds.contains(vmd);
+		} else {
+			Set<ValidatorMetaData> prjVmds = getValidatorMetaData(project);
+			if (prjVmds == null || prjVmds.size() == 0)return false;
+			synchronized(projectValidationMetaData){
+				projectValidationMetaData.put(project, prjVmds);
+			}
+			return prjVmds.contains(vmd);
+		}
+	}
+	
+	public void clearCachedMaps(){
+		synchronized(projectValidationMetaData){
+			projectValidationMetaData.clear();
+		}
+	}
+
+	/**
+	 * Return a set of ValidatorMetaData which are configured on all projects or which run on any
+	 * projects except certain project types.
+	 * 
+	 * Unlike other get methods, because this method is private it doesn't return a clone.
+	 * 
+	 * @see addExcludedRemainder()
+	 */
+	private Set<ValidatorMetaData> getValidatorMetaDataUnknownProject() {
+		Set<ValidatorMetaData> projVmds = _validators.get(UNKNOWN_PROJECT);
+		if (projVmds == null) {
+			projVmds = new HashSet<ValidatorMetaData>();
+		}
+		return projVmds;
+	}
+
+	/**
+	 * Return a set of ValidatorMetaData which are enabled by default.
+	 */
+	public Set<ValidatorMetaData> getValidatorMetaDataEnabledByDefault() {
+		Set<ValidatorMetaData> copy = new HashSet<ValidatorMetaData>();
+		clone(_defaultEnabledValidators, copy);
+		return copy;
+	}
+
+	public ValidatorMetaData[] getValidatorMetaDataArrayEnabledByDefault() {
+		ValidatorMetaData[] result = new ValidatorMetaData[_defaultEnabledValidators.size()];
+		_defaultEnabledValidators.toArray(result);
+		return result;
+	}
+
+	/**
+	 * This method should be called ONLY by the validation framework, UI, or TVT plugin. In general,
+	 * only the validation framework and the validation TVT should handle ValidatorMetaData objects.
+	 * 
+	 * Given a string which identifies a fully-qualified class name of a validator, return the
+	 * ValidatorMetaData that uses a validator of that name, if it exists.
+	 * 
+	 * It's okay to return a handle to the ValidatorMetaData because the vmd can't be modified by
+	 * any code not in this package.
+	 */
+	public ValidatorMetaData getValidatorMetaData(String validatorClassName) {
+		if (validatorClassName == null)return null;
+
+		ValidatorMetaData vmd2 = _indexedValidators.get(validatorClassName);
+		if (vmd2 != null)return vmd2;
+
+		// Check for an aggregate validator
+		for (ValidatorMetaData vmd : _indexedValidators.values()) {
+			if (vmd == null)continue;
+
+			if (vmd.getValidatorUniqueName().equals(validatorClassName))return vmd;
+
+			String[] aggregateNames = vmd.getAggregatedValidatorNames();
+			if (aggregateNames != null) {
+				for (String aggregateName : aggregateNames) {
+					if (validatorClassName.equals(aggregateName))return vmd;
+				}
+			}
+
+			// Current name of validator doesn't match; has this validator been
+			// migrated from another package?
+			ValidatorMetaData.MigrationMetaData mmd = vmd.getMigrationMetaData();
+			if (mmd == null) {
+				// Validator class name hasn't been migrated
+				continue;
+			}
+
+			Set<String[]> idList = mmd.getIds();
+			if (idList == null) {
+				// Invalid <migrate> element.
+				continue;
+			}
+
+			for (String[] ids : idList) {
+				if (ids.length != 2) {
+					// log
+					continue;
+				}
+
+				String from = ids[0];
+				if (from == null) {
+					// log
+					continue;
+				}
+
+				if (from.equals(validatorClassName)) {
+					return vmd;
+				}
+			}
+		}
+
+		// If we got to this point, no validator using that class name is loaded.
+		return null;
+	}
+
+	/**
+	 * Return true if the named validator is installed, otherwise false.
+	 */
+	public boolean isExistingValidator(String validatorClassName) {
+		return (getValidatorMetaData(validatorClassName) != null);
+	}
+
+	/**
+	 * Initialize the validator with the static metadata (runtime metadata is initialized in the
+	 * ValidationOperation class).
+	 */
+	private ValidatorMetaData initializeValidator(IConfigurationElement element, String validatorName, String pluginId) {
+		IConfigurationElement[] runChildren = element.getChildren(TAG_RUN_CLASS);
+		if ((runChildren == null) || (runChildren.length < 1)) {
+			// How can an IValidatorImpl be created when there no class name to instantiate?
+			if (Tracing.isLogging()) {
+				Tracing.log("ValidationRegistryReader-07: ", NLS.bind(ValMessages.VbfExcSyntaxNoValRun, validatorName));				 //$NON-NLS-1$
+			}
+			return null;
+		}
+
+		//WTP Bugzilla defect: 82338
+		//Using the Unique Identifier give the flexibility of the same validator class used by other validator extensions without writing a new validation class
+		//Reverting the fix back as the class name defined in the ext is unique to this validator and has to be used for the unique id in the validation metadata
+		String validatorImplName = runChildren[0].getAttribute(ATT_CLASS);
+		
+		if (validatorImplName == null) {
+			// Same as before; how can we instantiate when...
+			if (Tracing.isLogging()) {
+				Tracing.log("ValidationRegistryReader-08: ", NLS.bind(ValMessages.VbfExcSyntaxNoValClass, validatorName)); //$NON-NLS-1$
+			}
+			return null;
+		}
+
+		String helperImplName = getHelperName(element);
+		if (helperImplName == null) {
+			// Same as before; how can we instantiate when...
+			if (Tracing.isLogging()) {
+				Tracing.log("ValidationRegistryReader-09: ", NLS.bind(ValMessages.VbfExcSyntaxNoValRun, validatorImplName)); //$NON-NLS-1$
+			}
+			return null;
+		}
+
+		// In order to speed up our String comparisons, load these
+		// names into Java's constants space. This way, we'll be able to
+		// use pointer comparison instead of the traditional
+		// character-by-character comparison. Since these names should
+		// never be set by anyone other than this class, and this class
+		// sets them only once, it is safe to declare these Strings
+		// constants.
+		//
+		// To load a String into the constants space, call intern() on the String.
+		//
+		
+		boolean async = getAsync(element);
+		String[] markerIds = initializeValidatorCustomMarkers(element, pluginId);
+		ValidatorMetaData vmd = new ValidatorMetaData(async, getAggregateValidatorsNames(element), getEnabledByDefault(element),
+				getIncremental(element), getFullBuild(element), element, helperImplName, getMigrationMetaData(element),
+				pluginId, getRuleGroup(element), runChildren[0], validatorName.intern(), validatorImplName.intern(),
+				getContentTypeBindings(element), getDependentValidatorValue(element), getEnablementElement(element),
+				getFacetIds(element), getFilters(element), getProjectNatureFilters(element), markerIds, getRunStragety(element));
+		
+		
+		if (Tracing.isTraceV1()) {
+			Tracing.log("ValidationRegistryReader-10: validator loaded: " + validatorImplName); //$NON-NLS-1$
+		}
+
+		return vmd;
+	}
+
+	/**
+	 * @param element
+	 * @param pluginId
+	 * @param vmd
+	 */
+	private String[] initializeValidatorCustomMarkers(IConfigurationElement element, String pluginId) {
+		String[] qualifiedMarkerIds = null;
+		String[] customMarkerIds = getMarkerIdsValue(element);
+		if (customMarkerIds != null && customMarkerIds.length > 0) {
+			qualifiedMarkerIds = new String[customMarkerIds.length];
+			for (int i = 0; i < customMarkerIds.length; i++) {
+				String markerid = customMarkerIds[i];
+				if (markerid.lastIndexOf(".") != -1) { //$NON-NLS-1$
+					String pluginID = markerid.substring(0, markerid.lastIndexOf(".")); //$NON-NLS-1$
+					Bundle bundle = Platform.getBundle(pluginID);
+					if (bundle == null)
+						qualifiedMarkerIds[i] = pluginId + "." + customMarkerIds[i]; //$NON-NLS-1$
+					else
+						qualifiedMarkerIds[i] = customMarkerIds[i];
+				} else
+					qualifiedMarkerIds[i] = pluginId + "." + customMarkerIds[i]; //$NON-NLS-1$
+			}
+		}
+		return qualifiedMarkerIds;
+	}
+
+	private Expression getEnablementElement(IConfigurationElement element) {
+		IConfigurationElement[] enablements = element.getChildren(ExpressionTagNames.ENABLEMENT);
+		if (enablements.length == 0)
+			return null;
+		try {
+			return ExpressionConverter.getDefault().perform(enablements[0]);
+		} catch (CoreException e) {
+			ValidationPlugin.getPlugin().handleException(e);
+		}
+		return null;
+	}
+
+	/**
+	 * This method should be called ONLY BY THE VALIDATION FRAMEWORK! The value from this method is
+	 * used to populate the validation preference page.
+	 */
+	public Collection<ValidatorMetaData> getAllValidators() {
+		Set<ValidatorMetaData> validators = new HashSet<ValidatorMetaData>(50);
+		clone(_indexedValidators.values(), validators);
+		return validators;
+	}
+
+	public int numberOfValidators() {
+		return _indexedValidators.size();
+	}
+
+	/**
+	 * Reads one extension by looping through its configuration elements.
+	 */
+	private void readExtension(IExtension extension) {
+		IConfigurationElement[] elements = extension.getConfigurationElements();
+
+		for (int i = 0; i < elements.length; i++) {
+			IConfigurationElement element = elements[i];
+
+			String label = extension.getLabel();
+			if (label == null || label.equals("")) { //$NON-NLS-1$
+				if (Tracing.isTraceV1()) {
+					String[] msgParm = {extension.getUniqueIdentifier()};
+					String result = MessageFormat.format(ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_EXC_VALIDATORNAME_IS_NULL),
+							(Object[])msgParm);
+					Tracing.log("ValidationRegistryReader-11: ", result); //$NON-NLS-1$
+				}
+			} else {
+				// If getLabel() returns an empty string, this is an illegal validator.
+				// The PropertyPage, and other status messages, need to have a displayable name for
+				// the validator.
+				String pluginId = extension.getContributor().getName();
+				if (Tracing.isEnabled(extension.getUniqueIdentifier())){
+					ValidatorMetaData vmd = initializeValidator(element, label, pluginId);
+	
+					if (vmd != null) {
+						// Add this validator to the list of validators; if vmd is null, the validator
+						// couldn't be created.
+						add(vmd);
+					}
+				}
+			}
+		}
+	}
+
+	/**
+	 * Reads the registry to find the Validators which have been implemented.
+	 */
+	private void readRegistry() {
+		_validators.clear();
+
+		// Get the extensions that have been registered.
+		IExtensionPoint validatorEP = getValidatorExtensionPoint();
+		if (validatorEP == null) {
+			return;
+		}
+		IExtension[] extensions = validatorEP.getExtensions();
+
+		// find all runtime implementations
+		for (int i = 0; i < extensions.length; i++) {
+			readExtension(extensions[i]);
+		}
+    
+    // Force the delegate validators registry to be read early to avoid
+    // the non-synchronized singleton issue which occurs when two delegating
+    // validators race to load the registry.
+    
+    ValidatorDelegatesRegistry.getInstance();
+	}
+
+	public IValidator getValidator(String validatorClassName) throws InstantiationException {
+		ValidatorMetaData vmd = _indexedValidators.get(validatorClassName);
+		if(vmd != null)
+			return vmd.getValidator();
+		return null;
+	}
+	/**
+	 * Given an IConfigurationElement from plugin.xml, return whether or not the validator is called by project
+	 * 
+	 * <p>If no project attribute is specified, the default is false (validator is called by resource)
+	 */
+	private boolean getRunStragety(IConfigurationElement element) {
+		
+		IConfigurationElement[] runChildren = element.getChildren(TAG_RUN_STRATEGY);
+		
+		if (runChildren == null || runChildren.length < 1) return RegistryConstants.ATT_PROJECT_DEFAULT;
+		String project = runChildren[0].getAttribute(ATT_PROJECT);
+		if (project == null)return RegistryConstants.ATT_PROJECT_DEFAULT;
+
+		return Boolean.valueOf(project.trim()); 
+	
+	}
+	
+
+}
diff --git a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/ValidationSelectionHandlerRegistryReader.java b/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/ValidationSelectionHandlerRegistryReader.java
new file mode 100644
index 0000000..cf3ce9a
--- /dev/null
+++ b/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/ValidationSelectionHandlerRegistryReader.java
@@ -0,0 +1,114 @@
+/*******************************************************************************
+ * Copyright (c) 2001, 2008 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.wst.validation.internal;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.eclipse.core.runtime.IConfigurationElement;
+import org.eclipse.core.runtime.IExtension;
+import org.eclipse.core.runtime.IExtensionPoint;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Platform;
+import org.eclipse.wst.validation.internal.plugin.ValidationPlugin;
+
+public class ValidationSelectionHandlerRegistryReader {
+
+	public static final String VALIDATION_SELECTION_HANDLER = "validationSelectionHandler"; //$NON-NLS-1$
+	static final String ATT_ID = "id"; //$NON-NLS-1$ 
+	
+	/** handlerClass - */
+	static final String ATT_HANDLER_CLASS = "handlerClass"; //$NON-NLS-1$
+	
+	static final String ATT_SELECTION_TYPE = "selectionType"; //$NON-NLS-1$
+	private static ValidationSelectionHandlerRegistryReader INSTANCE;
+	private List<IValidationSelectionHandler> _validationSelectionHandlers;
+	
+	public ValidationSelectionHandlerRegistryReader() {
+	}
+	
+	public static ValidationSelectionHandlerRegistryReader getInstance() {
+		if (INSTANCE == null) {
+			INSTANCE = new ValidationSelectionHandlerRegistryReader();
+			INSTANCE.readRegistry();
+		}
+		return INSTANCE;
+	}
+
+	/**
+	 * Read the extension point and parse it.
+	 */
+	public void readRegistry() {
+		IExtensionPoint point = Platform.getExtensionRegistry()
+			.getExtensionPoint(ValidationPlugin.PLUGIN_ID, VALIDATION_SELECTION_HANDLER);
+		if (point == null)return;
+		IConfigurationElement[] elements = point.getConfigurationElements();
+		for (int i = 0; i < elements.length; i++) {
+			internalReadElement(elements[i]);
+		}
+	}
+	
+	private void internalReadElement(IConfigurationElement element) {
+		boolean recognized = this.readElement(element);
+		if (!recognized) {
+			logError(element, "Error processing extension: " + element); //$NON-NLS-1$
+		}
+	}
+
+	/*
+	 * Logs the error in the desktop log using the provided text and the information in the configuration element.
+	 */
+	protected void logError(IConfigurationElement element, String text) {
+		IExtension extension = element.getDeclaringExtension();
+		StringBuffer buf = new StringBuffer();
+		buf.append("Plugin " + extension.getContributor().getName() + ", extension " + extension.getExtensionPointUniqueIdentifier()); //$NON-NLS-1$ //$NON-NLS-2$
+		buf.append("\n" + text); //$NON-NLS-1$
+		ValidationPlugin.getPlugin().logMessage(IStatus.ERROR, buf.toString());
+	}
+	
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.jem.util.RegistryReader#readElement(org.eclipse.core.runtime.IConfigurationElement)
+	 */
+	public boolean readElement(IConfigurationElement element) {
+		if (!element.getName().equals(VALIDATION_SELECTION_HANDLER))
+			return false;
+		
+//		String handlerClass = element.getAttribute(ATT_HANDLER_CLASS);
+		String selectionType = element.getAttribute(ATT_SELECTION_TYPE); 
+		
+		IValidationSelectionHandler handler = null;
+		try {
+			handler = (IValidationSelectionHandler) element.createExecutableExtension(ATT_HANDLER_CLASS);
+			handler.setValidationTypeString(selectionType);
+			getValidationSelectionHandlers().add(handler);
+			return true;
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+	   return false;
+	}
+	
+	private List<IValidationSelectionHandler> getValidationSelectionHandlers() {
+		if (_validationSelectionHandlers == null)
+			_validationSelectionHandlers = new ArrayList<IValidationSelectionHandler>();
+		return _validationSelectionHandlers;
+	}
+	
+	public Object getExtendedType(Object selection) {
+		Object result = null;
+		for (IValidationSelectionHandler handler : getValidationSelectionHandlers()) {
+			result = handler.getBaseValidationType(selection);
+			if (result != null)break;
+		}
+		return result;
+	}
+}
diff --git a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/ValidatorActionFilter.java b/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/ValidatorActionFilter.java
new file mode 100644
index 0000000..ee241be
--- /dev/null
+++ b/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/ValidatorActionFilter.java
@@ -0,0 +1,130 @@
+/*******************************************************************************
+ * Copyright (c) 2001, 2004 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ * IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.wst.validation.internal;
+
+
+import java.util.StringTokenizer;
+
+import org.eclipse.core.resources.IResourceDelta;
+
+/**
+ * This class stores the value of the "action" attribute in the validator's plugin.xml contribution.
+ */
+public class ValidatorActionFilter {
+	public static final String ADD = "add"; //$NON-NLS-1$ // if the resource delta is an addition; this value is used in plugin.xml
+	public static final String CHANGE = "change"; //$NON-NLS-1$ // if the resource delta is a change; this value is used in plugin.xml
+	public static final String DELETE = "delete"; //$NON-NLS-1$ // if the resource delta is a removal; this value is used in plugin.xml
+	public static final int ALL_ACTIONS = (IResourceDelta.ADDED | IResourceDelta.CHANGED | IResourceDelta.REMOVED);
+
+	private int _actionType = 0; // Default to 0, so that if an invalid filter is specified, then no
+
+	// matter what the IResourceDelta is, the delta & _actionType will
+	// always == 0. (i.e., the resource will never be filtered in)
+
+	public ValidatorActionFilter() {
+		super();
+	}
+
+	/**
+	 * Return the hexadecimal number which represents the type(s) of actions which this filter
+	 * allows in.
+	 */
+	public int getActionType() {
+		// Since IResourceDelta's constants are hexadecimal numbers,
+		// it's nicer to return a corresponding hexadecimal, for bitwise OR,
+		// than it is to have three boolean methods on this class, i.e.,
+		// isAdd, isChange, isDelete.
+		return _actionType;
+	}
+
+	/**
+	 * <p>
+	 * Parse the incoming string, which is extracted from the plugin.xml file, to determine the
+	 * value of the actionType.
+	 * <p>
+	 * The string can contain one, two, or three constants. If there is more than one constant, the
+	 * constants should be separated by a comma.
+	 * <p>
+	 * These are the three constants: add, change, delete. The order that the constants are
+	 * specified in does not matter. The constants are case-sensitive; i.e., ADD is not considered
+	 * the same as add.
+	 * <p>
+	 * If the action attribute is not defined, the default behaviour is to filter in all types of
+	 * actions: add, change, delete. (i.e., the same behaviour can be achieved by specifying "add,
+	 * change, delete" as the action attribute's value.
+	 * <p>
+	 * If the action attribute is defined, and none of the constants are defined, then the filter is
+	 * invalid, and will be ignored by the Validation Framework. (If none of the actions should be
+	 * filtered in, then the filter itself should not exist.)
+	 * <p>
+	 * If the action attribute is defined, and one of the constants is defined, then the form of the
+	 * action should be like this: <br>
+	 * &nbsp;&nbsp;&nbsp;&lt;filter ... action="add"/>
+	 * <p>
+	 * If the action attribute is defined, and more than one constant is defined, then the form of
+	 * the action should be like this: <br>
+	 * &nbsp;&nbsp;&nbsp;&lt;filter ... action="add, delete"/>
+	 * <p>
+	 * If the action attribute is defined, and an unknown constant is defined, then the unknown
+	 * constant will be ignored. For example, <br>
+	 * &nbsp;&nbsp;&nbsp;&lt;filter ... action="ADD, delete"/> <br>
+	 * is the same as specifying <br>
+	 * &nbsp;&nbsp;&nbsp;&lt;filter ... action="delete"/> <br>
+	 * and if all of the constants are unknown, the filter is invalid, and will be ignored by the
+	 * Validation Framework. e.g., <br>
+	 * &nbsp;&nbsp;&nbsp;&lt;filter ... action="ADD, DELETE"/> <br>
+	 * is the same as not specifying a filter.
+	 * <p>
+	 * If the action attribute is defined, and a constant is defined more than once, the extra
+	 * constant is ignored. For example, <br>
+	 * &nbsp;&nbsp;&nbsp;&lt;filter ... action="add, change, add"/> <br>
+	 * is the same as specifying <br>
+	 * &nbsp;&nbsp;&nbsp;&lt;filter ... action="add, change"/>
+	 */
+	public void setActionTypes(String actions) {
+		if (actions == null) {
+			// user has not defined the "action" element, so default to everything
+			_actionType = ALL_ACTIONS;
+			return;
+		}
+
+		final String COMMA = ","; //$NON-NLS-1$
+		StringTokenizer tokenizer = new StringTokenizer(actions, COMMA, false); // false means don't
+		// return the comma
+		// as part of the
+		// string
+		int isAdd = 0;
+		int isChange = 0;
+		int isDelete = 0;
+		while (tokenizer.hasMoreTokens()) {
+			String nextAction = tokenizer.nextToken().trim();
+			if (nextAction.equals(ADD)) {
+				isAdd = IResourceDelta.ADDED;
+			} else if (nextAction.equals(CHANGE)) {
+				isChange = IResourceDelta.CHANGED;
+			} else if (nextAction.equals(DELETE)) {
+				isDelete = IResourceDelta.REMOVED;
+			}
+		}
+		_actionType = isAdd | isChange | isDelete;
+	}
+
+	public String toString() {
+		final String ON = "on"; //$NON-NLS-1$
+		final String OFF = "off"; //$NON-NLS-1$
+		StringBuffer buffer = new StringBuffer();
+		buffer.append("     ActionFilter:"); //$NON-NLS-1$
+		buffer.append("          add: " + (((getActionType() & IResourceDelta.ADDED) != 0) ? ON : OFF)); //$NON-NLS-1$
+		buffer.append("          change: " + (((getActionType() & IResourceDelta.CHANGED) != 0) ? ON : OFF)); //$NON-NLS-1$
+		buffer.append("          delete: " + (((getActionType() & IResourceDelta.REMOVED) != 0) ? ON : OFF)); //$NON-NLS-1$
+		return buffer.toString();
+	}
+}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/ValidatorFilter.java b/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/ValidatorFilter.java
new file mode 100644
index 0000000..d51a217
--- /dev/null
+++ b/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/ValidatorFilter.java
@@ -0,0 +1,109 @@
+/*******************************************************************************
+ * Copyright (c) 2001, 2007 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.wst.validation.internal;
+
+import org.eclipse.core.resources.IResource;
+
+/**
+ * This class represents the plugin.xml tags, for a validator, for both name filters and type
+ * filters. i.e., if an object has name filter and type filter specified, the filter filters out
+ * objects which are not both of that type and named like the filter.
+ */
+public class ValidatorFilter {
+	private ValidatorNameFilter _nameFilter;
+	private ValidatorTypeFilter _typeFilter;
+	private ValidatorActionFilter _actionFilter;
+
+	ValidatorFilter() {
+		super();
+		_nameFilter = new ValidatorNameFilter();
+		_typeFilter = new ValidatorTypeFilter();
+		_actionFilter = new ValidatorActionFilter();
+	}
+
+	ValidatorFilter(String mustImplementClass) {
+		this();
+		_nameFilter = new ValidatorNameFilter();
+		_typeFilter.setMustImplementClass(mustImplementClass);
+		_actionFilter = new ValidatorActionFilter();
+	}
+
+	public boolean isApplicableAction(int resourceDelta) {
+		return ((resourceDelta & _actionFilter.getActionType()) != 0);
+	}
+
+	/**
+	 * Returns true if the given resource's name matches the name filter.
+	 * 
+	 * e.g. if the name filter is "*.java", and this resource is "readme.txt", this method will
+	 * return false. If the resource is named "readme.java", this method will return true.
+	 */
+	boolean isApplicableName(IResource resource) {
+		return _nameFilter.isApplicableName(resource);
+	}
+
+	/**
+	 * Returns true if the given resource's type matches the type filter.
+	 * 
+	 * e.g. if the type filter is "IFile", and this resource is "IProject", this method will return
+	 * false. If the resource is an IFile, this method will return true.
+	 */
+	boolean isApplicableType(IResource resource) {
+		return _typeFilter.isApplicableType(resource);
+	}
+
+	public void setActionFilter(String actions) {
+		_actionFilter.setActionTypes(actions);
+	}
+
+	/**
+	 * Sets the name filter.
+	 */
+	void setNameFilter(String filter, String isCaseSensitiveString) {
+		_nameFilter.setNameFilter(filter);
+		if(filter != null)
+			  _nameFilter.setNameFilterExtension(getFilterExt(filter));
+		_nameFilter.setCaseSensitive(isCaseSensitiveString);
+	}
+	
+	private String getFilterExt(String filter) {
+		return filter.substring(filter.indexOf(".") + 1); //$NON-NLS-1$
+	}
+	
+
+	/**
+	 * Sets the type filter.
+	 */
+	void setTypeFilter(String filter) {
+		_typeFilter.setTypeFilter(filter);
+	}
+
+	public String toString() {
+		final String lineSep = System.getProperty("line.separator"); //$NON-NLS-1$
+		StringBuffer buffer = new StringBuffer();
+		buffer.append("ValidatorFilter:"); //$NON-NLS-1$
+		buffer.append(lineSep);
+		buffer.append("     nameFilter = " + _nameFilter); //$NON-NLS-1$
+		buffer.append(lineSep);
+		buffer.append("     typeFilter = " + _typeFilter); //$NON-NLS-1$
+		buffer.append(lineSep);
+		buffer.append("     actionFilter = " + _actionFilter); //$NON-NLS-1$
+		buffer.append(lineSep);
+		return buffer.toString();
+	}
+
+	/**
+	 * @return Returns the _nameFilter.
+	 */
+	public ValidatorNameFilter get_nameFilter() {
+		return _nameFilter;
+	}
+}
diff --git a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/ValidatorMetaData.java b/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/ValidatorMetaData.java
new file mode 100644
index 0000000..9d54ee3
--- /dev/null
+++ b/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/ValidatorMetaData.java
@@ -0,0 +1,554 @@
+/*******************************************************************************
+ * Copyright (c) 2001, 2011 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.wst.validation.internal;
+
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.atomic.AtomicReference;
+
+import org.eclipse.core.expressions.Expression;
+import org.eclipse.core.resources.IContainer;
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IConfigurationElement;
+import org.eclipse.core.runtime.Platform;
+import org.eclipse.core.runtime.content.IContentDescription;
+import org.eclipse.core.runtime.content.IContentType;
+import org.eclipse.wst.validation.internal.delegates.ValidatorDelegatesRegistry;
+import org.eclipse.wst.validation.internal.operations.IWorkbenchContext;
+import org.eclipse.wst.validation.internal.operations.WorkbenchContext;
+import org.eclipse.wst.validation.internal.plugin.ValidationHelperRegistryReader;
+import org.eclipse.wst.validation.internal.provisional.core.IValidator;
+import org.eclipse.wst.validation.internal.provisional.core.IValidatorJob;
+import org.osgi.framework.Bundle;
+
+/**
+ * This class stores information, as specified by a validator's plugin.xml tags. There is one
+ * ValidatorMetaData for each Validator. No Validator should attempt to access its
+ * ValidatorMetaData; it is for use by the base framework only.
+ */
+public class ValidatorMetaData {
+	private final ValidatorFilter[] _filters;
+	private final ValidatorNameFilter[] 	_projectNatureFilters;
+	private final String[]			_facetFilters;
+	private final AtomicReference<IValidator>	_validator = new AtomicReference<IValidator>();
+	private final AtomicReference<IWorkbenchContext> 		_helper = new AtomicReference<IWorkbenchContext>();
+	private final String 			_validatorDisplayName;
+	private final String 			_validatorUniqueName;
+	
+	/**
+	 * The list of class names of every validator which this validator aggregates. For
+	 * example, if the EJB Validator instantiated another validator, and started its validate
+	 * method, then that instantiated class' name should be in this list.
+	 */
+	private final String[] 	_aggregatedValidators;
+    private final String[] 	_contentTypeIds;
+	private final String[] 	_validatorNames;
+	private final String 	_pluginId;
+	private final boolean	_supportsIncremental;
+	private final boolean 	_supportsFullBuild;
+	private final boolean 	_isEnabledByDefault;
+	private final MigrationMetaData _migrationMetaData;
+	private final int 		_ruleGroup;
+	private final boolean 	_async;
+	private final boolean 	_dependentValidator;
+	private final String[]	_markerIds;
+	private final String 	_helperClassName;
+	private final IConfigurationElement _helperClassElement;
+	private final IConfigurationElement _validatorClassElement;
+	private volatile boolean 	_cannotLoad;
+	private volatile boolean 	_manualValidation = true;
+	private volatile boolean	_buildValidation = true;
+	private final Map<IValidatorJob, IWorkbenchContext> _helpers = 
+		Collections.synchronizedMap( new HashMap<IValidatorJob, IWorkbenchContext>() );
+	private final Expression 		_enablementExpression;
+	private boolean _validateByProject = true;
+
+	ValidatorMetaData(boolean async, String[] aggregatedValidators, boolean isEnabledByDefault, boolean supportsIncremental,
+			boolean supportsFullBuild, IConfigurationElement helperClassElement, String helperClassName, 
+			MigrationMetaData migrationMetaData, String pluginId, int ruleGroup, IConfigurationElement validatorClassElement,
+			String validatorDisplayName, String validatorUniqueName, String[] contentTypeIds, boolean dependentValidator,
+			Expression enablementExpression, String[] facetFilters, ValidatorFilter[] filters,
+			ValidatorNameFilter[] projectNatureFilters, String[] markerIds, boolean validateByProject) {
+		_async = async;
+		_aggregatedValidators = aggregatedValidators;
+		_isEnabledByDefault = isEnabledByDefault;
+		_supportsIncremental = supportsIncremental;
+		_supportsFullBuild = supportsFullBuild;
+		_helperClassElement = helperClassElement;
+		_helperClassName = helperClassName;
+		_migrationMetaData = migrationMetaData;
+		_pluginId = pluginId;
+		_ruleGroup = ruleGroup;
+		_validatorClassElement = validatorClassElement;
+		_validatorDisplayName = validatorDisplayName;
+		_validatorUniqueName = validatorUniqueName;
+		_contentTypeIds = contentTypeIds;
+		_dependentValidator = dependentValidator;
+		_enablementExpression = enablementExpression;
+		_facetFilters = facetFilters;
+		_filters = filters;
+		_projectNatureFilters = projectNatureFilters;
+		_markerIds = markerIds;
+		_validatorNames = buildValidatorNames();
+		_validateByProject = validateByProject;
+	}
+		
+	protected String[] getFacetFilters() {
+		return _facetFilters;
+	}
+
+	public List<String> getNameFilters() {
+		List<String> nameFilters = new ArrayList<String>();
+		if (_filters != null && _filters.length > 0) {
+			for (ValidatorFilter filter : _filters) {
+				ValidatorNameFilter nameFilter = filter.get_nameFilter();
+				if (nameFilter != null) {
+					nameFilters.add(nameFilter.getNameFilter());
+				}
+			}
+		}
+		return nameFilters;
+	}
+
+	/**
+	 * Return the list of class names of the primary validator and its aggregates.
+	 */
+	public String[] getValidatorNames() {
+		return _validatorNames;
+	}
+	
+	private String[] buildValidatorNames() {
+		int aLength = (_aggregatedValidators == null) ? 0 : _aggregatedValidators.length;
+		String [] validatorNames = new String[aLength + 1]; // add 1 for the primary validator name
+		validatorNames[0] = getValidatorUniqueName();
+		if (_aggregatedValidators != null) {
+			System.arraycopy(_aggregatedValidators, 0, validatorNames, 1, aLength);
+		}
+		return validatorNames;
+	}
+
+	/**
+	 * Return the list of class names of every validator which this validator aggregates. For
+	 * example, if the EJB Validator instantiated another validator, and started its validate
+	 * method, then that instantiated class' name should be in this list.
+	 */
+	public String[] getAggregatedValidatorNames() {
+		return _aggregatedValidators;
+	}
+
+	/**
+	 * Return the name/type filter pairs.
+	 */
+	public ValidatorFilter[] getFilters() {
+		return _filters;
+	}
+
+	/**
+	 * Return true if this vmd's helper and validator have been instantiated, and also if this
+	 * validator's plugin is active.
+	 */
+	public boolean isActive() {
+		if (_helperClassElement != null) {
+			return false;
+		}
+
+		if (_validatorClassElement != null) {
+			return false;
+		}
+
+		Bundle bundle = Platform.getBundle(_pluginId);
+		if (bundle != null)
+			return bundle.getState() == Bundle.ACTIVE;
+
+		return false;
+	}
+
+	/**
+	 * This method will throw an InstantiationException if the helper cannot be instantiated, e.g.,
+	 * if the helper's plugin is disabled for some reason. Before the InstantiationException is
+	 * thrown, this validator will be disabled.
+	 * 
+	 * The IWorkbenchContext must ALWAYS have its project set before it is used; but it can't be
+	 * created with the IProject. So, before using the single instance, always initialize that
+	 * instance with the IProject.
+	 * 
+	 * If this validator supports asynchronous validation, then instead of maintaining a single the
+	 * helper instance, create a new IWorkbenchContext instance every time that the helper is needed.
+	 * This feature is provided because several validation Runnables may be queued to run, and if
+	 * those Runnables's project is different from the current validation's project, then the
+	 * current validation will suddenly start validating another project.
+	 */
+	//TODO just want to remember to figure out the many-temporary-objects problem if this method
+	// continues to new an IValidationContext every time - Ruth
+	public IWorkbenchContext getHelper(IProject project) throws InstantiationException {
+		IWorkbenchContext helper = _helper.get();
+		if (helper != null){
+			IProject oldProject = helper.getProject();
+			if ((oldProject == null) || !(oldProject.equals(project)))helper.setProject(project);
+			return helper;
+		}
+		
+		helper = ValidationRegistryReader.createHelper(_helperClassElement, _helperClassName);
+		if (helper == null)helper = new WorkbenchContext();
+		
+		if ((helper.getProject() == null) || !(helper.getProject().equals(project))) {
+			helper.setProject(project);
+		}
+		if (_helper.compareAndSet(null, helper))return helper;
+		return _helper.get();
+	}
+
+	/**
+	 * cannotLoad is false if both the IValidator and IWorkbenchContext instance can be instantiated.
+	 */
+	private void setCannotLoad() {
+		_cannotLoad = true;
+	}
+
+	/**
+	 * Return false if both the IValidator and IWorkbenchContext instance can be instantiated.
+	 * 
+	 * @return boolean
+	 */
+	public boolean cannotLoad() {
+		return _cannotLoad;
+	}
+
+	public MigrationMetaData getMigrationMetaData() {
+		return _migrationMetaData;
+	}
+
+	/**
+	 * Return the IRuleGroup integer indicating which groups of rules this validator recognizes.
+	 */
+	public int getRuleGroup() {
+		return _ruleGroup;
+	}
+
+	/**
+	 * Return the filters which identify which project(s) this validator may run on.
+	 */
+	ValidatorNameFilter[] getProjectNatureFilters() {
+		return _projectNatureFilters;
+	}
+
+	/**
+	 * This method returns the validator if it can be loaded; if the validator cannot be loaded,
+	 * e.g., if its plugin is disabled for some reason, then this method throws an
+	 * InstantiationException. Before the CoreException is thrown, this validator is disabled.
+	 */
+	public IValidator getValidator() throws InstantiationException {
+		IValidator val = _validator.get();
+		if (val != null)return val;
+		
+		val = ValidationRegistryReader.createValidator(_validatorClassElement, getValidatorUniqueName());
+
+		if (val == null) {
+			setCannotLoad();
+			throw new InstantiationException(ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_EXC_DISABLEV, new String[]{getValidatorUniqueName()}));
+		}
+		if (_validator.compareAndSet(null, val))return val;
+		return _validator.get();
+	}
+
+	public String getValidatorDisplayName() {
+		return _validatorDisplayName;
+	}
+
+	public String getValidatorUniqueName() {
+		return _validatorUniqueName;
+	}
+
+	/**
+	 * If the resource is applicable to the Validator which this ValidatorMetaData is associated
+	 * with, return true; else return false.
+	 * 
+	 * A resource is applicable if it passes the name/type filters. This method is called if there
+	 * is no resource delta (i.e., a full validation).
+	 */
+	public boolean isApplicableTo(IResource resource) {
+		return isApplicableTo(resource, ValidatorActionFilter.ALL_ACTIONS);
+	}
+
+	/**
+	 * If the resource is applicable to the Validator which this ValidatorMetaData is associated
+	 * with, return true; else return false.
+	 * 
+	 * A resource is applicable if it passes the name/type filters.
+	 */
+	public boolean isApplicableTo(IResource resource, int resourceDelta) {
+		// If no filters are specified, then every type of resource should be validated/trigger a
+		// rebuild of the model cache.
+		// Also make sure no content type id is specified (BUG 193816)
+		if (_filters == null  && getContentTypeIds() == null)return true;
+
+		return isApplicableTo(resource, resourceDelta, _filters);
+	}
+
+	/**
+	 * Return true if the resource passes the name/type filters for this validator.
+	 */
+	boolean isApplicableTo(IResource resource, int resourceDelta, ValidatorFilter[] filters) {
+		// Are any of the filters satisfied? (i.e., OR them, not AND them.)
+		// make sure filters is not null (BUG 193816)
+		if (filters != null && checkIfValidSourceFile(resource)) {
+			for (ValidatorFilter filter : filters) {
+				if (filter.isApplicableType(resource)
+						&& filter.isApplicableName(resource)
+						&& filter.isApplicableAction(resourceDelta)) {
+					return true;
+				}
+			}
+		}
+		if (getContentTypeIds() != null) {
+			IContentDescription description = null;
+			try {
+				if (resource.getType() == IResource.FILE && resource.exists())
+					description = ((IFile) resource).getContentDescription();
+			} catch (CoreException e) {
+				//Resource exceptions
+			}
+			if (description == null)return false;
+			if (isApplicableContentType(description))return true;
+		}
+		return false;
+	}
+
+	private boolean checkIfValidSourceFile(IResource file) {
+		if (file.getType() == IResource.FILE) {
+			IProjectValidationHelper helper = ValidationHelperRegistryReader.getInstance().getValidationHelper();
+			IProject project = file.getProject();
+			if (helper == null || project == null)
+				return true;
+			IContainer[] outputContainers = helper.getOutputContainers(project);
+			IContainer[] sourceContainers = helper.getSourceContainers(project);
+			if(outputContainers != null && sourceContainers != null){
+			for (int i=0; i<outputContainers.length; i++) {
+				String outputPath = outputContainers[i].getProjectRelativePath().makeAbsolute().toString();
+                String filePath = file.getProjectRelativePath().makeAbsolute().toString();
+				if (filePath.startsWith(outputPath)) {
+					//The file is in an output container.
+					//If it is a source container return true and false otherwise.
+					for (int j=0;j<sourceContainers.length; j++) {
+	                    if(outputContainers[i].equals(sourceContainers[j])){
+	                    	return true;
+	                    }
+					}
+					return false;
+				}
+			}
+		}
+		}
+		return true;
+	}
+		
+		
+	/**
+	 * If this validator recognizes the project nature, whether included or excluded, return the
+	 * name filter which describes the nature. Otherwise return null.
+	 */
+	ValidatorNameFilter findProjectNature(String projId) {
+		if (projId == null) {
+			return null;
+		}
+
+		if (_projectNatureFilters == null) {
+			// If no tag is specified, this validator is configured on all IProjects
+			return null;
+		}
+
+		for (int i = 0; i < _projectNatureFilters.length; i++) {
+			ValidatorNameFilter filter = _projectNatureFilters[i];
+			// In this case, we're not checking if the project is an instance of the filter class,
+			// but if it has the Nature specified in the filter class.
+			String projectNatureID = filter.getNameFilter();
+			if (projId.equals(projectNatureID)) {
+				return filter;
+			}
+		}
+		return null;
+	}
+
+	/**
+	 * Convenience method. Rather than store the is-this-vmd-configured-on-this-IProject algorithm
+	 * in two places, refer back to the reader's cache.
+	 */
+	public boolean isConfiguredOnProject(IProject project) {
+		return ValidationRegistryReader.getReader().isConfiguredOnProject(this, project);
+	}
+
+	public boolean isEnabledByDefault() {
+		return _isEnabledByDefault;
+	}
+
+	public boolean isIncremental() {
+		return _supportsIncremental;
+	}
+
+	public boolean isFullBuild() {
+		return _supportsFullBuild;
+	}
+
+	/**
+	 * Return true if the validator is thread-safe and can be run asynchronously.
+	 */
+	public boolean isAsync() {
+		return _async;
+	}
+
+	public String toString() {
+		return getValidatorUniqueName();
+	}
+
+	public final static class MigrationMetaData {
+		private Set<String[]> _ids;
+
+		public MigrationMetaData() {
+		}
+
+		public void addId(String oldId, String newId) {
+			if (oldId == null)return;
+			if (newId == null)return;
+
+			String[] ids = new String[]{oldId, newId};
+			getIds().add(ids);
+		}
+
+		public Set<String[]> getIds() {
+			if (_ids == null)_ids = new HashSet<String[]>();
+			return _ids;
+		}
+	}
+
+	public boolean isDependentValidator() {
+		return _dependentValidator;
+	}
+
+	/**
+	 * @return Returns the markerId.
+	 */
+	public String[] getMarkerIds() {
+		return _markerIds;
+	}
+
+	public boolean isBuildValidation() {
+		return _buildValidation;
+	}
+
+	public void setBuildValidation(boolean buildValidation) {
+		_buildValidation = buildValidation;
+	}
+
+	public boolean isManualValidation() {
+		return _manualValidation;
+	}
+
+	public void setManualValidation(boolean manualValidation) {
+		_manualValidation = manualValidation;
+	}
+  
+	/**
+   * Determines if the validator described by this metadata object is a delegating validator. 
+   * @return true if the validator described by this metadata object is a delegating validator, false otherwise.
+	 */
+  public boolean isDelegating() {
+    String targetID = getValidatorUniqueName();
+    return ValidatorDelegatesRegistry.getInstance().hasDelegates(targetID);
+  }
+  
+
+	public IValidator createValidator() throws InstantiationException {
+		return  ValidationRegistryReader.createValidator(_validatorClassElement, getValidatorUniqueName());
+	}
+	
+	public IWorkbenchContext createHelper(IProject project) throws InstantiationException {
+		IWorkbenchContext helper = ValidationRegistryReader.createHelper(_helperClassElement, _helperClassName);
+		if (helper == null) {
+			helper = new WorkbenchContext();
+		}
+		helper.setProject(project);
+		return helper;
+	}	  
+	
+   public void addHelper( IValidatorJob validator, IWorkbenchContext helper ){
+	   _helpers.put( validator, helper );
+   }
+   
+   public void removeHelper( IValidatorJob validator ){
+	   _helpers.remove( validator );
+   }
+   
+   private IWorkbenchContext getHelper( IValidatorJob validator ){
+	   return _helpers.get( validator );
+   }   
+   
+   public IWorkbenchContext getHelper( IProject project, IValidator validator ){
+	   
+	   if( validator instanceof IValidatorJob ){
+		   IWorkbenchContext helper = getHelper( (IValidatorJob)validator );
+		   if( helper == null ){
+			   try{
+				helper =  getHelper( project );
+				return helper;
+			   }catch (InstantiationException e) {
+					e.printStackTrace();
+				}			   
+		   }
+	   	return helper;
+	   }
+	   else{
+		   try {
+			IWorkbenchContext helper =  getHelper( project );
+			return helper;
+			} catch (InstantiationException e) {
+				e.printStackTrace();
+			}
+	   }
+	   
+	   return null;
+   }   
+   
+   public Expression getEnablementExpresion() {
+		return _enablementExpression;
+	}
+
+public String[] getContentTypeIds() {
+	return _contentTypeIds;
+}
+
+ 
+private boolean isApplicableContentType(IContentDescription desc){
+	
+	IContentType ct = desc.getContentType();
+	String[] applicableContentTypes = getContentTypeIds();
+	if (applicableContentTypes != null) {
+		for (int i = 0; i < applicableContentTypes.length; i ++){
+			if(applicableContentTypes[i].equals(ct.getId()))
+				return true;
+		}
+	}
+	return false;
+}
+
+public boolean isValidateByProject() {
+	return _validateByProject;
+}
+   
+}
diff --git a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/ValidatorNameFilter.java b/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/ValidatorNameFilter.java
new file mode 100644
index 0000000..946cfba
--- /dev/null
+++ b/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/ValidatorNameFilter.java
@@ -0,0 +1,170 @@
+/*******************************************************************************
+ * Copyright (c) 2001, 2007 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.wst.validation.internal;
+
+
+import java.util.StringTokenizer;
+
+import org.eclipse.core.resources.IResource;
+
+/**
+ * Represents a name filter tag in a validator's plugin.xml file. e.g. &lt;filter name="*.*"> Then
+ * this class would store the "*.*", and provide the wildcard matching functionality.
+ */
+public class ValidatorNameFilter {
+	private String _nameFilter;
+	private String nameFilterExtension;
+	private boolean _include = true; // by default, filter in the IFile specified
+	private final static String WILDCARD = "*"; //$NON-NLS-1$
+	private boolean _isCaseSensitive = true; // by default, the filter name is case-sensitive
+
+	/**
+	 * Insert the method's description here. Creation date: (12/4/00 11:08:41 AM)
+	 */
+	ValidatorNameFilter() {
+		//default
+	}
+
+	/**
+	 * Get the filter, as specified in plugin.xml
+	 */
+	String getNameFilter() {
+		return _nameFilter;
+	}
+
+	boolean isCaseSensitive() {
+		return _isCaseSensitive;
+	}
+
+	boolean isInclude() {
+		return _include;
+	}
+
+	/**
+	 * Return true if the given resource is both applicable and include="true".
+	 */
+	boolean isApplicableTo(IResource resource) {
+		return (isApplicableName(resource) && isInclude());
+	}
+	
+	protected void setNameFilterExtension(String filterExt) {
+		nameFilterExtension = filterExt;
+	}
+
+	/**
+	 * Returns true if the name of the resource matches the filter, or if there is no filter
+	 * specified.
+	 */
+	public boolean isApplicableName(IResource resource) {
+		// If name filter is null, means filter out no names.
+		// Otherwise, return true only if the given name matches
+		// the name filter.
+		if (_nameFilter == null)
+			return true;
+		
+		String name = resource.getName();
+//		return true if the file name is exact match of the _nameFilter
+		if (name.equalsIgnoreCase(_nameFilter))
+			return true;
+
+		int indexOfStarDot = _nameFilter.indexOf("*."); //$NON-NLS-1$
+
+		//return value if the filter name extension matches the extension
+		//of the resource 
+		if (indexOfStarDot != -1) {
+			String nameExtension = name.substring(name.lastIndexOf(".") + 1); //$NON-NLS-1$
+			return nameFilterExtension.equalsIgnoreCase(nameExtension);
+		}
+
+		if (!isCaseSensitive()) {
+			name = name.toLowerCase();
+		}
+
+		return verifyNameMatch(_nameFilter, name);
+	}
+
+	void setInclude(String includeValue) {
+		if (includeValue != null) {
+			setInclude(Boolean.valueOf(includeValue).booleanValue());
+		}
+	}
+
+	void setInclude(boolean includeBool) {
+		_include = includeBool;
+	}
+
+	/**
+	 * Set the filter, as specified in plugin.xml
+	 */
+	void setNameFilter(String filter) {
+		_nameFilter = filter;
+	}
+
+	void setCaseSensitive(String isCaseSensitiveString) {
+		if (isCaseSensitiveString != null) {
+			// only change the value from the default if the case-sensitive attribute is defined
+			_isCaseSensitive = Boolean.valueOf(isCaseSensitiveString).booleanValue();
+		}
+	}
+
+	public String toString() {
+		StringBuffer buffer = new StringBuffer();
+		buffer.append("NameFilter:\n\tnameFilter = "); //$NON-NLS-1$
+		buffer.append(_nameFilter);
+		return buffer.toString();
+	}
+
+	/**
+	 * Return true if the given name matches the given filter.
+	 * 
+	 * The only filter wildcard allowed is '*'.
+	 */
+	static boolean verifyNameMatch(final String filter, String name) {
+		/*
+		 * There are eight possible wildcard combinations, given that a wildcard may, if present, be
+		 * at the beginning, middle, or end of a name; or any combination of those positions. i.e.,
+		 * 
+		 * beginning middle end 0 0 0 0 0 1 0 1 0 0 1 1 1 0 0 1 0 1 1 1 0 1 1 1
+		 *  
+		 */
+		StringTokenizer tokenizer = new StringTokenizer(filter, WILDCARD, true);
+		boolean wildcardFlag = false;
+		while (tokenizer.hasMoreTokens()) {
+			String token = tokenizer.nextToken();
+			if (token.equals(WILDCARD)) {
+				wildcardFlag = true;
+			} else {
+				if (wildcardFlag) {
+					int tokenIndex = name.indexOf(token);
+					if (tokenIndex >= 0) {
+						name = name.substring(tokenIndex + token.length());
+					} else {
+						return false;
+					}
+				} else {
+					if (name.startsWith(token)) {
+						int tokenIndex = token.length();
+						name = name.substring(tokenIndex);
+					} else {
+						return false;
+					}
+				}
+				wildcardFlag = false;
+			}
+		}
+		if (!name.equals("")) { //$NON-NLS-1$
+			if (!wildcardFlag) {
+				return false;
+			}
+		}
+		return true;
+	}
+}
diff --git a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/ValidatorTypeFilter.java b/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/ValidatorTypeFilter.java
new file mode 100644
index 0000000..40b74a4
--- /dev/null
+++ b/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/ValidatorTypeFilter.java
@@ -0,0 +1,143 @@
+/*******************************************************************************
+ * Copyright (c) 2001, 2011 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.wst.validation.internal;
+
+import java.text.MessageFormat;
+
+import org.eclipse.core.resources.IResource;
+
+/**
+ * Represents a type filter tag in a validator's plugin.xml file. e.g. &lt;filter
+ * objectClass="com.ibm.foo.MyClass"> Then this class would store the "com.ibm.foo.MyClass", and
+ * provide the "instanceof" matching functionality.
+ */
+public class ValidatorTypeFilter {
+	private Class _typeFilterClass;
+	private String _mustImplementClass; // the type set in setTypeFilter must implement the
+
+	// class/interface identified by this fully-qualified
+	// Java string.
+
+	ValidatorTypeFilter() {
+		//default
+	}
+
+	ValidatorTypeFilter(String mustImplementClass) {
+		setMustImplementClass(mustImplementClass);
+	}
+
+	/**
+	 * Type filters are allowed only for certain types of classes. This method returns the name of
+	 * the class which this type must implement before it can be a filter.
+	 */
+	String getMustImplementClass() {
+		return _mustImplementClass;
+	}
+
+	/**
+	 * Return the type filter as a java.lang.Class object.
+	 */
+	Class getTypeFilterClass() {
+		return _typeFilterClass;
+	}
+
+	/**
+	 * Returns true if the resource passed in either an instance of the type filter class, or if
+	 * there is no type filter class defined in plugin.xml.
+	 */
+	public boolean isApplicableType(IResource resource) {
+		// If type filter is null, means filter out no types.
+		// Otherwise, return true only if the given type is an instance of
+		// the type filter.
+		if (_typeFilterClass == null)
+			return true;
+
+		// If the resource is an instance of the type filter class.
+		return isInstance(resource.getClass(), _typeFilterClass);
+	}
+
+	/**
+	 * Checks if filterClass is a parent (interface or superclass) of objectClass.
+	 */
+	boolean isInstance(Class objectClass, Class filterClass) {
+		// The java.lang.Class.isInstance call doesn't check interfaces fully.
+		// i.e., if I have two interfaces, A and B, and B extends A but
+		// doesn't implement A, then the isInstance call will return false.
+		//
+		// So, instead of using Class.isInstance, do the checking myself.
+		final String filterClassName = filterClass.getName();
+		for (Class cl = objectClass; cl != null; cl = cl.getSuperclass()) {
+			if (cl.getName().equals(filterClassName))return true;
+			Class[] clInterfaces = cl.getInterfaces();
+			for (int i = 0; i < clInterfaces.length; i++) {
+				if (clInterfaces[i].getName().equals(filterClassName))return true;
+				if (isInstance(clInterfaces[i], filterClass))return true;
+			}
+		}
+		return false;
+	}
+
+	/**
+	 * Type filters are allowed only for certain types of classes. This method sets the name of the
+	 * class which this type must implement before it can be a filter.
+	 */
+	void setMustImplementClass(String className) {
+		_mustImplementClass = className;
+	}
+
+	/**
+	 * If the filter implements the mustImplementClass (in ValidatorFilter's case, IResource), then
+	 * this is a valid filter, and store the filter value.
+	 */
+	void setTypeFilter(String filter) {
+		Class filterClass = null;
+		Class mustImplementClass = null;
+
+		if (filter == null) {
+			_typeFilterClass = null;
+			return;
+		}
+
+		try {
+			filterClass = Class.forName(filter);
+			if (getMustImplementClass() != null) {
+				mustImplementClass = Class.forName(getMustImplementClass());
+
+				// If the filter class is not an instance of mustImplementClass
+				if (!isInstance(filterClass, mustImplementClass)) {
+					_typeFilterClass = null;
+					if (Tracing.isLogging()) {
+						String result = MessageFormat.format(ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_EXC_INVALID_TYPE_FILTER), 
+							new Object[]{filter, getMustImplementClass()});
+						Tracing.log("ValidatorTypeFilter-01: ", result); //$NON-NLS-1$
+					}
+				}
+			}
+		} catch (ClassNotFoundException exc) {
+			_typeFilterClass = null;
+			if (Tracing.isLogging()) {
+				Tracing.log("ValidatorTypeFilter-02: The class named " + filter +  //$NON-NLS-1$
+					" cannot be instantiated because it does not exist. Check the spelling of the name, " + //$NON-NLS-1$
+					"in the validator's plugin.xml contribution, and try restarting eclipse again."); //$NON-NLS-1$
+			}
+			return;
+		}
+		_typeFilterClass = filterClass;
+	}
+
+	public String toString() {
+		StringBuffer buffer = new StringBuffer();
+		buffer.append("TypeFilter:"); //$NON-NLS-1$
+		buffer.append("     _typeFilterClass = " + _typeFilterClass.getName()); //$NON-NLS-1$
+		buffer.append("     _mustImplementClass = " + _mustImplementClass); //$NON-NLS-1$
+		return buffer.toString();
+	}
+}
diff --git a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/delegates/DelegatingValidator.java b/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/delegates/DelegatingValidator.java
new file mode 100644
index 0000000..d143f9b
--- /dev/null
+++ b/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/delegates/DelegatingValidator.java
@@ -0,0 +1,270 @@
+/*******************************************************************************
+ * Copyright (c) 2006, 2008 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * IBM Corporation - initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.wst.validation.internal.delegates;
+
+import java.lang.reflect.InvocationTargetException;
+import java.util.List;
+
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.jobs.ISchedulingRule;
+import org.eclipse.wst.validation.AbstractValidator;
+import org.eclipse.wst.validation.ValidationResult;
+import org.eclipse.wst.validation.ValidationState;
+import org.eclipse.wst.validation.internal.ConfigurationManager;
+import org.eclipse.wst.validation.internal.ProjectConfiguration;
+import org.eclipse.wst.validation.internal.ResourceConstants;
+import org.eclipse.wst.validation.internal.ResourceHandler;
+import org.eclipse.wst.validation.internal.ValidationRegistryReader;
+import org.eclipse.wst.validation.internal.ValidatorMetaData;
+import org.eclipse.wst.validation.internal.core.ValidationException;
+import org.eclipse.wst.validation.internal.operations.LocalizedMessage;
+import org.eclipse.wst.validation.internal.provisional.core.IMessage;
+import org.eclipse.wst.validation.internal.provisional.core.IProjectValidationContext;
+import org.eclipse.wst.validation.internal.provisional.core.IReporter;
+import org.eclipse.wst.validation.internal.provisional.core.IValidationContext;
+import org.eclipse.wst.validation.internal.provisional.core.IValidator;
+import org.eclipse.wst.validation.internal.provisional.core.IValidatorJob;
+
+/**
+ * This class is to be used as a base class by clients who want to provide
+ * alternate validator implementations for a given validator type.
+ * 
+ * It locates the currently configured delegate for this validator and calls its
+ * validate method.
+ * 
+ * @see IValidator
+ * @see IDelegatingValidator
+ * 
+ * <p>
+ * <b>Note:</b> This class/interface is part of an interim API that is still
+ * under development and expected to change significantly before reaching
+ * stability. It is being made available at this early stage to solicit feedback
+ * from pioneering adopters on the understanding that any code that uses this
+ * API will almost certainly be broken (repeatedly) as the API evolves.
+ * </p>
+ */
+public class DelegatingValidator extends AbstractValidator implements IDelegatingValidator
+{
+  public DelegatingValidator()
+  {
+  }
+
+  /*
+   * (non-Javadoc)
+   * 
+   * @see org.eclipse.wst.validation.internal.provisional.core.IValidator#cleanup(org.eclipse.wst.validation.internal.provisional.core.IReporter)
+   */
+  public void cleanup(IReporter reporter)
+  {
+    // [Issue] This method does not get passed the validation context. How are
+    // going to know the delegate in order to invoke its cleanup method?
+  }
+
+  /*
+   * (non-Javadoc)
+   * 
+   * @see org.eclipse.wst.validation.internal.provisional.core.IValidator#validate(org.eclipse.wst.validation.internal.provisional.core.IValidationContext,
+   *      org.eclipse.wst.validation.internal.provisional.core.IReporter)
+   */
+  public void validate(IValidationContext helper, IReporter reporter) throws ValidationException
+  {
+    validateInJob(helper, reporter);
+  }
+
+  /**
+   * Wraps the original reporter instance to make it look like this validator is
+   * the one generating messages. This is needed because the framework ignores
+   * messages coming from the delegate validator because it is not registered
+   * with the validation framework.
+   */
+  private class DelegatingReporter implements IReporter
+  {
+    /**
+     * The reporter passed originally to the delegating validator by the
+     * framework.
+     */
+    IReporter delegatingReporter;
+
+    /**
+     * The delegating validator.
+     */
+    IValidator delegatingValidator;
+
+    /**
+     * Constructor.
+     * 
+     * @param validator
+     *          the original validator.
+     * @param reporter
+     *          the reporter originally passed to the delegating validator.
+     */
+    DelegatingReporter(IValidator validator, IReporter reporter)
+    {
+      delegatingReporter = reporter;
+      delegatingValidator = validator;
+    }
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see org.eclipse.wst.validation.internal.provisional.core.IReporter#addMessage(org.eclipse.wst.validation.internal.provisional.core.IValidator,
+     *      org.eclipse.wst.validation.internal.provisional.core.IMessage)
+     */
+    public void addMessage(IValidator origin, IMessage message)
+    {
+      delegatingReporter.addMessage(delegatingValidator, message);
+    }
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see org.eclipse.wst.validation.internal.provisional.core.IReporter#displaySubtask(org.eclipse.wst.validation.internal.provisional.core.IValidator,
+     *      org.eclipse.wst.validation.internal.provisional.core.IMessage)
+     */
+    public void displaySubtask(IValidator validator, IMessage message)
+    {
+      delegatingReporter.displaySubtask(delegatingValidator, message);
+    }
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see org.eclipse.wst.validation.internal.provisional.core.IReporter#getMessages()
+     */
+    public List getMessages()
+    {
+      return delegatingReporter.getMessages();
+    }
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see org.eclipse.wst.validation.internal.provisional.core.IReporter#isCancelled()
+     */
+    public boolean isCancelled()
+    {
+      return delegatingReporter.isCancelled();
+    }
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see org.eclipse.wst.validation.internal.provisional.core.IReporter#removeAllMessages(org.eclipse.wst.validation.internal.provisional.core.IValidator)
+     */
+    public void removeAllMessages(IValidator origin)
+    {
+      delegatingReporter.removeAllMessages(delegatingValidator);
+    }
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see org.eclipse.wst.validation.internal.provisional.core.IReporter#removeAllMessages(org.eclipse.wst.validation.internal.provisional.core.IValidator,
+     *      java.lang.Object)
+     */
+    public void removeAllMessages(IValidator origin, Object object)
+    {
+      delegatingReporter.removeAllMessages(delegatingValidator, object);
+    }
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see org.eclipse.wst.validation.internal.provisional.core.IReporter#removeMessageSubset(org.eclipse.wst.validation.internal.provisional.core.IValidator,
+     *      java.lang.Object, java.lang.String)
+     */
+    public void removeMessageSubset(IValidator validator, Object obj, String groupName)
+    {
+      delegatingReporter.removeMessageSubset(delegatingValidator, obj, groupName);
+    }
+  }
+
+  /*
+   * (non-Javadoc)
+   * 
+   * @see org.eclipse.wst.validation.internal.provisional.core.IValidatorJob#validateInJob(org.eclipse.wst.validation.internal.provisional.core.IValidationContext,
+   *      org.eclipse.wst.validation.internal.provisional.core.IReporter)
+   */
+  public IStatus validateInJob(IValidationContext helper, IReporter reporter) throws ValidationException
+  {
+    ValidatorMetaData vmd = ValidationRegistryReader.getReader().getValidatorMetaData(this);
+    String validatorName = vmd.getValidatorDisplayName();
+
+    // We need to ensure that the context is an IProjectValidationContext. The
+    // limitation of using an IValidationContext is that it does not readily
+    // provide the project the validator is being invoked upon.
+
+    if (!(helper instanceof IProjectValidationContext))
+    {
+      throw new ValidationException(new LocalizedMessage(IMessage.HIGH_SEVERITY, ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_WRONG_CONTEXT_FOR_DELEGATE, new String[] { validatorName })));
+    }
+
+    IProjectValidationContext projectContext = (IProjectValidationContext) helper;
+    IProject project = projectContext.getProject();
+
+    ValidatorDelegateDescriptor delegateDescriptor = null;
+
+    try
+    {
+      ProjectConfiguration projectConfig = ConfigurationManager.getManager().getProjectConfiguration(project);
+
+      delegateDescriptor = projectConfig.getDelegateDescriptor(vmd);
+    }
+    catch (InvocationTargetException e)
+    {
+      // Already dealt with by the framework.
+    }
+    finally
+    {
+      if (delegateDescriptor == null)
+      {
+        throw new ValidationException(new LocalizedMessage(IMessage.HIGH_SEVERITY, ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_NO_DELEGATE, new String[] { vmd.getValidatorDisplayName() })));
+      }
+    }
+
+    IValidatorJob delegate = (IValidatorJob)delegateDescriptor.getValidator();
+
+    // We need to make it look like this validator is the one generating
+    // messages so we wrap the reporter and use this validator as the source.
+    // The validation framework does not recognize our validators because they
+    // are not registered directly with the framework.
+    // We could make them work like the aggregated validators but that would
+    // create problems with markers not being cleaned up if someone switches
+    // validators.
+    // TODO : Maybe we could clear all the markers generated by a delegate when
+    // the user chooses a different delegate implementation?
+
+    DelegatingReporter delegatingReporter = new DelegatingReporter(this, reporter);
+
+    IStatus status = delegate.validateInJob(helper, delegatingReporter);
+
+    return status;
+  }
+
+  /*
+   * (non-Javadoc)
+   * 
+   * @see org.eclipse.wst.validation.internal.provisional.core.IValidatorJob#getSchedulingRule(org.eclipse.wst.validation.internal.provisional.core.IValidationContext)
+   */
+  public ISchedulingRule getSchedulingRule(IValidationContext helper)
+  {
+    return null;
+  }
+
+@Override
+public ValidationResult validate(IResource resource, int kind, ValidationState state, IProgressMonitor monitor) {
+	return null;
+}
+}
diff --git a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/delegates/IDelegatingValidator.java b/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/delegates/IDelegatingValidator.java
new file mode 100644
index 0000000..e779ed9
--- /dev/null
+++ b/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/delegates/IDelegatingValidator.java
@@ -0,0 +1,34 @@
+/*******************************************************************************
+ * Copyright (c) 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
+ *******************************************************************************/
+
+package org.eclipse.wst.validation.internal.delegates;
+
+import org.eclipse.wst.validation.internal.provisional.core.IValidatorJob;
+
+/**
+ * A delegating validator delegates the actual validation work to a delegate
+ * validator. This is a marker interface used internally by the framework to
+ * determine if a delegate is a delegating validator.
+ * 
+ * [Issue] Could/should this interface be replaced with an attribute on the
+ * validators extension definition?
+ * 
+ * <p>
+ * <b>Note:</b> This class/interface is part of an interim API that is still
+ * under development and expected to change significantly before reaching
+ * stability. It is being made available at this early stage to solicit feedback
+ * from pioneering adopters on the understanding that any code that uses this
+ * API will almost certainly be broken (repeatedly) as the API evolves.
+ * </p>
+ */
+public interface IDelegatingValidator extends IValidatorJob
+{
+}
diff --git a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/delegates/ValidatorDelegateDescriptor.java b/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/delegates/ValidatorDelegateDescriptor.java
new file mode 100644
index 0000000..51910e0
--- /dev/null
+++ b/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/delegates/ValidatorDelegateDescriptor.java
@@ -0,0 +1,154 @@
+/*******************************************************************************
+ * Copyright (c) 2006, 2008 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * IBM Corporation - initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.wst.validation.internal.delegates;
+
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IConfigurationElement;
+import org.eclipse.wst.validation.AbstractValidator;
+import org.eclipse.wst.validation.internal.ResourceConstants;
+import org.eclipse.wst.validation.internal.ResourceHandler;
+import org.eclipse.wst.validation.internal.ValidationRegistryReader;
+import org.eclipse.wst.validation.internal.ValidatorMetaData;
+import org.eclipse.wst.validation.internal.core.ValidationException;
+import org.eclipse.wst.validation.internal.operations.LocalizedMessage;
+import org.eclipse.wst.validation.internal.plugin.ValidationPlugin;
+import org.eclipse.wst.validation.internal.provisional.core.IMessage;
+import org.eclipse.wst.validation.internal.provisional.core.IValidator;
+
+/**
+ * ValidatorDelegateDescriptor stores information about a delegate validator.
+ * <p>
+ * It is also used to store the instance of the validator it describes. To
+ * obtain the instance call getValidator().
+ * </p>
+ */
+public class ValidatorDelegateDescriptor {
+	/**
+	 * The platform configuration element describing this delegate.
+	 */
+	private IConfigurationElement _delegateConfiguration;
+
+	/**
+	 * The delegating validator's ID.
+	 */
+	private String _delegatingValidatorID;
+
+	/**
+	 * The delegate's ID.
+	 */
+	private String _id;
+
+	/**
+	 * The delegate's display name.
+	 */
+	private String _name;
+
+	/**
+	 * Constructs a descriptor.
+	 * 
+	 * @param id
+	 *            The delegate's unique id. Must be unique in the context of a
+	 *            delegating validator.
+	 * @param delegateConfiguration
+	 *            The delegates configuration element
+	 * @param delegateName
+	 *            The delegate's display name.
+	 * @param targetValidatorID
+	 *            The target validator's unique id.
+	 */
+	public ValidatorDelegateDescriptor(String id,
+			IConfigurationElement delegateConfiguration, String delegateName,
+			String targetValidatorID) {
+
+		assert id != null;
+		assert delegateConfiguration != null;
+		assert targetValidatorID != null;
+
+		_id = id;
+		_delegateConfiguration = delegateConfiguration;
+		_name = delegateName;
+		_delegatingValidatorID = targetValidatorID;
+	}
+
+	/**
+	 * Provides the delegate's ID.
+	 * 
+	 * @return a string with the fully qualified class name of this validator
+	 *         implementation.
+	 */
+	public String getId() {
+		return _id;
+	}
+
+	/**
+	 * Provides the delegate's name.
+	 * 
+	 * @return a String with the validator's display name.
+	 */
+	public String getName() {
+		return _name;
+	}
+
+	/**
+	 * Retrieves the target validator's ID.
+	 * 
+	 * @return a String with the fully qualified class name of the delegating
+	 *         validator who will delegate its implementation to the validator
+	 *         described by this descriptor.
+	 */
+	public String getTargetID() {
+		return _delegatingValidatorID;
+	}
+
+	/**
+	 * Provides the instance of the validator delegate pointed to by this descriptor.
+	 * 
+	 * @return an IValidator instance.
+	 * @throws ValidationException
+	 */
+	public IValidator getValidator() throws ValidationException {
+		try {
+			IValidator delegate = (IValidator) _delegateConfiguration
+					.createExecutableExtension(ValidatorDelegatesRegistryReader.CLASS_ATTRIBUTE);
+			return delegate;
+		} catch (CoreException e) {
+			handleException(e);
+		}
+		return null;
+	}
+
+	/**
+	 * Answer an AbstractValidator if one has been defined, otherwise answer null.
+	 */
+	public AbstractValidator getValidator2() throws ValidationException {
+		try {
+			Object o = _delegateConfiguration
+					.createExecutableExtension(ValidatorDelegatesRegistryReader.CLASS_ATTRIBUTE);
+			if (o instanceof AbstractValidator)
+				return (AbstractValidator) o;
+		} catch (CoreException e) {
+			handleException(e);
+		}
+		return null;
+	}
+
+	private void handleException(CoreException e) throws ValidationException {
+		ValidationPlugin.getPlugin().handleException(e);
+		String delegatingValidatorName = getTargetID();
+		ValidatorMetaData vmd = ValidationRegistryReader.getReader()
+			.getValidatorMetaData(getTargetID());
+		if (vmd != null)delegatingValidatorName = vmd.getValidatorDisplayName();
+		throw new ValidationException(new LocalizedMessage(
+			IMessage.HIGH_SEVERITY, ResourceHandler.getExternalizedMessage(
+			ResourceConstants.VBF_CANNOT_INSTANTIATE_DELEGATE, new String[] { getName(), delegatingValidatorName })));
+	}
+}
diff --git a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/delegates/ValidatorDelegatesRegistry.java b/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/delegates/ValidatorDelegatesRegistry.java
new file mode 100644
index 0000000..3ea034f
--- /dev/null
+++ b/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/delegates/ValidatorDelegatesRegistry.java
@@ -0,0 +1,223 @@
+/*******************************************************************************
+ * Copyright (c) 2008 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * IBM Corporation - initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.wst.validation.internal.delegates;
+
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Set;
+import java.util.StringTokenizer;
+
+import org.eclipse.core.runtime.preferences.DefaultScope;
+import org.eclipse.core.runtime.preferences.IEclipsePreferences;
+import org.eclipse.wst.validation.internal.ConfigurationConstants;
+import org.eclipse.wst.validation.internal.core.ValidationException;
+import org.eclipse.wst.validation.internal.plugin.ValidationPlugin;
+import org.eclipse.wst.validation.internal.provisional.core.IValidator;
+
+/**
+ * ValidatorDelegatesRegistry is a singleton used to store validator delegate
+ * descriptors for each delegating validator.
+ */
+public class ValidatorDelegatesRegistry {
+	
+  /**
+   * The one and only instance of this registry.
+   */
+  private static ValidatorDelegatesRegistry _instance;
+
+  /**
+   * Provides the one and only instance of this class.
+   * 
+   * The actual platform extension registry reading happens at this time.
+   * 
+   * @see ValidatorDelegatesRegistryReader
+   * 
+   * @return the validator delegates registry singleton instance.
+   */
+  public static ValidatorDelegatesRegistry getInstance() {
+    if (_instance == null) {
+    	ValidatorDelegatesRegistry instance = new ValidatorDelegatesRegistry();
+    	ValidatorDelegatesRegistryReader reader = new ValidatorDelegatesRegistryReader(instance);
+    	reader.readRegistry();
+    	instance.initDefaults();
+    	_instance = instance;
+    }
+
+    return _instance;
+  }
+
+  /**
+   * Determine if the product defined any default delegate validators, by setting the old
+   * DELEGATES_PREFERENCE preference in the default preference scope. If they did, we remember
+   * them, so that if we every need to return a default for the delegating validator, we can return the one
+   * that the product requested.
+   */
+  private void initDefaults() {
+	  	// This code was copied from the ValidationConfiguration#deserializeDelegates() method. The code was copied because this
+	  	// change is part of a patch and I didn't want to disturb the ValidationConfiguration class.
+	  
+		IEclipsePreferences prefs = new DefaultScope().getNode(ValidationPlugin.PLUGIN_ID);
+		String delegatePref = prefs.get("DELEGATES_PREFERENCE", null); //$NON-NLS-1$
+		if (delegatePref == null)return;
+
+		int delegatesIndex = delegatePref.indexOf(ConfigurationConstants.DELEGATE_VALIDATORS);
+		String delegates = delegatePref.substring(delegatesIndex + ConfigurationConstants.DELEGATE_VALIDATORS.length(), delegatePref.length());
+
+		if (delegates == null)return;
+
+		_defaultDelegates = new HashSet<String>(10);
+		StringTokenizer tokenizer = new StringTokenizer(delegates, ConfigurationConstants.ELEMENT_SEPARATOR);
+		while (tokenizer.hasMoreTokens()) {
+			String delegateConfiguration = tokenizer.nextToken();
+			int separatorIndex = delegateConfiguration.indexOf(ConfigurationConstants.DELEGATES_SEPARATOR);
+//			String targetID = delegateConfiguration.substring(0, separatorIndex);
+			String delegateID = delegateConfiguration.substring(separatorIndex + 1);
+			_defaultDelegates.add(delegateID);
+		}
+
+	}
+
+/**
+   * The map of target validator id to Map of delegates by id.
+   */
+  private Map<String, Map<String,ValidatorDelegateDescriptor>> _delegatesByTarget = 
+	  new HashMap<String, Map<String,ValidatorDelegateDescriptor>>();
+  
+  /**
+   * Validator ids that have been defined by the product to be the default validators, for some of the delegating validtors.
+   */
+  private Set<String> _defaultDelegates;
+
+  /**
+   * Adds a descriptor to the registry.
+   * 
+   * @param descriptor
+   *          The descriptor to add. Must not be null.
+   */
+  void add(ValidatorDelegateDescriptor descriptor) {
+    if (descriptor == null)return;
+
+    String targetID = descriptor.getTargetID();
+
+    Map<String,ValidatorDelegateDescriptor> delegates = _delegatesByTarget.get(targetID);
+
+    if (delegates == null) {
+      delegates = new HashMap<String,ValidatorDelegateDescriptor>();
+      _delegatesByTarget.put(targetID, delegates);
+    }
+
+    delegates.put(descriptor.getId(), descriptor);
+  }
+
+  /**
+   * Provides the default delegate ID for the given delegating validator ID.
+   * 
+   * @param targetID
+   *          The delegating validator's ID.
+   * @return a String with the ID of the default delegate.
+   */
+  public String getDefaultDelegate(String targetID)
+  {
+    Map<String,ValidatorDelegateDescriptor> delegates = getDelegateDescriptors(targetID);
+
+    if (delegates == null)return null;
+
+    if (_defaultDelegates != null){
+    	for (ValidatorDelegateDescriptor vdd : delegates.values()){
+    		String id = vdd.getId();
+    		if (_defaultDelegates.contains(id))return id;
+    	}
+    }
+    
+    // TODO: Implement a default attribute and use that to get the default?
+    // What happens if two or more delegates claim to be the default one?
+    // For now, just pick the first one in the list.
+
+    Iterator<ValidatorDelegateDescriptor> delegatesIterator = delegates.values().iterator();
+    
+    if (!delegatesIterator.hasNext())return null;
+
+    return delegatesIterator.next().getId();
+  }
+
+  /**
+   * Retrieves a delegate instance based on the target and delegate IDs.
+   * 
+   * @param targetID
+   *          the delegating validator's ID.
+   * @param delegateID
+   *          the delegate validator's ID.
+   * @return an instance of the delegate validator or null if one cannot be
+   *         found.
+   */
+  public IValidator getDelegate(String targetID, String delegateID) throws ValidationException
+  {
+    ValidatorDelegateDescriptor descriptor = getDescriptor(targetID, delegateID);
+
+    if (descriptor == null)return null;
+
+    IValidator delegate = descriptor.getValidator();
+
+    return delegate;
+  }
+
+  /**
+   * Provides a map with all delegates descriptors for the given target, keyed
+   * by their ID.
+   * 
+   * @param targetID
+   *          the target (delegating) validator id. Must not be null.
+   * @return a Map <string, ValidatorDelegateDescriptor>. May be null if the ID
+   *         passed in is not a delegating validator.
+   */
+  public Map<String,ValidatorDelegateDescriptor> getDelegateDescriptors(String targetID) {
+    return _delegatesByTarget.get(targetID);
+  }
+
+  /**
+   * Finds a delegate descriptor based on the target id and delegate id.
+   * 
+   * @param targetID
+   *          the delegating validator's id
+   * @param delegateID
+   *          the delegate id
+   * @return a ValidatorDelegateDescriptor for the given target and id or null
+   *         if one cannot be found.
+   */
+  public ValidatorDelegateDescriptor getDescriptor(String targetID, String delegateID)
+  {
+    Map<String,ValidatorDelegateDescriptor> delegates = _delegatesByTarget.get(targetID);
+
+    if (delegates == null || delegateID == null)return null;
+    
+    ValidatorDelegateDescriptor descriptor = (ValidatorDelegateDescriptor) delegates.get(delegateID);
+
+    return descriptor;
+  }
+
+  /**
+   * Determines if a given validator has delegates.
+   * 
+   * @param targetID
+   *          the target validator id.
+   * @return true if the target has registered delegates, false otherwise.
+   */
+  public boolean hasDelegates(String targetID)
+  {
+    Map<String,ValidatorDelegateDescriptor> delegatesByID = _delegatesByTarget.get(targetID);
+
+    boolean hasDelegates = (delegatesByID != null && !delegatesByID.isEmpty());
+    return hasDelegates;
+  }
+}
diff --git a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/delegates/ValidatorDelegatesRegistryReader.java b/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/delegates/ValidatorDelegatesRegistryReader.java
new file mode 100644
index 0000000..c6bafe9
--- /dev/null
+++ b/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/delegates/ValidatorDelegatesRegistryReader.java
@@ -0,0 +1,120 @@
+/*******************************************************************************
+ * Copyright (c) 2006, 2008 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * IBM Corporation - initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.wst.validation.internal.delegates;
+
+import org.eclipse.core.runtime.IConfigurationElement;
+import org.eclipse.core.runtime.IContributor;
+import org.eclipse.core.runtime.IExtensionPoint;
+import org.eclipse.core.runtime.IExtensionRegistry;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Platform;
+import org.eclipse.osgi.util.NLS;
+import org.eclipse.wst.validation.internal.ValMessages;
+import org.eclipse.wst.validation.internal.plugin.ValidationPlugin;
+
+/**
+ * This class reads the plug-in extension registry and registers each delegating
+ * validator descriptor with the delegates registry.
+ * 
+ * @see ValidatorDelegatesRegistry
+ */
+class ValidatorDelegatesRegistryReader {
+	/**
+	 * The delegate class attribute.
+	 */
+	static final String CLASS_ATTRIBUTE = "class"; //$NON-NLS-1$
+
+	/**
+	 * The delegate element name.
+	 */
+	private static final String DELEGATE_ELEMENT = "delegate"; //$NON-NLS-1$
+
+	/**
+	 * The validator delegates extension point id.
+	 */
+	private static final String EXTENSION_POINT_ID = "validatorDelegates"; //$NON-NLS-1$
+
+	/**
+	 * The delegate name attribute.
+	 */
+	private static final String NAME_ATTRIBUTE = "name"; //$NON-NLS-1$
+
+	private static final String PLUGIN_ID = "org.eclipse.wst.validation"; //$NON-NLS-1$
+
+	/**
+	 * The target id attribute name.
+	 */
+	private static final String TARGET_ATTRIBUTE = "target"; //$NON-NLS-1$
+
+	/**
+	 * The validator registry where the descriptors being read will be placed.
+	 */
+	private ValidatorDelegatesRegistry registry;
+
+	/**
+	 * Constructor.
+	 * 
+	 * @param registry
+	 *            The registry where the descriptors being read will be placed.
+	 */
+	public ValidatorDelegatesRegistryReader(ValidatorDelegatesRegistry registry) {
+		this.registry = registry;
+	}
+
+	/**
+	 * Reads a configuration element.
+	 * 
+	 * @param element
+	 *            The platform configuration element being read.
+	 */
+	private void readElement(IConfigurationElement element) {
+		String elementName = element.getName();
+
+		if (elementName.equals(DELEGATE_ELEMENT)) {
+			String delegateID = element.getAttribute(CLASS_ATTRIBUTE);
+			String delegateName = element.getAttribute(NAME_ATTRIBUTE);
+			String targetValidatorID = element.getAttribute(TARGET_ATTRIBUTE);
+
+			ValidatorDelegateDescriptor descriptor = new ValidatorDelegateDescriptor(
+					delegateID, element, delegateName, targetValidatorID);
+
+			registry.add(descriptor);
+		}
+	}
+
+	/**
+	 * Read from the extensions registry and parse it.
+	 */
+	void readRegistry() {
+		IExtensionRegistry pluginRegistry = Platform.getExtensionRegistry();
+		IExtensionPoint point = pluginRegistry.getExtensionPoint(PLUGIN_ID,
+				EXTENSION_POINT_ID);
+
+		if (point != null) {
+			IConfigurationElement[] elements = point.getConfigurationElements();
+			for (IConfigurationElement configurationElement : elements) {
+				try {
+					readElement(configurationElement);
+				} catch (Exception e) {
+					// we don't want all the validators to be rendered helpless
+					// by some
+					// rogue contribution, so, we catch any exception that
+					// occurs during
+					// initialization, log it, and continue on.
+					IContributor contributor = configurationElement.getContributor();
+					String msg = NLS.bind(ValMessages.RogueValidator, contributor);
+					ValidationPlugin.getPlugin().logMessage(IStatus.ERROR, msg);
+				}
+			}
+		}
+	}
+}
diff --git a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/operations/AllValidatorsOperation.java b/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/operations/AllValidatorsOperation.java
new file mode 100644
index 0000000..66809bc
--- /dev/null
+++ b/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/operations/AllValidatorsOperation.java
@@ -0,0 +1,61 @@
+/*******************************************************************************
+ * Copyright (c) 2001, 2008 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.wst.validation.internal.operations;
+
+
+import java.lang.reflect.InvocationTargetException;
+
+import org.eclipse.core.resources.IProject;
+import org.eclipse.wst.validation.internal.ConfigurationManager;
+import org.eclipse.wst.validation.internal.InternalValidatorManager;
+import org.eclipse.wst.validation.internal.ProjectConfiguration;
+import org.eclipse.wst.validation.internal.plugin.ValidationPlugin;
+
+/**
+ * Implemented Validators must not be called directly by anyone other than instances of
+ * ValidationOperation, because some initialization of the validator, and handling of error
+ * conditions, is done in the operation. The initialization is separated because some of the
+ * information needed to initialize the validator (i.e., the project) isn't known until runtime.
+ * 
+ * This operation runs all validators: enabled validators, disabled validators, incremental
+ * validators, full validators.
+ * 
+ * This operation is not intended to be subclassed outside of the validation framework.
+ */
+public class AllValidatorsOperation extends ValidatorSubsetOperation {
+	/**
+	 * @deprecated Will be removed in Milestone 3. Use AllValidatorsOperation(IProject, boolean)
+	 */
+	public AllValidatorsOperation(IProject project) {
+		this(project, DEFAULT_ASYNC);
+	}
+
+	/**
+	 * Run all configured validators on the project, regardless of whether the validator is enabled
+	 * or disabled by the user.
+	 * 
+	 * If async is true, the validation will run all thread-safe validators in a background thread.
+	 * If async is false, no validators will run in a background thread.
+	 */
+	public AllValidatorsOperation(IProject project, boolean async) {
+		super(project, true, async);// always force validation to run
+		try {
+			ProjectConfiguration prjp = ConfigurationManager.getManager().getProjectConfiguration(project);
+			setEnabledValidators(InternalValidatorManager.wrapInSet(prjp.getValidators()));
+		} catch (InvocationTargetException e) {
+			ValidationPlugin.getPlugin().handleException(e);
+			if (e.getTargetException() != null) {
+				ValidationPlugin.getPlugin().handleException(e.getTargetException());
+			}
+		}
+	}
+
+}
diff --git a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/operations/DefaultResourceUtil.java b/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/operations/DefaultResourceUtil.java
new file mode 100644
index 0000000..39231d4
--- /dev/null
+++ b/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/operations/DefaultResourceUtil.java
@@ -0,0 +1,25 @@
+/*******************************************************************************
+ * Copyright (c) 2001, 2004 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ * IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.wst.validation.internal.operations;
+
+/**
+ * The default line number calculator (always returns "0").
+ */
+public class DefaultResourceUtil implements IResourceUtil {
+
+	/**
+	 * @see org.eclipse.wst.validation.internal.operations.IResourceUtil#getLineNo(Object)
+	 */
+	public int getLineNo(Object obj) {
+		return 0;
+	}
+
+}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/operations/EnabledIncrementalValidatorsOperation.java b/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/operations/EnabledIncrementalValidatorsOperation.java
new file mode 100644
index 0000000..f36e48b
--- /dev/null
+++ b/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/operations/EnabledIncrementalValidatorsOperation.java
@@ -0,0 +1,202 @@
+/*******************************************************************************
+ * Copyright (c) 2001, 2008 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.wst.validation.internal.operations;
+
+
+import java.lang.reflect.InvocationTargetException;
+import java.util.Set;
+
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.resources.IResourceDelta;
+import org.eclipse.wst.validation.internal.ConfigurationManager;
+import org.eclipse.wst.validation.internal.FilterUtil;
+import org.eclipse.wst.validation.internal.InternalValidatorManager;
+import org.eclipse.wst.validation.internal.ProjectConfiguration;
+import org.eclipse.wst.validation.internal.RegistryConstants;
+import org.eclipse.wst.validation.internal.ValidatorMetaData;
+import org.eclipse.wst.validation.internal.plugin.ValidationPlugin;
+
+/**
+ * Implemented Validators must not be called directly by anyone other than instances of
+ * ValidationOperation, because some initialization of the validator, and handling of error
+ * conditions, is done in the operation. The initialization is separated because some of the
+ * information needed to initialize the validator (i.e., the project) isn't known until runtime.
+ * 
+ * Instances of this operation load the project's configured validators, and run the validators if
+ * they are both enabled and incremental.
+ * 
+ * This operation is not intended to be subclassed outside of the validation framework.
+ */
+public class EnabledIncrementalValidatorsOperation extends EnabledValidatorsOperation {
+	/**
+	 * @deprecated Will be removed in Milestone 3. Use
+	 *             EnabledIncrementalValidatorsOperation(IProject, IResourceDelta, boolean)
+	 */
+	public EnabledIncrementalValidatorsOperation(IProject project, IResourceDelta delta) {
+		this(project, delta, DEFAULT_ASYNC);
+	}
+
+	/**
+	 * @deprecated Will be removed in Milestone 3. Use
+	 *             EnabledIncrementalValidatorsOperation(IProject, IResourceDelta, int, boolean)
+	 */
+	public EnabledIncrementalValidatorsOperation(IProject project, IResourceDelta delta, int ruleGroup) {
+		this(project, delta, ruleGroup, DEFAULT_ASYNC);
+	}
+
+	/**
+	 * @deprecated Will be removed in Milestone 3. Use
+	 *             EnabledIncrementalValidatorsOperation(IProject, IResourceDelta, int, boolean)
+	 *             instead.
+	 */
+	public EnabledIncrementalValidatorsOperation(IProject project, Set<ValidatorMetaData> validators, IResourceDelta delta, int ruleGroup) {
+		this(project, delta, ruleGroup, DEFAULT_ASYNC);
+		setEnabledValidators(validators);
+	}
+
+	/**
+	 * IProject must exist and be open.
+	 * 
+	 * If delta is null, a full validation of the project using only the incremental validators is
+	 * performed. If delta is not null, all enabled incremental validators that validate resources
+	 * in the delta will validate those resources.
+	 * 
+	 * If async is true, all thread-safe validators will run in the background validation thread,
+	 * and all other validators will run in the main thread. If async is false, all validators will
+	 * run in the main thread.
+	 */
+	public EnabledIncrementalValidatorsOperation(IProject project, IResourceDelta delta, boolean async) {
+		this(project, delta, RegistryConstants.ATT_RULE_GROUP_DEFAULT, async);
+	}
+	
+	/**
+	 * IProject must exist and be open.
+	 * 
+	 * If delta is null, a full validation of the project using only the incremental validators is
+	 * performed. If delta is not null, all enabled incremental validators that validate resources
+	 * in the delta will validate those resources.
+	 * 
+	 * If async is true, all thread-safe validators will run in the background validation thread,
+	 * and all other validators will run in the main thread. If async is false, all validators will
+	 * run in the main thread.
+	 */
+	public EnabledIncrementalValidatorsOperation(IProject project, IWorkbenchContext context, IResourceDelta delta, boolean async) {
+		this(project,context, delta, RegistryConstants.ATT_RULE_GROUP_DEFAULT, async);
+	}
+	
+	/**
+	 * IProject must exist and be open.
+	 * 
+	 * If delta is null, a full validation of the project using only the incremental validators is
+	 * performed. If delta is not null, all enabled incremental validators that validate resources
+	 * in the delta will validate those resources.
+	 * 
+	 * If async is true, all thread-safe validators will run in the background validation thread,
+	 * and all other validators will run in the main thread. If async is false, all validators will
+	 * run in the main thread.
+	 */
+	public EnabledIncrementalValidatorsOperation(IProject project,IWorkbenchContext context, IResourceDelta delta, int ruleGroup, boolean async) {
+		super(project, ruleGroup, shouldForce(delta), async);
+		try {
+			ProjectConfiguration prjp = ConfigurationManager.getManager().getProjectConfiguration(project);
+			setEnabledValidators(InternalValidatorManager.wrapInSet(prjp.getEnabledIncrementalValidators(true)));
+		} catch (InvocationTargetException e) {
+			ValidationPlugin.getPlugin().handleException(e);
+			if (e.getTargetException() != null)
+				ValidationPlugin.getPlugin().handleException(e.getTargetException());
+
+		}
+		setDelta(delta);
+		setContext(context);
+	}
+
+	/**
+	 * IProject must exist and be open.
+	 * 
+	 * If delta is null, a full validation of the project using only the incremental validators is
+	 * performed. If delta is not null, all enabled incremental validators that validate resources
+	 * in the delta will validate those resources.
+	 * 
+	 * If async is true, all thread-safe validators will run in the background validation thread,
+	 * and all other validators will run in the main thread. If async is false, all validators will
+	 * run in the main thread.
+	 */
+	public EnabledIncrementalValidatorsOperation(IProject project, IResourceDelta delta, int ruleGroup, boolean async) {
+		super(project, ruleGroup, shouldForce(delta), async);
+		try {
+			ProjectConfiguration prjp = ConfigurationManager.getManager().getProjectConfiguration(project);
+			setEnabledValidators(InternalValidatorManager.wrapInSet(prjp.getEnabledIncrementalValidators(true)));
+		} catch (InvocationTargetException e) {
+			ValidationPlugin.getPlugin().handleException(e);
+			if (e.getTargetException() != null)
+				ValidationPlugin.getPlugin().handleException(e.getTargetException());
+
+		}
+		setDelta(delta);
+	}
+
+	/**
+	 * IProject must exist, be open, and contain all of the resources in changedResources. If some
+	 * of the resources in changedResources belong to different projects, the result is undefined.
+	 * 
+	 * If changedResources is null, a full validation of the project using only the incremental
+	 * validators is performed. If changedResources is not null, all enabled incremental validators
+	 * that validate resources in the changedResources array will validate those resources.
+	 * 
+	 * If async is true, all thread-safe validators will run in the background validation thread,
+	 * and all other validators will run in the main thread. If async is false, all validators will
+	 * run in the main thread.
+	 */
+	public EnabledIncrementalValidatorsOperation(IResource[] changedResources,IWorkbenchContext aWorkbenchContext, IProject project, boolean async) {
+		super(project, RegistryConstants.ATT_RULE_GROUP_DEFAULT, shouldForce(changedResources), async);
+		try {
+			ProjectConfiguration prjp = ConfigurationManager.getManager().getProjectConfiguration(project);
+			setEnabledValidators(InternalValidatorManager.wrapInSet(prjp.getEnabledIncrementalValidators(true)));
+		} catch (InvocationTargetException e) {
+			ValidationPlugin.getPlugin().handleException(e);
+			if (e.getTargetException() != null)
+				ValidationPlugin.getPlugin().handleException(e.getTargetException());
+
+		}
+		//construct an array of IFileDelta[] to wrap the Object[]; one IFileDelta for each Object in the array
+		setFileDeltas(FilterUtil.getFileDeltas(getEnabledValidators(), changedResources, false));
+		setContext(aWorkbenchContext);
+	}
+	
+	/**
+	 * IProject must exist, be open, and contain all of the resources in changedResources. If some
+	 * of the resources in changedResources belong to different projects, the result is undefined.
+	 * 
+	 * If changedResources is null, a full validation of the project using only the incremental
+	 * validators is performed. If changedResources is not null, all enabled incremental validators
+	 * that validate resources in the changedResources array will validate those resources.
+	 * 
+	 * If async is true, all thread-safe validators will run in the background validation thread,
+	 * and all other validators will run in the main thread. If async is false, all validators will
+	 * run in the main thread.
+	 */
+	public EnabledIncrementalValidatorsOperation(IResource[] changedResources,IProject project, boolean async) {
+		super(project, RegistryConstants.ATT_RULE_GROUP_DEFAULT, shouldForce(changedResources), async);
+		try {
+			ProjectConfiguration prjp = ConfigurationManager.getManager().getProjectConfiguration(project);
+			setEnabledValidators(InternalValidatorManager.wrapInSet(prjp.getEnabledIncrementalValidators(true)));
+		} catch (InvocationTargetException e) {
+			ValidationPlugin.getPlugin().handleException(e);
+			if (e.getTargetException() != null)
+				ValidationPlugin.getPlugin().handleException(e.getTargetException());
+
+		}
+		//construct an array of IFileDelta[] to wrap the Object[]; one IFileDelta for each Object in the array
+		setFileDeltas(FilterUtil.getFileDeltas(getEnabledValidators(), changedResources, false));
+	}
+
+}
diff --git a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/operations/EnabledValidatorsOperation.java b/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/operations/EnabledValidatorsOperation.java
new file mode 100644
index 0000000..9b8afb3
--- /dev/null
+++ b/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/operations/EnabledValidatorsOperation.java
@@ -0,0 +1,170 @@
+/*******************************************************************************
+ * Copyright (c) 2001, 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
+ *******************************************************************************/
+package org.eclipse.wst.validation.internal.operations;
+
+
+import java.util.Set;
+
+import org.eclipse.core.resources.IProject;
+import org.eclipse.wst.validation.internal.RegistryConstants;
+import org.eclipse.wst.validation.internal.ValidatorMetaData;
+
+
+/**
+ * Implemented Validators must not be called directly by anyone other than instances of
+ * ValidationOperation, because some initialization of the validator, and handling of error
+ * conditions, is done in the operation. The initialization is separated because some of the
+ * information needed to initialize the validator (i.e., the project) isn't known until runtime.
+ * 
+ * Instances of this operation run every enabled validator (both full and incremental) on the
+ * project.
+ * 
+ * This operation is not intended to be subclassed outside of the validation framework.
+ */
+public class EnabledValidatorsOperation extends ValidatorSubsetOperation {
+	
+
+	/**
+	 * @deprecated Will be removed in Milestone 3. Use EnabledValidatorsOperation(IProject, boolean)
+	 */
+	public EnabledValidatorsOperation(IProject project) {
+		this(project, DEFAULT_ASYNC);
+	}
+
+	/**
+	 * @deprecated Will be removed in Milestone 3. Use EnabledValidatorsOperation(IProject, int,
+	 *             boolean, boolean)
+	 */
+	public EnabledValidatorsOperation(IProject project, int ruleGroup) {
+		this(project, ruleGroup, DEFAULT_FORCE, DEFAULT_ASYNC);
+	}
+
+	/**
+	 * @deprecated Will be removed in Milestone 3. Use EnabledValidatorsOperation(IProject, int,
+	 *             boolean, boolean)
+	 */
+	public EnabledValidatorsOperation(IProject project, int ruleGroup, boolean force) {
+		this(project, ruleGroup, force, DEFAULT_ASYNC);
+	}
+
+	/**
+	 * Run all enabled validators on the project.
+	 * 
+	 * IProject must exist and be open.
+	 * 
+	 * If async is true, the validation will run all validators implementing IValidatorJob interface 
+	 * in the background validation thread, if async is false, it would run in the main thread. 
+	 * All validators implementing IValidator interface will run in in the main thread regardless of this flag.
+	 */
+	public EnabledValidatorsOperation(IProject project, boolean async) {
+		this(project, RegistryConstants.ATT_RULE_GROUP_DEFAULT, DEFAULT_FORCE, async);
+	}
+	
+	/**
+	 * Run all enabled validators on the project.
+	 * 
+	 * IProject must exist and be open.
+	 * 
+	 * If async is true, the validation will run all validators implementing IValidatorJob interface 
+	 * in the background validation thread, if async is false, it would run in the main thread. 
+	 * All validators implementing IValidator interface will run in in the main thread regardless of this flag.
+	 */
+	public EnabledValidatorsOperation(IProject project, IWorkbenchContext aWorkbenchContext, boolean async) {
+		this(project, aWorkbenchContext, RegistryConstants.ATT_RULE_GROUP_DEFAULT, DEFAULT_FORCE, async);
+	}
+	
+	/**
+	 * Run all enabled validators on the project with the identified ruleGroup.
+	 * 
+	 * IProject must exist and be open.
+	 * 
+	 * If async is true, the validation will run all validators implementing IValidatorJob interface 
+	 * in the background validation thread, if async is false, it would run in the main thread. 
+	 * All validators implementing IValidator interface will run in in the main thread regardless of this flag.
+	 */
+	public EnabledValidatorsOperation(IProject project, IWorkbenchContext aWorkbenchContext, int ruleGroup, boolean force, boolean async) {
+		this(project, aWorkbenchContext, ValidatorManager.getManager().getEnabledValidators(project), ruleGroup, force, async);
+	}
+	
+
+	/**
+	 * Run all enabled validators on the project with the identified ruleGroup.
+	 * 
+	 * IProject must exist and be open.
+	 * 
+	 * If async is true, the validation will run all validators implementing IValidatorJob interface 
+	 * in the background validation thread, if async is false, it would run in the main thread. 
+	 * All validators implementing IValidator interface will run in in the main thread regardless of this flag.
+	 */
+	public EnabledValidatorsOperation(IProject project, int ruleGroup, boolean force, boolean async) {
+		this(project, ValidatorManager.getManager().getEnabledValidators(project), ruleGroup, force, async);
+	}
+
+	/**
+	 * Run the identified validators on the project.
+	 * 
+	 * IProject must exist and be open.
+	 * 
+	 * If async is true, the validation will run all validators implementing IValidatorJob interface 
+	 * in the background validation thread, if async is false, it would run in the main thread. 
+	 * All validators implementing IValidator interface will run in in the main thread regardless of this flag.
+	 */
+	protected EnabledValidatorsOperation(IProject project, Set<ValidatorMetaData> enabledValidators, boolean async) {
+		this(project, enabledValidators, RegistryConstants.ATT_RULE_GROUP_DEFAULT, DEFAULT_FORCE, async); 
+		// true = force validation to run whether or not auto-validate is on
+	}
+	
+	/**
+	 * Run the identified validators on the project.
+	 * 
+	 * IProject must exist and be open.
+	 * 
+	 * If async is true, the validation will run all validators implementing IValidatorJob interface 
+	 * in the background validation thread, if async is false, it would run in the main thread. 
+	 * All validators implementing IValidator interface will run in in the main thread regardless of this flag.
+	 */
+	protected EnabledValidatorsOperation(IProject project,IWorkbenchContext aWorkbenchContext, 
+		Set<ValidatorMetaData> enabledValidators, boolean async) {
+		this(project,aWorkbenchContext, enabledValidators, RegistryConstants.ATT_RULE_GROUP_DEFAULT, DEFAULT_FORCE, async); 
+		// true = force validation to run whether or not auto-validate is on
+	}
+
+	/**
+	 * Run the identified validators on the project with the ruleGroup.
+	 * 
+	 * IProject must exist and be open.
+	 * 
+	 * If async is true, the validation will run all validators implementing IValidatorJob interface 
+	 * in the background validation thread, if async is false, it would run in the main thread. 
+	 * All validators implementing IValidator interface will run in in the main thread regardless of this flag.
+	 */
+	protected EnabledValidatorsOperation(IProject project, Set<ValidatorMetaData> enabledValidators, 
+		int ruleGroup, boolean force, boolean async) {
+		
+		super(project, force, ruleGroup, async);
+		setEnabledValidators(enabledValidators);
+	}
+	
+	/**
+	 * Run the identified validators on the project with the ruleGroup.
+	 * 
+	 * IProject must exist and be open.
+	 * 
+	 * If async is true, the validation will run all validators implementing IValidatorJob interface 
+	 * in the background validation thread, if async is false, it would run in the main thread. 
+	 * All validators implementing IValidator interface will run in in the main thread regardless of this flag.
+	 */
+	protected EnabledValidatorsOperation(IProject project, IWorkbenchContext aWorkbenchContext, 
+		Set<ValidatorMetaData> enabledValidators, int ruleGroup, boolean force, boolean async) {
+		super(project,aWorkbenchContext,force, ruleGroup, async);
+		setEnabledValidators(enabledValidators);
+	}
+}
diff --git a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/operations/IResourceUtil.java b/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/operations/IResourceUtil.java
new file mode 100644
index 0000000..d0a34bf
--- /dev/null
+++ b/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/operations/IResourceUtil.java
@@ -0,0 +1,22 @@
+/*******************************************************************************
+ * Copyright (c) 2001, 2004 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ * IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.wst.validation.internal.operations;
+
+
+/**
+ * This type is not intended to be extended by clients.
+ */
+public interface IResourceUtil {
+	/**
+	 * Return the line number where the Object is located.
+	 */
+	public int getLineNo(Object obj);
+}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/operations/IRuleGroup.java b/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/operations/IRuleGroup.java
new file mode 100644
index 0000000..1c2ad11
--- /dev/null
+++ b/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/operations/IRuleGroup.java
@@ -0,0 +1,41 @@
+/*******************************************************************************
+ * Copyright (c) 2001, 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
+ *******************************************************************************/
+package org.eclipse.wst.validation.internal.operations;
+
+/**
+ * This type represents a group of rules which a validator checks. For now, the only grouping is by
+ * speed: if a set of rules can be checked quickly, it will be included in the PASS_FAST group,
+ * otherwise, it is grouped in the PASS_FULL group.
+ * 
+ * In future, this could be extended to include severities. To be able to group by severity helps
+ * with the MessageLimitException. A validator should report errors first, and then warnings, and
+ * then infos, in order to avoid the message limit being reached before the most severe problems are
+ * reported.
+ */
+public interface IRuleGroup {
+	// The following filters are used to identify a group of validation checks.
+
+	// retrieves the type of pass, from the IValidationContext, which the validator should execute
+	public static final String PASS_LEVEL = "PASS_LEVEL"; //$NON-NLS-1$
+
+	// On the FAST_PASS, the validator should check the rules which do not
+	// take much time to check, and exclude the rules which are valid only
+	// before some action (e.g. exporting or deploying).
+	// 
+	// The severity of the messages is irrelevant.
+	public static final int PASS_FAST = 0x1;
+	public static final String PASS_FAST_NAME = "fast"; //$NON-NLS-1$ // In plugin.xml, identify this pass by this constant
+
+	// On the FULL_PASS, the validator should check everything. This is the default.
+	public static final int PASS_FULL = 0x2 | PASS_FAST;
+	public static final String PASS_FULL_NAME = "full"; //$NON-NLS-1$ // In plugin.xml, identify this pass by this constant
+
+}
diff --git a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/operations/IWorkbenchContext.java b/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/operations/IWorkbenchContext.java
new file mode 100644
index 0000000..2ee4b60
--- /dev/null
+++ b/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/operations/IWorkbenchContext.java
@@ -0,0 +1,174 @@
+/*******************************************************************************
+ * Copyright (c) 2001, 2007 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.wst.validation.internal.operations;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.wst.validation.internal.provisional.core.IProjectValidationContext;
+
+/**
+ * In the eclipse environment, not only does the IValidationContext need to be able to load the MOF model, it
+ * also needs to load items from the eclipse workbench. This interface should be extended by
+ * workbench IHelpers, so that items can be added to, and from, the task list.
+ */
+public interface IWorkbenchContext extends IProjectValidationContext {
+	/**
+	 * When the validation is complete, this method will be called so that the IWorkbenchContext can
+	 * clean up any resources it allocated during the validation.
+	 * 
+	 * If the cleanup is a long-running operation, subtask messages should be sent to the IReporter.
+	 */
+	void cleanup(WorkbenchReporter reporter);
+
+	/**
+	 * When the IProject is closing, perform any cleanup that needs to be done. When this method is
+	 * called, if the helper has cached any resources from the IProject, it should release those
+	 * resources. If you do not allocate resources in your helper, then this method should be a
+	 * no-op.
+	 */
+	void closing();
+
+	/**
+	 * When the IProject is being deleted, perform any cleanup that needs to be done. When this
+	 * method is called, if the helper has cached any resources from the IProject, it should release
+	 * those resources. If you do not allocate resources in your helper, then this method should be
+	 * a no-op.
+	 */
+	void deleting();
+
+	/**
+	 * Given an Object, if the object has a corresponding IFile in the workbench, return the IFile.
+	 * Otherwise return null.
+	 * 
+	 * This method is used by the WorkbenchReporter. In eclipse, in order to add or remove a task
+	 * list entry, the IResource, to which the entry applies, must be identified. The IReporter
+	 * interface passes in an Object in these methods:
+	 * 
+	 * addValidationMessage(IValidator, IMessage) // Object is a part of IMessage
+	 * 
+	 * removeAllMessages(IValidator, Object),
+	 * 
+	 * Thus, the WorkbenchReporter needs to know how, given the Object, which IFile that the Object
+	 * represents in the workbench, in order to be able to add the task list entry.
+	 * 
+	 * If this method returns null, then the WorkbenchReporter will add the message to the IProject
+	 * instead of an IFile.
+	 * 
+	 * @deprecated Implement getResource(Object) instead.
+	 */
+	IFile getFile(Object object);
+
+	/**
+	 * Given an Object, if the object has a corresponding IResource in the workbench, return the
+	 * IResourcee. Otherwise return null.
+	 * 
+	 * This method is used by the WorkbenchReporter. In eclipse, in order to add or remove a task
+	 * list entry, the IResource, to which the entry applies, must be identified. The IReporter
+	 * interface passes in an Object in these methods:
+	 * 
+	 * addValidationMessage(IValidator, IMessage) // Object is a part of IMessage
+	 * 
+	 * removeAllMessages(IValidator, Object),
+	 * 
+	 * Thus, the WorkbenchReporter needs to know how, given the Object, which IFile that the Object
+	 * represents in the workbench, in order to be able to add the task list entry.
+	 * 
+	 * If this method returns null, then the WorkbenchReporter will add the message to the IProject
+	 * instead of an IResource.
+	 */
+	IResource getResource(Object object);
+
+	/**
+	 * Given an IMessage's target object, return the line number, of the IFile, which the target
+	 * object represents, if possible. If the object is null, or if access to line numbers is not
+	 * possible, return a text description of the location.
+	 * 
+	 * This method will be called whether or not the IResource is an IFile, IFolder, or IProject.
+	 * Line numbers are valid only for IFile types; if the resource is not an IFile, then a text
+	 * description of the location must be returned.
+	 */
+	String getLocation(Object object);
+
+	/**
+	 * Return the name of the resource, without the project-specific information in front.
+	 * <p>
+	 * This method is used by ValidationOperation to calculate the non-environment specific names of
+	 * the files. Only the IWorkbenchContext implementation knows how much information to strip off
+	 * of the IResource name. For example, if there is an EJB Project named "MyEJBProject", and it
+	 * uses the default names for the source and output folders, "source" and "ejbModule",
+	 * respectively, then the current implementation of EJB Helper knows how much of that structure
+	 * is eclipse-specific.
+	 * </p><p>
+	 * Since the "source" folder contains Java source files, a portable name would be the
+	 * fully-qualified name of the Java class, without the eclipse-specific project and folder names
+	 * in front of the file name. The EJBHelper knows that everything up to the "source" folder, for
+	 * example, can be removed, because, according to the definition of the EJB Project, everything
+	 * contained in the source folder is java source code. So if there is an IResource in an EJB
+	 * Project named "/MyEJBProject/source/com/ibm/myclasses/MyJavaFile.java", this method would
+	 * make this name portable by stripping off the "/MyEJBProject/source", and returning
+	 * "com/ibm/myclasses/MyJavaFile.java".
+	 * </p><p>
+	 * The output of this method is used by the ValidationOperation, when it is calculating the list
+	 * of added/changed/deleted file names for incremental validation. If getPortableName(IResource)
+	 * returns null, that means that the IWorkbenchContext's implementation does not support that
+	 * particular type of resource, and the resource should not be included in the array of
+	 * IFileDelta objects in the IValidator's "validate" method.
+	 * </p>
+	 */
+	String getPortableName(IResource resource);
+
+	/**
+	 * Return the IProject which is about to be validated. Each IWorkbenchContext knows how to
+	 * traverse a certain type of IProject, for example, an EJB project or a web project.
+	 */
+	IProject getProject();
+
+	/**
+	 * When an IValidator associates a target object with an IMessage, the WorkbenchReporter
+	 * eventually resolves that target object with an IResource. Sometimes more than one target
+	 * object resolves to the same IResource (usually the IProject, which is the default IResource
+	 * when an IFile cannot be found). This method is called, by the WorkbenchReporter, so that the
+	 * WorkbenchReporter can distinguish between the IMessages which are on the same IResource, but
+	 * refer to different target objects. This is needed for the removeAllMessages(IValidator,
+	 * Object) method, so that when one target object removes all of its messages, that it doesn't
+	 * remove another target object's messages.
+	 * 
+	 * This method may return null only if object is null. Otherwise, an id which can uniquely
+	 * identify a particular object must be returned. The id needs to be unique only within one
+	 * particular IValidator.
+	 */
+	String getTargetObjectName(Object object);
+
+	/**
+	 * Whether full or incremental validation is running, this method will be called, by the
+	 * Validation Framework, for every IResource which is filtered in by the IValidator, so that the
+	 * IValidationContext can receive notification that one of the resources, which validation will run on, is
+	 * being filtered in.
+	 */
+	void registerResource(IResource resource);
+
+	/**
+	 * This method is called by the Validation Framework, to initialize the IWorkbenchContext so that
+	 * it can gather information from the current project.
+	 */
+	void setProject(IProject project);
+
+	/**
+	 * Notifies this IWorkbenchContext that the Validation Framework is shutting down. There will be
+	 * calls to closing(IProject) and possibly deleting(IProject) following this call, but the
+	 * resources may already be closed by the time that those methods are called, so EVERYTHING
+	 * should be cleaned up in this method. The parameter passed in is the project which is about to
+	 * shut down. This method will be called once for every IProject in the workbench. The IProject
+	 * may, or may not, be closed.
+	 */
+	void shutdown();
+}
diff --git a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/operations/LocalizedMessage.java b/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/operations/LocalizedMessage.java
new file mode 100644
index 0000000..9b03057
--- /dev/null
+++ b/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/operations/LocalizedMessage.java
@@ -0,0 +1,63 @@
+/*******************************************************************************
+ * Copyright (c) 2001, 2007 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.wst.validation.internal.operations;
+
+import java.util.Locale;
+
+import org.eclipse.core.resources.IResource;
+import org.eclipse.wst.validation.internal.core.Message;
+
+/**
+ * This class is provided for validators which run only in UI and whose messages, because they
+ * come from another tool, are already localized. LocalizedMessage cannot be used by any validator
+ * which needs to run in both WebSphere and WSAD.
+ */
+public class LocalizedMessage extends Message {
+	private String _message;
+
+	public LocalizedMessage(int severity, String messageText) {
+		this(severity, messageText, null);
+	}
+
+	public LocalizedMessage(int severity, String messageText, IResource targetObject) {
+		this(severity, messageText, (Object) targetObject);
+	}
+
+	public LocalizedMessage(int severity, String messageText, Object targetObject) {
+		super(null, severity, null);
+		setLocalizedMessage(messageText);
+		setTargetObject(targetObject);
+	}
+
+	public void setLocalizedMessage(String message) {
+		_message = message;
+	}
+
+	public String getLocalizedMessage() {
+		return _message;
+	}
+
+	public String getText() {
+		return getLocalizedMessage();
+	}
+
+	public String getText(ClassLoader cl) {
+		return getLocalizedMessage();
+	}
+
+	public String getText(Locale l) {
+		return getLocalizedMessage();
+	}
+
+	public String getText(Locale l, ClassLoader cl) {
+		return getLocalizedMessage();
+	}
+}
diff --git a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/operations/ManualIncrementalValidatorsOperation.java b/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/operations/ManualIncrementalValidatorsOperation.java
new file mode 100644
index 0000000..59d5f0f
--- /dev/null
+++ b/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/operations/ManualIncrementalValidatorsOperation.java
@@ -0,0 +1,31 @@
+/*******************************************************************************
+ * Copyright (c) 2001, 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
+ *******************************************************************************/
+package org.eclipse.wst.validation.internal.operations;
+
+
+import org.eclipse.core.resources.IProject;
+import org.eclipse.wst.validation.internal.FilterUtil;
+
+
+/**
+ * 
+ * This operation is not intended to be subclassed outside of the validation framework.
+ */
+public class ManualIncrementalValidatorsOperation extends ManualValidatorsOperation {
+
+	public ManualIncrementalValidatorsOperation(IProject project) {
+		super( project );
+	}	
+	public ManualIncrementalValidatorsOperation(IProject project, Object[] changedResources) {
+		super( project, changedResources );
+		setFileDeltas( FilterUtil.getFileDeltas(getEnabledValidators(), changedResources, false) );
+	}	
+}
diff --git a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/operations/ManualValidatorsOperation.java b/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/operations/ManualValidatorsOperation.java
new file mode 100644
index 0000000..03a0bf2
--- /dev/null
+++ b/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/operations/ManualValidatorsOperation.java
@@ -0,0 +1,41 @@
+/*******************************************************************************
+ * Copyright (c) 2001, 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
+ *******************************************************************************/
+package org.eclipse.wst.validation.internal.operations;
+
+
+import org.eclipse.core.resources.IProject;
+import org.eclipse.wst.validation.internal.RegistryConstants;
+
+
+/**
+ * Implemented Validators must not be called directly by anyone other than instances of
+ * ValidationOperation, because some initialization of the validator, and handling of error
+ * conditions, is done in the operation. The initialization is separated because some of the
+ * information needed to initialize the validator (i.e., the project) isn't known until runtime.
+ * <p>
+ * Instances of this operation run every enabled validator (both full and incremental) on the
+ * project.
+ * </p>
+ * <p>
+ * This operation is not intended to be subclassed outside of the validation framework.
+ * </p>
+ */
+public class ManualValidatorsOperation extends ValidatorSubsetOperation {
+
+	public ManualValidatorsOperation(IProject project) {
+		super(project, DEFAULT_FORCE, RegistryConstants.ATT_RULE_GROUP_DEFAULT, true);
+		setEnabledValidators(ValidatorManager.getManager().getManualEnabledValidators(project));
+	}	
+	public ManualValidatorsOperation(IProject project, Object[] changedResources) {
+		super(project, shouldForce(changedResources), RegistryConstants.ATT_RULE_GROUP_DEFAULT, true);
+		setEnabledValidators(ValidatorManager.getManager().getManualEnabledValidators(project));
+	}	
+}
diff --git a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/operations/MessageInfo.java b/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/operations/MessageInfo.java
new file mode 100644
index 0000000..16b93c0
--- /dev/null
+++ b/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/operations/MessageInfo.java
@@ -0,0 +1,104 @@
+/*******************************************************************************
+ * Copyright (c) 2003, 2008 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * IBM Corporation - initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.wst.validation.internal.operations;
+
+import org.eclipse.core.resources.IResource;
+import org.eclipse.wst.validation.internal.provisional.core.IMessage;
+
+public class MessageInfo {
+
+	private String		messageOwnerId;	
+	private IResource	resource;
+	private String		location;	
+	private String		text;
+	private String		targetObjectName;	
+	private String		markerId;	
+	private IMessage	msg;
+	
+	public MessageInfo(){		
+	}
+	
+	public MessageInfo(String messageOwnerId, IResource resource, String location, 
+		String text, String targetObjectName, String markerId, IMessage msg){
+		
+		this.messageOwnerId = messageOwnerId;	
+		this.resource = resource;
+		this.location = location;	
+		this.text = text;
+		this.targetObjectName = targetObjectName;	
+		this.markerId = markerId;	
+		this.msg = msg;
+	}	
+
+	public String getLocation() {
+		return location;
+	}
+
+	public void setLocation(String location) {
+		this.location = location;
+	}
+
+	public String getMarkerId() {
+		return markerId;
+	}
+
+	public void setMarkerId(String markerId) {
+		this.markerId = markerId;
+	}
+
+	public String getMessageOwnerId() {
+		return messageOwnerId;
+	}
+
+	public void setMessageOwnerId(String messageOwnerId) {
+		this.messageOwnerId = messageOwnerId;
+	}
+
+	public IMessage getMsg() {
+		return msg;
+	}
+
+	public void setMsg(IMessage msg) {
+		this.msg = msg;
+	}
+
+	public IResource getResource() {
+		return resource;
+	}
+
+	public void setResource(IResource resource) {
+		this.resource = resource;
+	}
+
+	public String getTargetObjectName() {
+		return targetObjectName;
+	}
+
+	public void setTargetObjectName(String targetObjectName) {
+		this.targetObjectName = targetObjectName;
+	}
+
+	public String getText() {
+		return text;
+	}
+
+	public void setText(String text) {
+		this.text = text;
+	}
+	
+	@Override
+	public String toString() {
+		if (text != null)return "MessageInfo: " + text; //$NON-NLS-1$
+		return super.toString();
+	}
+	
+}
diff --git a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/operations/OneValidatorOperation.java b/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/operations/OneValidatorOperation.java
new file mode 100644
index 0000000..99d359b
--- /dev/null
+++ b/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/operations/OneValidatorOperation.java
@@ -0,0 +1,125 @@
+/*******************************************************************************
+ * Copyright (c) 2001, 2008 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.wst.validation.internal.operations;
+
+
+import java.util.HashSet;
+import java.util.Set;
+
+import org.eclipse.core.resources.IProject;
+import org.eclipse.wst.validation.internal.RegistryConstants;
+import org.eclipse.wst.validation.internal.ValidationRegistryReader;
+import org.eclipse.wst.validation.internal.ValidatorMetaData;
+
+
+/**
+ * Implemented Validators must not be called directly by anyone other than instances of
+ * ValidationOperation, because some initialization of the validator, and handling of error
+ * conditions, is done in the operation. The initialization is separated because some of the
+ * information needed to initialize the validator (i.e., the project) isn't known until runtime.
+ * 
+ * This operation runs a single validator on a project.
+ * 
+ * This operation is not intended to be subclassed outside of the validation framework.
+ */
+public class OneValidatorOperation extends ValidatorSubsetOperation {
+	/**
+	 * @deprecated Will be removed in Milestone 3. Use OneValidatorOperation(project, validatorId,
+	 *             boolean, boolean)
+	 */
+	public OneValidatorOperation(IProject project, String validatorId) throws IllegalArgumentException {
+		this(project, validatorId, DEFAULT_FORCE, DEFAULT_ASYNC);
+	}
+
+	/**
+	 * @deprecated Will be removed in Milestone 3. Use OneValidatorOperation(project, validatorId,
+	 *             boolean, boolean)
+	 */
+	public OneValidatorOperation(IProject project, String validatorId, boolean force) throws IllegalArgumentException {
+		this(project, validatorId, force, DEFAULT_ASYNC);
+	}
+
+	/**
+	 * @deprecated Will be removed in Milestone 3. Use OneValidatorOperation(IProject, String,
+	 *             boolean, int, boolean)
+	 */
+	public OneValidatorOperation(IProject project, String validatorId, boolean force, int ruleGroup) throws IllegalArgumentException {
+		this(project, validatorId, force, ruleGroup, DEFAULT_ASYNC);
+	}
+
+	/**
+	 * @param validatorId
+	 *            The plugin id of the validator which you wish to run.
+	 * @param force
+	 *            If the value is "true", the validator should be run regardless of what the
+	 *            environment settings are; if the value is "false", this operation should be run
+	 *            only if the validation builder will not run the validator.
+	 * 
+	 * IllegalArgumentException will be thrown if the named validator is not configured on the
+	 * project.
+	 * 
+	 * IProject must exist and be open.
+	 * 
+	 * If async is true, the validation will run all thread-safe validators in the background
+	 * validation thread, and all other validators in the main thread. If async is false, all
+	 * validators will run in in the main thread.
+	 */
+	public OneValidatorOperation(IProject project, String validatorId, boolean force, boolean async) throws IllegalArgumentException {
+		this(project, validatorId, force, RegistryConstants.ATT_RULE_GROUP_DEFAULT, async);
+	}
+
+	/**
+	 * OneValidatorOperation constructor comment.
+	 * 
+	 * @param project
+	 *            The project to be validated. It must exist and be open.
+	 * @param validatorId
+	 *            The plug-in id of the validator which you wish to run.
+	 * @param force
+	 *            If the value is "true", the validator should be run regardless
+	 *            of what the environment settings are; if the value is "false",
+	 *            this operation should be run only if the validation builder
+	 *            will not run the validator.
+	 * @param ruleGroup
+	 *            Whether a FULL or FAST pass should be invoked.
+	 * @param async
+	 *            If async is true, the validation will run all thread-safe
+	 *            validators in the background validation thread, and all other
+	 *            validators in the main thread. If async is false, all
+	 *            validators will run in in the main thread.
+	 * 
+	 * IllegalArgumentException will be thrown if the named validator is not
+	 * configured on the project.
+	 * 
+	 */
+	public OneValidatorOperation(IProject project, String validatorId, boolean force, int ruleGroup, boolean async) throws IllegalArgumentException {
+		super(project, force, ruleGroup, async);
+
+		ValidatorMetaData vmd = ValidationRegistryReader.getReader().getValidatorMetaData(validatorId);
+		if (vmd == null) {
+			// No validator, with that plug-in id, can be run on that project.
+			// Either the validator isn't installed, or the IProject passed in
+			// doesn't have the necessary nature.
+			throw new IllegalArgumentException(validatorId);
+		}
+
+		if (!vmd.isConfiguredOnProject(project)) {
+			// No validator, with that plug-in id, can be run on that project.
+			// Either the validator isn't installed, or the IProject passed in
+			// doesn't have the necessary nature.
+			throw new IllegalArgumentException(validatorId);
+		}
+
+		Set<ValidatorMetaData> enabled = new HashSet<ValidatorMetaData>();
+		enabled.add(vmd);
+		setEnabledValidators(enabled);
+	}
+}
diff --git a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/operations/ReferencialFileValidator.java b/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/operations/ReferencialFileValidator.java
new file mode 100644
index 0000000..c15609c
--- /dev/null
+++ b/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/operations/ReferencialFileValidator.java
@@ -0,0 +1,35 @@
+/*******************************************************************************
+ * Copyright (c) 2001, 2008 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
+ *******************************************************************************/
+/*
+ * Created on May 3, 2004
+ *
+ * To change the template for this generated file go to
+ * Window - Preferences - Java - Code Generation - Code and Comments
+ */
+package org.eclipse.wst.validation.internal.operations;
+
+import java.util.List;
+
+import org.eclipse.core.resources.IFile;
+
+/**
+ * @author vijayb
+ */
+public interface ReferencialFileValidator {
+	
+	/**
+	 * Answer the referenced files.
+	 * 
+	 * @param inputFiles
+	 * @return a list of IFile's.
+	 */
+	public List<IFile> getReferencedFile(List inputFiles);
+}
diff --git a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/operations/ReferencialFileValidatorHelper.java b/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/operations/ReferencialFileValidatorHelper.java
new file mode 100644
index 0000000..99d66e1
--- /dev/null
+++ b/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/operations/ReferencialFileValidatorHelper.java
@@ -0,0 +1,58 @@
+/*******************************************************************************
+ * Copyright (c) 2001, 2008 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
+ *******************************************************************************/
+/*
+ * Created on May 4, 2004
+ *
+ * To change the template for this generated file go to
+ * Window - Preferences - Java - Code Generation - Code and Comments
+ */
+package org.eclipse.wst.validation.internal.operations;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IFolder;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.runtime.CoreException;
+
+/**
+ * @author vijayb
+ */
+public class ReferencialFileValidatorHelper {
+	public ReferencialFileValidatorHelper() {
+	}
+
+	/**
+	 * Return a list of all files contained in project to infinite depth
+	 */
+	public static List<IFile> getAllProjectFiles(IProject project) {
+		List<IFile> result = new ArrayList<IFile>();
+		if (project == null)return result;
+		
+		try {
+			result = collectFiles(project.members(), result);
+		} catch (CoreException e) {
+			//Ignore
+		}
+		return result;
+	}
+
+	private static List<IFile> collectFiles(IResource[] members, List<IFile> result) throws CoreException {
+		// recursively collect files for the given members
+		for (IResource res : members) {
+			if (res instanceof IFolder)collectFiles(((IFolder) res).members(), result);
+			else if (res instanceof IFile)result.add((IFile)res);
+		}
+		return result;
+	}
+}
diff --git a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/operations/ResourceHandler.java b/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/operations/ResourceHandler.java
new file mode 100644
index 0000000..8e942ea
--- /dev/null
+++ b/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/operations/ResourceHandler.java
@@ -0,0 +1,20 @@
+/*******************************************************************************
+ * Copyright (c) 2001, 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
+ *******************************************************************************/
+package org.eclipse.wst.validation.internal.operations;
+
+
+/**
+ * @deprecated For use by the validation framework only. This class retrieves the Strings from the
+ *             .properties file appropriate for the machine's Locale.
+ */
+public final class ResourceHandler extends org.eclipse.wst.validation.internal.ResourceHandler {
+	//Default
+}
diff --git a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/operations/TaskListHelper.java b/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/operations/TaskListHelper.java
new file mode 100644
index 0000000..8532dc1
--- /dev/null
+++ b/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/operations/TaskListHelper.java
@@ -0,0 +1,107 @@
+/*******************************************************************************
+ * Copyright (c) 2001, 2004 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ * IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.wst.validation.internal.operations;
+
+import org.eclipse.core.resources.IMarker;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.wst.validation.internal.TaskListUtility;
+
+
+
+/**
+ * @deprecated This class is intended to be used only by the validation framework. The
+ *             TaskListHelper class will be removed in Milestone 4.
+ */
+public class TaskListHelper {
+	private static TaskListHelper _taskListHelper = null;
+
+	public static TaskListHelper getTaskList() {
+		if (_taskListHelper == null) {
+			_taskListHelper = new TaskListHelper();
+		}
+		return _taskListHelper;
+	}
+
+	/**
+	 * This method adds a message to a resource in the task list.
+	 */
+	public void addTask(String pluginId, IResource resource, String location, String messageId, String message, int markerType, String targetObjectName, String groupName, int offset, int length) throws CoreException {
+		TaskListUtility.addTask(pluginId, resource, location, messageId, message, markerType, targetObjectName, groupName, offset, length);
+	}
+
+
+	public IMarker[] getValidationTasks(int severity, IProject project) {
+		return TaskListUtility.getValidationTasks(severity, project);
+	}
+
+	public IMarker[] getValidationTasks(IResource resource, int severity) {
+		return TaskListUtility.getValidationTasks(resource, severity);
+	}
+
+	public IMarker[] getValidationTasks(IResource resource, String messageOwner) {
+		return TaskListUtility.getValidationTasks(resource, messageOwner);
+	}
+
+	public IMarker[] getValidationTasks(IResource resource, String[] messageOwners) {
+		return TaskListUtility.getValidationTasks(resource, messageOwners);
+	}
+
+	/**
+	 * Remove all validation messages from the resource and its children.
+	 */
+	public void removeAllTasks(IResource resource) {
+		TaskListUtility.removeAllTasks(resource);
+	}
+
+	/**
+	 * This method removes all tasks from the resource. If the resource is an IProject, all tasks
+	 * are also removed from the project's children.
+	 */
+	public void removeAllTasks(IResource resource, String[] owners) throws CoreException {
+		TaskListUtility.removeAllTasks(resource, owners);
+	}
+
+	/**
+	 * This method removes all messages from a resource in the task list.
+	 */
+	public void removeAllTasks(IResource resource, String owner, String objectName) throws CoreException {
+		TaskListUtility.removeAllTasks(resource, owner, objectName);
+	}
+
+	public void removeAllTasks(IResource resource, String[] owners, String objectName) throws CoreException {
+		TaskListUtility.removeAllTasks(resource, owners, objectName);
+	}
+
+	/**
+	 * This method removes a subset of tasks from the project, including child tasks. Every task
+	 * which belongs to the group, identified by groupName, will be removed.
+	 */
+	public void removeTaskSubset(IResource resource, String[] owners, String objectName, String groupName) throws CoreException {
+		TaskListUtility.removeTaskSubset(resource, owners, objectName, groupName);
+	}
+
+	/**
+	 * This method changes all validator markers which are owned by "from" to make their owner "to".
+	 */
+	public void updateOwner(String from, String to) throws CoreException {
+		TaskListUtility.updateOwner(from, to);
+	}
+
+	/**
+	 * This method changes all validator markers on the IResource and its children. All markers
+	 * owned by "from" have their owner reassigned to "to".
+	 */
+	public void updateOwner(String from, String to, IResource resource) throws CoreException {
+		TaskListUtility.updateOwner(from, to, resource);
+	}
+}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/operations/ValidationBuilder.java b/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/operations/ValidationBuilder.java
new file mode 100644
index 0000000..5bb1c28
--- /dev/null
+++ b/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/operations/ValidationBuilder.java
@@ -0,0 +1,303 @@
+/*******************************************************************************
+ * Copyright (c) 2001, 2009 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.wst.validation.internal.operations;
+
+import java.lang.reflect.InvocationTargetException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IResourceDelta;
+import org.eclipse.core.resources.IncrementalProjectBuilder;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.wst.validation.ValidationFramework;
+import org.eclipse.wst.validation.internal.ConfigurationManager;
+import org.eclipse.wst.validation.internal.InternalValidatorManager;
+import org.eclipse.wst.validation.internal.ProjectConfiguration;
+import org.eclipse.wst.validation.internal.ResourceConstants;
+import org.eclipse.wst.validation.internal.ResourceHandler;
+import org.eclipse.wst.validation.internal.Tracing;
+import org.eclipse.wst.validation.internal.ValBuilderJob;
+import org.eclipse.wst.validation.internal.ValManager;
+import org.eclipse.wst.validation.internal.ValidatorMetaData;
+import org.eclipse.wst.validation.internal.plugin.ValidationPlugin;
+
+/**
+ * Validation Framework Builder.
+ * <p>
+ * This builder is configured on J2EE IProjects automatically, and can be added to other types of
+ * projects through the Properties page. It launches validation on the project if the project has
+ * build validation enabled.
+ * </p>
+ * <p>
+ * This launches a Job for the new V2 validators and also a Job for each of the Job based V1
+ * validators. If there are any "in-line" V1 validations they are done as part of this builder.
+ * Because of all the jobs that this builder spawns, the build will usually be finished long before
+ * all the validation has finished.
+ * </p>
+ */
+public class ValidationBuilder extends IncrementalProjectBuilder {
+	/*
+	 * GRK - This class serves as a main entry point into the framework. There is one instance of this class for every
+	 * project that has a validation builder configured for it. Typically if you had ten projects in your workspace you would have
+	 * ten of these objects. They are created early in the life cycle of the workbench, and then are reused. 
+	 * 
+	 * My observation was that they are run serially by the same thread.
+	 */
+	public static final int NO_DELTA_CHANGE = -1;
+	protected List<IProject> referencedProjects;
+	protected IWorkbenchContext workbenchContext = null;
+	
+	/** 
+	 * All the jobs that the validation framework spawns will belong to this family. 
+	 */
+	public static final Object FAMILY_VALIDATION_JOB = new Object();
+	
+	public ValidationBuilder() {
+	}
+
+	private IProject[] getAllReferencedProjects(IProject project, Set<IProject> visitedProjects) {
+		if (visitedProjects == null)visitedProjects = new HashSet<IProject>();
+		else if (visitedProjects.contains(project))return getReferencedProjects();
+		else visitedProjects.add(project);
+		
+		if (referencedProjects == null)referencedProjects = new ArrayList<IProject>();
+		try {
+			if (project.isAccessible()) {
+				IProject[] refProjArray = project.getReferencedProjects();
+				collectReferecedProject(refProjArray);
+				for (IProject refProject : refProjArray) {
+					getAllReferencedProjects(refProject, visitedProjects);
+				}
+			}
+			return getReferencedProjects();
+		} catch (CoreException e) {
+			ValidationPlugin.getPlugin().handleException(e);
+		}
+		return null;
+	}
+	
+	public IWorkbenchContext getWorkbenchContext() {
+		if(workbenchContext == null) {
+			workbenchContext = new WorkbenchContext();
+			workbenchContext.setProject(getProject());
+		}
+		return workbenchContext;
+	}
+
+	/**
+	 * Add the projects from refProjArray to the list of referenced projects (if they are not
+	 * already in the list).
+	 * @param refProjArray
+	 */
+	private void collectReferecedProject(IProject[] refProjArray) {
+		for (IProject project : refProjArray) {
+			if (!referencedProjects.contains(project))referencedProjects.add(project);
+		}
+	}
+
+	protected void clean(IProgressMonitor monitor) throws CoreException {
+		IProject currentProject = getProject();
+		Tracing.log("ValidationBuilder-02 clean ", currentProject); //$NON-NLS-1$
+
+		newClean(monitor);
+		if (currentProject == null || !currentProject.isAccessible())return;
+		try {
+			ProjectConfiguration prjp = ConfigurationManager.getManager().getProjectConfiguration(currentProject);
+			ValidatorMetaData[] vmds = prjp.getValidators();
+			for (int i = 0; i < vmds.length; i++) {
+				ValidatorMetaData vmd = vmds[i];
+				// For validators who aren't going to run, clear their messages from the task list.
+				// Don't need to check for duplicate entries because each Validator must be unique.
+				// The uniqueness of each Validator is checked by the plugin registry.
+				WorkbenchReporter.removeAllMessages(currentProject, vmd.getValidatorNames(), null);
+			}
+		} catch (InvocationTargetException e) {
+			ValidationPlugin.getPlugin().handleException(e);
+			ValidationPlugin.getPlugin().handleException(e.getTargetException());
+		}
+
+	}
+
+	private IProject[] getReferencedProjects() {
+		IProject[] refProjArray = new IProject[referencedProjects.size()];
+		return referencedProjects.toArray(refProjArray);
+	}
+	
+	@SuppressWarnings("unchecked")
+	public IProject[] build(int kind, Map parameters, IProgressMonitor monitor) {
+		IResourceDelta delta = null;
+		IProject project = getProject();
+		Tracing.log("ValidationBuilder-01 build ", kind, project);  //$NON-NLS-1$
+		if (Tracing.isLogging(1)){
+			Tracing.logResourceDeltas(getDelta(project), 50);
+		}
+		
+		// GRK I wonder why this builder needs to know about all the other referenced projects?
+		// won't they have builders of their own.
+		IProject[] referenced = getAllReferencedProjects(project, null);
+		if (ValidationFramework.getDefault().isSuspended(project) || 
+			ValManager.getDefault().isDisabled(project))return referenced;
+
+		try {
+			newBuild(kind, monitor);
+
+			ProjectConfiguration prjp = ConfigurationManager.getManager().getProjectConfiguration(project);
+			delta = getDelta(project);
+			boolean doFullBuild = (kind == FULL_BUILD);
+			
+			// It is possible for kind to == AUTO_BUILD while delta is null
+			// (saw this when creating a project by copying another project.)
+			// However, a "Rebuild Project" will invoke this builder with
+			// kind==FULL_BUILD and a null delta, and validation should run in that case.
+			if (!doFullBuild && delta == null) {
+				if (isReferencedProjectInDelta(referenced)) {
+					performFullBuildForReferencedProjectChanged(monitor, prjp);
+				} else {
+					String[] msgParms = new String[]{project.getName()};
+					monitor.subTask(ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_STATUS_NULL_DELTA, msgParms));
+					// A null delta means that a full build must be performed,
+					// but this builder was invoked with an incremental or automatic
+					// build kind. Return without doing anything so that the user
+					// doesn't have to wait forever.
+				}
+				return referenced;
+			}
+			if (doFullBuild) {
+				cleanupReferencedProjectsMarkers(prjp, referenced);
+				performFullBuild(monitor, prjp);
+			} else {
+				if (delta.getAffectedChildren().length == 0) {
+					if (isReferencedProjectInDelta(referenced)){
+						cleanupReferencedProjectsMarkers(prjp, referenced);
+						performFullBuildForReferencedProjectChanged(monitor, prjp);
+					}
+					return referenced;
+				}
+				EnabledIncrementalValidatorsOperation operation = new EnabledIncrementalValidatorsOperation(project, delta, true);
+				operation.run(monitor);
+			}
+			return referenced;
+		} catch (InvocationTargetException e) {
+			ValidationPlugin.getPlugin().handleException(e);
+			ValidationPlugin.getPlugin().handleException(e.getTargetException());
+			return referenced;
+		} catch (Exception e) {
+			ValidationPlugin.getPlugin().handleException(e);
+			return referenced;
+		} finally {
+			referencedProjects = null;
+		}
+	}
+	
+	private void cleanupReferencedProjectsMarkers(final ProjectConfiguration prjp, IProject[] referenced){
+		//When a project references one or more project, performing a clean build on referenced
+		//causes delta to be invoked on referencee, aka, parent. This causes following code to
+		//be invoked.
+		//The following code is trying to fix a case where Ejb project references a utility project,
+		//and the clean build on utility project causes the code to come here, the ejb validator runs
+		//on the ejb  project due to performFullBuildForReferencedProjectChanged() below, but it also
+		//causes marker to be generated for the util project, but the markers for util project are not
+		//cleaned up.   
+		
+		if( referenced == null || referenced.length == 0 )return;
+		
+		try{
+			ValidatorMetaData[] enabledValidators = prjp.getEnabledFullBuildValidators(true, false);
+ 
+			Set<ValidatorMetaData>  set = new HashSet<ValidatorMetaData>();
+			set.addAll( Arrays.asList( enabledValidators ) );
+			for (IProject p : referenced) {
+				if (!p.isAccessible())continue;
+				ProjectConfiguration refProjectCfg = ConfigurationManager.getManager().getProjectConfiguration(p);
+		
+				ValidatorMetaData[] refEnabledValidators = refProjectCfg.getEnabledFullBuildValidators(true, false);
+				
+				//remove from the set the validators which are also in child
+				for(ValidatorMetaData vmd : refEnabledValidators)set.remove(vmd);
+				
+				for(ValidatorMetaData vmd : set)WorkbenchReporter.removeAllMessages(p, vmd.getValidator());		
+			}	
+		}catch (Exception exc) {
+			ValidationPlugin.getPlugin().logMessage(IStatus.ERROR, exc.toString());
+	}
+}
+
+	private boolean isReferencedProjectInDelta(IProject[] referenced) {
+		IProject p = null;
+		for (int i = 0; i < referenced.length; i++) {
+			p = referenced[i];
+			IResourceDelta delta = getDelta(p);
+			if (delta != null && delta.getAffectedChildren().length > 0)
+				return true;
+		}
+		return false;
+	}
+
+	private void performFullBuildForReferencedProjectChanged(IProgressMonitor monitor, ProjectConfiguration prjp) throws InvocationTargetException {
+		performFullBuild(monitor, prjp, true);
+	}
+
+	private void performFullBuild(IProgressMonitor monitor, ProjectConfiguration prjp) throws InvocationTargetException {
+		performFullBuild(monitor, prjp, false);
+	}
+
+	private void performFullBuild(IProgressMonitor monitor, ProjectConfiguration prjp, boolean onlyDependentValidators) throws InvocationTargetException {
+		ValidatorMetaData[] enabledValidators = prjp.getEnabledFullBuildValidators(true, onlyDependentValidators);
+		if ((enabledValidators != null) && (enabledValidators.length > 0)) {
+			Set<ValidatorMetaData> enabledValidatorsSet = InternalValidatorManager.wrapInSet(enabledValidators);
+			EnabledValidatorsOperation op = new EnabledValidatorsOperation(getProject(), enabledValidatorsSet, true);
+			op.run(monitor);
+		}
+	}
+	
+	/**
+	 * Run the new validation builder. This is a transition method, while we continue to have
+	 * the old and new validation builders.
+	 * 
+	 * @param kind the kind of build
+	 * 
+	 * @see IncrementalProjectBuilder#AUTO_BUILD
+	 * @see IncrementalProjectBuilder#CLEAN_BUILD
+	 * @see IncrementalProjectBuilder#FULL_BUILD
+	 * @see IncrementalProjectBuilder#INCREMENTAL_BUILD
+	 */
+	private void newBuild(int kind, IProgressMonitor monitor)	throws CoreException {
+
+		IResourceDelta delta = null;
+		IProject project = getProject();
+		
+		switch (kind){
+			case AUTO_BUILD:
+			case INCREMENTAL_BUILD:
+				delta = getDelta(project);
+				break;
+		}
+		
+		ValBuilderJob.validateProject(project, delta, kind);		
+	}
+	
+	
+	/**
+	 * Run the new clean method. This is a transition method, while we continue to have
+	 * the old and new validation builders.
+	 */
+	private void newClean(IProgressMonitor monitor) throws CoreException {
+		ValManager.getDefault().clean(getProject(), monitor);
+	}	
+	
+}
diff --git a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/operations/ValidationConstants.java b/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/operations/ValidationConstants.java
new file mode 100644
index 0000000..260fa72
--- /dev/null
+++ b/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/operations/ValidationConstants.java
@@ -0,0 +1,25 @@
+/*******************************************************************************
+ * Copyright (c) 2001, 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
+ *******************************************************************************/
+package org.eclipse.wst.validation.internal.operations;
+
+
+import org.eclipse.wst.validation.internal.ResourceConstants;
+
+/**
+ * @deprecated For use by the validation framework only.
+ * 
+ * Constants used to access the string resources associated with the plugin.
+ * 
+ * See the plugin.properties file, in the plugin's directory, for the contents of the strings.
+ */
+public interface ValidationConstants extends ResourceConstants {
+	//Default
+}
diff --git a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/operations/ValidationOperation.java b/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/operations/ValidationOperation.java
new file mode 100644
index 0000000..c9f7b53
--- /dev/null
+++ b/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/operations/ValidationOperation.java
@@ -0,0 +1,1460 @@
+/*******************************************************************************
+ * Copyright (c) 2001, 2009 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.wst.validation.internal.operations;
+
+import java.text.MessageFormat;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.Queue;
+import java.util.Set;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IFolder;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.resources.IResourceDelta;
+import org.eclipse.core.resources.IWorkspace;
+import org.eclipse.core.resources.IWorkspaceRunnable;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.OperationCanceledException;
+import org.eclipse.core.runtime.QualifiedName;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.core.runtime.jobs.IJobChangeEvent;
+import org.eclipse.core.runtime.jobs.ISchedulingRule;
+import org.eclipse.core.runtime.jobs.Job;
+import org.eclipse.core.runtime.jobs.JobChangeAdapter;
+import org.eclipse.wst.common.frameworks.internal.operations.IHeadlessRunnableWithProgress;
+import org.eclipse.wst.validation.ValidationFramework;
+import org.eclipse.wst.validation.internal.FilterUtil;
+import org.eclipse.wst.validation.internal.IProjectValidationHelper;
+import org.eclipse.wst.validation.internal.InternalValidatorManager;
+import org.eclipse.wst.validation.internal.ReferencialFileValidatorRegistryReader;
+import org.eclipse.wst.validation.internal.RegistryConstants;
+import org.eclipse.wst.validation.internal.ResourceConstants;
+import org.eclipse.wst.validation.internal.ResourceHandler;
+import org.eclipse.wst.validation.internal.TaskListUtility;
+import org.eclipse.wst.validation.internal.Tracing;
+import org.eclipse.wst.validation.internal.ValManager;
+import org.eclipse.wst.validation.internal.ValidationRegistryReader;
+import org.eclipse.wst.validation.internal.ValidatorMetaData;
+import org.eclipse.wst.validation.internal.core.IFileDelta;
+import org.eclipse.wst.validation.internal.core.ValidationException;
+import org.eclipse.wst.validation.internal.core.ValidatorLauncher;
+import org.eclipse.wst.validation.internal.plugin.ValidationHelperRegistryReader;
+import org.eclipse.wst.validation.internal.plugin.ValidationPlugin;
+import org.eclipse.wst.validation.internal.provisional.core.IReporter;
+import org.eclipse.wst.validation.internal.provisional.core.IValidationContext;
+import org.eclipse.wst.validation.internal.provisional.core.IValidator;
+import org.eclipse.wst.validation.internal.provisional.core.IValidatorJob;
+
+/**
+ * Validators must not be called directly by anyone other than this class, since
+ * some initialization of the validator is done here (via the getProject() method). The
+ * initialization is separated because the IProject isn't known until runtime.
+ * <p>
+ * This operation is not intended to be subclassed outside of the validation framework.
+ * </p>
+ */
+public abstract class ValidationOperation implements IWorkspaceRunnable, IHeadlessRunnableWithProgress {
+	// Since IResourceConstants don't have a "no delta" flag, let this constant be the flag.
+	public static final int NO_DELTA_CHANGE = -1; 
+	private static final String DELTA_AS_STRING = "IFileDelta[{0}] '{'{1}'}'"; //$NON-NLS-1$
+	private static final String COMMA = ", "; //$NON-NLS-1$
+	
+	// For the depreciated constructors, by default the operation will not fork. 
+	protected static final boolean DEFAULT_ASYNC = true;
+	
+	protected static final boolean DEFAULT_FORCE = true;
+	
+	private static ValidationLauncherJob launcherJob = new ValidationLauncherJob();
+	
+	private static final int jobsPerProcessor = 3;
+	
+	private final static class ValidationLauncherJob extends Job {
+	    private Queue<Job> _validationJobs = new LinkedList<Job>();
+	    
+	    public ValidationLauncherJob() {
+            super(ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_VALIDATION_JOB_MSG));
+            setSystem(true);
+            setRule(ResourcesPlugin.getWorkspace().getRoot());
+	    }
+	    
+	    protected IStatus run(IProgressMonitor monitor) {
+			int processors = Runtime.getRuntime().availableProcessors();
+			int totalInitialJobs = processors * jobsPerProcessor;
+    		synchronized (_validationJobs) {
+    			// never schedule more than 3 validation jobs per processor at a time
+    			for (int i=0; i< totalInitialJobs; i++) {
+    				Job validationJob = _validationJobs.poll();
+    				if (validationJob == null) break;
+    				addJobChangeAdapter(validationJob);
+    				validationJob.schedule();
+    			}
+    		}
+            return Status.OK_STATUS;
+	    }
+	    
+	    private void addJobChangeAdapter(Job job) {
+	    	job.addJobChangeListener(new JobChangeAdapter(){
+	    		// when done, see if there is another validation job to schedule
+				public void done(IJobChangeEvent event) {
+					synchronized (_validationJobs) {
+						Job validationJob = _validationJobs.poll();
+						if (validationJob != null) {
+							addJobChangeAdapter(validationJob);
+							validationJob.schedule();
+						}
+					}
+				}
+			});
+	    }
+	    
+	    @Override
+	    public boolean belongsTo(Object family) {
+			if (family == ResourcesPlugin.FAMILY_MANUAL_BUILD)return true;
+			if (family == ValidationBuilder.FAMILY_VALIDATION_JOB){
+				return true;
+			}
+			return super.belongsTo(family);
+	    }
+	    
+	    public void addValidationJob(Job validationJob) {
+	    	synchronized (_validationJobs) {
+	    		_validationJobs.add(validationJob);
+	    		// schedule the job if we were empty
+	    		if (_validationJobs.size() == 1) {
+	    			this.schedule();
+	    		}
+	    	}
+	    }
+	}
+	
+	/**
+	 * @deprecated Will be removed in Milestone 3. Use DEFAULT_ASYNC
+	 */
+	protected static final boolean DEFAULT_FORK = false; // @deprecated
+	private IProject 		_project; // project to be validated
+	private int 			_ruleGroup = RegistryConstants.ATT_RULE_GROUP_DEFAULT;
+	private boolean _fork = DEFAULT_ASYNC; // do not fork the validation into a
+	// different thread by default
+	private Map<ValidatorMetaData, Set<IFileDelta>> _fileDeltas; // To reduce object creation,
+	private IResourceDelta _delta;
+	
+	// the resource delta tree to be processed, or null if a full build/menu
+	// option was triggered. This value is cached so that validation can be run
+	// either from a builder, or from a menu item. (The Operation interface
+	// doesn't allow any parameter on execute except the IProgressMonitor.)
+	private Set<ValidatorMetaData> _enabledValidators;
+	
+	private boolean _force = DEFAULT_FORCE; // force this operation to run even if it doesn't need to?
+	private boolean _isFullValidate; 	// Run a full validation or an incremental? (true = full)
+	private Boolean _isAutoBuild; 		// Is the global auto-build preference enabled?
+	private Set<ValidatorMetaData> _launchedValidators;
+	
+	protected IWorkbenchContext context;
+
+	// are enabled and were launched (i.e., that have input to validate). For internal
+	// validation framework use only;
+	// it's needed for the automatic tests.
+	/**
+	 * This method is used for FINEST logging, to report exactly what deltas were about to be
+	 * validated.
+	 */
+	private static final String getDeltaAsString(IFileDelta[] delta) {
+		String args = ""; //$NON-NLS-1$
+		int numArgs = 0;
+		if (delta != null) {
+			numArgs = delta.length;
+			StringBuffer buffer = new StringBuffer();
+			for (int i = 0; i < delta.length; i++) {
+				buffer.append(COMMA);
+				buffer.append(delta[i].toString());
+			}
+			buffer.replace(0, 1, ""); //$NON-NLS-1$ // magic numbers 0 and 1 => Remove first COMMA from the list (hence index 0); length of COMMA is 2, hence index 0, 1.
+			args = buffer.toString();
+		}
+		return MessageFormat.format(DELTA_AS_STRING, new Object[]{String.valueOf(numArgs), args});
+	}
+
+	protected static void checkCanceled(WorkbenchReporter reporter) throws OperationCanceledException {
+		if (reporter == null)return;
+		else if (reporter.getProgressMonitor().isCanceled()) {
+			throw new OperationCanceledException(""); //$NON-NLS-1$
+		}
+	}
+
+	protected static boolean shouldForce(IResourceDelta delta) {
+		return ((delta == null) ? DEFAULT_FORCE : false);
+	}
+
+	protected static boolean shouldForce(Object[] changedResources) {
+		return (((changedResources == null) || (changedResources.length == 0)) ? DEFAULT_FORCE : false);
+	}
+
+	/**
+	 * @deprecated. Will be removed in Milestone 3. Use ValidationOperation(project, boolean)
+	 */
+	public ValidationOperation(IProject project) {
+		this(project, DEFAULT_ASYNC, DEFAULT_FORCE);
+	}
+
+	/**
+	 * Internal.
+	 */
+	public ValidationOperation(IProject project, boolean force, boolean async) {
+		this(project, null, null, RegistryConstants.ATT_RULE_GROUP_DEFAULT, force, async);
+	}
+
+	/**
+	 * @deprecated. Will be removed in Milestone 3. Use ValidationOperation(project, int, boolean)
+	 */
+	public ValidationOperation(IProject project, int ruleGroup) {
+		this(project, null, null, ruleGroup, DEFAULT_FORCE, DEFAULT_ASYNC);
+	}
+
+	/**
+	 * @deprecated. Will be removed in Milestone 3. Use ValidationOperation(IProject,
+	 *              IResourceDelta, Boolean, int, boolean, boolean)
+	 */
+	public ValidationOperation(IProject project, IResourceDelta delta, boolean isAutoBuild, int ruleGroup, boolean force, boolean fork) {
+		this(project, delta, ((isAutoBuild) ? Boolean.TRUE : Boolean.FALSE), ruleGroup, fork, force);
+	}
+
+	/**
+	 * Internal.
+	 */
+	protected ValidationOperation(IProject project, IResourceDelta delta, Boolean isAutoBuild, int ruleGroup, boolean force, boolean fork) {
+		super();
+		_project = project;
+		_delta = delta;
+		_isAutoBuild = isAutoBuild;
+		_ruleGroup = ruleGroup;
+		_fork = fork;
+		_force = force;
+		_enabledValidators = new HashSet<ValidatorMetaData>();
+	}
+	
+	/**
+	 * Internal.
+	 */
+	protected ValidationOperation(IProject project, IWorkbenchContext aContext, IResourceDelta delta, Boolean isAutoBuild, int ruleGroup, boolean force, boolean fork) {
+		super();
+		_project = project;
+		_delta = delta;
+		_isAutoBuild = isAutoBuild;
+		_ruleGroup = ruleGroup;
+		_fork = fork;
+		_force = force;
+		_enabledValidators = new HashSet<ValidatorMetaData>();
+		context = aContext;
+	}
+
+	/**
+	 * @deprecated Will be removed in Milestone 3.
+	 */
+	protected void terminateCleanup(WorkbenchReporter reporter) {
+		for (ValidatorMetaData vmd : getEnabledValidators()) {
+			reporter.displaySubtask(ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_STATUS_VALIDATOR_CLEANUP, new String[]{vmd.getValidatorDisplayName()}));
+			try {
+				reporter.removeAllMessages(vmd.getValidator());
+			} catch (InstantiationException e) {
+				// Remove the vmd from the reader's list
+				ValidationRegistryReader.getReader().disableValidator(vmd);
+				ValidationPlugin.getPlugin().handleException(e);
+				continue;
+			}
+			addCancelTask(vmd);
+			reporter.displaySubtask(ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_STATUS_VALIDATOR_TERMINATED, new String[]{getProject().getName(), vmd.getValidatorDisplayName()}));
+		}
+	} 
+	
+
+	/**
+	 * @param vmd
+	 * @param delta
+	 * @param logger
+	 * @param start
+	 */
+//	private void logValidationInfo(ValidatorMetaData vmd, IFileDelta[] delta, Logger logger, long start) {
+//		long finish = System.currentTimeMillis();
+//		TimeEntry entry = ValidationPlugin.getTimeEntry();
+//		entry.setSourceID("ValidationOperation.launchValidator"); //$NON-NLS-1$
+//		entry.setProjectName(getProject().getName());
+//		entry.setToolName(vmd.getValidatorUniqueName());
+//		entry.setElapsedTime(finish - start);
+//		if (logger.isLoggingLevel(Level.FINE)) {
+//			StringBuffer buffer = new StringBuffer();
+//			if (isFullValidate()) {
+//				buffer.append("EVERYTHING"); //$NON-NLS-1$
+//			} else {
+//				if (delta.length == 0) {
+//					buffer.append("NOTHING"); //$NON-NLS-1$
+//				} else {
+//					buffer.append(getDeltaAsString(delta));
+//				}
+//			}
+//			entry.setDetails(buffer.toString());
+//		}
+//		logger.write(Level.INFO, entry);
+//	}
+
+	/**
+	 * @param reporter
+	 * @param vmd
+	 * @param logger
+	 * @param exc
+	 */
+//	private void handleThrowables(WorkbenchReporter reporter, ValidatorMetaData vmd, Logger logger, Throwable exc) {
+//		// If a runtime exception has occured, e.g. NullPointer or ClassCast,
+//		// display it with the "A runtime exception has occurred " messsage.
+//		// This will provide more information to the user when he/she calls IBM
+//		// Service.
+//		if (logger.isLoggingLevel(Level.SEVERE)) {
+//			LogEntry entry = ValidationPlugin.getLogEntry();
+//			entry.setSourceID("ValidationOperation::launchValidator"); //$NON-NLS-1$
+//			entry.setTargetException(exc);
+//			logger.write(Level.SEVERE, entry);
+//		}
+//		String[] msgParm = {exc.getClass().getName(), vmd.getValidatorDisplayName(), (exc.getMessage() == null ? "" : exc.getMessage())}; //$NON-NLS-1$
+//		Message message = ValidationPlugin.getMessage();
+//		message.setSeverity(IMessage.NORMAL_SEVERITY);
+//		message.setId(ResourceConstants.VBF_EXC_RUNTIME);
+//		message.setParams(msgParm);
+//		try {
+//			reporter.addMessage(vmd.getValidator(), message);
+//		} catch (InstantiationException exc2) {
+//			handleInstantiationException(vmd, logger, exc2);
+//		} catch (MessageLimitException e) {
+//			throw e;
+//		}
+//		return;
+//	}
+
+	/**
+	 * @param vmd
+	 * @param logger
+	 * @param exc2
+	 */
+//	private void handleInstantiationException(ValidatorMetaData vmd, Logger logger, InstantiationException exc2) {
+//		// Remove the vmd from the reader's list
+//		ValidationRegistryReader.getReader().disableValidator(vmd);
+//		// Log the reason for the disabled validator
+//		if (logger.isLoggingLevel(Level.SEVERE)) {
+//			LogEntry entry = ValidationPlugin.getLogEntry();
+//			entry.setSourceID("ValidationOperation::launchValidator (deprecated)"); //$NON-NLS-1$
+//			entry.setTargetException(exc2);
+//			logger.write(Level.SEVERE, entry);
+//		}
+//	}
+
+	/**
+	 * @param reporter
+	 * @param vmd
+	 * @param logger
+	 * @param exc
+	 */
+//	private void handleValidationExceptions(WorkbenchReporter reporter, ValidatorMetaData vmd, Logger logger, ValidationException exc) {
+//		// First, see if a validator just caught all Throwables and
+//		// accidentally wrapped a MessageLimitException instead of propagating
+//		// it.
+//		if (exc.getAssociatedException() != null) {
+//			if (exc.getAssociatedException() instanceof MessageLimitException) {
+//				MessageLimitException mssgExc = (MessageLimitException) exc.getAssociatedException();
+//				throw mssgExc;
+//			} else if (exc.getAssociatedException() instanceof ValidationException) {
+//				try {
+//					ValidationException vexc = (ValidationException) exc.getAssociatedException();
+//					vexc.setClassLoader(vmd.getValidator().getClass().getClassLoader()); // first,
+//					// set the class loader,so that the exception's getMessage() method can retrieve
+//					// the resource bundle
+//				} catch (InstantiationException exc2) {
+//					handleInstantiationException(vmd, logger, exc2);
+//				}
+//			}
+//		}
+//		// If there is a problem with this particular validator, log the error
+//		// and continue
+//		// with the next validator.
+//		try {
+//			exc.setClassLoader(vmd.getValidator().getClass().getClassLoader()); // first,
+//			// set the class loader,so that the exception's getMessage() method can retrieve the
+//			// resource bundle
+//		} catch (InstantiationException exc2) {
+//			handleInstantiationException(vmd, logger, exc2);
+//		}
+//		if (logger.isLoggingLevel(Level.SEVERE)) {
+//			LogEntry entry = ValidationPlugin.getLogEntry();
+//			entry.setSourceID("ValidationOperation.validate(WorkbenchMonitor)"); //$NON-NLS-1$
+//			entry.setTargetException(exc);
+//			logger.write(Level.SEVERE, entry);
+//			if (exc.getAssociatedException() != null) {
+//				entry.setTargetException(exc.getAssociatedException());
+//				logger.write(Level.SEVERE, entry);
+//			}
+//		}
+//		String message = ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_STATUS_ENDING_VALIDATION_ABNORMALLY, new String[]{getProject().getName(), vmd.getValidatorDisplayName()});
+//		reporter.displaySubtask(message);
+//		if (exc.getAssociatedMessage() != null) {
+//			try {
+//				reporter.addMessage(vmd.getValidator(), exc.getAssociatedMessage());
+//			} catch (InstantiationException exc2) {
+//				handleInstantiationException(vmd, logger, exc2);
+//			}
+//		}
+//	}
+
+	/**
+	 * @param reporter
+	 * @param vmd
+	 * @param logger
+	 * @param exc
+	 */
+//	private void handleHelperCleanupExceptions(WorkbenchReporter reporter, ValidatorMetaData vmd, Logger logger, Throwable exc) {
+//		// If a runtime exception has occured, e.g. NullPointer or ClassCast,
+//		// display it with the "A runtime exception has occurred " messsage.
+//		// This will provide more information to the user when he/she calls IBM
+//		// Service.
+//		if (logger.isLoggingLevel(Level.SEVERE)) {
+//			LogEntry entry = ValidationPlugin.getLogEntry();
+//			entry.setSourceID("ValidationOperation::launchValidator"); //$NON-NLS-1$
+//			entry.setTargetException(exc);
+//			logger.write(Level.SEVERE, entry);
+//		}
+//		String[] msgParm = {exc.getClass().getName(), vmd.getValidatorDisplayName(), (exc.getMessage() == null ? "" : exc.getMessage())}; //$NON-NLS-1$
+//		Message message = ValidationPlugin.getMessage();
+//		message.setSeverity(IMessage.NORMAL_SEVERITY);
+//		message.setId(ResourceConstants.VBF_EXC_RUNTIME);
+//		message.setParams(msgParm);
+//		try {
+//			reporter.addMessage(vmd.getValidator(), message);
+//		} catch (InstantiationException exc2) {
+//			handleInstantiationException(vmd, logger, exc2);
+//		} catch (MessageLimitException e) {
+//			throw e;
+//		}
+//		return;
+//	}
+
+	public boolean isFork() {
+		return _fork;
+	}
+
+	public boolean isForce() {
+		return _force;
+	}
+
+	public void setForce(boolean force) {
+		_force = force;
+	}
+
+	/**
+	 * If the code that invoked this operation suspended auto-build before invoking this operation,
+	 * the user's auto-build setting is stored in the following methods.
+	 */
+	public boolean isAutoBuild() {
+		if (_isAutoBuild == null) {
+			return ValidatorManager.getManager().isGlobalAutoBuildEnabled();
+		}
+		return _isAutoBuild.booleanValue();
+	}
+
+	protected void setAutoBuild(boolean autoOn) {
+		_isAutoBuild = ((autoOn) ? Boolean.TRUE : Boolean.FALSE);
+	}
+
+	protected boolean isFullValidate() {
+		return _isFullValidate;
+	}
+
+	private void setFullValidate(boolean b) {
+		_isFullValidate = b;
+	}
+
+	protected int getRuleGroup() {
+		return _ruleGroup;
+	}
+
+	/**
+	 * Return true if the given validator must run (i.e., it has changes to validate, and it was not
+	 * run automatically.)
+	 */
+	private boolean isValidationNecessary(ValidatorMetaData vmd, IFileDelta[] delta) {
+		// Validation is not necessary if there are no files for the validator to validate.
+		return isFullValidate() || (delta.length > 0);
+	}
+
+	/**
+	 * Return true if, given the enabled validators and file deltas, there is work for this
+	 * operation to do.
+	 */
+	public boolean isNecessary(IProgressMonitor monitor) throws CoreException, OperationCanceledException {
+		Set<ValidatorMetaData> enabledValidators = getEnabledValidators();
+		if ((enabledValidators == null) || (enabledValidators.size() == 0)) {
+			return false;
+		}
+		if (isFullValidate())return true;
+		
+		for (ValidatorMetaData vmd : enabledValidators) {
+			if (isValidationNecessary(vmd, getFileDeltas(monitor, vmd)))return true;
+		}
+		return false;
+	}
+
+	private Map<ValidatorMetaData, Set<IFileDelta>> getFileDeltas(IProgressMonitor monitor) throws CoreException {
+		if (_fileDeltas == null)loadFileDeltas(monitor);
+		return _fileDeltas;
+	}
+
+	private IFileDelta[] getFileDeltas(IProgressMonitor monitor, ValidatorMetaData vmd) throws CoreException {
+		Set<IFileDelta> result = getFileDeltas(monitor).get(vmd);
+		if (result == null)return new IFileDelta[0];
+		
+		IFileDelta[] temp = new IFileDelta[result.size()];
+		result.toArray(temp);
+		return temp;
+	}
+
+	/**
+	 * Store the file deltas (VMD <=>Set[IFileDelta]) if the file deltas haven't been loaded. If the
+	 * deltas have already been loaded, return without doing anything.
+	 */
+	private void loadFileDeltas(IProgressMonitor monitor) throws CoreException {
+		// Although, for a full build, we don't build up a list of changed
+		// files, we do need to notify each IWorkbenchContext that an
+		// IResource has been filtered in.
+		// It's a full validation if the IResourceDelta is null and the
+		// Object[] (or IResource[]) is also null.
+		// i.e., it's a full validation if no incremental input has been set.
+		setFullValidate((getDelta() == null) && (_fileDeltas == null));
+		if (isFullValidate()) {
+			_fileDeltas = FilterUtil.loadDeltas(monitor, getEnabledValidators(), getProject());
+		} else {
+			_fileDeltas = FilterUtil.loadDeltas(monitor, getEnabledValidators(), getDelta()); // traverse,
+			// and process, each resource in the delta tree
+		}
+	}
+
+	protected void setFileDeltas(Map<ValidatorMetaData, Set<IFileDelta>> deltas) {
+		_fileDeltas = deltas;
+	}
+
+	protected IResourceDelta getDelta() {
+		return _delta;
+	}
+
+	protected void setDelta(IResourceDelta delta) {
+		_delta = delta;
+	}
+
+	protected boolean areValidatorsEnabled() {
+		return (getEnabledValidators().size() != 0);
+	}
+
+	/**
+	 * Return the validators which are both configured on this type of project, (as stored in
+	 * getProject()), and enabled by the user on this project.
+	 */
+	public Set<ValidatorMetaData> getEnabledValidators() {
+		return _enabledValidators;
+	}
+
+	/**
+	 * This is an internal method, subject to change without notice. It is provided only for the
+	 * automated validation framework tests.
+	 */
+	public Set<ValidatorMetaData> getLaunchedValidators() {
+		if (_launchedValidators == null) {
+			_launchedValidators = new HashSet<ValidatorMetaData>();
+		}
+		return _launchedValidators;
+	}
+
+	protected void setEnabledValidators(Set<ValidatorMetaData> evmds) {
+		// Check that every VMD in the set is configured on this project.
+		// Necessary because the user can manually choose which validators
+		// to launch, and the validator may not be installed.
+		_enabledValidators.clear();
+		for (ValidatorMetaData vmd : evmds) {
+			if (ValidationRegistryReader.getReader().isConfiguredOnProject(vmd, getProject())) {
+				_enabledValidators.add(vmd);
+			}
+		}
+	}
+
+	/**
+	 * This method returns the IProject that this ValidationOperation was created with.
+	 */
+	public IProject getProject() {
+		return _project;
+	}
+
+	protected int getUnitsOfWork() {
+		/*
+		 * Let one unit of work equal one resource. number of enabled validators. i.e., each
+		 * enabled validator must process (at most) each resource in the project; count each process
+		 * as one unit of work. Note that this is a ceiling number, because if we're doing an
+		 * incremental validation, not all resources will be validated.
+		 * setNumResources(countResources(getProject())); getEnabledValidators().size();
+		 */
+		// Until the validators can report units-of-work complete,
+		// initialize the monitor with an unknown amount of work.
+		// (So the user will see movement in the progress bar, even
+		// if the movement doesn't indicate the amount of work done.)
+		return IProgressMonitor.UNKNOWN;
+	}
+
+	/**
+	 * If the user is cancelling validation on the current project/resource, Add an information task
+	 * to the task list informing the user that validation has not been run on the current project.
+	 */
+	protected void addCancelTask(ValidatorMetaData vmd) {
+		InternalValidatorManager.getManager().addOperationTask(getProject(), vmd, ResourceConstants.VBF_STATUS_VALIDATOR_TERMINATED, new String[]{getProject().getName(), vmd.getValidatorDisplayName()});
+	}
+
+	/**
+	 * This method starts the validation of each configured enabled validator on the current
+	 * project.
+	 * 
+	 * The IProgressMonitor passed in must not be null.
+	 */
+	public void run(IProgressMonitor progressMonitor) throws OperationCanceledException {
+		try {
+			// In order to check whether or not the monitor has been canceled, the monitor must not be null.
+			if (progressMonitor == null)return;
+			IProject project = getProject();
+			if (ValidationFramework.getDefault().isSuspended(project))return;
+			if (ValManager.getDefault().isDisabled(project))return;
+			
+			if (!areValidatorsEnabled()) {
+				// save some processing time...
+				return;
+			}
+			
+			final WorkbenchReporter reporter = new WorkbenchReporter(getProject(), progressMonitor);
+
+			try {
+				// Periodically check if the user has canceled the operation
+				checkCanceled(reporter);
+				preValidate(reporter);
+				validate(reporter);
+				validateReferencialFiles(reporter);
+			} catch (CoreException e) {
+				ValidationPlugin.getPlugin().handleException(e);
+			}
+		} finally {
+			//TODO GRK determine if timing info should be added here
+//			if (logger.isLoggingLevel(Level.FINE)) {
+//				long finish = System.currentTimeMillis();
+//				TimeEntry entry = ValidationPlugin.getTimeEntry();
+//				entry.setSourceID("ValidationOperation.run(WorkbenchMonitor)"); //$NON-NLS-1$
+//				entry.setProjectName(getProject().getName());
+//				entry.setToolName("ValidationOperation"); //$NON-NLS-1$
+//				entry.setElapsedTime(finish - start);
+//				logger.write(Level.FINE, entry);
+//			}
+		}
+	}
+
+	private void validateReferencialFiles(WorkbenchReporter reporter) {
+		ReferencialFileValidatorRegistryReader reader = ReferencialFileValidatorRegistryReader.getInstance();
+		if (reader != null) {
+			reader.readRegistry();
+			ReferencialFileValidator refFileValidator = reader.getReferencialFileValidator();
+			if (refFileValidator != null) {
+				if (_delta != null) {
+					refFileValidateFileDelta(reporter, refFileValidator);
+				} else if (_project != null) {
+					postValidateProject(reporter, refFileValidator);
+				}
+			}
+		}
+	}
+
+	private void refFileValidateFileDelta(WorkbenchReporter reporter, ReferencialFileValidator refFileValidator) {
+		IResourceDelta[] resourceDelta = _delta.getAffectedChildren(IResourceDelta.ADDED | IResourceDelta.CHANGED | IResourceDelta.REMOVED);
+		List<IResource> inputFiles = new ArrayList<IResource>();
+		
+		List<IFile> referencingFiles = new ArrayList<IFile>();
+		if (resourceDelta != null && resourceDelta.length > 0) {
+			for (int i = 0; i < resourceDelta.length; i++) {
+				IResource resource = resourceDelta[i].getResource();
+				if (resource instanceof IFolder) {
+					getFileResourceDeltaInFolder(resourceDelta[i], inputFiles);
+				} else if (resource instanceof IFile)
+					inputFiles.add(resource);
+			}
+			List<IFile> rFilesToValidate = refFileValidator.getReferencedFile(inputFiles);
+			if (rFilesToValidate != null && !rFilesToValidate.isEmpty())
+				referencingFiles.addAll(rFilesToValidate);
+			try {
+				if (!referencingFiles.isEmpty())
+					validateReferencingFiles(reporter, referencingFiles);
+			} catch (Exception e) {
+				ValidationPlugin.getPlugin().handleException(e);
+			}
+		}
+	}
+
+	private void getFileResourceDeltaInFolder(IResourceDelta delta, List<IResource> inputFiles) {
+		IResourceDelta[] resourceDelta = delta.getAffectedChildren();
+		for (int i = 0; i < resourceDelta.length; i++) {
+			IResource resource = resourceDelta[i].getResource();
+			if (resource instanceof IFile)inputFiles.add(resource);
+			else if (resource instanceof IFolder)getFileResourceDeltaInFolder(resourceDelta[i], inputFiles);
+		}
+	}
+
+	private void postValidateProject(WorkbenchReporter reporter, ReferencialFileValidator refFileValidator) {
+		Set<ValidatorMetaData> set = ValidationRegistryReader.getReader().getValidatorMetaData(_project);
+		for (ValidatorMetaData data : set) {
+			List<String> filters = data.getNameFilters();
+			List<IFile> files = getAllFilesForFilter(filters);
+			if (!files.isEmpty()) {
+				List<IFile> fileForValidation = refFileValidator.getReferencedFile(files);
+				try {
+					validateReferencingFiles(reporter, fileForValidation);
+				} catch (Exception e) {
+					ValidationPlugin.getPlugin().handleException(e);
+				}
+			}
+		}
+	}
+
+	private List<IFile> getAllFilesForFilter(List<String> filters) {
+		if (!filters.isEmpty()) {
+			List<IFile> allProjectFiles = ReferencialFileValidatorHelper.getAllProjectFiles(_project);
+			List<IFile> filterFiles = new ArrayList<IFile>();
+			for (String fileName : filters) {
+				if (fileName == null)continue;
+				
+				for (IFile projectFile : allProjectFiles) {
+					if (fileName.charAt(0) == '*') {
+						String extName = fileName.substring(2, fileName.length());
+						String ext = projectFile.getFileExtension();
+						if (ext != null && ext.equals(extName))filterFiles.add(projectFile);
+					} else if (fileName.equals(projectFile.getName()))filterFiles.add(projectFile);
+				}
+			}
+			return filterFiles;
+		}
+		return new LinkedList<IFile>();
+	}
+
+	private void validateReferencingFiles(IReporter reporter, List<IFile> referencingFiles) throws Exception {
+		Set<IFile> validatedFiles = new HashSet<IFile>();
+		for (IFile refFile : referencingFiles) {
+			if (!validatedFiles.contains(refFile)) {
+				IResource resource = refFile.getParent();
+				IProject project = null;
+				if (resource != null && !(resource instanceof IProject))
+					project = getProjectContainer(resource);
+				else
+					project = (IProject) resource;
+				if (project != null) {
+					Set<ValidatorMetaData> set = ValidationRegistryReader.getReader().getValidatorMetaData(project);
+					for (ValidatorMetaData data : set) {
+						if (data.isApplicableTo(refFile)) {
+							IValidator validator = data.getValidator();
+							validator.validate(data.getHelper(project),reporter);
+							validatedFiles.add(refFile);
+						}
+					}
+				}
+			}
+		}
+	}
+
+	private IProject getProjectContainer(IResource resource) {
+		IResource pResource = resource.getParent();
+		if (!(pResource instanceof IProject))
+			return getProjectContainer(pResource);
+		return (IProject) pResource;
+	}
+
+	protected void preValidate(WorkbenchReporter reporter) throws CoreException, OperationCanceledException {
+		// Load the input.
+		getFileDeltas(reporter.getProgressMonitor());
+	}
+
+	/**
+	 * Iterate over all of the enabled validators and run the thread-safe validators in a background
+	 * thread, and the not-thread-safe validators in this thread.
+	 */
+	protected void validate(WorkbenchReporter reporter) throws OperationCanceledException {
+		if (reporter == null)return;
+		checkCanceled(reporter);
+		reporter.getProgressMonitor().beginTask(ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_STATUS_PROGRESSMONITOR_TITLE), getUnitsOfWork());
+		IValidator validator = null;
+		Iterator<ValidatorMetaData> iterator = null;
+		IFileDelta[] delta = null;
+		
+		Set<ValidatorMetaData> jobValidators = new HashSet<ValidatorMetaData>();
+		Set<ValidatorMetaData> validators = new HashSet<ValidatorMetaData>();
+				
+		for(ValidatorMetaData vmd : getEnabledValidators()){
+			IValidator valInstance = null;
+			try {
+				valInstance = vmd.getValidator();
+			} 
+			catch (InstantiationException e1) {
+				if(!ValidatorManager.getManager().getProblemValidators().contains(vmd)) {
+					ValidatorManager.getManager().getProblemValidators().add(vmd);
+					System.out.println(e1.getMessage());
+				}
+			}
+			
+			if( isFork() && (valInstance != null) && valInstance instanceof IValidatorJob ){
+				try {
+					delta = getFileDeltas(reporter.getProgressMonitor(), vmd);
+				} catch (CoreException e) {
+					e.printStackTrace();
+				}
+				boolean willRun = (isForce() || isValidationNecessary(vmd, delta));
+				if( willRun )jobValidators.add( vmd );
+			}
+			else if (valInstance != null){
+				validators.add( vmd );
+			}
+		}
+		if( jobValidators.size() > 0 ){
+			launchJobs( jobValidators, reporter );
+		}
+				
+		ValidatorMetaData currentVmd = null;
+		try {
+			for (ValidatorMetaData vmd : validators) {
+				currentVmd = vmd;
+				// Is validation about to be run on this validator?
+				// Validation will run either if this operation forces regardless
+				// of need, or if the validator was not run automatically.
+				// If validation is not about to be run, then don't activate
+				// the plug-in
+				try {
+					delta = getFileDeltas(reporter.getProgressMonitor(), vmd);
+					boolean willRun = (isForce() || isValidationNecessary(vmd, delta));
+					if (Tracing.isTraceV1()) {
+						StringBuffer buffer = new StringBuffer();
+						buffer.append("ValidationOperation-01: will run? "); //$NON-NLS-1$
+						buffer.append(willRun);
+						buffer.append("  "); //$NON-NLS-1$
+						buffer.append("is force? "); //$NON-NLS-1$
+						buffer.append(isForce());
+						buffer.append("  "); //$NON-NLS-1$
+						buffer.append("isAutoBuild? "); //$NON-NLS-1$
+						buffer.append(_isAutoBuild);
+						buffer.append("  "); //$NON-NLS-1$
+						buffer.append("isAutoValidate? "); //$NON-NLS-1$
+						buffer.append("  "); //$NON-NLS-1$
+						buffer.append("isIncremental? "); //$NON-NLS-1$
+						buffer.append(vmd.isIncremental());
+						buffer.append("  "); //$NON-NLS-1$
+						if (isFullValidate()) {
+							buffer.append("EVERYTHING"); //$NON-NLS-1$
+						} else {
+							if (delta.length == 0) {
+								buffer.append("NOTHING"); //$NON-NLS-1$
+							} else {
+								buffer.append(getDeltaAsString(delta));
+							}
+						}
+						Tracing.log(buffer);
+					}
+					if (!willRun) {
+						continue;
+					}
+				} catch (CoreException e) {
+					ValidationPlugin.getPlugin().handleException(e);
+					String mssg = ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_STATUS_ENDING_VALIDATION_ABNORMALLY, new String[]{getProject().getName(), vmd.getValidatorDisplayName()});
+					reporter.displaySubtask(mssg);
+					continue;
+				}
+				try {
+					context = vmd.getHelper(getProject());
+					initValidateContext(delta);
+					validator = vmd.getValidator();
+					
+					checkCanceled(reporter);
+					
+				} catch (InstantiationException e) {
+					// Remove the vmd from the reader's list
+					ValidationRegistryReader.getReader().disableValidator(vmd);
+					ValidationPlugin.getPlugin().handleException(e);
+					continue;
+				}
+				
+//				if (isFork() && vmd.isAsync()) {
+//					// Don't appear to run in the foreground by sending
+//					// progress to the IProgressMonitor in the
+//					// WorkbenchMonitor. Suppress the status messages by
+//					// changing the IProgressMonitor to a
+//					// NullProgressMonitor.
+//					VThreadManager.getManager().queue(wrapInRunnable(nullReporter, validator, vmd,(WorkbenchContext)getContext(),delta, iterator));
+//				} else {
+//					internalValidate(reporter, validator, vmd, context, delta);
+//				}
+				internalValidate(reporter, validator, vmd, context, delta);
+			}
+		} 
+		catch (OperationCanceledException exc) {
+			handleOperationCancelledValidateException(reporter, validator, currentVmd, iterator, exc);
+		} 
+		finally {
+			releaseCachedMaps();
+		}
+	}
+
+	private void releaseCachedMaps() {
+		ValidationRegistryReader.getReader().clearCachedMaps();
+		IProjectValidationHelper helper = ValidationHelperRegistryReader.getInstance().getValidationHelper();
+		if (helper != null)
+			helper.disposeInstance();
+	}
+
+	private void initValidateContext(IFileDelta[] delta) {
+		 if (context instanceof WorkbenchContext) {
+			 ((WorkbenchContext)context).setValidationFileURIs(new ArrayList<String>());
+			 for(IFileDelta file : delta) {
+				 if(file.getDeltaType() != IFileDelta.DELETED ) {
+					 ((WorkbenchContext)context).getValidationFileURIs().add(file.getFileName());
+				 }
+			 } 
+		}
+	}
+
+	/**
+	 * @param reporter
+	 * @param validator
+	 * @param vmd
+	 * @param iterator
+	 * @param logger
+	 * @param exc
+	 */
+	private void handleOperationCancelledValidateException(WorkbenchReporter reporter, IValidator validator, 
+		ValidatorMetaData vmd, Iterator<ValidatorMetaData> iterator, OperationCanceledException exc) {
+		/*
+		 * If the user terminates validation (i.e., presses "cancel" on the progress monitor) before
+		 * the validation completes, perform clean up on each configured enabled validator.
+		 * 
+		 * To clean up, several steps are performed: 1. call <code></code> on each configured
+		 * enabled validator, so that each validator can perform cleanup that it knows is necessary.
+		 * 2. remove all tasks that this validator has added to the task list 3. add another task to
+		 * the task list to say that validation, using this validator on this project, was
+		 * terminated.
+		 * 
+		 * Steps 2 and 3 are done so that it's clear what has, and has not, been validated. If these
+		 * steps weren't performed, validation could be done on some items in the project, but not
+		 * others; and the user could mistakenly believe that those are the only problems with the
+		 * project. Unless the user knows that a full verification needs to be done, he/she could
+		 * continue to rely on automatic verification, and never know that there are problems with a
+		 * resource which hasn't been validated.
+		 */
+		reporter.displaySubtask(ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_STATUS_VALIDATOR_CLEANUP, new String[]{vmd.getValidatorDisplayName()}));
+		reporter.removeAllMessages(validator);
+		addCancelTask(vmd);
+		reporter.displaySubtask(ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_STATUS_VALIDATOR_TERMINATED, new String[]{getProject().getName(), vmd.getValidatorDisplayName()}));
+		while (iterator.hasNext()) {
+			vmd = (ValidatorMetaData) iterator.next();
+			try {
+				validator = vmd.getValidator();
+			} catch (InstantiationException exc2) {
+				// Remove the vmd from the reader's list
+				ValidationRegistryReader.getReader().disableValidator(vmd);
+				ValidationPlugin.getPlugin().handleException(exc2);
+				continue;
+			}
+			reporter.displaySubtask(ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_STATUS_VALIDATOR_CLEANUP, new String[]{vmd.getValidatorDisplayName()}));
+			reporter.removeAllMessages(validator);
+			addCancelTask(vmd);
+			reporter.displaySubtask(ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_STATUS_VALIDATOR_TERMINATED, new String[]{getProject().getName(), vmd.getValidatorDisplayName()}));
+		}
+		throw exc; // propagate the exception up to the framework so that
+		// the framework can display the correct "canceled"
+		// message in the dialog
+
+	}
+
+	/* package */
+	void internalValidate(final WorkbenchReporter reporter, final IValidator validator, final ValidatorMetaData vmd,final IWorkbenchContext aContext, final IFileDelta[] delta) throws OperationCanceledException {
+		try {
+			checkCanceled(reporter);
+			removeOldMessages(reporter, validator, vmd, delta);
+			// Do NOT check if the message limit is exceeded before launching
+			// the validator.
+			// Even if the limit is exceeded when the messages are removed from
+			// the delta
+			// files, it could be that the validator itself will remove
+			// messages before
+			// proceeding. Let the validator run so that it can remove messages
+			// if it
+			// needs to, and if it tries to add a message when the limit is
+			// exceeded, let
+			// the WorkbenchReporter take care of it.
+			launchValidator(reporter, validator, vmd, aContext, delta);
+		} catch (OperationCanceledException exc) {
+			// This is handled in the validate(WorkbenchReporter) method.
+			throw exc;
+		}catch (Exception e) {
+			// If there is a problem with this particular validator, log the
+			// error and continue with the next validator.
+			// If a runtime exception has occurred, e.g. NullPointer or
+			// ClassCast, display it with the "A runtime exception has occurred" message.
+			// This will provide more information to the user when he/she calls Service.
+			ValidationPlugin.getPlugin().handleException(e);
+			String mssg = ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_STATUS_ENDING_VALIDATION_ABNORMALLY, new String[]{getProject().getName(), vmd.getValidatorDisplayName()});
+			reporter.displaySubtask(mssg);
+			
+			/*
+			 The code  below  causes bundle not found exception since, the  bundle here is
+			 validate_base and we  are  trying to load that bundle from the classloader of 
+			 the Validator. 
+			  
+			String[] msgParm = {exc.getClass().getName(), vmd.getValidatorDisplayName(), (exc.getMessage() == null ? "" : exc.getMessage())}; //$NON-NLS-1$
+			Message message = ValidationPlugin.getMessage();
+			message.setSeverity(IMessage.NORMAL_SEVERITY);
+			message.setId(ResourceConstants.VBF_EXC_RUNTIME);
+			message.setParams(msgParm);
+			reporter.addMessage(validator, message);
+			*/
+		} finally {
+			// If user fixes problem, and limit exceeded, add "exceeded"
+			// message, or
+			// if limit not exceeded any more, remove "exceeded" message.
+			//Message Limit is removed from the framework
+			//ValidatorManager.getManager().checkMessageLimit(getProject(), true);
+			reporter.getProgressMonitor().done();
+		}
+	}
+
+	/**
+	 * In order to allow validators to run, must first check if there's space for new markers. But
+	 * the old markers must not prevent validation from running again (limit exceeded), so delete
+	 * all of the old markers first, and then run validation.
+	 */
+	private final void removeOldMessages(WorkbenchReporter reporter, IValidator validator, ValidatorMetaData vmd, IFileDelta[] delta) {
+		if (reporter == null) {
+			return;
+		}
+		// If the validator has been enabled, remove the "cancel" task.
+		// If the validator, on the last run, threw a Throwable, remove the
+		// "internal error" task. (For the same reasons we remove the "cancel"
+		// task.
+		InternalValidatorManager.getManager().removeOperationTasks(getProject(), vmd);
+		checkCanceled(reporter);
+		try {
+			// Check to see if a full build must be performed, or if a delta
+			// build is to be performed, if there are files to verify for that
+			// validator. (If it's delta, but there are no files, calling
+			// validate on that validator starts a full build, instead of just
+			// returning.)
+			if (isFullValidate()) {
+				String message = ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_STATUS_START_REMOVING_OLD_MESSAGES, new String[]{vmd.getValidatorDisplayName(), getProject().getName()});
+				reporter.displaySubtask(message);
+				reporter.removeAllMessages(validator);
+				message = ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_STATUS_FINISH_REMOVING_OLD_MESSAGES, new String[]{getProject().getName(), vmd.getValidatorDisplayName()});
+				reporter.displaySubtask(message);
+			} else {
+				// Don't need to check that there are deltas to validate
+				// because that's already checked in isValidationNecessary
+				String message = ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_STATUS_START_REMOVING_OLD_MESSAGES, new String[]{vmd.getValidatorDisplayName(), getProject().getName()});
+				reporter.displaySubtask(message);
+				for (int i = 0; i < delta.length; i++) {
+					WorkbenchFileDelta fd = (WorkbenchFileDelta) delta[i];
+					if (fd.getDeltaType() != IFileDelta.DELETED) {
+						// If the file has been deleted, eclipse erases all
+						// markers on the file.
+						// Also, when a resource doesn't exist,
+						// WorkbenchReporter's getMessageResource()
+						// returns the IProject, which means that removing the
+						// messages from this
+						// file removes all of this validator's messages on
+						// this IProject (aix defect 206157)
+						IResource resource = reporter.getMessageResource(validator, fd);
+						if (fd.getObject().equals(fd.getResource())) {
+							WorkbenchReporter.removeAllMessages(resource, validator); // remove
+						} else {
+							reporter.removeAllMessages(validator, fd.getObject());
+						}
+					}
+				}
+				message = ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_STATUS_FINISH_REMOVING_OLD_MESSAGES, new String[]{getProject().getName(), vmd.getValidatorDisplayName()});
+				reporter.displaySubtask(message);
+			}
+		} catch (OperationCanceledException exc) {
+			throw exc;
+		} catch (Exception e) {
+			ValidationPlugin.getPlugin().handleException(e);
+			String mssg = ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_STATUS_ENDING_VALIDATION_ABNORMALLY, new String[]{getProject().getName(), vmd.getValidatorDisplayName()});
+			reporter.displaySubtask(mssg);
+			return;
+		}
+	}
+
+	/**
+	 * Whether a full verification or a delta verification is in progress, both will call this
+	 * method to process the resource. This method calls the current Validator to filter the
+	 * resource (i.e., this method returns if the resource fails the filter test).
+	 * <code>process</code> also sends output to the <code>IProgressMonitor</code>, and calls
+	 * the current Validator to validate the resource.
+	 * 
+	 * <p>To process a resource, there are several steps:</p> 
+	 * <p>1. check if the resource is registered for
+	 * this validator (i.e., the validator has either specified it in a filter, or has not filtered
+	 * it out explicitly)</p>
+	 * 
+	 * <p>2. call <code>isValidationSource</code> on the current validator with
+	 * the current resource. This method performs further filtering by the Validator itself, in
+	 * addition to the static filtering done by the framework, based on the information in
+	 * plugin.xml.</p> 
+	 * 
+	 * <p>3. If the resource passes both filters, call <code>validate</code> on the
+	 * validator, with the resource.</p> 
+	 * 
+	 * <p>4. When complete (either by failing to pass a filter, or by the
+	 * completion of the <code>validate</code>), increment the IProgressMonitor's status by one
+	 * (i.e., one resource has been processed.)</p>
+	 */
+	private final void launchValidator(WorkbenchReporter reporter, IValidator validator, ValidatorMetaData vmd, IWorkbenchContext helper, IFileDelta[] delta) {
+		if (reporter == null)return;
+		checkCanceled(reporter);
+		// Check to see if a full build must be performed, or if a delta
+		// build is to be performed, if there are files to verify for that
+		// validator. (If it's delta, but there are no files, calling
+		// validate on that validator starts a full build, instead of just
+		// returning.)
+		try {
+			// Validate the resource; this step will add errors/warnings to the
+			// task list, and remove errors/warnings from the task list.
+			if (helper instanceof WorkbenchContext) {
+				// Initialize the "loadRuleGroup" method with the group of rules
+				// which the validator should validate.
+				((WorkbenchContext) helper).setRuleGroup(getRuleGroup());
+			}
+			String message = ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_STATUS_STARTING_VALIDATION, new String[]{getProject().getName(), vmd.getValidatorDisplayName()});
+			reporter.displaySubtask(message);
+			if (Tracing.isLogging()) {
+				// This internal "launched validators" value is used only in tests.
+				getLaunchedValidators().add(vmd);
+			}
+			//initValidateContext(delta);
+			ValidatorLauncher.getLauncher().start(helper, validator, reporter);
+			//TODO GRK determine if timing info should be added here
+//			if (logger.isLoggingLevel(Level.INFO)) {
+//				TimeEntry entry = ValidationPlugin.getTimeEntry();
+//				entry.setSourceID("ValidationOperation.launchValidator"); //$NON-NLS-1$
+//				entry.setProjectName(getProject().getName());
+//				entry.setToolName(vmd.getValidatorUniqueName());
+//				entry.setElapsedTime(finish - start);
+//				if (logger.isLoggingLevel(Level.FINE)) {
+//					StringBuffer buffer = new StringBuffer();
+//					if (isFullValidate()) {
+//						buffer.append("EVERYTHING"); //$NON-NLS-1$
+//					} else {
+//						if (delta.length == 0) {
+//							buffer.append("NOTHING"); //$NON-NLS-1$
+//						} else {
+//							buffer.append(getDeltaAsString(delta));
+//						}
+//					}
+//					entry.setDetails(buffer.toString());
+//				}
+//				logger.write(Level.INFO, entry);
+//			}
+			message = ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_STATUS_ENDING_VALIDATION, new String[]{getProject().getName(), vmd.getValidatorDisplayName()});
+			reporter.displaySubtask(message);
+		} catch (OperationCanceledException exc) {
+			throw exc;
+		} catch (ValidationException exc) {
+			// First, see if a validator just caught all Throwables and
+			// accidentally wrapped a MessageLimitException instead of
+			// propagating it.
+			if (exc.getAssociatedException() != null) {
+				if (exc.getAssociatedException() instanceof ValidationException) {
+					ValidationException vexc = (ValidationException) exc.getAssociatedException();
+					vexc.setClassLoader(validator.getClass().getClassLoader()); // first,
+					// set the class loader, so that the exception's getMessage() method
+					// can retrieve the resource bundle
+				}
+			}
+			// If there is a problem with this particular validator, log the
+			// error and continue with the next validator.
+			exc.setClassLoader(validator.getClass().getClassLoader()); // first,
+			ValidationPlugin.getPlugin().handleException(exc);
+			ValidationPlugin.getPlugin().handleException(exc.getAssociatedException());
+			String message = ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_STATUS_ENDING_VALIDATION_ABNORMALLY, new String[]{getProject().getName(), vmd.getValidatorDisplayName()});
+			reporter.displaySubtask(message);
+			if (exc.getAssociatedMessage() != null) {
+				reporter.addMessage(validator, exc.getAssociatedMessage());
+			}
+		} catch (Exception e) {
+			ValidationPlugin.getPlugin().handleException(e);
+			String mssg = ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_STATUS_ENDING_VALIDATION_ABNORMALLY, new String[]{getProject().getName(), vmd.getValidatorDisplayName()});
+			reporter.displaySubtask(mssg);
+			
+			/*
+			 The code  below  causes bundle not found exception since, the  bundle here is
+			 validate_base and we  are  trying to load that bundle from the classloader of 
+			 the Validator. 
+			 
+			String[] msgParm = {exc.getClass().getName(), vmd.getValidatorDisplayName(), (exc.getMessage() == null ? "" : exc.getMessage())}; //$NON-NLS-1$
+			Message message = ValidationPlugin.getMessage();
+			message.setSeverity(IMessage.NORMAL_SEVERITY);
+			message.setId(ResourceConstants.VBF_EXC_RUNTIME);
+			message.setParams(msgParm);
+			reporter.addMessage(validator, message);
+			*/
+			
+		} finally {
+			try {
+				validator.cleanup(reporter);
+			} catch (OperationCanceledException e) {
+				throw e;
+			} catch (Exception e) {
+				ValidationPlugin.getPlugin().handleException(e);
+				return;
+			}
+			try {
+				helper.cleanup(reporter);
+			} catch (OperationCanceledException e) {
+				throw e;
+			} catch (Exception e) {
+				ValidationPlugin.getPlugin().handleException(e);
+				return;
+			} finally {
+				// Now that cleanup has been called, set the project to null.
+				// This project's
+				// resources have been freed so this project should also be
+				// cleared on the helper.
+				// If it isn't set to null, then the next time that the helper
+				// is retrieved from
+				// the ValidatorMetaData, the resources allocated for this
+				// project, in the
+				// helper's initialize method, will not be reallocated if the
+				// project is the same.
+				helper.setProject(null);
+			}
+			// Tell the progress monitor that we've completed n units of work
+			// (i.e., n resources validated by one validator).
+			reporter.getProgressMonitor().worked(((delta == null) ? 1 : delta.length));
+		}
+	}
+
+//	private Runnable wrapInRunnable(final WorkbenchReporter reporter, final IValidator validator, final ValidatorMetaData vmd, final IWorkbenchContext helper, final IFileDelta[] delta, final Iterator iterator) {
+//		// Need to create a new Runnable each time because several Runnable
+//		// instances may exist at the same time.
+//		Runnable runnable = new ProjectRunnable(reporter, validator, vmd, helper, delta, iterator);
+//		return runnable;
+//	}
+
+	/*
+	 * // For convenience, keep this method in the class but commented out. // When async needs to
+	 * be tested, this method may be needed again. private static void debug(String prefix,
+	 * IWorkbenchContext helper) { IProject hProject = helper.getProject(); System.err.println(prefix +
+	 * "Start ValidationOperation "+Thread.currentThread().getName() + "::" + hProject.getName());
+	 * if( Thread.currentThread().getName().equals("ValidationThread") &&
+	 * (hProject.getName().indexOf("noFork") > -1)) { Thread.dumpStack(); } else
+	 * if((!Thread.currentThread().getName().equals("ValidationThread")) &&
+	 * (hProject.getName().indexOf("fork") > -1)) { Thread.dumpStack(); } System.err.println(prefix +
+	 * "End ValidationOperation"); }
+	 */
+	
+	/**
+	 * @deprecated This class is no longer used by the framework.
+	 */
+	public class ProjectRunnable implements Runnable {
+		private WorkbenchReporter _reporter;
+		private IValidator _validator;
+		private ValidatorMetaData _vmd;
+		private IFileDelta[] _delta;
+
+		@SuppressWarnings("unchecked")
+		public ProjectRunnable(WorkbenchReporter reporter, IValidator validator, 
+			ValidatorMetaData vmd, IWorkbenchContext helper, IFileDelta[] delta, Iterator iterator) {
+			_reporter = reporter;
+			_validator = validator;
+			_vmd = vmd;
+			_delta = delta;
+		}
+
+		public void run() {
+			try {
+				internalValidate(_reporter, _validator, _vmd, context,_delta);
+			} catch (OperationCanceledException exc) {
+				// User can't cancel a job in a background thread, so ignore this exception.
+			}
+		}
+
+		public IProject getProject() {
+			return _reporter.getProject();
+		}
+	}
+
+	/**
+	 * @return Returns the context.
+	 */
+	public IValidationContext getContext() {
+		return context;
+	}
+
+	/**
+	 * @param context The context to set.
+	 */
+	public void setContext(IWorkbenchContext context) {
+		this.context = context;
+	}
+	
+	void launchJobs(Set<ValidatorMetaData> validators, final WorkbenchReporter reporter) throws OperationCanceledException{
+		
+		IValidator validator = null;
+		IFileDelta[] delta = null;
+		IWorkbenchContext workbenchcontext = null;
+		
+		for (ValidatorMetaData vmd : validators) {
+			checkCanceled(reporter);
+			
+			try {
+				delta = getFileDeltas(reporter.getProgressMonitor(), vmd);
+				boolean willRun = (isForce() || isValidationNecessary(vmd, delta));
+				if (!willRun)continue;
+
+			} catch (CoreException e) {
+				ValidationPlugin.getPlugin().handleException(e);
+				String mssg = ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_STATUS_ENDING_VALIDATION_ABNORMALLY, new String[]{getProject().getName(), vmd.getValidatorDisplayName()});
+				reporter.displaySubtask(mssg);
+				continue;
+			}
+			
+			try {
+				validator = vmd.createValidator();
+				workbenchcontext = vmd.createHelper( getProject() );
+				initValidateContext( delta, workbenchcontext );
+				vmd.addHelper((IValidatorJob)validator, workbenchcontext);				
+				checkCanceled(reporter);
+				
+			} catch (InstantiationException e) {
+				// Remove the vmd from the reader's list
+				ValidationRegistryReader.getReader().disableValidator(vmd);
+				ValidationPlugin.getPlugin().handleException(e);
+				continue;
+			}
+			
+			try {
+				checkCanceled(reporter);
+				removeOldMessages(reporter, validator, vmd, delta);
+				
+				if( validator instanceof IValidatorJob ){
+					launchValidatorJob( reporter, (IValidatorJob)validator, vmd, workbenchcontext, delta);
+				}
+
+				
+			} catch (OperationCanceledException exc) {
+				throw exc;
+
+			} catch (Exception e) {
+				ValidationPlugin.getPlugin().handleException(e);
+				String mssg = ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_STATUS_ENDING_VALIDATION_ABNORMALLY, new String[]{getProject().getName(), vmd.getValidatorDisplayName()});
+				reporter.displaySubtask(mssg);
+			} catch (Error e) {
+				ValidationPlugin.getPlugin().handleException(e);
+				String mssg = ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_STATUS_ENDING_VALIDATION_ABNORMALLY, new String[]{getProject().getName(), vmd.getValidatorDisplayName()});
+				reporter.displaySubtask(mssg);
+				throw e;
+			} finally {
+				// If user fixes problem, and limit exceeded, add "exceeded"
+				// message, or if limit not exceeded any more, remove "exceeded" message.
+				reporter.getProgressMonitor().done();
+			}
+		}
+	}
+		
+	private void initValidateContext(IFileDelta[] delta, IWorkbenchContext context ) {
+		 if (context instanceof WorkbenchContext) {
+			 ((WorkbenchContext)context).setValidationFileURIs(new ArrayList<String>());
+			 for(IFileDelta file : delta) {
+				 if(file.getDeltaType() != IFileDelta.DELETED ) {
+					 ((WorkbenchContext)context).getValidationFileURIs().add(file.getFileName());
+				 }
+			 } 
+		}
+	}
+						
+	private final void launchValidatorJob(WorkbenchReporter reporter,
+		IValidatorJob validator, ValidatorMetaData vmd, IWorkbenchContext helper, IFileDelta[] delta) {
+		
+		if (reporter == null)return;
+		checkCanceled(reporter);
+
+		if (helper instanceof WorkbenchContext) {
+			((WorkbenchContext) helper).setRuleGroup(getRuleGroup());
+		}
+		if (Tracing.isLogging()) {
+			// This internal "launched validators" value is used only in tests.
+			getLaunchedValidators().add(vmd);
+		}
+		
+		ValidatorJob validatorjob = new ValidatorJob( validator, vmd.getValidatorDisplayName(), 
+			vmd.getValidatorUniqueName(), helper.getProject(), helper );
+
+		ISchedulingRule schedulingRule = validator.getSchedulingRule(helper);
+		validatorjob.setRule( schedulingRule );		
+		QualifiedName validatorKey = new QualifiedName(null, "Validator"); //$NON-NLS-1$
+		validatorjob.setProperty( validatorKey, validator );
+		validatorjob.addJobChangeListener(
+			new JobChangeAdapter(){
+				
+				public void done(IJobChangeEvent event){
+					Job job = event.getJob();
+					QualifiedName validatorKey = new QualifiedName(null, "Validator"); //$NON-NLS-1$
+					IValidatorJob validator = (IValidatorJob)job.getProperty( validatorKey );
+					ValidatorManager mgr = ValidatorManager.getManager();
+					final List<MessageInfo> list = mgr.getMessages(validator);							
+					
+					IWorkspaceRunnable runnable = new IWorkspaceRunnable() {
+					    public void run(IProgressMonitor monitor) throws CoreException {
+
+							for(MessageInfo info : list){
+								try {								
+									TaskListUtility.addTask( info.getMessageOwnerId(), info.getResource(),
+										info.getLocation(), info.getMsg().getId(), info.getText(),
+										info.getMsg().getSeverity(),
+										info.getMarkerId(),
+										info.getTargetObjectName(),
+										info.getMsg().getGroupName(),
+										info.getMsg().getOffset(),
+										info.getMsg().getLength());								
+								} catch (CoreException e) {
+									ValidationPlugin.getPlugin().handleException(e);
+								}										
+							}
+					    }
+					};
+					try {
+						
+						ResourcesPlugin.getWorkspace().run(runnable, null, IWorkspace.AVOID_UPDATE, null);
+					} catch (CoreException e) {
+					   e.printStackTrace();
+					}
+					mgr.clearMessages( validator );
+					validator = null;
+				}
+			}
+		);
+		validatorjob.setPriority(Job.DECORATE);
+		launcherJob.addValidationJob(validatorjob);
+	}
+		
+}
diff --git a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/operations/ValidationUtility.java b/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/operations/ValidationUtility.java
new file mode 100644
index 0000000..4e53471
--- /dev/null
+++ b/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/operations/ValidationUtility.java
@@ -0,0 +1,102 @@
+/*******************************************************************************
+ * Copyright (c) 2001, 2008 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.wst.validation.internal.operations;
+
+import java.lang.reflect.InvocationTargetException;
+import java.util.HashSet;
+import java.util.Set;
+
+import org.eclipse.core.resources.IMarker;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.wst.validation.internal.ConfigurationConstants;
+import org.eclipse.wst.validation.internal.ConfigurationManager;
+import org.eclipse.wst.validation.internal.ProjectConfiguration;
+import org.eclipse.wst.validation.internal.TaskListUtility;
+import org.eclipse.wst.validation.internal.plugin.ValidationPlugin;
+
+/**
+ * This class contains utility methods that are intended to be used by validators and code outside
+ * of the validation framework.
+ */
+public final class ValidationUtility {
+	//TODO Make the ValidationUtility constructor private in Milestone 4.
+
+	/**
+	 * Given an IResource and one of the org.eclipse.wst.validation.internal.core.core.SevertyEnum constants,
+	 * return an array containing the fully-qualified class names of the validators which have
+	 * reported messages, of the given severity, against the resource and the resource's children.
+	 */
+	public static String[] listValidatorClasses(IResource resource, int severity) {
+		IMarker[] markers = TaskListUtility.getValidationTasks(resource, severity);
+		if ((markers == null) || (markers.length == 0)) {
+			return new String[0];
+		}
+
+		Set<String> tempSet = new HashSet<String>();
+		for (int i = 0; i < markers.length; i++) {
+			IMarker marker = markers[i];
+			try {
+				Object owner = marker.getAttribute(ConfigurationConstants.VALIDATION_MARKER_OWNER);
+				if ((owner == null) || !(owner instanceof String)) {
+					// The ValidationMigrator will remove any "unowned" validation markers.
+					continue;
+				}
+				tempSet.add((String)owner);
+			} catch (CoreException e) {
+				ValidationPlugin.getPlugin().handleException(e);
+			}
+		}
+
+
+		if (tempSet.size() > 0) {
+			String[] result = new String[tempSet.size()];
+			tempSet.toArray(result);
+			tempSet.clear();
+			return result;
+		}
+		return new String[0];
+	}
+
+	/**
+	 * @deprecated This instance method will be made static in Milestone 4.
+	 */
+	public boolean isEnabled(IProject project, String validatorClassName) {
+		return isEnabled(project, new String[]{validatorClassName});
+	}
+
+	/**
+	 * Return true if all of the validators, identified by their fully-qualified class names, are
+	 * enabled on the project. If a validator isn't enabled, or if there's an internal error while
+	 * retrieving the user's configuration, return false.
+	 */
+	public static boolean isEnabled(IProject project, String[] validatorClassNames) {
+		if ((validatorClassNames == null) || (validatorClassNames.length == 0)) {
+			return false;
+		}
+
+		try {
+			ProjectConfiguration prjp = ConfigurationManager.getManager().getProjectConfiguration(project);
+			for (int i = 0; i < validatorClassNames.length; i++) {
+				if (!prjp.isEnabled(validatorClassNames[i])) {
+					return false;
+				}
+			}
+		} catch (InvocationTargetException e) {
+			ValidationPlugin.getPlugin().handleException(e);
+			ValidationPlugin.getPlugin().handleException(e.getTargetException());
+			return false;
+		}
+
+		return true;
+	}
+}
diff --git a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/operations/ValidatorJob.java b/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/operations/ValidatorJob.java
new file mode 100644
index 0000000..048dd39
--- /dev/null
+++ b/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/operations/ValidatorJob.java
@@ -0,0 +1,177 @@
+/*******************************************************************************
+ * Copyright (c) 2005, 2008 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.wst.validation.internal.operations;
+
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.OperationCanceledException;
+import org.eclipse.core.runtime.jobs.Job;
+import org.eclipse.wst.common.frameworks.internal.plugin.WTPCommonPlugin;
+import org.eclipse.wst.validation.IPerformanceMonitor;
+import org.eclipse.wst.validation.PerformanceCounters;
+import org.eclipse.wst.validation.ValidationFramework;
+import org.eclipse.wst.validation.internal.Misc;
+import org.eclipse.wst.validation.internal.ResourceConstants;
+import org.eclipse.wst.validation.internal.ResourceHandler;
+import org.eclipse.wst.validation.internal.ValidationRegistryReader;
+import org.eclipse.wst.validation.internal.ValidatorMetaData;
+import org.eclipse.wst.validation.internal.core.Message;
+import org.eclipse.wst.validation.internal.core.ValidationException;
+import org.eclipse.wst.validation.internal.plugin.ValidationPlugin;
+import org.eclipse.wst.validation.internal.provisional.core.IMessage;
+import org.eclipse.wst.validation.internal.provisional.core.IValidatorJob;
+
+public class ValidatorJob extends Job {
+
+
+	private IProject			project;
+	private IWorkbenchContext 	helper;
+	private IValidatorJob		validator;
+	
+	public ValidatorJob(String name) {
+		super(name);
+	}
+	   
+	public ValidatorJob( IValidatorJob validator, String displayName, String name, IProject project, IWorkbenchContext aHelper  ){
+		super(displayName);
+		this.project = project;
+		this.helper = aHelper;
+		this.validator = validator;
+	}
+	
+	//revisit reporter in the code  below
+	//subtask information is displayed in the monitor created by the Job
+	//error information is reported by the IReporter
+	
+	protected IStatus run(IProgressMonitor monitor) {
+		
+		IPerformanceMonitor pm = ValidationFramework.getDefault().getPerformanceMonitor();
+		long elapsed = -1;
+		long cpuTime = -1;
+		if (pm.isCollecting()){
+			elapsed = System.currentTimeMillis();
+			cpuTime = Misc.getCPUTime();
+		}
+
+		monitor.beginTask("Validating", IProgressMonitor.UNKNOWN); //$NON-NLS-1$
+		IStatus status = IValidatorJob.OK_STATUS;
+		WorkbenchReporter	reporter = new WorkbenchReporter( project, monitor );
+
+		ValidatorMetaData vmd = ValidationRegistryReader.getReader().getValidatorMetaData(validator);
+		
+		try {
+
+			String message = ResourceHandler.getExternalizedMessage(
+				ResourceConstants.VBF_STATUS_STARTING_VALIDATION,
+				new String[]{helper.getProject().getName(), vmd.getValidatorDisplayName()});
+			
+			monitor.subTask(message);		
+			status = validator.validateInJob(helper, reporter);
+		
+			message = ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_STATUS_ENDING_VALIDATION,
+				new String[]{helper.getProject().getName(), vmd.getValidatorDisplayName()});
+			monitor.subTask(message);
+ 
+		} catch (OperationCanceledException exc) {
+			throw exc;
+		} catch (ValidationException exc) {
+			// First, see if a validator just caught all Throwables and
+			// accidentally wrapped a MessageLimitException instead of
+			// propagating it.
+			if (exc.getAssociatedException() != null) {
+				if (exc.getAssociatedException() instanceof ValidationException) {
+					ValidationException vexc = (ValidationException) exc.getAssociatedException();
+					vexc.setClassLoader(validator.getClass().getClassLoader()); 
+				}
+			}
+			// If there is a problem with this particular validator, log the
+			// error and continue with the next validator.
+			exc.setClassLoader(validator.getClass().getClassLoader());
+
+			ValidationPlugin.getPlugin().handleException(exc);
+			ValidationPlugin.getPlugin().handleException(exc.getAssociatedException());
+			String message = ResourceHandler.getExternalizedMessage(
+					ResourceConstants.VBF_STATUS_ENDING_VALIDATION_ABNORMALLY,
+					new String[]{helper.getProject().getName(), vmd.getValidatorDisplayName()});
+			
+			monitor.subTask(message);
+			if (exc.getAssociatedMessage() != null) {
+				reporter.addMessage(validator, exc.getAssociatedMessage());
+			}
+		} catch (Exception e) {
+			ValidationPlugin.getPlugin().handleException(e);
+			String mssg = ResourceHandler.getExternalizedMessage(
+				ResourceConstants.VBF_STATUS_ENDING_VALIDATION_ABNORMALLY,
+				new String[]{helper.getProject().getName(), vmd.getValidatorDisplayName() });
+			
+			monitor.subTask(mssg);
+			
+		} finally {
+			try {
+				validator.cleanup(reporter);
+			} catch (OperationCanceledException e) {
+				throw e;
+			} catch (Exception exc) {
+				ValidationPlugin.getPlugin().handleException(exc);
+				
+				String[] msgParm = {exc.getClass().getName(), vmd.getValidatorDisplayName(), (exc.getMessage() == null ? "" : exc.getMessage())}; //$NON-NLS-1$				
+				Message message = ValidationPlugin.getMessage();
+				message.setSeverity(IMessage.NORMAL_SEVERITY);
+				message.setId(ResourceConstants.VBF_EXC_RUNTIME);
+				message.setParams(msgParm);				
+				status = WTPCommonPlugin.createErrorStatus(message.getText());
+				return status;
+			} finally {
+				try {
+					helper.cleanup(reporter);
+					vmd.removeHelper( validator );
+				}catch (OperationCanceledException e) {
+					throw e;
+				} catch (Exception exc) {
+					ValidationPlugin.getPlugin().handleException(exc);
+					String[] msgParm = {exc.getClass().getName(), vmd.getValidatorDisplayName(), (exc.getMessage() == null ? "" : exc.getMessage())}; //$NON-NLS-1$
+					Message message = ValidationPlugin.getMessage();
+					message.setSeverity(IMessage.NORMAL_SEVERITY);
+					message.setId(ResourceConstants.VBF_EXC_RUNTIME);
+					message.setParams(msgParm);
+					reporter.addMessage(validator, message);
+	
+					status = WTPCommonPlugin.createErrorStatus(message.getText());	
+					return status;
+				} finally {
+					helper.setProject(null);
+					vmd.removeHelper( validator );
+					helper = null;
+					reporter = null;
+				}
+			}
+			//reporter.getProgressMonitor().worked(((delta == null) ? 1 : delta.length)); // One
+			//monitor.worked(((delta == null) ? 1 : delta.length)); // One
+			monitor.done();
+		}
+		if (pm.isCollecting()){
+			if (cpuTime != -1){
+				cpuTime = Misc.getCPUTime() - cpuTime;
+			}
+			String projectName = null;
+			if (project != null)projectName = project.getName();
+			pm.add(new PerformanceCounters(vmd.getValidatorUniqueName(), 
+				vmd.getValidatorDisplayName(),projectName, -1, 
+				System.currentTimeMillis()-elapsed, cpuTime));
+		}
+		return status;
+	}
+
+	public boolean belongsTo(Object family) {
+		return (project.getName() + ValidatorManager.VALIDATOR_JOB_FAMILY).equals(family);
+	}	
+}
diff --git a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/operations/ValidatorManager.java b/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/operations/ValidatorManager.java
new file mode 100644
index 0000000..553538b
--- /dev/null
+++ b/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/operations/ValidatorManager.java
@@ -0,0 +1,995 @@
+/*******************************************************************************
+ * Copyright (c) 2001, 2009 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.wst.validation.internal.operations;
+
+import java.lang.reflect.InvocationTargetException;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import org.eclipse.core.resources.ICommand;
+import org.eclipse.core.resources.IMarker;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IProjectDescription;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.wst.validation.ValidationFramework;
+import org.eclipse.wst.validation.internal.ConfigurationManager;
+import org.eclipse.wst.validation.internal.GlobalConfiguration;
+import org.eclipse.wst.validation.internal.InternalValidatorManager;
+import org.eclipse.wst.validation.internal.ProjectConfiguration;
+import org.eclipse.wst.validation.internal.TaskListUtility;
+import org.eclipse.wst.validation.internal.ValidationRegistryReader;
+import org.eclipse.wst.validation.internal.ValidatorMetaData;
+import org.eclipse.wst.validation.internal.plugin.ValidationPlugin;
+import org.eclipse.wst.validation.internal.provisional.core.IValidator;
+import org.eclipse.wst.validation.internal.provisional.core.IValidatorJob;
+
+/**
+ * A centralized class for accessing validation metadata.
+ * 
+ * This class is not intended to be subclassed outside of the validation framework.
+ */
+public final class ValidatorManager {
+	public static final String VALIDATOR_JOB_FAMILY = "validators";	 //$NON-NLS-1$	
+	private static ValidatorManager inst;
+	private static IResourceUtil _resourceUtil; // a common utility, different whether or not
+	// WSAD is running in headless or UI mode, which can retrieve the line number of some MOF objects.
+	private static final Class RESOURCEUTIL_DEFAULTCLASS = org.eclipse.wst.validation.internal.operations.DefaultResourceUtil.class;
+	private static Class _resourceUtilClass = RESOURCEUTIL_DEFAULTCLASS;		
+	private static Class 	_messageLimitOwner;
+	
+	private static final Set<ValidatorMetaData> EmptySet = Collections.emptySet();
+		
+	private String[] 		_internalOwners;
+	private Map<IValidatorJob, List<MessageInfo>> _validatorMsgs = 
+		Collections.synchronizedMap( new HashMap<IValidatorJob, List<MessageInfo>>() );	
+	private Set<ValidatorMetaData> _problemValidators = new HashSet<ValidatorMetaData>();	
+	
+	private ValidatorManager() {
+		super();
+		_internalOwners = new String[0];
+
+		addInternalOwner(getMessageLimitOwner());
+	}
+
+	/**
+	 * Disable all validators for the current project, and does not touch the auto-validate setting.
+	 */
+	public void disableAllValidators(IProject currentProject, IProgressMonitor monitor) {
+		// Disable the individual validators
+		setEnabledValidators(currentProject, EmptySet, monitor);
+	}
+
+	public void enableValidator(String validatorId) {
+
+		try {
+			ValidatorMetaData vmd = ValidationRegistryReader.getReader().getValidatorMetaData(validatorId);
+			GlobalConfiguration gf = ConfigurationManager.getManager().getGlobalConfiguration();
+			gf.enableSingleValidator(vmd);
+		} catch (InvocationTargetException e) {
+			e.printStackTrace();
+		}
+	}
+	
+	
+	public void disableValidator(String validatorId){
+
+		try {
+			ValidatorMetaData vmd = ValidationRegistryReader.getReader().getValidatorMetaData(validatorId);
+			GlobalConfiguration gf = ConfigurationManager.getManager().getGlobalConfiguration();
+			gf.disableSingleValidator(vmd);
+		} catch (InvocationTargetException e) {
+			e.printStackTrace();
+		}
+	}
+	
+	
+	public void enableValidator(String validatorId, IProject project, boolean manualValidation, boolean buildValidation) {		
+		try {
+			ProjectConfiguration prjp = ConfigurationManager.getManager().getProjectConfiguration(project);
+			prjp.setDoesProjectOverride(true);
+			ValidatorMetaData vmd = ValidationRegistryReader.getReader().getValidatorMetaData(validatorId);
+			
+			if(manualValidation)prjp.enableSingleManualValidator(vmd);
+			if (buildValidation)prjp.enableSingleBuildValidator(vmd);
+			prjp.store();		
+		} catch (InvocationTargetException e) {
+			e.printStackTrace();
+		}
+	}
+	
+	public void disableValidator(String validatorId, IProject project, boolean manualValidation, boolean buildValidation){
+
+		try {
+			ProjectConfiguration prjp = ConfigurationManager.getManager().getProjectConfiguration(project);
+			prjp.setDoesProjectOverride(true);
+			ValidatorMetaData vmd = ValidationRegistryReader.getReader().getValidatorMetaData(validatorId);
+			
+			if(manualValidation)prjp.disableSingleManualValidator(vmd);
+			if (buildValidation)prjp.disableSingleBuildValidator(vmd);
+			prjp.store();
+			
+		} catch (InvocationTargetException e) {
+			e.printStackTrace();
+		}
+
+	}
+	
+	
+	
+	/**
+	 * Given an IProject, if the IProject does not support build validation, add the validation
+	 * builder to the project description so that the project can support build validation.
+	 */
+	public static void addProjectBuildValidationSupport(IProject project) {
+		/*
+		 * I'm working my way through the code to see where this gets called. One place was in ModuleCoreNature
+		 * which had hard coded the builder id.
+		 */
+		if (project == null)return;
+
+		boolean isBuilderAdded = false;
+		try {
+			IProjectDescription description = project.getDescription();
+			ICommand[] commands = description.getBuildSpec();
+			if (commands != null) {
+				for (ICommand command : commands) {
+					String builderName = command.getBuilderName();
+					if (builderName == null) {
+						// builder name will be null if it has not been set
+						continue;
+					}
+
+					if (builderName.equals(ValidationPlugin.VALIDATION_BUILDER_ID)) {
+						isBuilderAdded = true;
+						break;
+					}
+				}
+			}
+
+			if (!isBuilderAdded) {
+				ICommand newCommand = description.newCommand();
+				newCommand.setBuilderName(ValidationPlugin.VALIDATION_BUILDER_ID);
+
+				ICommand[] newCommands = null;
+				if (commands != null) {
+					newCommands = new ICommand[commands.length + 1];
+					System.arraycopy(commands, 0, newCommands, 0, commands.length);
+					newCommands[commands.length] = newCommand;
+				} else {
+					newCommands = new ICommand[1];
+					newCommands[0] = newCommand;
+				}
+				description.setBuildSpec(newCommands);
+
+				project.setDescription(description, null);
+			}
+		} catch (CoreException exc) {
+			// if we can't read the information, the project isn't open, so it can't run
+			// auto-validate
+			return;
+		}
+	}
+
+
+	/**
+	 * Given an IProject, this method returns true if the project can run build validation (i.e.,
+	 * incremental validation), and false otherwise. The test, to find out if the project supports
+	 * build validation or not, is to see if the ValidationBuilder is configured on that type of
+	 * project.
+	 * <p>
+	 * This is a long-running process - is there any way that I can shorten the amount of time this
+	 * takes?
+	 */
+	public static boolean doesProjectSupportBuildValidation(IProject project) {
+		boolean canRunAV = false;
+		if (project == null) {
+			return canRunAV;
+		}
+
+		try {
+			IProjectDescription description = project.getDescription();
+			ICommand[] commands = description.getBuildSpec(); // don't need to check if description
+			// is null, because it's never null
+			if (commands == null) {
+				return canRunAV;
+			}
+
+			for (int i = 0; i < commands.length; i++) {
+				String builderName = commands[i].getBuilderName();
+				if (builderName == null) {
+					// builder name will be null if it has not been set
+					continue;
+				}
+
+				if (builderName.equals(ValidationPlugin.VALIDATION_BUILDER_ID)) {
+					canRunAV = true;
+					break;
+				}
+			}
+		} catch (CoreException exc) {
+			// if we can't read the information, the project isn't open, so it can't run
+			// auto-validate
+			return false;
+		}
+
+		return canRunAV;
+	}
+
+	/**
+	 * Enable all validators for the current project, and does not touch the auto-validate setting.
+	 */
+	public void enableAllValidators(IProject project, IProgressMonitor monitor) {
+		// Turn auto-validate off
+		//	setAutoValidate(currentProject, false);
+
+		// Enable the individual validators
+		try {
+			ProjectConfiguration prjp = ConfigurationManager.getManager().getProjectConfiguration(project);
+			prjp.setEnabledValidators(prjp.getValidators());
+		} catch (InvocationTargetException e) {
+			ValidationPlugin.getPlugin().handleException(e);
+			ValidationPlugin.getPlugin().handleException(e.getTargetException());
+		}
+	}
+
+	/**
+	 * @deprecated For use by the validation framework only.
+	 * 
+	 * Return a collection of incremental ValidatorMetaData configured on a certain type of IProject
+	 * (e.g. EJB Project vs. Web Project).
+	 */
+	public Set<ValidatorMetaData> getProjectConfiguredIncrementalValidators(IProject project) {
+		try {
+			ProjectConfiguration prjp = ConfigurationManager.getManager().getProjectConfiguration(project);
+			return InternalValidatorManager.wrapInSet(prjp.getIncrementalValidators());
+		} catch (InvocationTargetException e) {
+			ValidationPlugin.getPlugin().handleException(e);
+			ValidationPlugin.getPlugin().handleException(e.getTargetException());
+			return EmptySet;
+		}
+	}
+
+	/**
+	 * @deprecated For use by the validation framework only.
+	 * 
+	 * Return a collection of ValidatorMetaData configured on a certain type of IProject (e.g. EJB
+	 * Project vs. Web Project).
+	 * 
+	 * If the collection has not been calculated before, calculate it now, and cache the result.
+	 */
+	public Set<ValidatorMetaData> getProjectConfiguredValidatorMetaData(IProject project) {
+		try {
+			ProjectConfiguration prjp = ConfigurationManager.getManager().getProjectConfiguration(project);
+			return InternalValidatorManager.wrapInSet(prjp.getValidators());
+		} catch (InvocationTargetException e) {
+			ValidationPlugin.getPlugin().handleException(e);
+			ValidationPlugin.getPlugin().handleException(e.getTargetException());
+			return EmptySet;
+		}
+	}
+
+	/**
+	 * @deprecated For use by the validation framework only.
+	 * 
+	 * Return a collection of ValidatorMetaData enabled on a certain type of IProject (e.g. EJB
+	 * Project vs. Web Project). The second parameter, isIncremental, identifies whether it's the
+	 * incremental, or non-incremental, validators which should be returned. If the parameter is
+	 * true, return incremental validators. If the parameter is false, return nonincremental
+	 * validators.
+	 */
+	public Set<ValidatorMetaData> getProjectEnabledIncrementalValidators(IProject project) {
+		try {
+			ProjectConfiguration prjp = ConfigurationManager.getManager().getProjectConfiguration(project);
+			return InternalValidatorManager.wrapInSet(prjp.getEnabledIncrementalValidators(true));
+		} catch (InvocationTargetException e) {
+			ValidationPlugin.getPlugin().handleException(e);
+			ValidationPlugin.getPlugin().handleException(e.getTargetException());
+			return EmptySet;
+		}
+	}
+
+	/**
+	 * @deprecated For use by the validation framework only.
+	 * 
+	 * Return a collection of ValidatorMetaData enabled on a certain type of IProject (e.g. EJB
+	 * Project vs. Web Project). The second parameter, isIncremental, identifies whether it's the
+	 * incremental, or non-incremental, validators which should be returned. If the parameter is
+	 * true, return incremental validators. If the parameter is false, return nonincremental
+	 * validators.
+	 */
+	public Collection<ValidatorMetaData> getProjectEnabledNonIncrementalValidators(IProject project) {
+		try {
+			ProjectConfiguration prjp = ConfigurationManager.getManager().getProjectConfiguration(project);
+			return InternalValidatorManager.wrapInSet(prjp.getEnabledIncrementalValidators(false));
+		} catch (InvocationTargetException e) {
+			ValidationPlugin.getPlugin().handleException(e);
+			ValidationPlugin.getPlugin().handleException(e.getTargetException());
+			return EmptySet;
+		}
+	}
+
+	/**
+	 * @deprecated For use by the validation framework only.
+	 * 
+	 * Returns a Vector of all ValidatorMetaData who are both configured on this type of project,
+	 * and who are also enabled by this project. If the list of enabled validators hasn't been
+	 * loaded into the cache, load it now. Otherwise, just return it.
+	 */
+	public Set<ValidatorMetaData> getProjectEnabledValidators(IProject project) {
+		return getEnabledValidators(project);
+	}
+
+	public static ValidatorManager getManager() {
+		if (inst == null) {
+			inst = new ValidatorManager();
+		}
+		return inst;
+	}
+
+	public static IResourceUtil getResourceUtil() {
+		if (_resourceUtil == null) {
+			if (_resourceUtilClass == null) {
+				// Since the value returned from this method must never be null,
+				// default the resource util to the headless resource util.
+				_resourceUtilClass = RESOURCEUTIL_DEFAULTCLASS;
+			}
+
+			try {
+				_resourceUtil = (IResourceUtil) _resourceUtilClass.newInstance();
+			} catch (ClassCastException e) {
+				_resourceUtil = null;
+			} catch (InstantiationException e) {
+				_resourceUtil = null;
+			} catch (IllegalAccessException e) {
+				_resourceUtil = null;
+			}
+		}
+		return _resourceUtil;
+	}
+
+	/**
+	 * @deprecated This method is intended for use only by the validation framework. It will be
+	 *             moved to a class in the "internal" package at some time.
+	 */
+	public IMarker[] getValidationTasks(int severity, IProject project) {
+		return getValidationTasks(project, severity);
+	}
+
+	/**
+	 * @deprecated This method is intended for use only by the validation framework. It will be
+	 *             moved to a class in the "internal" package at some time.
+	 */
+	public IMarker[] getValidationTasks(IResource resource, int severity) {
+		return TaskListUtility.getValidationTasks(resource, severity);
+	}
+
+	/**
+	 * @deprecated This method is intended for use only by the validation framework. It will be
+	 *             moved to a class in the "internal" package at some time.
+	 */
+	public IMarker[] getValidationTasks(IResource resource, String[] validatorNames) {
+		return TaskListUtility.getValidationTasks(resource, validatorNames);
+	}
+
+	/**
+	 * @deprecated For use by the validation framework only.
+	 */
+	public ValidatorMetaData getValidatorMetaData(IValidator validator) {
+		return ValidationRegistryReader.getReader().getValidatorMetaData(validator);
+	}
+
+	/**
+	 * @deprecated For use by the validation framework only.
+	 */
+	public Set<ValidatorMetaData> getIncrementalValidators(Collection<ValidatorMetaData> vmds) {
+		if (vmds == null)return new HashSet<ValidatorMetaData>();
+
+		Set<ValidatorMetaData> result = new HashSet<ValidatorMetaData>();
+		for (ValidatorMetaData vmd : vmds) {
+			if (vmd.isIncremental())result.add(vmd);
+		}
+		return result;
+	}
+
+
+	/**
+	 * Return true if the validator identified by validatorId will validate the given resource. If
+	 * either parameter is null, false is returned. If the validator is not registered with the
+	 * validation framework (i.e., either no validator in the activated plugins is identified by
+	 * that plugin id, or the given IResource's project does not run that particular validator),
+	 * then this method will return false.
+	 */
+	public boolean isApplicableTo(String validatorId, IResource res) {
+		if ((validatorId == null) || (res == null)) {
+			return false;
+		}
+
+		ValidatorMetaData vmd = ValidationRegistryReader.getReader().getValidatorMetaData(validatorId);
+		if (vmd == null) {
+			// validator not registered with the framework
+			return false;
+		}
+
+		if (!ValidationRegistryReader.getReader().isConfiguredOnProject(vmd, res.getProject())) {
+			return false;
+		}
+
+		return vmd.isApplicableTo(res);
+	}
+
+
+	public boolean isAutoValidate(IProject project) {
+		return isAutoValidate(project, isGlobalAutoBuildEnabled());
+	}
+
+	/**
+	 * Keeping this API around so as not to break existing code.
+	 * 
+	 * @deprecated use isAutoValidate
+	 */
+	public boolean isAutoValidateChecked(IProject project) {
+		return isAutoValidate(project);
+	}
+
+	/**
+	 * Keeping this API around so as not to break existing code.
+	 * 
+	 * @deprecated use isAutoValidate
+	 */
+	public boolean isAutoValidateChecked(IProject project, boolean isGlobalAutoBuildOn) {
+		return isAutoValidate(project, isGlobalAutoBuildOn);
+	}
+
+	/**
+	 * This method returns true if validate will run when there is a resource change. The following
+	 * attributes are checked: 1. does this project have auto-validate on or off? 2. if this project
+	 * does not have an auto-validate value set, is the global auto-validate preference on? 3. if 1
+	 * or 2 is true, does the project support auto-validate? 4. if 1/2, & 3, is auto-build on? 5. if
+	 * 1/2, 3, and 4, is there at least one incremental validator enabled on the project?
+	 * 
+	 * @deprecated auto validate is not used any more
+	 */
+	public boolean isAutoValidate(IProject project, boolean isGlobalAutoBuildOn) {
+		/*try {
+			// 1. does the project have auto-validate on or off?
+			boolean isAutoValidate = ConfigurationManager.getManager().getProjectConfiguration(project).isAutoValidate();
+			if (!isAutoValidate) {
+				return false;
+			}
+
+			// 3. does the project support auto-validate?
+			// 4. is auto-build on?
+			// 5. is there at least one incremental validator enabled on the project?
+			
+			 * Auto-validation, on the properties page, can be enabled under these conditions: 1.
+			 * the project supports auto-validation, AND 2. fhe platform's global "automatically
+			 * build" is selected, AND 3. at least one of the project's validators supports
+			 * incremental validation. Without #1, the ValidationBuilder is never called because
+			 * it's not configured on the project. Without #2, the ValidationBuilder will not be
+			 * called because auto-building is turned off. Without #3, the ValidationBuilder will be
+			 * called, but there's no point because no validators can run.
+			 
+			return canAutoValidateButtonBeEnabled(project, isGlobalAutoBuildOn);
+		} catch (InvocationTargetException exc) {
+			Logger logger = ValidationPlugin.getPlugin().getMsgLogger();
+			if (logger.isLoggingLevel(Level.SEVERE)) {
+				LogEntry entry = ValidationPlugin.getLogEntry();
+				entry.setSourceIdentifier("ValidatorManager.canAutoValidateButtonBeEnabled(" + project.getName() + ")"); //$NON-NLS-1$  //$NON-NLS-2$
+				entry.setTargetException(exc);
+				logger.write(Level.SEVERE, entry);
+
+				if (exc.getTargetException() != null) {
+					entry.setTargetException(exc);
+					logger.write(Level.SEVERE, entry);
+				}
+			}
+
+			// If the user's setting can't be retrieved, return the default
+			return ValidationConfiguration.getAutoValidateDefault();
+		}*/
+		return false;
+	}
+
+	public boolean canAutoValidateButtonBeEnabled(IProject project) {
+		return canAutoValidateButtonBeEnabled(project, isGlobalAutoBuildEnabled());
+	}
+
+	/**
+	 * @deprecated For use by the validation framework only.
+	 */
+	public Set<ValidatorMetaData> getEnabledIncrementalValidators(IProject project) {
+		try {
+			ProjectConfiguration prjp = ConfigurationManager.getManager().getProjectConfiguration(project);
+			ValidatorMetaData[] vmds = prjp.getEnabledIncrementalValidators(true);
+			return InternalValidatorManager.wrapInSet(vmds);
+		} catch (InvocationTargetException e) {
+			ValidationPlugin.getPlugin().handleException(e);
+			ValidationPlugin.getPlugin().handleException(e.getTargetException());
+			return EmptySet;
+		}
+	}
+
+	/**
+	 * @deprecated For use by the validation framework only.
+	 * 
+	 * Given a checked list of enabled validators, return a set of the ones which are configured on
+	 * the project and, if getIncremental is true, which also run incrementally.
+	 */
+	public Set<ValidatorMetaData> getProjectConfiguredValidators(IProject project, Object[] enabledVal, 
+			boolean getIncremental) {
+		if ((project == null) || (enabledVal == null) || (enabledVal.length == 0)) {
+			return new HashSet<ValidatorMetaData>();
+		}
+
+		Set<ValidatorMetaData> val = new HashSet<ValidatorMetaData>();
+		for (int i = 0; i < enabledVal.length; i++) {
+			ValidatorMetaData vmd = (ValidatorMetaData) enabledVal[i];
+			if (!vmd.isConfiguredOnProject(project))continue;
+
+			if (!getIncremental || vmd.isIncremental())val.add(vmd);
+		}
+		return val;
+	}
+
+	public boolean containsIncrementalValidators(Object[] enabledVal) {
+		if ((enabledVal == null) || (enabledVal.length == 0)) {
+			return false;
+		}
+
+		for (int i = 0; i < enabledVal.length; i++) {
+			ValidatorMetaData vmd = (ValidatorMetaData) enabledVal[i];
+
+			if (vmd.isIncremental()) {
+				return true;
+			}
+		}
+
+		return false;
+	}
+
+	/**
+	 * For use by the validation framework only.
+	 */
+	protected Set<ValidatorMetaData> getEnabledValidators(IProject project) {
+		try {
+			ValidatorMetaData[] vmds = null;
+			ProjectConfiguration prjp = ConfigurationManager.getManager().getProjectConfiguration(project);
+			if(!prjp.useGlobalPreference()) 
+			   vmds = prjp.getEnabledValidators();
+			else
+			   vmds = getStateOfProjectLevelValidatorsFromGlobal(prjp);
+			return InternalValidatorManager.wrapInSet(vmds);
+		} catch (InvocationTargetException e) {
+			ValidationPlugin.getPlugin().handleException(e);
+			ValidationPlugin.getPlugin().handleException(e.getTargetException());
+			return EmptySet;
+		}
+	}
+
+	private ValidatorMetaData[] getStateOfProjectLevelValidatorsFromGlobal(ProjectConfiguration prjp) throws InvocationTargetException {
+		List<ValidatorMetaData> enabledGlobalValidatorsForProject = new ArrayList<ValidatorMetaData>();
+		GlobalConfiguration gf = ConfigurationManager.getManager().getGlobalConfiguration();
+		List<String> allProjectValidator = getAllValidatorUniqueNames(prjp.getValidators());
+		for(ValidatorMetaData vmd : gf.getBuildEnabledValidators()) {
+			if(allProjectValidator.contains(vmd.getValidatorUniqueName())) {
+				enabledGlobalValidatorsForProject.add(vmd);
+			}
+	   }
+		return (ValidatorMetaData[]) enabledGlobalValidatorsForProject.toArray(new ValidatorMetaData[enabledGlobalValidatorsForProject.size()]);
+	}
+	
+	private List<String> getAllValidatorUniqueNames(ValidatorMetaData[] metaData) {
+		List<String> names = new ArrayList<String>();
+		for(ValidatorMetaData vmd : metaData) {
+			names.add(vmd.getValidatorUniqueName());
+		}
+		return names;
+	}
+	
+	
+
+	protected Set<ValidatorMetaData> getManualEnabledValidators(IProject project) {
+		try {
+			ProjectConfiguration prjp = ConfigurationManager.getManager().getProjectConfiguration(project);
+			ValidatorMetaData[] vmds = prjp.getManualEnabledValidators();
+			return InternalValidatorManager.wrapInSet(vmds);
+		} catch (InvocationTargetException e) {
+			ValidationPlugin.getPlugin().handleException(e);
+			ValidationPlugin.getPlugin().handleException(e.getTargetException());
+			return EmptySet;
+		}
+	}	
+	
+	protected Set<ValidatorMetaData> getBuildEnabledValidators(IProject project) {
+		try {
+			ProjectConfiguration prjp = ConfigurationManager.getManager().getProjectConfiguration(project);
+			ValidatorMetaData[] vmds = prjp.getBuildEnabledValidators();
+			return InternalValidatorManager.wrapInSet(vmds);
+		} catch (InvocationTargetException e) {
+			ValidationPlugin.getPlugin().handleException(e);
+			ValidationPlugin.getPlugin().handleException(e.getTargetException());
+			return EmptySet;
+		}
+	}	
+	
+	/**
+	 * This method is for use only by the validation framework. Update the task list based on which
+	 * validators are enabled or disabled. This method should be called only by the validation
+	 * framework UI classes. Remove the messages belonging to disabled validators.
+	 */
+	public void updateTaskList(IProject project) {
+		try {
+			ProjectConfiguration prjp = ConfigurationManager.getManager().getProjectConfiguration(project);
+			ValidatorMetaData[] vmds = prjp.getDisabledValidators();
+			for (int i = 0; i < vmds.length; i++) {
+				ValidatorMetaData vmd = vmds[i];
+				// For validators who aren't going to run, clear their messages from the task list.
+				// Don't need to check for duplicate entries because each Validator must be unique.
+				// The uniqueness of each Validator is checked by the plugin registry.
+				WorkbenchReporter.removeAllMessages(project, vmd.getValidatorNames(), null);
+			}
+			 //Message Limit is removed from the framework - WTP1.5M5
+			/*if (prjp.numberOfEnabledValidators() > 0) {
+				ValidatorManager.getManager().checkMessageLimit(project, false); // Do not remove
+				// the exceeded
+				// message; only
+				// ValidationOperation
+				// should do that
+				// because it's
+				// about to run
+				// validation. If
+				// the limit is
+				// increased,
+				// messages may
+				// still be
+				// missing, so
+				// don't remove the
+				// "messages may be
+				// missing"
+				// message.
+			} else {
+				// Can't run validation, so remove the "exceeded" message
+				ValidatorManager.getManager().removeMessageLimitExceeded(project);
+			}*/
+		} catch (InvocationTargetException e) {
+			ValidationPlugin.getPlugin().handleException(e);
+			ValidationPlugin.getPlugin().handleException(e.getTargetException());
+		}
+	}
+
+
+	public boolean canAutoValidateButtonBeEnabled(IProject project, boolean isGlobalAutoBuildOn) {
+		try {
+			ProjectConfiguration prjp = ConfigurationManager.getManager().getProjectConfiguration(project);
+			boolean incrementalValEnabled = (prjp.numberOfEnabledIncrementalValidators() > 0);
+			return canAutoValidateButtonBeEnabled(project, isGlobalAutoBuildOn, incrementalValEnabled);
+		} catch (InvocationTargetException e) {
+			ValidationPlugin.getPlugin().handleException(e);
+			ValidationPlugin.getPlugin().handleException(e.getTargetException());
+			return false;
+		}
+	}
+
+	public boolean canAutoValidateButtonBeEnabled(IProject project, boolean isGlobalAutoBuildOn, boolean incrementalValEnabled) {
+		boolean doesProjectSupportAutoValidate = doesProjectSupportBuildValidation(project);
+		return (doesProjectSupportAutoValidate && isGlobalAutoBuildOn && incrementalValEnabled);
+	}
+
+	/**
+	 * Return true if the validator identified by the String is configured on the IProject and
+	 * enabled on the IProject. Otherwise return false;
+	 */
+	public boolean isEnabled(IProject project, String validatorName) {
+		try {
+			ProjectConfiguration prjp = ConfigurationManager.getManager().getProjectConfiguration(project);
+			return prjp.isEnabled(validatorName);
+		} catch (InvocationTargetException e) {
+			ValidationPlugin.getPlugin().handleException(e);
+			ValidationPlugin.getPlugin().handleException(e.getTargetException());
+			return false;
+		}
+	}
+
+	/**
+	 * @deprecated For use by the validation framework only. Return true if the ValidatorMetaData is
+	 *             enabled for the given project
+	 */
+	public boolean isEnabled(IProject project, ValidatorMetaData vmd) {
+		try {
+			ProjectConfiguration prjp = ConfigurationManager.getManager().getProjectConfiguration(project);
+			return prjp.isEnabled(vmd);
+		} catch (InvocationTargetException e) {
+			ValidationPlugin.getPlugin().handleException(e);
+			ValidationPlugin.getPlugin().handleException(e.getTargetException());
+			return false;
+		}
+	}
+
+	/**
+	 * @deprecated For use by the validation framework only.
+	 */
+	public boolean isConfigured(IProject project, ValidatorMetaData vmd) {
+		return ValidationRegistryReader.getReader().isConfiguredOnProject(vmd, project);
+	}
+
+	/**
+	 * This method returns true if the global auto-build setting is turned on.
+	 */
+	public boolean isGlobalAutoBuildEnabled() {
+		return ResourcesPlugin.getWorkspace().isAutoBuilding();
+	}
+
+	/**
+	 * Returns the number of enabled validators on the given project.
+	 */
+	public int numberProjectEnabledValidators(IProject project) {
+		if (project == null) {
+			return 0;
+		}
+
+		try {
+			ProjectConfiguration prjp = ConfigurationManager.getManager().getProjectConfiguration(project);
+			return prjp.numberOfEnabledValidators();
+		} catch (InvocationTargetException e) {
+			ValidationPlugin.getPlugin().handleException(e);
+			ValidationPlugin.getPlugin().handleException(e.getTargetException());
+			return 0;
+		}
+	}
+
+
+	/**
+	 * @deprecated Use ValidationFramework.suspendValidation(project, suspend) directly.
+	 * @see ValidationFramework#suspendValidation(IProject, boolean)
+	 */
+	public void suspendValidation(IProject project, boolean suspend) {
+		ValidationFramework.getDefault().suspendValidation(project, suspend);
+	}
+
+	/**
+	 * @deprecated Use ValidationFramework.getDefault().suspendAllValidation(suspend) directly.
+	 * @see ValidationFramework#suspendAllValidation(boolean)
+	 */
+	public void suspendAllValidation(boolean suspend) {
+		ValidationFramework.getDefault().suspendAllValidation(suspend);
+	}
+
+	/**
+	 * @deprecated Use ValidationFramework.getDefault().isSuspended() directly.
+	 * @see ValidationFramework#isSuspended()
+	 */
+	public boolean isSuspended() {
+		return ValidationFramework.getDefault().isSuspended();
+	}
+
+	/**
+	 * @deprecated Use ValidationFramework.getDefault().isSuspended(project) directly.
+	 * @see ValidationFramework#isSuspended(IProject)
+	 */
+	public boolean isSuspended(IProject project) {
+		return ValidationFramework.getDefault().isSuspended(project);
+	}
+
+	/**
+	 * @deprecated Use ValidationFramework.getDefault().isProjectSuspended(project) directly.
+	 * @see ValidationFramework#isProjectSuspended(IProject)
+	 */
+	public boolean isProjectSuspended(IProject project) {
+		return ValidationFramework.getDefault().isProjectSuspended(project);
+	}
+
+	/**
+	 * @deprecated For use by the validation framework only.
+	 * 
+	 * Given a list of validators' plugin ids, make those validators enabled for this project. All
+	 * others, disable for this project.
+	 */
+	public void setEnabledValidators(IProject project, Set<ValidatorMetaData> vmdsSet, IProgressMonitor monitor) {
+		try {
+			ProjectConfiguration prjp = ConfigurationManager.getManager().getProjectConfiguration(project);
+			ValidatorMetaData[] vmds = null;
+			if (vmdsSet == null) {
+				vmds = new ValidatorMetaData[0];
+			} else {
+				vmds = new ValidatorMetaData[vmdsSet.size()];
+				vmdsSet.toArray(vmds);
+			}
+
+			prjp.setEnabledValidators(vmds);
+
+			updateTaskList(project);
+		} catch (InvocationTargetException e) {
+			ValidationPlugin.getPlugin().handleException(e);
+			ValidationPlugin.getPlugin().handleException(e.getTargetException());
+		}
+	}
+
+	public static void setResourceUtilClass(Class clazz) {
+		_resourceUtilClass = clazz;
+	}
+
+	/**
+	 * This method is for use by batch EJB deploy only. Only in batch mode is an infinite number of
+	 * messages allowed.
+	 * 
+	 * Enable a project to have an infinite number of messages.
+	 * @deprecated
+	 */
+	public void setNoMessageLimit(IProject project) {/*
+		setMessageLimit(project, WorkbenchReporter.NO_MESSAGE_LIMIT);
+	*/}
+
+	/**
+	 * This message is for use only by the validation framework. If the "max messages were reported"
+	 * IMarker exists, return it. Otherwise return null.
+	 */
+	private IMarker[] getLimitMessage(IProject project) {
+		IMarker[] exceededMessage = TaskListUtility.getValidationTasks(project, WorkbenchReporter.getUniqueId(getMessageLimitOwner()));
+		if ((exceededMessage != null) && (exceededMessage.length != 0)) {
+			return exceededMessage;
+		}
+
+		return null;
+	}
+
+//	/**
+//	 * Return true if the given IMarker is a "limit was exceeded" message, false otherwise.
+//	 */
+//	private boolean isLimitMessage(IMarker marker) {
+//		if (marker == null) {
+//			return false;
+//		}
+//
+//		return TaskListUtility.isOwner(marker, WorkbenchReporter.getUniqueId(getMessageLimitOwner()));
+//	}
+
+//	/**
+//	 * Return all of the IMarkers on the IProject excluding the "limit was exceeded" message. If
+//	 * there are no markers, return null.
+//	 */
+//	private IMarker[] getValidationTasksWithoutLimitMessage(IProject project) {
+//		IMarker[] allTasks = TaskListUtility.getValidationTasks(project, IMessage.ALL_MESSAGES);
+//		if ((allTasks == null) || (allTasks.length == 0)) {
+//			return null;
+//		}
+//
+//		// Don't check if the limit message exists because
+//		// any interaction with markers is costly. Since the
+//		// interaction has to be done at least once, make that
+//		// single occasion in the for loop below.
+//		IMarker[] validatorMessages = new IMarker[allTasks.length];
+//		int count = 0; // how many markers have been added to the result array?
+//		for (int i = 0; i < allTasks.length; i++) {
+//			IMarker marker = allTasks[i];
+//			if (isLimitMessage(marker)) {
+//				continue;
+//			}
+//			validatorMessages[count++] = marker;
+//		}
+//
+//		IMarker[] result = new IMarker[count];
+//		System.arraycopy(validatorMessages, 0, result, 0, count);
+//		return result;
+//	}
+
+	/**
+	 * This method should be called only by the validation framework. Return true if the message was
+	 * removed, false if the message didn't exist.
+	 * @deprecated This method should be not be used anymore as Message Limit is removed from
+	 * the framework - WTP1.5M5
+	 */
+	public boolean removeMessageLimitExceeded(IProject project) {
+		IMarker[] exceededMessage = getLimitMessage(project);
+		if (exceededMessage != null) {
+			try {
+				ResourcesPlugin.getWorkspace().deleteMarkers(exceededMessage);
+				return true;
+			} catch (CoreException e) {
+				ValidationPlugin.getPlugin().handleException(e);
+			}
+		}
+		return false;
+	}
+
+	/**
+	 * Return true if the last validation operation terminated due to the maximum number of messages
+	 * having already been reported.
+	 */
+	public boolean wasValidationTerminated(IProject project) {
+		IMarker[] exceededMessage = getLimitMessage(project);
+		return (exceededMessage != null); // Validation was terminated if the message exists.
+	}
+
+	private Class getMessageLimitOwner() {
+		if (_messageLimitOwner == null) {
+			_messageLimitOwner = getClass();
+		}
+		return _messageLimitOwner;
+	}
+
+	/**
+	 * Return true if owner is the name of the class which owns validation framework status
+	 * messages.
+	 * 
+	 * ONLY the validation framework should use this method.
+	 */
+	public boolean isInternalOwner(String owner) {
+		if (owner == null) {
+			return false;
+		}
+
+		for (int i = 0; i < _internalOwners.length; i++) {
+			String internalOwner = _internalOwners[i];
+			if (owner.equals(internalOwner)) {
+				return true;
+			}
+		}
+
+		return false;
+	}
+
+	/**
+	 * Add a class to the list of owners of validation messages. ONLY by the validation framework
+	 * should use this method (it is used for messages owned by framework classes or classes used by
+	 * the TVT plugin.)
+	 */
+	public void addInternalOwner(Class clazz) {
+		if (clazz == null) {
+			return;
+		}
+
+		String[] tempInternalOwners = new String[_internalOwners.length + 1];
+		if (_internalOwners.length > 0) {
+			System.arraycopy(_internalOwners, 0, tempInternalOwners, 0, _internalOwners.length);
+		}
+		tempInternalOwners[_internalOwners.length] = WorkbenchReporter.getUniqueId(clazz);
+
+		_internalOwners = tempInternalOwners;
+	}
+	
+	public void cacheMessage(IValidatorJob validator, MessageInfo info){
+		List<MessageInfo> list = _validatorMsgs.get(validator);
+		if( list == null ){
+			list = new ArrayList<MessageInfo>();
+			_validatorMsgs.put(validator, list);
+		}
+		list.add(info);
+	}
+	
+	public List<MessageInfo> getMessages(IValidatorJob validator){
+		List<MessageInfo> list = _validatorMsgs.get(validator);
+		if( list == null )list = new ArrayList<MessageInfo>();		
+		return list;
+	}
+	
+	public void clearMessages(IValidatorJob validator){
+		List<MessageInfo> list = _validatorMsgs.get(validator);
+		if( list != null ){
+			list.clear();
+		}
+		_validatorMsgs.remove( validator );
+	}
+
+	
+	public Set<ValidatorMetaData> getProblemValidators() {
+		return _problemValidators;
+	}
+	
+}
diff --git a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/operations/ValidatorSubsetOperation.java b/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/operations/ValidatorSubsetOperation.java
new file mode 100644
index 0000000..274ddec
--- /dev/null
+++ b/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/operations/ValidatorSubsetOperation.java
@@ -0,0 +1,277 @@
+/*******************************************************************************
+ * Copyright (c) 2001, 2008 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.wst.validation.internal.operations;
+
+
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.Set;
+
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.wst.validation.internal.FilterUtil;
+import org.eclipse.wst.validation.internal.InternalValidatorManager;
+import org.eclipse.wst.validation.internal.RegistryConstants;
+import org.eclipse.wst.validation.internal.ResourceConstants;
+import org.eclipse.wst.validation.internal.ResourceHandler;
+import org.eclipse.wst.validation.internal.ValidationRegistryReader;
+import org.eclipse.wst.validation.internal.ValidatorMetaData;
+
+
+/**
+ * Run some validators on a given IProject. Any validators which cannot be loaded or which are not
+ * registered against this type of project will be ignored.
+ * 
+ * This operation is not intended to be subclassed outside of the validation framework.
+ */
+public class ValidatorSubsetOperation extends ValidationOperation {
+	// By default, assume that there is no default fallback extension
+	protected static final String DEFAULT_DEFAULTEXTENSION = null; 
+
+	/**
+	 * Create an operation that runs a full validation on the named validators either if validation
+	 * needs to (@see ValidatorSubsetOperation(IProject)) or if <code>force</code> is true.
+	 * 
+	 * IProject must exist and be open.
+	 * 
+	 * If async is true, the validation will run all thread-safe validators in the background
+	 * validation thread, and all other validators in the main thread. If async is false, all
+	 * validators will run in in the main thread.
+	 */
+	public ValidatorSubsetOperation(IProject project, boolean force, boolean async) {
+		this(project, force, RegistryConstants.ATT_RULE_GROUP_DEFAULT, async);
+	}
+
+	/**
+	 * Create an operation that runs a full validation on the named validators using the
+	 * <code>ruleGroup</code> pass. Use this constructor only if you want to run a validator that
+	 * supports the two passes: FAST and FULL.
+	 * 
+	 * If force is true, validation is run whether or not it needs to.
+	 * 
+	 * IProject must exist and be open.
+	 * 
+	 * If async is true, the validation will run all thread-safe validators in the background
+	 * validation thread, and all other validators in the main thread. If async is false, all
+	 * validators will run in in the main thread.
+	 */
+	public ValidatorSubsetOperation(IProject project, IWorkbenchContext aWorkenchContext, boolean force, int ruleGroup, boolean async) {
+		super(project, aWorkenchContext, null, null, ruleGroup, force, async);
+	}
+	
+
+	/**
+	 * Create an operation that runs a full validation on the named validators using the
+	 * <code>ruleGroup</code> pass. Use this constructor only if you want to run a validator that
+	 * supports the two passes: FAST and FULL.
+	 * 
+	 * If force is true, validation is run whether or not it needs to.
+	 * 
+	 * IProject must exist and be open.
+	 * 
+	 * If async is true, the validation will run all thread-safe validators in the background
+	 * validation thread, and all other validators in the main thread. If async is false, all
+	 * validators will run in in the main thread.
+	 */
+	public ValidatorSubsetOperation(IProject project, boolean force, int ruleGroup, Object[] changedResources, boolean async) {
+		super(project, null, null, ruleGroup, force, async);
+		setEnabledValidators(ValidatorManager.getManager().getManualEnabledValidators(project));
+		setFileDeltas(FilterUtil.getFileDeltas(getEnabledValidators(), changedResources, false));
+	}
+	
+	/**
+	 * Create an operation that runs a full validation on the named validators using the
+	 * <code>ruleGroup</code> pass. Use this constructor only if you want to run a validator that
+	 * supports the two passes: FAST and FULL.
+	 * 
+	 * If force is true, validation is run whether or not it needs to.
+	 * 
+	 * IProject must exist and be open.
+	 * 
+	 * If async is true, the validation will run all thread-safe validators in the background
+	 * validation thread, and all other validators in the main thread. If async is false, all
+	 * validators will run in in the main thread.
+	 */
+	public ValidatorSubsetOperation(IProject project, boolean force, int ruleGroup, boolean async) {
+		super(project, null, null, ruleGroup, force, async);
+	}
+
+	/**
+	 * The fileExtension parameter must be ".X", where X is the extension. Do not type "*.X" or "X"
+	 * (i.e., without the dot). The parameter could also be the file name, e.g. "foo.X".
+	 * 
+	 * This constructor should be used when the invoker wishes to force validation on certain
+	 * resources, without waiting for the user to save their changes.
+	 * 
+	 * An IllegalArgumentException is thrown if there are no validators registered for the
+	 * fileExtension on the given IProject.
+	 * 
+	 * IProject must exist and be open.
+	 * 
+	 * If async is true, the validation will run all thread-safe validators in the background
+	 * validation thread, and all other validators in the main thread. If async is false, all
+	 * validators will run in in the main thread.
+	 */
+	public ValidatorSubsetOperation(IProject project, String fileExtension, Object[] changedResources, boolean async) throws IllegalArgumentException {
+		this(project, fileExtension, DEFAULT_DEFAULTEXTENSION, changedResources, async);
+	}
+
+	/**
+	 * The fileExtension parameter must be ".X", where X is the extension. Do not type "*.X" or "X"
+	 * (i.e., without the dot). The parameter could also be the file name, e.g. "foo.X".
+	 * 
+	 * This constructor should be used when the invoker wishes to force validation on certain
+	 * resources, without waiting for the user to save their changes.
+	 * 
+	 * If there are no validators configured on files named ".X", then use the validators configured
+	 * on validators named ".Y", where defaultExtension identifies the fallback extension to use.
+	 * defaultExtension follows the same syntax as fileExtension.
+	 * 
+	 * An IllegalArgumentException is thrown if there are no validators registered for the
+	 * fileExtension or defaultExtension on the given IProject.
+	 * 
+	 * IProject must exist and be open.
+	 * 
+	 * If async is true, the validation will run all thread-safe validators in the background
+	 * validation thread, and all other validators in the main thread. If async is false, all
+	 * validators will run in in the main thread.
+	 */
+	public ValidatorSubsetOperation(IProject project, String fileExtension, String defaultExtension, Object[] changedResources, boolean async) throws IllegalArgumentException {
+		super(project, shouldForce(changedResources), async);
+
+		// force the resources to be filtered in even if the validator doesn't normally take them?
+		boolean filterIn = false; 
+		
+		// a list of validators which are configured to run on files with that extension.
+		// A validator will be in the list whether it has been enabled or disabled by the user.
+		ValidatorMetaData[] vmds = InternalValidatorManager.getManager().getValidatorsForExtension(project, fileExtension);
+		if ((defaultExtension != null) && ((vmds == null) || (vmds.length == 0))) {
+			filterIn = true;
+			vmds = InternalValidatorManager.getManager().getValidatorsForExtension(project, defaultExtension);
+		}
+
+		if ((vmds == null) || (vmds.length == 0)) {
+			throw new IllegalArgumentException();
+		}
+
+		setEnabledValidators(InternalValidatorManager.wrapInSet(vmds));
+
+		// construct an array of IFileDelta[] to wrap the Object[];
+		// one IFileDelta for each Object in the array
+		setFileDeltas(FilterUtil.getFileDeltas(getEnabledValidators(), changedResources, filterIn));
+	}
+
+	/**
+	 * This constructor is provided for the validation async testing, and is not intended to be
+	 * called outside the validation framework.
+	 * 
+	 * Run validation on the changed resources with the given validators. All resources must be from
+	 * the same project; if they're not, an IllegalArgumentException will be thrown. All validators
+	 * must be able to run on the resources' project; if not, an IllegalArgumentException will be
+	 * thrown. If the vmds are either empty or null, an IllegalArgumentExeption will be thrown. If
+	 * the project is closed or doesn't exist then an IllegalArgumentException will be thrown.
+	 * 
+	 * The ifileDeltaType is one of the IFileDelta constants: ADDED, CHANGED, or DELETED.
+	 * 
+	 * IProject must exist and be open.
+	 * 
+	 * If async is true, the validation will run all thread-safe validators in the background
+	 * validation thread, and all other validators in the main thread. If async is false, all
+	 * validators will run in in the main thread.
+	 */
+	public ValidatorSubsetOperation(IProject project, ValidatorMetaData[] vmds, IResource[] changedResources, int ifileDeltaType, boolean force, boolean async) throws IllegalArgumentException {
+		// Have to have the IProject as a parameter because ValidationOperation needs the IProject,
+		// and the super(..)
+		// must be called before anything else in this constructor is called.
+		super(project, force, async);
+
+		if ((vmds == null) || (vmds.length == 0)) {
+			throw new IllegalArgumentException(ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_EXC_BADVMD));
+		}
+
+		if (!project.isOpen()) {
+			throw new IllegalArgumentException(ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_EXC_OPENPRJ, new String[]{project.getName()}));
+		}
+		if (!project.exists()) {
+			throw new IllegalArgumentException(ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_EXC_EXISTPRJ, new String[]{project.getName()}));
+		}
+
+		if ((changedResources != null) && (changedResources.length > 0)) {
+			Set<IProject> tempSet = new HashSet<IProject>();
+			for (int i = 0; i < changedResources.length; i++) {
+				IProject p = changedResources[i].getProject();
+				if (!p.isOpen()) {
+					throw new IllegalArgumentException(ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_EXC_OPENPRJ, new String[]{p.getName()}));
+				}
+				if (!p.exists()) {
+					throw new IllegalArgumentException(ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_EXC_EXISTPRJ, new String[]{p.getName()}));
+				}
+				tempSet.add(project);
+			}
+
+			if (!tempSet.contains(project)) {
+				throw new IllegalArgumentException(ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_EXC_BADPRJ, new String[]{project.getName()}));
+			}
+			if (tempSet.size() != 1) {
+				StringBuffer buffer = new StringBuffer("\n"); //$NON-NLS-1$
+				Iterator<IProject> iterator = tempSet.iterator();
+				while (iterator.hasNext()) {
+					IProject p = iterator.next();
+					buffer.append("\t"); //$NON-NLS-1$
+					buffer.append(p.getName());
+					if (iterator.hasNext()) {
+						buffer.append(", "); //$NON-NLS-1$
+					}
+				}
+				throw new IllegalArgumentException(ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_EXC_MULTIPRJ, new String[]{buffer.toString()}));
+			}
+		}
+
+		for (int i = 0; i < vmds.length; i++) {
+			ValidatorMetaData vmd = vmds[i];
+			if (!ValidationRegistryReader.getReader().isConfiguredOnProject(vmd, project)) {
+				throw new IllegalArgumentException(ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_EXC_BADVAL, new String[]{vmd.getValidatorDisplayName(), project.getName()}));
+			}
+		}
+
+		setEnabledValidators(InternalValidatorManager.wrapInSet(vmds));
+		setFileDeltas(FilterUtil.getFileDeltas(getEnabledValidators(), changedResources, ifileDeltaType)); // construct
+		// an array of IFileDelta[] to wrap the IResource[]; one IFileDelta for each IResource in the array
+	}
+
+	/**
+	 * Given an array of fully-qualified class names of validators, create the list of validators to
+	 * be run. The array is not checked for duplicates or for invalid validators (i.e., a validator
+	 * of that class type is not loaded, or the validator is loaded but cannot run against this type
+	 * of IProject.)
+	 */
+	public void setValidators(String[] validatorNames) throws IllegalArgumentException {
+		Set<ValidatorMetaData> enabled = new HashSet<ValidatorMetaData>();
+		for (String name : validatorNames) {
+			ValidatorMetaData vmd = ValidationRegistryReader.getReader().getValidatorMetaData(name);
+			if (vmd == null) {
+				// No validator, with that plug-in id, can be run on that project.
+				// Either the validator isn't installed, or the IProject passed in
+				// doesn't have the necessary nature.
+				throw new IllegalArgumentException(name);
+			}
+			enabled.add(vmd);
+		}
+		setEnabledValidators(enabled);
+	}
+
+	/**
+	 * @deprecated Will be removed in Milestone 3. Use setForce(boolean)
+	 */
+	public void setAlwaysRun(boolean force) {
+		setForce(force);
+	}
+}
diff --git a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/operations/WorkbenchContext.java b/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/operations/WorkbenchContext.java
new file mode 100644
index 0000000..eea36c1
--- /dev/null
+++ b/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/operations/WorkbenchContext.java
@@ -0,0 +1,729 @@
+/*******************************************************************************
+ * Copyright (c) 2001, 2008 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.wst.validation.internal.operations;
+
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Hashtable;
+import java.util.List;
+
+import org.eclipse.core.resources.IContainer;
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IFolder;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.Path;
+import org.eclipse.wst.validation.internal.RegistryConstants;
+import org.eclipse.wst.validation.internal.Tracing;
+import org.eclipse.wst.validation.internal.plugin.ValidationPlugin;
+import org.eclipse.wst.validation.internal.provisional.core.IMessage;
+
+/**
+ * Abstract base class for registration of symbolic model names, and also provides the mechanism for
+ * registering the load model method which loads a specific type of MOF model, as identified by the
+ * symbolic model name.
+ */
+public class WorkbenchContext implements IWorkbenchContext {
+	private IProject 	_project;
+	private Hashtable<String,Method> 	_modelRegistry;
+	private int 		_ruleGroup = RegistryConstants.ATT_RULE_GROUP_DEFAULT;
+	public List<String> validationFileURIs; 
+	public static final String GET_PROJECT_FILES = "getAllFiles"; //$NON-NLS-1$
+	public static final String GET_FILE = "getFile"; //$NON-NLS-1$
+	public static final String VALIDATION_MARKER = "com.ibm.etools.validation.problemmarker"; //$NON-NLS-1$
+	public static final String VALIDATION_MARKER_OWNER = "owner";  //$NON-NLS-1$
+
+	public WorkbenchContext() {
+		super();
+		_modelRegistry = new Hashtable<String, Method>();
+
+		registerModel(IRuleGroup.PASS_LEVEL, "loadRuleGroup"); //$NON-NLS-1$
+		
+		//the following will register the helper's symbolic methods
+	    Class [] args = new Class[1] ;
+	    args[0] = String.class ;  // a string argument denoting a specific JSP.
+		registerModel(GET_FILE, "getFile", args);//$NON-NLS-1$
+		registerModel(GET_PROJECT_FILES, "getFiles", args);//$NON-NLS-1$
+	}
+
+	/**
+	 * When the validation is complete, this method will be called so that the IWorkbenchContext can
+	 * clean up any resources it allocated during the validation.
+	 * 
+	 * If the cleanup is a long-running operation, subtask messages should be sent to the IReporter.
+	 */
+	public void cleanup(WorkbenchReporter reporter) {
+		// Default: nothing to clean up
+	}
+
+	/**
+	 * When the IProject is closing, perform any cleanup that needs to be done. When this method is
+	 * called, if the helper has cached any resources from the IProject, it should release those
+	 * resources. If you do not allocate resources in your helper, then this method should be a
+	 * no-op.
+	 */
+	public void closing() {
+		closing(getProject());
+	}
+
+	/**
+	 * When the IProject is closing, perform any cleanup that needs to be done. When this method is
+	 * called, if the helper has cached any resources from the IProject, it should release those
+	 * resources. If you do not allocate resources in your helper, then this method should be a
+	 * no-op.
+	 * 
+	 * @deprecated Override closing() instead, and use getProject()
+	 */
+	public void closing(IProject project) {
+		//do nothing
+	}
+
+	/**
+	 * When the IProject is being deleted, perform any cleanup that needs to be done. When this
+	 * method is called, if the helper has cached any resources from the IProject, it should release
+	 * those resources. If you do not allocate resources in your helper, then this method should be
+	 * a no-op.
+	 */
+	public void deleting() {
+		deleting(getProject());
+	}
+
+	/**
+	 * When the IProject is being deleted, perform any cleanup that needs to be done. When this
+	 * method is called, if the helper has cached any resources from the IProject, it should release
+	 * those resources. If you do not allocate resources in your helper, then this method should be
+	 * a no-op.
+	 * 
+	 * @deprecated Override deleting() instead, and use getProject()
+	 */
+	public void deleting(IProject project) {
+		//do nothing
+	}
+
+	/**
+	 * Returns the IPath of a resource, relative to the container. If the IResource is not a member
+	 * of the container, return null. This method should be useful for implementors of this class;
+	 * specifically, in their getPortableName method.
+	 */
+	public static String getContainerRelativePath(String fullPath, IContainer container) {
+		if ((fullPath == null) || (container == null))
+			return null;
+		IPath relPath = getContainerRelativePath(new Path(fullPath), container);
+		if (relPath != null)
+			return relPath.toString();
+		return null;
+	}
+
+	/**
+	 * Returns the IPath of a resource, relative to the container. If the IResource is not a member
+	 * of the container, return null. This method should be useful for implementors of this class;
+	 * specifically, in their getPortableName method.
+	 */
+	public static IPath getContainerRelativePath(IResource resource, IContainer container) {
+		if ((resource == null) || (container == null)) {
+			return null;
+		}
+
+		IResource foundResource = null;
+		IPath relPath = getContainerRelativePath(resource.getFullPath(), container);
+		if (relPath != null) {
+			// if relPath is null, the resource is not a direct member of the container
+			try {
+				if (!resource.exists()) { // findMember won't work
+					if (resource instanceof IFile) {
+						foundResource = container.getFile(relPath);
+					} else if (resource instanceof IFolder) {
+						foundResource = container.getFolder(relPath);
+					}
+				} else {
+					foundResource = container.findMember(relPath, true); // true means include
+					// phantom resources
+					if ((foundResource != null) && !foundResource.exists()) {
+						foundResource = null;
+					}
+				}
+			} catch (IllegalArgumentException e) {
+				foundResource = null;
+				ValidationPlugin.getPlugin().handleException(e);
+			}
+		}
+
+		if (foundResource == null) {
+			return null;
+		}
+
+		// file has been found
+		int matchingFirstSegments = container.getProjectRelativePath().matchingFirstSegments(resource.getProjectRelativePath());
+		return resource.getProjectRelativePath().removeFirstSegments(matchingFirstSegments);
+	}
+
+	/**
+	 * Given an IPath, if the IPath is absolute, and is a part of the IContainer, return an IPath
+	 * which is relative to the container. If the IPath is not part of the IContainer, return null.
+	 */
+	public static IPath getContainerRelativePath(IPath path, IContainer container) {
+		if ((path == null) || (container == null)) {
+			return null;
+		}
+
+		if (path.isAbsolute()) {
+			// Is the path part of the IContainer?
+			int matchingFirstSegments = path.matchingFirstSegments(container.getFullPath());
+			if ((matchingFirstSegments > 0) && (matchingFirstSegments == container.getFullPath().segmentCount())) {
+				// part of the IContainer
+				return path.removeFirstSegments(matchingFirstSegments);
+			}
+			// not part of the IContainer
+			return null;
+		}
+		// path is relative
+		// Is the path part of the IContainer?
+		//TODO don't have time to implement this now, but should in future. - Ruth
+		return null;
+	}
+
+	/**
+	 * Given an IMessage's target object, return a string which identifies the object, so that the
+	 * user can locate it.
+	 */
+	public String getDescription(Object object) {
+		if (object == null) {
+			return ""; //$NON-NLS-1$
+		}
+
+		if (object instanceof WorkbenchFileDelta) {
+			WorkbenchFileDelta wfd = (WorkbenchFileDelta) object;
+			if (wfd.getResource() != null) {
+				// resource will be null if WorkbenchFileDelta was constructed from an Object
+				// instead of an IResource
+				return wfd.getResource().getFullPath().toString();
+			}
+		}
+
+		return object.toString();
+	}
+
+	/**
+	 * Given an Object, if the object has a corresponding IFile in the workbench, return the IFile.
+	 * Otherwise return null.
+	 * 
+	 * This method is used by the WorkbenchReporter. In eclipse, in order to add or remove a task
+	 * list entry, the IResource, to which the entry applies, must be identified. The IReporter
+	 * interface passes in an Object in these methods:
+	 * 
+	 * addValidationMessage(IValidator, IMessage) // Object is a part of IMessage
+	 * 
+	 * removeAllMessages(IValidator, Object),
+	 * 
+	 * Thus, the WorkbenchReporter needs to know how, given the Object, which IFile that the Object
+	 * represents in the workbench, in order to be able to add the task list entry.
+	 * 
+	 * If this method returns null, then the WorkbenchReporter will add the message to the IProject
+	 * instead of an IFile.
+	 *  
+	 */
+	public IFile getFile(Object obj) {
+		return null;
+	}
+
+	public IResource getResource(Object obj) {
+		if (obj == null) {
+			return null;
+		}
+
+		IResource res = null;
+		if (obj instanceof WorkbenchFileDelta) {
+			// resource may be null if WorkbenchFileDelta was constructed from an Object instead of
+			// an IResource
+			res = ((WorkbenchFileDelta) obj).getResource();
+		} else if (obj instanceof IResource) {
+			res = (IResource) obj;
+		}
+
+		if ((res == null) || (!res.exists())) {
+			return getFile(obj);
+		}
+
+		return res;
+	}
+
+	/**
+	 * If the IProject is associated with an EJBNatureRuntime, return the IJavaProject which
+	 * represents it.
+	 */
+//	public static IJavaProject getJavaProject(IProject project) {
+//		if (project == null) {
+//			return null;
+//		}
+//		return JavaCore.create(project);
+//	}
+
+	/**
+	 * Given an IMessage's target object, return the line number, of the IFile, which the target
+	 * object represents. If the object is null, or if access to line numbers is not possible,
+	 * return "0".
+	 */
+	public int getLineNo(Object object) {
+		IResourceUtil util = ValidatorManager.getResourceUtil();
+		if (util == null) {
+			return IMessage.LINENO_UNSET;
+		}
+		try {
+			return util.getLineNo(object);
+		} catch (Exception e) {
+			ValidationPlugin.getPlugin().handleException(e);
+			return IMessage.LINENO_UNSET;
+		}
+
+	}
+	
+	/**
+	 * Given an IMessage's target object, return the line number, of the IFile, which the target
+	 * object represents, if possible. If the object is null, or if access to line numbers is not
+	 * possible, return a text description of the location.
+	 * 
+	 * This method will be called whether or not the IResource is an IFile, IFolder, or IProject.
+	 * Line numbers are valid only for IFile types; if the resource is not an IFile, then a text
+	 * description of the location must be returned.
+	 */
+	public String getLocation(Object object) {
+		IResource res = getResource(object);
+		if ((res == null) || !(res instanceof IFile))
+			// return a text description
+			return getDescription(object);
+		// default to a line number, if it's available. Else, use a text description.
+		int lineNumber = getLineNo(object);
+		if (lineNumber == IMessage.LINENO_UNSET) {
+			return getDescription(object);
+		}
+		// return the line number
+		return String.valueOf(lineNumber);
+	}
+
+	/**
+	 * Given a name of a load method, and the types of parameters it takes (this method is always
+	 * called with null as the second parameter), return the java.lang.reflect.Method which
+	 * represents the load method.
+	 */
+	private final Method getMethod(String methodName, Class[] parmTypes) {
+		Method m = null;
+		try {
+			m = getClass().getMethod(methodName, parmTypes);
+		} catch (NoSuchMethodException e) {
+			ValidationPlugin.getPlugin().handleException(e);
+			return null;
+		}
+
+		return m;
+	}
+
+	/**
+	 * @see IWorkbenchContext.getPortableName(IResource)
+	 */
+	public String getPortableName(IResource resource) {
+		return resource.getFullPath().toString();
+	}
+
+	/**
+	 * Return the IProject which is about to be validated. Each IWorkbenchContext knows how to
+	 * traverse a certain type of IProject, for example, an EJB project or a web project.
+	 */
+	public final IProject getProject() {
+		return _project;
+	}
+	
+	  /**
+	   * Get the IFile for the given filename.
+	   * 
+	   * @param filename The name of the file to retrieve.
+	   * @return An IFile representing the file specified or null if it can't be resolved.
+	   */
+	  public IFile getFile(String filename)
+	  {
+	    //    System.out.println("file name = " + filename);
+	    IResource res = getProject().findMember(filename, true); // true means include phantom resources
+	    if (res instanceof IFile) 
+	    {
+	      return (IFile) res;
+	    }
+	    return null;
+	  }
+	  
+	  /**
+	   * Get the collection of files from the project that are relevant for the
+	   * validator with the given class name.
+	   * 
+	   * @param validatorClassName The name of the validator class.
+	   * @return The collection of files relevant for the validator class specified.
+	   */
+	  public Collection<IFile> getFiles(String validatorClassName)
+	  {
+	    IProject project = getProject();
+	    List<IFile> files = new ArrayList<IFile>();
+	    getFiles(files, project, validatorClassName);
+	    return files;
+	  }
+
+	  /**
+	   * Get the collection of files from the project that are relevant for the
+	   * validator with the given class name.
+	   * 
+	   * @param files The files relevant for the class name.
+	   * @param resource The resource to look for files in.
+	   * @param validatorClassName The name of the validator class.
+	   */
+	  protected void getFiles(Collection<IFile> files, IContainer resource, String validatorClassName)
+	  {
+	    try
+	    {
+	      IResource [] resourceArray = resource.members(false);
+	      for (int i=0; i<resourceArray.length; i++)
+	      {       
+	        if (ValidatorManager.getManager().isApplicableTo(validatorClassName, resourceArray[i])) 
+	        {
+	          if (resourceArray[i] instanceof IFile) 
+				  files.add((IFile)resourceArray[i]);
+	        }
+	        if (resourceArray[i].getType() == IResource.FOLDER)
+	         getFiles(files,(IContainer)resourceArray[i], validatorClassName) ;
+	      }
+	    }
+	    catch (Exception e) {}
+	  }
+	  
+
+//	/**
+//	 * Return the folders (or project) which contain the .java source files.
+//	 */
+//	public static IContainer[] getProjectSourceContainers(IProject project) {
+//		if (project == null) {
+//			return NO_CONTAINERS;
+//		}
+//
+//		IJavaProject jp = getJavaProject(project);
+//		if (jp == null) {
+//			return NO_CONTAINERS;
+//		}
+//
+//		return getProjectSourceContainers(jp);
+//	}
+
+	/**
+	 * Return the folders (or project) which contain the .java source files.
+	 */
+//	public static IContainer[] getProjectSourceContainers(IJavaProject javaProject) {
+//		if (javaProject == null) {
+//			return NO_CONTAINERS;
+//		}
+//		IProject project = javaProject.getProject();
+//
+//		IClasspathEntry[] classpath = null;
+//		try {
+//			classpath = javaProject.getResolvedClasspath(true); // true means ignore unresolved
+//			// (missing) variables, instead of
+//			// throwing an exception
+//		} catch (JavaModelException exc) {
+//			Logger logger = ValidationPlugin.getPlugin().getMsgLogger();
+//			if (logger.isLoggingLevel(Level.SEVERE)) {
+//				LogEntry entry = ValidationPlugin.getLogEntry();
+//				entry.setSourceID("WorkbenchContext::getProjectSourceContainers(IJavaProject)"); //$NON-NLS-1$
+//				entry.setTargetException(exc);
+//				logger.write(Level.SEVERE, entry);
+//			}
+//			return NO_CONTAINERS;
+//		}
+//
+//		if (classpath == null) {
+//			return NO_CONTAINERS;
+//		}
+//
+//		// Traverse the classpath, and calculate a list of just the
+//		// IFolders and IProjects (i.e., IContainers) which contain source
+//		IContainer[] icontainers = new IContainer[classpath.length];
+//		int validCount = 0;
+//		for (int i = 0; i < classpath.length; i++) {
+//			IClasspathEntry entry = classpath[i];
+//			if (entry.getEntryKind() == IClasspathEntry.CPE_SOURCE) {
+//				IPath entryPath = entry.getPath();
+//				IPath relEntryPath = getContainerRelativePath(entryPath, project);
+//				if (relEntryPath == null) {
+//					// classpath entry refers to something which doesn't exist
+//					continue;
+//				}
+//
+//				IResource outputResource = project.findMember(relEntryPath);
+//				if (outputResource == null) {
+//					// classpath entry refers to something which doesn't exist
+//					continue;
+//				}
+//
+//				if (outputResource instanceof IContainer) {
+//					icontainers[validCount++] = (IContainer) outputResource;
+//				}
+//			}
+//		}
+//
+//		//  following line causes a ClassCastException, so construct an array of IContainers
+//		// explicitly
+//		//	return (IContainer[])icontainers.toArray();
+//		IContainer[] containers = new IContainer[validCount];
+//		System.arraycopy(icontainers, 0, containers, 0, validCount);
+//		return containers;
+//	}
+
+	public int getRuleGroup() {
+		return _ruleGroup;
+	}
+
+	/**
+	 * This method can be overriden by AWorkbenchHelpers, if they wish to perform some
+	 * initialization once the IProject is set. Default is to do nothing.
+	 * 
+	 * For example, if this IWorkbenchContext delegates to another IWorkbenchContext, then that
+	 * IWorkbenchContext's setProject() method should be called here.
+	 */
+	public void initialize() {
+		//do nothing
+	}
+
+	/**
+	 * Return true if the given resource is in an IJavaProject, and if it is in one of the source
+	 * folders in the IJavaProject. If the project's source folder happens to be the project's
+	 * output folder too, this method will return true. If res is null, or is not found in one of
+	 * the source containers, this method will return false.
+	 */
+//	public boolean isInJavaSourcePath(IResource res) {
+//		if (res == null) {
+//			return false;
+//		}
+//
+//		IContainer[] containers = getProjectSourceContainers(res.getProject());
+//		for (int c = 0; c < containers.length; c++) {
+//			IPath resourcePath = getContainerRelativePath(res, containers[c]);
+//			if (resourcePath != null) {
+//				// file has been found
+//				return true;
+//			}
+//		}
+//
+//		return false;
+//	}
+
+	/**
+	 * Return true if the given symbolic name is registered, and can be loaded by WorkbenchContext's
+	 * "loadModel" method. For further information, see the comment above WorkbenchContext's
+	 * "registerModel" method.
+	 */
+	public final boolean isRegistered(String symbolicName) {
+		if (symbolicName == null)return false;
+		return _modelRegistry.containsKey(symbolicName);
+	}
+
+	/**
+	 * Given a symbolic name, load the MOF model which is identified by that name.
+	 * 
+	 * For support of dynamic symbolic names, such as file names, read the comment above the
+	 * registerModel method.
+	 * 
+	 * @see registerModel
+	 */
+	public Object loadModel(String symbolicName) {
+		return loadModel(symbolicName, null);
+	}
+
+	/**
+	 * Given a symbolic name, load the MOF model which is identified by that name.
+	 * 
+	 * For support of dynamic symbolic names, such as file names, read the comment above the
+	 * registerModel method.
+	 * 
+	 * @see registerModel
+	 */
+	public Object loadModel(String symbolicName, Object[] parms) {
+		try {
+			Method loader = _modelRegistry.get(symbolicName);
+			if (loader == null)return null;
+
+			return loader.invoke(this, parms);
+		} catch (IllegalAccessException e) {
+			ValidationPlugin.getPlugin().handleException(e);
+			return null;
+		} catch (InvocationTargetException e) {
+			ValidationPlugin.getPlugin().handleException(e);
+			ValidationPlugin.getPlugin().handleException(e.getTargetException());
+			return null;
+		} catch (NullPointerException e) {
+			ValidationPlugin.getPlugin().handleException(e);
+			return null;
+		} catch (ExceptionInInitializerError e) {
+			ValidationPlugin.getPlugin().handleException(e);
+			return null;
+		}
+	}
+
+	public Object loadRuleGroup() {
+		return new Integer(getRuleGroup()); // have to wrap the int in an Integer because can't cast
+		// an int to an Object
+	}
+
+	/**
+	 * This method should be used only by the validation framework. This method will be called by
+	 * ValidationOperation, before the IValidator's validate method is called, to set the group of
+	 * rules which the IValidator should check.
+	 */
+	public void setRuleGroup(int rg) {
+		_ruleGroup = rg;
+	}
+
+	/**
+	 * Register a load method for a symbolic name. A load method is defined as a method which takes
+	 * no parameters and returns a RefObject.
+	 * 
+	 * Every subclass of WorkbenchContext, for every static type of symbolic name which it supports,
+	 * should call registerModel. For IWorkbenchHelpers which support dynamic symbolic names, such
+	 * as file names, each IWorkbenchContext should override the "loadModel" method. Their
+	 * "loadModel" should first call this class' "isRegistered" method to see if they're dealing
+	 * with a static symbolic name, or a dynamic one. If the symbolic name is registered, the
+	 * child's "loadModel" method should just return the result of WorkbenchContext's "loadModel"
+	 * method. Otherwise, it should return the result based on its own processing.
+	 * 
+	 * When this method is called, the load method identified by loadMethodName is located & stored
+	 * for future retrieval by the "loadModel" method. When the IValidator calls "loadModel" with a
+	 * symbolic name, the java.lang.reflect.Method which was loaded by this method is invoked, and
+	 * the result (RefObject) returned by that method is returned by "loadModel".
+	 * 
+	 * symbolicName must not be null or the empty string. loadMethodName must not be null or the
+	 * empty string.
+	 */
+	protected final void registerModel(String symbolicName, String loadMethodName) {
+		registerModel(symbolicName, loadMethodName, null);
+	}
+
+	/**
+	 * Register a load method for a symbolic name. A load method is defined as a method which takes
+	 * no parameters and returns a RefObject.
+	 * 
+	 * Every subclass of WorkbenchContext, for every static type of symbolic name which it supports,
+	 * should call registerModel. For IWorkbenchHelpers which support dynamic symbolic names, such
+	 * as file names, each IWorkbenchContext should override the "loadModel" method. Their
+	 * "loadModel" should first call this class' "isRegistered" method to see if they're dealing
+	 * with a static symbolic name, or a dynamic one. If the symbolic name is registered, the
+	 * child's "loadModel" method should just return the result of WorkbenchContext's "loadModel"
+	 * method. Otherwise, it should return the result based on its own processing.
+	 * 
+	 * When this method is called, the load method identified by loadMethodName is located & stored
+	 * for future retrieval by the "loadModel" method. When the IValidator calls "loadModel" with a
+	 * symbolic name, the java.lang.reflect.Method which was loaded by this method is invoked, and
+	 * the result (RefObject) returned by that method is returned by "loadModel".
+	 * 
+	 * symbolicName must not be null or the empty string. loadMethodName must not be null or the
+	 * empty string.
+	 */
+	protected final void registerModel(String symbolicName, String loadMethodName, Class[] parms) {
+		Method method = getMethod(loadMethodName, parms);
+		if (method == null) {
+			if (Tracing.isLogging()) {
+				StringBuffer buffer = new StringBuffer("WorkbenchContext-01: load method "); //$NON-NLS-1$
+				buffer.append(loadMethodName);
+				buffer.append("("); //$NON-NLS-1$
+				for (int i = 0; (parms != null) && (i < parms.length); i++) {
+					buffer.append(parms[i]);
+				}
+				buffer.append(") must exist. " + getClass().getName() + " cannot support model " + symbolicName); //$NON-NLS-1$ //$NON-NLS-2$
+
+				Tracing.log(buffer);
+			}
+		} else {
+			_modelRegistry.put(symbolicName, method);
+		}
+	}
+
+	/**
+	 * Whether full or incremental validation is running, this method will be called, for every
+	 * IResource which is filtered in by the IValidator, so that the IValidationContext can receive
+	 * notification that one of the resources, which validation will run on, is being filtered in.
+	 */
+	public void registerResource(IResource resource) {
+		// default: do nothing
+	}
+
+	/**
+	 * This method is called by the Validation Framework, to initialize the IWorkbenchContext so that
+	 * it can gather information from the current project.
+	 * 
+	 * If an IWorkbenchContext delegates some model loading to another IWorkbenchContext, this method
+	 * should be overriden so that the delegatee IWorkbenchContext is initialized with the IProject.
+	 */
+	public final void setProject(IProject project) {
+		_project = project;
+
+		if (project != null) {
+			// Project will be set back to null once the validation of the project is complete.
+			initialize();
+		}
+	}
+
+	/**
+	 * Notifies this IWorkbenchContext that the Validation Framework is shutting down. There will be
+	 * calls to closing(IProject) and possibly deleting(IProject) following this call, but the
+	 * resources may already be closed by the time that those methods are called, so EVERYTHING
+	 * should be cleaned up in this method. The parameter passed in is the project which is about to
+	 * shut down. This method will be called once for every IProject in the workbench. The IProject
+	 * may, or may not, be closed.
+	 */
+	public void shutdown() {
+		// Default is to assume that no resources were allocated; therefore,
+		// no cleanup needs to be done.
+		shutdown(getProject());
+	}
+
+	/**
+	 * Notifies this IWorkbenchContext that the Validation Framework is shutting down. There will be
+	 * calls to closing(IProject) and possibly deleting(IProject) following this call, but the
+	 * resources may already be closed by the time that those methods are called, so EVERYTHING
+	 * should be cleaned up in this method. The parameter passed in is the project which is about to
+	 * shut down. This method will be called once for every IProject in the workbench. The IProject
+	 * may, or may not, be closed.
+	 * 
+	 * @deprecated Override shutdown() instead, and use getProject()
+	 */
+	public void shutdown(IProject project) {
+		// Default is to assume that no resources were allocated; therefore,
+		// no cleanup needs to be done.
+	}
+
+	public String getTargetObjectName(Object object) {
+		return null;
+	}
+
+	public String[] getURIs() {
+		String[] uris = new String[validationFileURIs.size()];
+		validationFileURIs.toArray(uris);
+		return uris;
+	}
+
+	/**
+	 * @return Returns the validationFileURIs.
+	 */
+	public List<String> getValidationFileURIs() {
+		return validationFileURIs;
+	}
+
+	/**
+	 * @param validationFileURIs The validationFileURIs to set.
+	 */
+	public void setValidationFileURIs(List<String> validationFileURIs) {
+		this.validationFileURIs = validationFileURIs;
+	}
+}
diff --git a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/operations/WorkbenchFileDelta.java b/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/operations/WorkbenchFileDelta.java
new file mode 100644
index 0000000..0953e0a
--- /dev/null
+++ b/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/operations/WorkbenchFileDelta.java
@@ -0,0 +1,78 @@
+/*******************************************************************************
+ * Copyright (c) 2001, 2007 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.wst.validation.internal.operations;
+
+import org.eclipse.core.resources.IResource;
+import org.eclipse.wst.validation.internal.core.FileDelta;
+import org.eclipse.wst.validation.internal.core.IFileDelta;
+
+
+/**
+ * Eclipse-specific implementation of FileDelta which also caches the IResource which is associated
+ * with the FileDelta.
+ */
+public class WorkbenchFileDelta extends FileDelta {
+	private IResource _resource;
+	private Object _changedResource;
+
+	private static final String FILE_NAME = "FILE NAME:"; //$NON-NLS-1$
+	private static final String DELTA = "  DELTA: "; //$NON-NLS-1$
+	private static final String RESOURCE = "  RESOURCE: "; //$NON-NLS-1$
+	private static final String OBJECT = "  OBJECT: "; //$NON-NLS-1$
+
+	public WorkbenchFileDelta(String aFileName, int aFileDelta, IResource resource) {
+		super(aFileName, aFileDelta);
+		setResource(resource);
+		setObject(resource);
+	}
+
+	public WorkbenchFileDelta(Object changedResource) {
+		super(null, IFileDelta.CHANGED);
+		setObject(changedResource);
+	}
+
+	public IResource getResource() {
+		return _resource;
+	}
+
+	public void setResource(IResource resource) {
+		_resource = resource;
+	}
+
+	/**
+	 * If the changed resource is not an IResource (e.g., a RefObject), then the getFileName method
+	 * will return null, getResource will return null, and this method will return the object. If
+	 * the changedResource is an IResource, then both this method and the getResource method will
+	 * return the resource.
+	 */
+	public Object getObject() {
+		return _changedResource;
+	}
+
+	/**
+	 * @see getObject()
+	 */
+	public void setObject(Object o) {
+		_changedResource = o;
+	}
+
+	public String toString() {
+		StringBuffer buffer = new StringBuffer(FILE_NAME);
+		buffer.append(String.valueOf(getFileName()));
+		buffer.append(DELTA);
+		buffer.append(getDeltaType());
+		buffer.append(RESOURCE);
+		buffer.append(String.valueOf(getResource()));
+		buffer.append(OBJECT);
+		buffer.append(String.valueOf(getObject()));
+		return buffer.toString();
+	}
+}
diff --git a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/operations/WorkbenchReporter.java b/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/operations/WorkbenchReporter.java
new file mode 100644
index 0000000..f9162f3
--- /dev/null
+++ b/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/operations/WorkbenchReporter.java
@@ -0,0 +1,597 @@
+/*******************************************************************************
+ * Copyright (c) 2001, 2008 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.wst.validation.internal.operations;
+
+import java.text.MessageFormat;
+import java.util.Arrays;
+import java.util.List;
+
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.wst.validation.internal.ResourceConstants;
+import org.eclipse.wst.validation.internal.ResourceHandler;
+import org.eclipse.wst.validation.internal.TaskListUtility;
+import org.eclipse.wst.validation.internal.Tracing;
+import org.eclipse.wst.validation.internal.ValidationRegistryReader;
+import org.eclipse.wst.validation.internal.ValidatorMetaData;
+import org.eclipse.wst.validation.internal.plugin.ValidationPlugin;
+import org.eclipse.wst.validation.internal.provisional.core.IMessage;
+import org.eclipse.wst.validation.internal.provisional.core.IReporter;
+import org.eclipse.wst.validation.internal.provisional.core.IValidator;
+import org.eclipse.wst.validation.internal.provisional.core.IValidatorJob;
+
+/**
+ * IValidator instances will interact with an instance of this class, but should never cast that
+ * IReporter instance to WorkbenchReporter.
+ * <p>
+ * This class handles interaction between the user and the IValidator in the eclipse workbench
+ * environment.
+ * <p>
+ * This class must not be called outside of an IWorkspaceRunnable or IRunnableWithProgress. Many
+ * resource deltas can be generated by the methods in this class.
+ * <p>
+ * Only the validation framework may instantiate or alter instances of this class.
+ */
+
+public class WorkbenchReporter implements IReporter {
+	public static final String DEFAULT_LOCATION = ""; //$NON-NLS-1$
+	public static final int NO_MESSAGE_LIMIT = -1;
+
+	private IProject _project;
+	private IProgressMonitor _monitor;
+
+	public static void addMessage(IResource resource, Class messageOwner, IMessage message) {
+		addMessage(resource, messageOwner, null, message);
+	}
+	
+	public static void addMessage(IResource resource, Class messageOwner, ClassLoader cl, IMessage message) {
+		addMessage(resource, messageOwner, cl, message, null, ""); //$NON-NLS-1$
+	}
+	
+	public static void addMessage(IResource resource, Class clazz, IMessage message, 
+		String targetObjectName, String location) {
+		addMessage(resource, clazz, null, message, targetObjectName, location);
+	}
+	
+	public static void addMessage(IResource resource, Class clazz, IMessage message, 
+		String targetObjectName, String location,String markerId) {
+		addMessage(resource, clazz, null, message, targetObjectName, location,markerId);
+	}
+	
+	public static void addMessage(IResource resource, Class clazz, ClassLoader cl, IMessage message, 
+		String targetObjectName, String location) {
+		if ((clazz == null) || (message == null) || (resource == null))return;
+
+		if (cl == null)cl = clazz.getClassLoader();
+
+		addMessage(resource, getUniqueId(clazz), cl, message, targetObjectName, location);
+	}
+	
+	public static void addMessage(IResource resource, Class clazz, ClassLoader cl, IMessage message, 
+		String targetObjectName, String location, String markerId) {
+		if ((clazz == null) || (message == null) || (resource == null))return;
+
+		if (cl == null)cl = clazz.getClassLoader();
+
+		addMessage(resource, getUniqueId(clazz), cl, message, targetObjectName, location, markerId);
+	}
+
+	public static void addMessage(IResource resource, String messageOwnerId, ClassLoader cl, IMessage message) {
+		addMessage(resource, messageOwnerId, cl, message, null, ""); //$NON-NLS-1$
+	}
+
+	public static void addMessage(IResource resource, String messageOwnerId, ClassLoader cl, 
+		IMessage message, String targetObjectName, String location) {
+		int severity = message.getSeverity();
+		try {
+			TaskListUtility.addTask(messageOwnerId, resource, location, message.getId(), 
+				message.getText(cl), severity,targetObjectName, message.getGroupName(), 
+				message.getOffset(), message.getLength());
+		} catch (CoreException e) {
+			ValidationPlugin.getPlugin().handleException(e);
+		}
+	}
+	
+	public static void addMessage(IResource resource, String messageOwnerId, ClassLoader cl, 
+		IMessage message, String targetObjectName, String location, String markerId) {
+		int severity = message.getSeverity();
+		try {
+			TaskListUtility.addTask(messageOwnerId, resource, location, message.getId(), 
+				message.getText(cl), severity,markerId,targetObjectName, message.getGroupName(), 
+				message.getOffset(), message.getLength());
+		} catch (CoreException e) {
+			ValidationPlugin.getPlugin().handleException(e);
+		}
+	}
+	
+	public static void removeAllMessages(IResource resource, IValidator validator) {
+		if (resource == null)return;
+
+		ValidatorMetaData vmd = ValidationRegistryReader.getReader().getValidatorMetaData(validator);
+		if (vmd == null) {
+			// log
+			return;
+		}
+
+		String[] validatorNames = vmd.getValidatorNames();
+		try {
+			TaskListUtility.removeAllTasks(resource, validatorNames);
+		} catch (CoreException e) {
+			ValidationPlugin.getPlugin().handleException(e);
+		}
+	}
+
+	/**
+	 * @deprecated Will be removed in Milestone 3. Should not be called outside of the validation
+	 *             framework.
+	 */
+	public static void removeAllMessages(IResource resource, IValidator validator, Object object) {
+		if (resource == null) {
+			return;
+		}
+
+		ValidatorMetaData vmd = ValidationRegistryReader.getReader().getValidatorMetaData(validator);
+		if (vmd == null) {
+			// log
+			return;
+		}
+
+		String[] validatorNames = vmd.getValidatorNames();
+		try {
+			//String targetObjectName = getTargetObjectName(vmd.getHelper(resource.getProject()), object);
+			String targetObjectName = getTargetObjectName( getHelper( resource.getProject(), validator), object);			
+			removeAllMessages(resource, validatorNames, targetObjectName);
+		} catch (InstantiationException e) {
+			// Remove the vmd from the reader's list
+			ValidationRegistryReader.getReader().disableValidator(vmd);
+			ValidationPlugin.getPlugin().handleException(e);
+		}
+	}
+
+	public static void removeAllMessages(IResource resource, String[] validatorNames, String targetObjectName) {
+		try {
+			TaskListUtility.removeAllTasks(resource, validatorNames, targetObjectName);
+		} catch (CoreException e) {
+			ValidationPlugin.getPlugin().handleException(e);
+		}
+	}
+
+	public static void removeMessageSubset(IResource resource, Class messageOwner, String groupName) {
+		// Since the addMessage(Class, IMessage) is defaulted to the IProject,
+		// remove the message subsets from the IProject
+		removeMessageSubset(resource, new String[]{getUniqueId(messageOwner)}, null, groupName);
+	}
+
+	public static void removeMessageSubset(IResource resource, String messageOwnerId, String groupName) {
+		// Since the addMessage(Class, IMessage) is defaulted to the IProject,
+		// remove the message subsets from the IProject
+		removeMessageSubset(resource, new String[]{messageOwnerId}, null, groupName);
+	}
+
+	public static void removeMessageSubset(IResource resource, String[] ownerId, String targetObjectName, String groupName) {
+		try {
+			TaskListUtility.removeTaskSubset(resource, ownerId, targetObjectName, groupName);
+		} catch (CoreException e) {
+			ValidationPlugin.getPlugin().handleException(e);
+		}
+	}
+
+	/**
+	 * Given a Class instance, return the id that uniquely identifies this instance. (Used as the
+	 * value for the message owner.)
+	 */
+	public static String getUniqueId(Class clazz) {
+		if (clazz == null) {
+			return ""; //$NON-NLS-1$
+		}
+
+		// It is safe to load this String into the constants space because
+		// the Class name will not change during WSAD's session.
+		return clazz.getName().intern();
+	}
+
+	public static String getUniqueId(IValidator validator) {
+		if (validator == null) {
+			return ""; //$NON-NLS-1$
+		}
+		return getUniqueId(validator.getClass());
+	}
+
+	public static String getLocation(IWorkbenchContext helper, IMessage message) {
+		if (message == null) {
+			return getLocationText(helper, null);
+		}
+		int lineNo = message.getLineNumber();
+		if (lineNo == IMessage.LINENO_UNSET) {
+			return getLocationText(helper, message.getTargetObject());
+		}
+		return String.valueOf(lineNo);
+	}
+
+	public static String getLocationText(IWorkbenchContext helper, Object targetObject) {
+		String location = null;
+		try {
+			location = helper.getLocation(targetObject);
+		} catch (Exception e) {
+			ValidationPlugin.getPlugin().handleException(e);
+		}
+		if ((location == null) || (location.trim().equals(""))) { //$NON-NLS-1$
+			location = DEFAULT_LOCATION;
+		}
+		return location;
+	}
+
+	// TODO This method was made protected for the SaberReporter. Make this method private again
+	// once the framework supports IMarker.PRIORITY.
+	protected static String getTargetObjectName(IWorkbenchContext helper, IMessage message) {
+		if (message == null) {
+			return getTargetObjectName(helper, null);
+		}
+		return getTargetObjectName(helper, message.getTargetObject());
+	}
+
+	private static String getTargetObjectName(IWorkbenchContext helper, Object targetObject) {
+		String targetObjectName = null;
+		try {
+			targetObjectName = helper.getTargetObjectName(targetObject);
+		} catch (Exception e) {
+			ValidationPlugin.getPlugin().handleException(e);
+		}
+		return targetObjectName;
+	}
+
+	// TODO This method was made "protected" for the SaberReporter. Do not call this method! This
+	// method will be made private once support for marker PRIORITY attributes is in the framework.
+	protected static ValidatorMetaData getVMD(IValidator validator) throws IllegalArgumentException {
+		ValidatorMetaData vmd = ValidationRegistryReader.getReader().getValidatorMetaData(validator);
+		if (vmd == null) {
+			throw new IllegalArgumentException(); // already logged in the ValidationRegistryReader
+		}
+		return vmd;
+	}
+
+	/**
+	 * @deprecated. The IValidationContext will be ignored.
+	 */
+	public WorkbenchReporter(IWorkbenchContext helper, IProgressMonitor monitor, IProject project) {
+		this(project, monitor);
+	}
+
+	/**
+	 * An IReporter instance must exist for each Runnable in order for the validator to report
+	 * status messages. IProject and IProgressMonitor must not be null.
+	 */
+	public WorkbenchReporter(IProject project, IProgressMonitor monitor) {
+		super();
+		_project = project;
+		_monitor = monitor;
+	}
+
+	// TODO This method was made protected for the SaberReporter. Make it private again once the
+	// framework support IMarker.PRIORITY.
+	protected IWorkbenchContext getHelper(IValidator validator) throws InstantiationException, IllegalArgumentException {
+		ValidatorMetaData vmd = getVMD(validator);
+		IWorkbenchContext helper = vmd.getHelper( getProject(), validator );
+		return helper;
+	}
+	
+	protected static IWorkbenchContext getHelper(IProject project, IValidator validator) throws InstantiationException, IllegalArgumentException {
+		ValidatorMetaData vmd = getVMD(validator);
+		IWorkbenchContext helper = vmd.getHelper( project, validator );
+		return helper;
+	}
+	
+	public IProject getProject() {
+		return _project;
+	}
+
+	public IProgressMonitor getProgressMonitor() {
+		return _monitor;
+	}
+
+	/**
+	 * This method will never return null.
+	 */
+	private IResource getDefaultResource() {
+		IResource prj = getProject();
+		if (prj != null) {
+			return prj;
+		}
+		// return the workspace root
+		return ResourcesPlugin.getWorkspace().getRoot();
+	}
+
+	/**
+	 * When an IMessage is created, the user has the option of creating it with a target object.
+	 * That target object is used to identify which object has the problem identified by the
+	 * IMessage. This method, given the target object, returns the IResource which represents that
+	 * object in the workbench.
+	 */
+	public IResource getMessageResource(IValidator validator, Object object) {
+		if (validator == null) {
+			return null;
+		}
+
+		IResource resource = null;
+		if (object != null) {
+			if (object instanceof IResource) {
+				resource = (IResource) object;
+			} else if (object instanceof WorkbenchFileDelta) {
+				// resource may be null if the WorkbenchFileDelta was constructed from an Object
+				// instead of an IResource
+				resource = ((WorkbenchFileDelta) object).getResource();
+			}
+
+			if (resource == null) {
+				try {
+					IWorkbenchContext helper = getHelper(validator);
+					resource = helper.getResource(object);
+				} catch (InstantiationException e) {
+					try {
+						// Unlikely that an exception will be thrown, because this method is
+						// invoked by the validator, and if the validator is invoked, it's likely
+						// that the helper has been loaded too.
+						ValidatorMetaData vmd = getVMD(validator);
+
+						// Remove the vmd from the reader's list
+						ValidationRegistryReader.getReader().disableValidator(vmd);
+
+						ValidationPlugin.getPlugin().handleException(e);
+					} catch (IllegalArgumentException e2) {
+						// Even the IValidator is invalid. Unfortunately, can't disable the
+						// validator because it can't be found by the registry reader.
+						// Log the reason for the disabled validator
+						ValidationPlugin.getPlugin().handleException(e2);
+					}
+				} catch (IllegalArgumentException e) {
+					// Even the IValidator is invalid. Unfortunately, can't disable the
+					// validator because it can't be found by the registry reader.
+					// Log the reason for the disabled validator
+					ValidationPlugin.getPlugin().handleException(e);
+				} catch (Exception e) {
+					ValidationPlugin.getPlugin().handleException(e);
+				}
+			}
+		}
+
+		if (resource == null) {
+			resource = getDefaultResource();
+		}
+
+		if (!resource.exists()) {
+			resource = getDefaultResource();
+		}
+
+		return resource;
+	}
+
+	/**
+	 * Show a message to the user indicating which subtask is currently being processed. <br>
+	 * <br>
+	 * <code>message</code> may not be null or the empty string (""). <br>
+	 */
+	public void displaySubtask(String message) {
+		if ((message == null) || (message.equals(""))) { //$NON-NLS-1$
+			return;
+		}
+
+		if (getProgressMonitor() != null) {
+			getProgressMonitor().subTask(message);
+		} else {
+			System.out.println(message);
+		}
+	}
+
+	/**
+	 * @see org.eclipse.wst.validation.internal.provisional.core.core.IReporter#getMessages()
+	 */
+	public List getMessages() {
+		return null;
+	}
+
+	/**
+	 * @see org.eclipse.wst.validation.internal.provisional.core.core.IReporter#isCancelled()
+	 */
+	public boolean isCancelled() {
+		if (getProgressMonitor() != null) {
+			return getProgressMonitor().isCanceled();
+		}
+		return false;
+	}
+
+	/**
+	 * @see org.eclipse.wst.validation.internal.provisional.core.core.IReporter#addMessage(IValidator, IMessage)
+	 */
+	public void addMessage(IValidator validator, IMessage message)  {
+		IResource resource = getMessageResource(validator, message.getTargetObject());
+		IWorkbenchContext helper = null;
+		ValidatorMetaData vmd = getVMD(validator);
+		try {
+			helper = getHelper(validator);
+		} catch (InstantiationException e) {
+			try {
+				// Unlikely that an exception will be thrown, because this method is
+				// invoked by the validator, and if the validator is invoked, it's likely
+				// that the helper has been loaded too
+								
+				// Remove the vmd from the reader's list
+				ValidationRegistryReader.getReader().disableValidator(vmd);
+				ValidationPlugin.getPlugin().handleException(e);
+				return;
+			} catch (IllegalArgumentException exc2) {
+				logDisabledValidator(exc2);
+				return;
+			}
+		} catch (IllegalArgumentException exc) {
+			logDisabledValidator(exc);
+			return;
+		}
+
+		if (resource == null) {
+			if (Tracing.isLogging()) {
+				String result = MessageFormat.format(ResourceHandler.getExternalizedMessage(
+					ResourceConstants.VBF_EXC_INVALID_RESOURCE), 
+					new Object[]{message.getText(), getTargetObjectName(helper, message)});
+				Tracing.log("WorkbenchReporter-01: ", result); //$NON-NLS-1$
+			}
+			return;
+		}
+
+		if( validator instanceof IValidatorJob ){
+			cacheMessage( (IValidatorJob)validator, resource, validator.getClass(), message, 
+				getTargetObjectName(helper, message), getLocation(helper, message), getMarkerId(vmd, message) );
+		}else
+			addMessage(resource, validator.getClass(), message, getTargetObjectName(helper, message), 
+				getLocation(helper, message),getMarkerId(vmd,message));
+	}
+
+	private String getMarkerId(ValidatorMetaData vmd, IMessage message) {
+		if (vmd.getMarkerIds() != null) {
+			if (vmd.getMarkerIds().length == 1)
+				return vmd.getMarkerIds()[0];
+			else if (vmd.getMarkerIds().length > 1) {
+				String messageMarkerId = message.getMarkerId();
+				if (messageMarkerId != null && messageMarkerId.length() > 0) {
+					String firstMarkerId = vmd.getMarkerIds()[0];
+					String pluginQualifier = firstMarkerId.substring(0, firstMarkerId.lastIndexOf(".")); //$NON-NLS-1$
+					String qualifiedMessageMarkerId = null;
+					if (messageMarkerId.indexOf(pluginQualifier) == -1)
+						qualifiedMessageMarkerId = pluginQualifier + "." + messageMarkerId; //$NON-NLS-1$
+					else
+						qualifiedMessageMarkerId = messageMarkerId;
+					if (Arrays.asList(vmd.getMarkerIds()).contains(qualifiedMessageMarkerId))
+						return qualifiedMessageMarkerId;
+				}
+			}
+		}
+		return null;
+	}
+
+	private void logDisabledValidator(IllegalArgumentException e) {
+		// Even the IValidator is invalid. Unfortunately, can't disable the
+		// validator because it can't be found by the registry reader.
+		// Log the reason for the disabled validator
+		ValidationPlugin.getPlugin().handleException(e);
+		return;
+	}
+
+	/**
+	 * @see org.eclipse.wst.validation.internal.provisional.core.core.IReporter#displaySubtask(IValidator, IMessage)
+	 */
+	public void displaySubtask(IValidator validator, IMessage message) {
+		if ((message == null) || (message.equals(""))) { //$NON-NLS-1$
+			return;
+		}
+
+		displaySubtask(message.getText(validator.getClass().getClassLoader()));
+	}
+
+	/**
+	 * @see org.eclipse.wst.validation.internal.provisional.core.core.IReporter#removeAllMessages(IValidator)
+	 */
+	public void removeAllMessages(IValidator validator) {
+		if (validator == null) { // getHelper could be null if the user cancelled before something
+			// was fully initialized
+			return;
+		}
+
+		removeAllMessages(validator, null);
+	}
+
+	/**
+	 * @see org.eclipse.wst.validation.internal.provisional.core.core.IReporter#removeAllMessages(IValidator, Object)
+	 */
+	public void removeAllMessages(IValidator validator, Object object) {
+		IResource resource = getMessageResource(validator, object);
+		if (resource == null) {
+			return;
+		}
+
+		ValidatorMetaData vmd = ValidationRegistryReader.getReader().getValidatorMetaData(validator);
+		if (vmd == null) {
+			return;
+		}
+
+		IWorkbenchContext helper = null;
+		try {
+			//helper = vmd.getHelper(resource.getProject());
+			helper = getHelper(validator);
+		} catch (InstantiationException e) {
+			// Unlikely that an exception will be thrown, because this method is
+			// invoked by the validator, and if the validator is invoked, it's likely
+			// that the helper has been loaded too.
+
+			// Remove the vmd from the reader's list
+			ValidationRegistryReader.getReader().disableValidator(vmd);
+			ValidationPlugin.getPlugin().handleException(e);
+
+			return;
+		}
+
+		String[] validatorNames = vmd.getValidatorNames();
+		String targetObjectName = getTargetObjectName(helper, object);
+		removeAllMessages(resource, validatorNames, targetObjectName);
+	}
+
+	/**
+	 * @see org.eclipse.wst.validation.internal.provisional.core.core.IReporter#removeMessageSubset(IValidator, Object, String)
+	 */
+	public void removeMessageSubset(IValidator validator, Object obj, String groupName) {
+		IResource resource = getMessageResource(validator, obj);
+		if (resource == null) {
+			return;
+		}
+
+		ValidatorMetaData vmd = ValidationRegistryReader.getReader().getValidatorMetaData(validator);
+		if (vmd == null) {
+			return;
+		}
+
+
+		IWorkbenchContext helper = null;
+		try {
+			//helper = vmd.getHelper(resource.getProject());
+			helper = getHelper( resource.getProject(), validator );
+		} 
+		catch (InstantiationException e) {
+			// Unlikely that an exception will be thrown, because this method is
+			// invoked by the validator, and if the validator is invoked, it's likely
+			// that the helper has been loaded too.
+
+			// Remove the vmd from the reader's list
+			ValidationRegistryReader.getReader().disableValidator(vmd);
+			ValidationPlugin.getPlugin().handleException(e);
+
+			return;
+		}
+
+		String[] validatorNames = vmd.getValidatorNames();
+		String targetObjectName = getTargetObjectName(helper, obj);
+		removeMessageSubset(resource, validatorNames, targetObjectName, groupName);
+	}
+	
+	private static void cacheMessage( IValidatorJob validator,
+		IResource resource,	Class clazz, IMessage message,
+		String targetObjectName, String location, String markerId ){
+		
+		if ((clazz == null) || (message == null) || (resource == null))return;
+		
+		ClassLoader cl = clazz.getClassLoader();
+		String text = message.getText(cl);
+		MessageInfo msgInfo = new MessageInfo(getUniqueId(clazz), resource, location,
+				text, targetObjectName, markerId, message );
+
+		ValidatorManager.getManager().cacheMessage( validator, msgInfo );
+	}
+}
diff --git a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/plugin/ValidationHelperRegistryReader.java b/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/plugin/ValidationHelperRegistryReader.java
new file mode 100644
index 0000000..887f7cd
--- /dev/null
+++ b/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/plugin/ValidationHelperRegistryReader.java
@@ -0,0 +1,103 @@
+/*******************************************************************************
+ * Copyright (c) 2001, 2008 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.wst.validation.internal.plugin;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.eclipse.core.runtime.IConfigurationElement;
+import org.eclipse.core.runtime.IExtension;
+import org.eclipse.core.runtime.IExtensionPoint;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Platform;
+import org.eclipse.wst.validation.internal.IProjectValidationHelper;
+
+public class ValidationHelperRegistryReader {
+
+	/** validationHelper - extension point name. */
+	public static final String VALIDATION_HELPER = "validationHelper"; //$NON-NLS-1$
+	
+	static final String ATT_ID = "id"; //$NON-NLS-1$ 
+	
+	/** helperClass - class that implements the extension. */
+	static final String ATT_HELPER_CLASS = "helperClass"; //$NON-NLS-1$
+	
+	private static ValidationHelperRegistryReader INSTANCE = null;
+	private List<IProjectValidationHelper> _validationHelpers;
+	
+	public ValidationHelperRegistryReader() {
+	}
+	
+	public static ValidationHelperRegistryReader getInstance() {
+		if (INSTANCE == null) {
+			INSTANCE = new ValidationHelperRegistryReader();
+			INSTANCE.readRegistry();
+		}
+		return INSTANCE;
+	}
+
+	/**
+	 * Read the extension point and parse it.
+	 */
+	public void readRegistry() {
+		IExtensionPoint point = Platform.getExtensionRegistry()
+			.getExtensionPoint(ValidationPlugin.PLUGIN_ID, VALIDATION_HELPER);
+		if (point == null)return;
+		IConfigurationElement[] elements = point.getConfigurationElements();
+		for (int i = 0; i < elements.length; i++) {
+			internalReadElement(elements[i]);
+		}
+	}
+	
+	private void internalReadElement(IConfigurationElement element) {
+		boolean recognized = this.readElement(element);
+		if (!recognized) {
+			logError(element, "Error processing extension: " + element); //$NON-NLS-1$
+		}
+	}
+
+	/*
+	 * Logs the error in the desktop log using the provided text and the information in the configuration element.
+	 */
+	protected void logError(IConfigurationElement element, String text) {
+		IExtension extension = element.getDeclaringExtension();
+		StringBuffer buf = new StringBuffer();
+		buf.append("Plugin " + extension.getContributor().getName() + ", extension " + extension.getExtensionPointUniqueIdentifier()); //$NON-NLS-1$ //$NON-NLS-2$
+		buf.append("\n" + text); //$NON-NLS-1$
+		ValidationPlugin.getPlugin().logMessage(IStatus.ERROR, buf.toString());
+	}
+
+	private List<IProjectValidationHelper> getValidationHelpers() {
+		if (_validationHelpers == null)
+			_validationHelpers = new ArrayList<IProjectValidationHelper>();
+		return _validationHelpers;
+	}
+
+	public boolean readElement(IConfigurationElement element) {
+		if (!element.getName().equals(VALIDATION_HELPER))
+			return false;
+		IProjectValidationHelper helper = null;
+		try {
+			helper = (IProjectValidationHelper) element.createExecutableExtension(ATT_HELPER_CLASS);
+			getValidationHelpers().add(helper);
+			return true;
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+		return false;
+	}
+	
+	public IProjectValidationHelper getValidationHelper() {
+		if (getValidationHelpers().isEmpty())return null;
+		return getValidationHelpers().get(0);
+	}
+
+}
diff --git a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/plugin/ValidationPlugin.java b/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/plugin/ValidationPlugin.java
new file mode 100644
index 0000000..4713fd2
--- /dev/null
+++ b/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/plugin/ValidationPlugin.java
@@ -0,0 +1,182 @@
+/*******************************************************************************
+ * Copyright (c) 2001, 2010 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.wst.validation.internal.plugin;
+
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IResourceChangeEvent;
+import org.eclipse.core.resources.IWorkspace;
+import org.eclipse.core.resources.ProjectScope;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Platform;
+import org.eclipse.core.runtime.Plugin;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.core.runtime.preferences.IEclipsePreferences;
+import org.eclipse.core.runtime.preferences.IScopeContext;
+import org.eclipse.wst.validation.ValidationFramework;
+import org.eclipse.wst.validation.internal.DependencyIndex;
+import org.eclipse.wst.validation.internal.EventManager;
+import org.eclipse.wst.validation.internal.ProjectUnavailableError;
+import org.eclipse.wst.validation.internal.ResourceUnavailableError;
+import org.eclipse.wst.validation.internal.Tracing;
+import org.eclipse.wst.validation.internal.core.Message;
+import org.eclipse.wst.validation.internal.provisional.core.IMessage;
+import org.osgi.framework.Bundle;
+import org.osgi.framework.BundleContext;
+
+/**
+ * How does this plug-in get activated? There are many other plug-ins that depend on this plug-in, so there are
+ * many paths that will activate it. One common path is the J2EE perspective. If the J2EE plug-in start method, they
+ * reference a class in this plug-in, which activates the plug-in. For that case this plug-in will be active even before
+ * the workbench is up.
+ */
+public class ValidationPlugin extends Plugin {
+	public static final String 	VALIDATION_PROP_FILE_NAME = "validate_base"; //$NON-NLS-1$
+	
+	/** org.eclipse.wst.validation - the plug-in id */
+	public static final String 	PLUGIN_ID = "org.eclipse.wst.validation"; //$NON-NLS-1$
+	private static ValidationPlugin _plugin;
+	private static Message 		_message;
+	public static final String VALIDATION_BUILDER_ID = PLUGIN_ID + ".validationbuilder"; //$NON-NLS-1$// plugin id of the validation builder
+	public static final String VALIDATOR_EXT_PT_ID = "validator"; //$NON-NLS-1$// extension point declaration of the validator 
+
+	public ValidationPlugin() {
+		super();
+		if (_plugin == null)_plugin = this;
+	}
+	
+	/**
+	 * Answer the name of the bundle's property file.
+	 * 
+	 * @deprecated Use getBundlePropertyFileName() instead.
+	 */
+	public static String getBundleName() {
+		return getBundlePropertyFileName();
+	}
+
+	/**
+	 * Answer the name of the bundle's property file.
+	 */
+	public static String getBundlePropertyFileName() {
+		return VALIDATION_PROP_FILE_NAME;
+	}
+
+	public static Message getMessage() {
+		if (_message == null) {
+			_message = new Message();
+			_message.setBundleName(getBundlePropertyFileName());
+		}
+		// clear the message for reuse
+		_message.setId(null);
+		_message.setParams(null);
+		_message.setTargetObject(null);
+		_message.setGroupName(null);
+		_message.setSeverity(IMessage.LOW_SEVERITY);
+		return _message;
+	}
+
+	public static ValidationPlugin getPlugin() {
+		return _plugin;
+	}
+
+	public static boolean isActivated() {
+		Bundle bundle = Platform.getBundle(PLUGIN_ID);
+		if (bundle != null)
+			return bundle.getState() == Bundle.ACTIVE;
+		return false;
+	}
+
+	public void start(BundleContext context) throws Exception {
+		super.start(context);
+		ResourcesPlugin.getWorkspace().addResourceChangeListener(EventManager.getManager(), 
+			IResourceChangeEvent.PRE_CLOSE | IResourceChangeEvent.PRE_DELETE | 
+			IResourceChangeEvent.POST_BUILD | IResourceChangeEvent.PRE_BUILD | IResourceChangeEvent.POST_CHANGE);
+
+		DependencyIndex di = (DependencyIndex)ValidationFramework.getDefault().getDependencyIndex();
+		IWorkspace ws = ResourcesPlugin.getWorkspace();
+		ws.addSaveParticipant(this, di);
+//		ws.addResourceChangeListener(ValOperationManager.getDefault(), 
+//			IResourceChangeEvent.POST_BUILD | IResourceChangeEvent.PRE_BUILD);
+
+	}
+
+	public void stop(BundleContext context) throws Exception {
+		super.stop(context);
+		ResourcesPlugin.getWorkspace().removeResourceChangeListener( EventManager.getManager() );		
+		ValidationFramework.getDefault().join(null);
+//		ResourcesPlugin.getWorkspace().removeResourceChangeListener( ValOperationManager.getDefault() );		
+		EventManager.getManager().shutdown();
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see org.eclipse.wst.common.frameworks.internal.WTPPlugin#getPluginID()
+	 */
+	public String getPluginID() {
+		return PLUGIN_ID;
+	}
+	
+	public static IEclipsePreferences getPreferences(IProject project){
+		IScopeContext projectContext = new ProjectScope(project);
+		return projectContext.getNode(PLUGIN_ID);
+	}
+	
+	/**
+	 * Write this exception to the log.
+	 * <p>
+	 * We are in the transition of moving to a new approach for localized messages. This is the new 
+	 * approach for exceptions.
+	 * 
+	 * @param e the throwable, this can be null in which case it is a nop.
+	 */
+	public void handleException(Throwable e){
+		handleException(e, IStatus.ERROR);
+	}
+	
+	/**
+	 * Write this exception to the log.
+	 * <p>
+	 * We are in the transition of moving to a new approach for localized messages. This is the new 
+	 * approach for exceptions.
+	 * 
+	 * @param e the throwable, this can be null in which case it is a nop.
+	 * @param severity the severity of the message. This must be one of the IStatus severities. 
+	 */
+	public void handleException(Throwable e, int severity){
+		if (e == null)return;
+		Status status = new Status(severity, PLUGIN_ID, e.getLocalizedMessage(), e);
+		getLog().log(status);
+	}
+	
+	public void handleProjectUnavailableError(ProjectUnavailableError e){
+		if (Tracing.isLogging())handleException(e);
+	}
+	
+	public void handleResourceUnavailableError(ResourceUnavailableError e){
+		if (Tracing.isLogging())handleException(e);
+	}
+	
+	/** 
+	 * Write a message into the log. 
+	 * 
+	 * We are in the transition of moving to a new approach for localized messages. This is the new 
+	 * approach for exceptions.
+	 * 
+	 * @param severity message severity, see IStaus
+	 * @param message a localized message
+	 */
+	public void logMessage(int severity, String message){
+		Status status = new Status(severity, PLUGIN_ID, message);
+		getLog().log(status);
+		
+	}	
+}
diff --git a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/provisional/ValidationFactory.java b/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/provisional/ValidationFactory.java
new file mode 100644
index 0000000..caa4614
--- /dev/null
+++ b/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/provisional/ValidationFactory.java
@@ -0,0 +1,46 @@
+/*******************************************************************************
+ * Copyright (c) 2001, 2004 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ * IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.wst.validation.internal.provisional;
+
+import org.eclipse.wst.validation.internal.ValidationFactoryImpl;
+import org.eclipse.wst.validation.internal.provisional.core.IValidator;
+
+/**
+ * This interface provides a way to access an instance of the ValidationFactoryImpl
+ * instance, an internal implementation that provides access to some of the internal state
+ * of validators.
+ * 
+ * @plannedfor 1.0
+ * 
+ * [issue: LM - 2 issues.
+ *  1. I don't think the name 'factory' provides a good description of 
+ *     this interface. Unless I'm mistaken the ValidationFactory doesn't
+ *     actually create validators but simply returns existing validators.
+ *     Looking at the implementation this is currently the case. I suggest
+ *     renaming this to ValidatorRegistry or something similar.
+ *  2. I think the common way for creating a factory is to create a class
+ *     with a static method such as getFactory. If this is to be a factory
+ *     it should probably be structured as per the convention.]
+ */
+public interface ValidationFactory {
+	
+	ValidationFactory instance = ValidationFactoryImpl.getInstance();
+	/**
+	 * This api returns the IValidator given the validatorUniqueName id. The unique
+	 * id name is the class name that is defined in the class name element in the 
+	 * plugin extension of the validator.
+	 * @param validatorUniqueId
+	 * @return IValidator
+	 * @plannedfor WTP 1.0
+	 */
+	public IValidator getValidator(String validatorUniqueId) throws InstantiationException;
+
+}
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/IRootObjectResource.java b/plugins/org.eclipse.wst.validation/validate_core/org/eclipse/wst/validation/internal/core/EmptySchedulingRule.java
similarity index 60%
copy from plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/IRootObjectResource.java
copy to plugins/org.eclipse.wst.validation/validate_core/org/eclipse/wst/validation/internal/core/EmptySchedulingRule.java
index 7048136..dacb599 100644
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/IRootObjectResource.java
+++ b/plugins/org.eclipse.wst.validation/validate_core/org/eclipse/wst/validation/internal/core/EmptySchedulingRule.java
@@ -8,12 +8,18 @@
  * Contributors:
  *     IBM Corporation - initial API and implementation
  *******************************************************************************/
-package org.eclipse.wst.common.internal.emf.resource;
+package org.eclipse.wst.validation.internal.core;
 
-import org.eclipse.emf.ecore.EObject;
+import org.eclipse.core.runtime.jobs.ISchedulingRule;
 
-public interface IRootObjectResource {
+public class EmptySchedulingRule implements ISchedulingRule {
+		
+    public boolean contains(ISchedulingRule rule) 
+    {
+         return rule == this;
+    }
 
-	public EObject getRootObject();
-
+    public boolean isConflicting(ISchedulingRule rule) {
+         return rule == this;
+    }
 }
diff --git a/plugins/org.eclipse.wst.validation/validate_core/org/eclipse/wst/validation/internal/core/FileDelta.java b/plugins/org.eclipse.wst.validation/validate_core/org/eclipse/wst/validation/internal/core/FileDelta.java
new file mode 100644
index 0000000..04e6ba7
--- /dev/null
+++ b/plugins/org.eclipse.wst.validation/validate_core/org/eclipse/wst/validation/internal/core/FileDelta.java
@@ -0,0 +1,84 @@
+/*******************************************************************************
+ * Copyright (c) 2001, 2007 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.wst.validation.internal.core;
+
+
+
+/**
+ * <p>
+ * Default implementation of the IFileDelta
+ * </p>
+ * 
+ * @see org.eclipse.wst.validation.internal.core.IFileDelta
+ * 
+ *  [issue: CS - is there a reason that we need to expose this impl class as an API?
+ *   It would seem better to only expose IFileDelta.  I can't think of a reason where 
+ *   a typical client would need to create one of these.]
+ */
+public class FileDelta implements IFileDelta {
+	private int fileDelta;
+	private String fileName;
+
+	/**
+	 * <p>
+	 * Creates a default instance of the FileDelta
+	 * </p>
+	 */
+	public FileDelta() {
+		super();
+	}
+	
+	/**
+	 * <p>
+	 * Constructor is used to initialize the fields. 
+	 * </p>
+	 * 
+	 * @param aFileName specifies the file name
+	 * @param aFileDelta specifies the 
+	 */
+	public FileDelta(String aFileName, int aFileDelta) {
+		fileName = aFileName;
+		fileDelta = aFileDelta;
+	}
+
+	/**
+	 * @see IFileDelta#getDeltaType()
+	 */
+	public int getDeltaType() {
+		return fileDelta;
+	}
+
+	/**
+	 * @see IFileDelta#getFileName()
+	 */
+	public String getFileName() {
+		return fileName;
+	}
+
+	/**
+	 * <p>
+	 * Set the flag which indicates the type of change that the file 
+	 * has undergone.
+	 * </p>
+	 */
+	public void setDeltaType(int deltaType) {
+		fileDelta = deltaType;
+	}
+
+	/**
+	 * <p>
+	 * Set the name of the file which has changed.
+	 * </p>
+	 */
+	public void setFileName(String aFileName) {
+		fileName = aFileName;
+	}
+}
diff --git a/plugins/org.eclipse.wst.validation/validate_core/org/eclipse/wst/validation/internal/core/IFileDelta.java b/plugins/org.eclipse.wst.validation/validate_core/org/eclipse/wst/validation/internal/core/IFileDelta.java
new file mode 100644
index 0000000..b848eed
--- /dev/null
+++ b/plugins/org.eclipse.wst.validation/validate_core/org/eclipse/wst/validation/internal/core/IFileDelta.java
@@ -0,0 +1,65 @@
+/*******************************************************************************
+ * Copyright (c) 2001, 2007 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.wst.validation.internal.core;
+
+/**
+ * <p>
+ * This interface is used, for incremental validation, to encapsulate the change 
+ * status of a resource. IFileDelta contains the name of the file which has 
+ * changed, and a flag which indicates the type of change which has occurred.
+ * 
+ * @plannedfor 1.0
+ * </p>
+ * [issue: LM - From speaking with Vijay the name IFileDelta doesn't really capture
+ *  what this interface is for. Validation may occur of files, it may occur on resources,
+ *  or it may occur on something more abstract simply known as an artifact. The delta part
+ *  of the name also seems misleading as this interface doesn't provide the delta but
+ *  rather provides the type of change. I suggest renaming this interface to IModifiedArtifact
+ *  or something along those lines to better capture its use. ]
+ */
+public interface IFileDelta {
+	
+	/** 1 - the file has been added */
+	int ADDED = 1;
+	
+	/** 2 - the file has been changed */
+	int CHANGED = 2;
+	
+	/** 3 - the file has been deleted */
+	int DELETED = 3;
+
+	/**
+	 * <p>
+	 * Returns the flag which indicates the type of change which has occurred:
+	 * IFileDelta.ADDED, IFileDelta.CHANGED, or IFileDelta.DELETED.
+	 * </p>
+	 * @return returns the delta type.
+	 * @plannedfor WTP 1.0
+	 * 
+	 * [issue: LM - From my experience a validator simply needs to know what artifact needs
+	 *  to be validated. Can you provide a use case where the type of change is needed for
+	 *  validation? ]
+	 */
+	int getDeltaType();
+
+	/**
+	 * <p>
+	 * Returns the name of the eclipse resource file which has changed. The return value must not be 
+	 * null or the empty string ("").
+	 * </p>
+	 * @return returns the file name.
+	 * @plannedfor WTP 1.0
+	 * 
+	 * [issue: LM - Following my comments above this method should be renamed to getArtifactName or
+	 *  something that follows along with the interface rename. ]
+	 */
+	String getFileName();
+}
diff --git a/plugins/org.eclipse.wst.validation/validate_core/org/eclipse/wst/validation/internal/core/IMessageAccess.java b/plugins/org.eclipse.wst.validation/validate_core/org/eclipse/wst/validation/internal/core/IMessageAccess.java
new file mode 100644
index 0000000..af85f64
--- /dev/null
+++ b/plugins/org.eclipse.wst.validation/validate_core/org/eclipse/wst/validation/internal/core/IMessageAccess.java
@@ -0,0 +1,47 @@
+/*******************************************************************************
+ * Copyright (c) 2001, 2007 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.wst.validation.internal.core;
+
+
+import java.util.List;
+import java.util.Locale;
+
+
+/**
+ * <p>
+ * Interface which can be used to access messages which are stored within a reporter which retains
+ * its message history.
+ * </p>
+ * 
+ * [issue: CS - This interface seems like overkill.  I'd think that an IReport should simply have a getMessages() method.
+ * I think MessageFiltering should take place at the 'display' level and not at this level of the API.]
+ */
+public interface IMessageAccess {
+	/**
+	 * @param filter
+	 *            A filter which specifies a subset of messages to retrieve. null specifies, "all
+	 *            messages".
+	 * @return List list of messages related to the target object
+	 */
+	abstract List getMessages(MessageFilter filter);
+
+	/**
+	 * @param filter
+	 *            A filter which specifies a subset of messages to retrieve. null specifies, "all
+	 *            messages".
+	 * @param locale
+	 *            The target local to translate the messages into. null specifies, "use default
+	 *            locale".
+	 * @return List a list of messages related to the target object, translated into the specified
+	 * locale.
+	 */
+	abstract List getMessagesAsText(MessageFilter filter, Locale targetLocale);
+}
diff --git a/plugins/org.eclipse.wst.validation/validate_core/org/eclipse/wst/validation/internal/core/Message.java b/plugins/org.eclipse.wst.validation/validate_core/org/eclipse/wst/validation/internal/core/Message.java
new file mode 100644
index 0000000..8998112
--- /dev/null
+++ b/plugins/org.eclipse.wst.validation/validate_core/org/eclipse/wst/validation/internal/core/Message.java
@@ -0,0 +1,398 @@
+/*******************************************************************************
+ * Copyright (c) 2001, 2007 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.wst.validation.internal.core;
+
+
+import java.util.HashMap;
+import java.util.Locale;
+import java.util.MissingResourceException;
+import java.util.ResourceBundle;
+
+import org.eclipse.wst.validation.internal.provisional.core.IMessage;
+
+/**
+ * <p>
+ * Default implementation of the IMessage interface, provided for the convenience of the
+ * IValidators. If an IValidator needs to run in both AAT and WSAD then this IMessage implementation
+ * should be used; if the IValidator runs in WSAD alone, the WSAD LocalizedMessage may be used in
+ * place of this implementation.
+ * <p>
+ * @see org.eclipse.wst.validation.internal.provisional.core.IMessage
+ * 
+ * [issue: CS - I'd suggest splitting this class into Message and BundleMessage (where the latter inherits
+ * from the former.  We have many messages that come (from xerces) pretranslated and don't require 'bundle'
+ * related fields and methods. Splitting this class would make it easier to understand where bundle related
+ * function is coming into play. Below I've listed out what would go into BundleMessage to demonstrate how 
+ * we can simplify the 'Message' class by factoring out the bundle related details.
+ * 
+ * Message
+ *	private Object targetObject = null;
+ *	private String groupName = null;
+ *	private int lineNumber = IMessage.LINENO_UNSET;
+ *	private int length = IMessage.OFFSET_UNSET;
+ *	private int offset = IMessage.OFFSET_UNSET;
+ *
+ *    
+ * BundleMessage
+ *	private String id = null;
+ *	private String[] params = null;
+ *	private String bundleName = null;
+ *   
+ *   - getId()
+ *   - getBundle(...)
+ *   - getBundleName()
+ *   - getParams()
+ *   - getText(Locale)
+ *   - getText(ClassLoader)
+ *   - getText(Locale, ClassLoader)
+ *   - setId(String)
+ *   - setBundleName(String)
+ *   - setParams(String[])
+ * ]
+ */
+public class Message implements IMessage {
+	private String id;
+	private String[] params;
+	private int severity = MessageFilter.ANY_SEVERITY;
+	private Object targetObject;
+	private String bundleName;
+	private String groupName;
+	private int lineNumber = IMessage.LINENO_UNSET;
+	private int length = IMessage.OFFSET_UNSET;
+	private int offset = IMessage.OFFSET_UNSET;
+	private HashMap<String, Object> messageAttributes;
+	private String markerId;
+
+	/**
+	 * <p>
+	 * Creates a default instance of the Message
+	 * </p>
+	 */
+	public Message() {
+		super();
+	}
+
+	/**
+	 * <p>
+	 * Creates a Message object with bundle name, severity and a unique id
+	 * </p>
+	 * 
+	 * @param aBundleName 
+	 * 			Must not be null or the empty string (""). 
+	 * @param aSeverity 
+	 * 			Must be one of the severities specified in IMessage. 
+	 * @param anId 
+	 * 			Must not be null or the empty string ("").
+	 */
+	public Message(String aBundleName, int aSeverity, String anId) {
+		this(aBundleName, aSeverity, anId, null, null);
+	}
+
+	/**
+	 * <p>
+	 * Creates a Message object with bundle name, severity, a unique id, and 
+	 * a list of parameters. 
+	 * </p>
+	 * 
+	 * @param aBundleName 
+	 * 			Must not be null or the empty string (""). 
+	 * @param aSeverity 
+	 * 			Must be one of the severities specified in IMessage.
+	 * @param anId 
+	 * 			Must not be null or the empty string ("").
+	 * @param aParams 
+	 * 			May be null, if there are no parameters in the message.
+	 */
+	public Message(String aBundleName, int aSeverity, String anId, String[] aParams) {
+		this(aBundleName, aSeverity, anId, aParams, null);
+	}
+	
+	/**
+	 * <p>
+	 * Creates a Message object with bundle name, severity, a unique id, and 
+	 * a list of parameters and the target object.
+	 * </p>
+	 * 
+	 * @param aBundleName 
+	 * 			Must not be null or the empty string (""). 
+	 * @param aSeverity 
+	 * 			Must be one of the severities specified in IMessage.
+	 * @param anId 
+	 * 			Must not be null or the empty string ("").
+	 * @param aParams 
+	 * 			May be null, if there are no parameters in the message.
+	 * @param targetObject 
+	 * 			May be null, if the message does not pertain to a particular 
+	 * 			object.
+	 */
+	public Message(String aBundleName, int aSeverity, String anId, String[] aParams, Object aTargetObject) {
+		bundleName = aBundleName;
+		severity = aSeverity;
+		id = anId;
+		params = aParams;
+		targetObject = aTargetObject;
+	}
+	
+	public Message(String aBundleName, int aSeverity, String anId, String[] aParams, Object aTargetObject, String aGroupName) {
+		bundleName = aBundleName;
+		severity = aSeverity;
+		id = anId;
+		params = aParams;
+		targetObject = aTargetObject;
+		groupName = aGroupName;
+	}
+
+	/**
+	 * @return the resource bundle which contains the messages, as identified by
+	 * 
+	 * @link #getBundleName()
+	 */
+	public ResourceBundle getBundle(Locale locale, ClassLoader classLoader) {
+		ResourceBundle bundle = null;
+		try {
+			if (classLoader == null) {
+				bundle = ResourceBundle.getBundle(getBundleName(), locale);
+			} else {
+				bundle = ResourceBundle.getBundle(getBundleName(), locale, classLoader);
+			}
+		} catch (MissingResourceException e) {
+			//try to  load the bundle from the validation framework plugin
+			bundle = getFrameworkBundle(locale);
+		}
+		return bundle;
+	}
+
+	private ResourceBundle getFrameworkBundle(Locale locale) {
+		ResourceBundle bundle = null;
+		try {
+			bundle = ResourceBundle.getBundle(getBundleName(), locale, this.getClass().getClassLoader());
+			
+		} catch (MissingResourceException e) {
+			e.printStackTrace();
+		}
+		return bundle;
+	}
+	
+	/**
+	 * @see IMessage#getBundleName()
+	 */
+	public String getBundleName() {
+		return bundleName;
+	}
+
+	/**
+	 * @see IMessage#getGroupName()
+	 */
+	public String getGroupName() {
+		return groupName;
+	}
+
+	/**
+	 * @see IMessage#getId()
+	 */
+	public String getId() {
+		return id;
+	}
+
+	/**
+	 * @see IMessage#getLength()
+	 */
+	public int getLength() {
+		return length;
+	}
+
+	/**
+	 * @see IMessage#getLineNumber()
+	 */
+	public int getLineNumber() {
+		return lineNumber;
+	}
+
+	/**
+	 * @see IMessage#getOffset()
+	 */
+	public int getOffset() {
+		return offset;
+	}
+
+	/**
+	 * @see IMessage#getParams()
+	 */
+	public String[] getParams() {
+		return params;
+	}
+
+	/**
+	 * @see IMessage#getSeverity()
+	 */
+	public int getSeverity() {
+		return severity;
+	}
+
+	/**
+	 * @see IMessage#getTargetObject()
+	 */
+	public Object getTargetObject() {
+		return targetObject;
+	}
+
+	/**
+	 * @see IMessage#getText()
+	 */
+	public String getText() {
+		return getText(Locale.getDefault(), null);
+	}
+
+	/**
+	 * @see IMessage#getText(ClassLoader)
+	 */
+	public String getText(ClassLoader classLoader) {
+		return getText(Locale.getDefault(), classLoader);
+	}
+
+	/**
+	 * @see IMessage#getText(Locale)
+	 */
+	public String getText(Locale locale) {
+		return getText(locale, null);
+	}
+
+	/**
+	 * @see IMessage#getText(Locale, ClassLoader)
+	 */
+	public java.lang.String getText(Locale locale, ClassLoader classLoader) {
+		String message = ""; //$NON-NLS-1$
+
+		if (locale == null) {
+			return message;
+		}
+
+		ResourceBundle bundle = getBundle(locale, classLoader);
+		if (bundle == null) {
+			return message;
+		}
+
+		try {
+			message = bundle.getString(getId());
+
+			if (getParams() != null) {
+				message = java.text.MessageFormat.format(message, (Object[])getParams());
+			}
+		} catch (MissingResourceException exc) {
+			System.err.println(exc.getMessage());
+			System.err.println(getId());
+		} catch (NullPointerException exc) {
+			System.err.println(exc.getMessage());
+			System.err.println(getId());
+		}
+
+		return message;
+	}
+
+	/**
+	 * @see IMessage#setBundleName(String)
+	 */
+	public void setBundleName(String aBundleName) {
+		bundleName = aBundleName;
+	}
+
+	/**
+	 * @see IMessage#setGroupName(String)
+	 */
+	public void setGroupName(String name) {
+		groupName = name;
+	}
+
+	/**
+	 * @see IMessage#setId(String)
+	 */
+	public void setId(String newId) {
+		id = newId;
+	}
+
+	/**
+	 * @see IMessage#setLength(int)
+	 */
+	public void setLength(int length) {
+		if (length < 0) {
+			length = IMessage.OFFSET_UNSET;
+		}
+		this.length = length;
+	}
+
+	/**
+	 * @see IMessage#setLineNo(int)
+	 */
+	public void setLineNo(int lineNumber) {
+		if (lineNumber < 0) {
+			this.lineNumber = IMessage.LINENO_UNSET;
+		} else {
+			this.lineNumber = lineNumber;
+		}
+	}
+
+	/**
+	 * @see IMessage#setOffset(int)
+	 */
+	public void setOffset(int offset) {
+		if (offset < 0) {
+			offset = IMessage.OFFSET_UNSET;
+		}
+		this.offset = offset;
+	}
+
+	/**
+	 * @see IMessage#setParams(String[])
+	 */
+	public void setParams(String[] newParams) {
+		params = newParams;
+	}
+
+	/**
+	 * @see IMessage#setSeverity(int)
+	 */
+	public void setSeverity(int newSeverity) {
+		severity = newSeverity;
+	}
+
+	/**
+	 * @see IMessage#setTargetObject(Object)
+	 */
+	public void setTargetObject(Object obj) {
+		targetObject = obj;
+	}
+
+	public Object getAttribute(String attributeName) {
+		if(messageAttributes != null) {
+			return messageAttributes.get(attributeName);
+		}
+		return null;
+	}
+
+	public void setAttribute(String attributeName, Object value) {
+		if(messageAttributes == null) {
+			messageAttributes = new HashMap<String, Object>();
+		}
+		messageAttributes.put(attributeName,value);
+	}
+	
+	public HashMap<String,Object> getAttributes() {
+		return messageAttributes;
+	}
+
+	public String getMarkerId() {
+		return markerId;
+	}
+
+	public void setMarkerId(String markerId) {
+		this.markerId = markerId;
+	}
+}
diff --git a/plugins/org.eclipse.wst.validation/validate_core/org/eclipse/wst/validation/internal/core/MessageFilter.java b/plugins/org.eclipse.wst.validation/validate_core/org/eclipse/wst/validation/internal/core/MessageFilter.java
new file mode 100644
index 0000000..a8e97a3
--- /dev/null
+++ b/plugins/org.eclipse.wst.validation/validate_core/org/eclipse/wst/validation/internal/core/MessageFilter.java
@@ -0,0 +1,129 @@
+/*******************************************************************************
+ * Copyright (c) 2001, 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
+ *******************************************************************************/
+package org.eclipse.wst.validation.internal.core;
+
+import org.eclipse.wst.validation.internal.provisional.core.IValidator;
+
+
+/**
+ * <p>
+ * Encapsulates common message filtering parameters. Message Filters are used when retrieving
+ * messages via an IMessageAccess. The filter encapsulates a simple set of typical filter criteria
+ * which is used to select a subset of messages to retrieve. If multiple attributes of the message
+ * filter are specified, they should be logically AND'd together by the MessageAccess
+ * implementation.
+ * </p>
+ */
+public class MessageFilter {
+	public static final int ANY_SEVERITY = -1;
+
+	/**
+	 * <p>
+	 * Messages matching this severity(s) will be retrieved. One of SeverityEnum XXX_severity
+	 * constants, or ANY_SEVERITY to specify that messages of any severity will be returned. This
+	 * field can be combined with other filter attributes to narrow the selection set further.
+	 * </p>
+	 */
+	private int severity = ANY_SEVERITY;
+
+	/**
+	 * <p>
+	 * The validator which reported the messages that should be returned. All messages which were
+	 * reported using validator matching this validator will be returned. This field can be combined
+	 * with other filter attributes to narrow the selection set further.
+	 * </p>
+	 */
+	private IValidator validator;
+
+	/**
+	 * <p>
+	 * The target object of the messages that should be returned, or null to specify to retrieve
+	 * messages of any target. All messages having a target object matching this object will be
+	 * returned. This field can be combined with other filter attributes to narrow the selection set
+	 * further.
+	 * </p>
+	 */
+	private Object targetObject;
+
+	/**
+	 * @deprecated
+	 */
+	public MessageFilter() {
+		super();
+	}
+
+	/**
+	 * 
+	 * @param aSeverity
+	 * 			Severity of the message
+	 * @param validator
+	 * 			IValidator which reported the message
+	 * @param aTargetObject
+	 * 			Target object of the message
+	 */
+	public MessageFilter(int aSeverity, IValidator validator, Object aTargetObject) {
+		super();
+		severity = aSeverity;
+		this.validator = validator;
+		targetObject = aTargetObject;
+	}
+
+	/**
+	 * @return the severity filter constraint.
+	 */
+	public int getSeverity() {
+		return severity;
+	}
+
+	/**
+	 * @return the target object filter constraint.
+	 */
+	public java.lang.Object getTargetObject() {
+		return targetObject;
+	}
+
+	/**
+	 * @return the validator to filter on.
+	 */
+	public IValidator getValidator() {
+		return validator;
+	}
+
+	/**
+	 * Set the severity filter constraint.
+	 * 
+	 * @param newSeverity
+	 *            severity filter constraint
+	 */
+	public void setSeverity(int newSeverity) {
+		severity = newSeverity;
+	}
+
+	/**
+	 * Set the target object filter constraint.
+	 * 
+	 * @param newTargetObject
+	 *             target object filter constraint
+	 */
+	public void setTargetObject(java.lang.Object newTargetObject) {
+		targetObject = newTargetObject;
+	}
+
+	/**
+	 * Set the validator to return messages for.
+	 * 
+	 * @param validator
+	 *            validator to return messages for
+	 */
+	public void setValidator(IValidator validator) {
+		this.validator = validator;
+	}
+}
diff --git a/plugins/org.eclipse.wst.validation/validate_core/org/eclipse/wst/validation/internal/core/ValidationException.java b/plugins/org.eclipse.wst.validation/validate_core/org/eclipse/wst/validation/internal/core/ValidationException.java
new file mode 100644
index 0000000..f8970a7
--- /dev/null
+++ b/plugins/org.eclipse.wst.validation/validate_core/org/eclipse/wst/validation/internal/core/ValidationException.java
@@ -0,0 +1,165 @@
+/*******************************************************************************
+ * Copyright (c) 2001, 2007 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.wst.validation.internal.core;
+
+
+import java.util.Locale;
+
+import org.eclipse.wst.validation.internal.provisional.core.IMessage;
+
+/**
+ * <p>
+ * This exception is the only exception which should be thrown by IValidators. The message in this
+ * exception must be suitable for showing to the user. All ValidationExceptions will have their
+ * message extracted when they're caught, and the message will be shown to the user.
+ * 
+ * @plannedfor 1.0
+ * </p>
+ */
+public class ValidationException extends Exception {
+	private Throwable _lowLevelException;
+	private IMessage _message;
+	private ClassLoader _loader;
+	private final static long serialVersionUID = -3387516993124229949L;
+
+
+	
+	/**
+	 * Constructs a new exception with a given message string. <br>
+	 * <br>
+	 * 
+	 * @param message
+	 *            IMessage, which is Locale-independent, which contains the message to be shown to
+	 *            be shown to the user.
+	 */
+	public ValidationException(IMessage message) {
+		this(message, null);
+	}
+
+	/**
+	 * Constructs a new exception with a given message string, and low-level exception. <br>
+	 * <br>
+	 * 
+	 * @param message
+	 *            IMessage Locale-independent message to be shown to the user.
+	 * @param exception
+	 *            relevant low-level exception, or <code>null</code> if none. <br>
+	 *            &nbsp;&nbsp;&nbsp For example, when a method fails because of a network
+	 *            communications &nbsp;&nbsp;&nbsp problem, this would be the
+	 *            <code>java.io.IOException</code> &nbsp;&nbsp;&nbsp describing the exact nature
+	 *            of the problem.
+	 */
+	public ValidationException(IMessage message, Throwable exception) {
+		super();
+		_message = message;
+		_lowLevelException = exception;
+	}
+
+	/**
+	 * @return the low-level exception associated with this ValidationException.
+	 */
+	public Throwable getAssociatedException() {
+		return _lowLevelException;
+	}
+
+	/**
+	 * @return the IMessage to be shown to the user, or null if this exception should be handled
+	 * internally.
+	 */
+	public IMessage getAssociatedMessage() {
+		return _message;
+	}
+
+	/**
+	 * @return if the IValidator which threw this exception was loaded by a different ClassLoader than the
+	 * framework, this method returns the ClassLoader of the IValidator.
+	 */
+	public ClassLoader getClassLoader() {
+		return _loader;
+	}
+
+	/**
+	 * @return the error message string of this <code>Throwable</code> object if it was
+	 *         {@link java.lang.Throwable#Throwable(String) created}with an error message string;
+	 *         or <code>null</code> if it was {@link java.lang.Throwable#Throwable() created}with
+	 *         no error message.
+	 *  
+	 */
+	public String getMessage() {
+		return _message.getText(getClassLoader());
+	}
+
+	/**
+	 * @param locale
+	 * 			The locale of which to get the message.
+	 * @return the error message string of this <code>Throwable</code> object if it was
+	 *         {@link java.lang.Throwable#Throwable(String) created}with an error message string;
+	 *         or <code>null</code> if it was {@link java.lang.Throwable#Throwable() created}with
+	 *         no error message.
+	 */
+	public String getMessage(Locale locale) {
+		return _message.getText(locale, getClassLoader());
+	}
+
+	/**
+	 * <p>
+	 * If the IValidator which threw this exception was loaded by a different ClassLoader than the
+	 * framework, this method should set the ClassLoader to be the ClassLoader of the IValidator.
+	 * </p>
+	 * @param loader
+	 *  		ClassLoader of the validator
+	 */
+	public void setClassLoader(ClassLoader loader) {
+		_loader = loader;
+	}
+
+	/**
+	 * <p>
+	 * Returns a short description of this throwable object. If this <code>Throwable</code> object
+	 * was {@link java.lang.Throwable#Throwable(String) created}with an error message string, then
+	 * the result is the concatenation of three strings:
+	 * <ul>
+	 * <li>The name of the actual class of this object
+	 * <li>": " (a colon and a space)
+	 * <li>The result of the {@link #getMessage}method for this object
+	 * </ul>
+	 * If this <code>Throwable</code> object was {@link java.lang.Throwable#Throwable() created}
+	 * with no error message string, then the name of the actual class of this object is returned.
+	 * </p>
+	 * 
+	 * @return a string representation of this <code>Throwable</code>.
+	 */
+	public String toString() {
+		return toString(Locale.getDefault());
+	}
+
+	/**
+	 * <p>
+	 * Returns a short description of this throwable object. If this <code>Throwable</code> object
+	 * was {@link java.lang.Throwable#Throwable(String) created}with an error message string, then
+	 * the result is the concatenation of three strings:
+	 * <ul>
+	 * <li>The name of the actual class of this object
+	 * <li>": " (a colon and a space)
+	 * <li>The result of the {@link #getMessage}method for this object
+	 * </ul>
+	 * If this <code>Throwable</code> object was {@link java.lang.Throwable#Throwable() created}
+	 * with no error message string, then the name of the actual class of this object is returned.
+	 * </p>
+	 * 
+	 * @return a string representation of this <code>Throwable</code>.
+	 */
+	public String toString(Locale locale) {
+		String s = getClass().getName();
+		String message = getMessage(locale);
+		return (message != null) ? (s + ": " + message) : s; //$NON-NLS-1$
+	}
+}
diff --git a/plugins/org.eclipse.wst.validation/validate_core/org/eclipse/wst/validation/internal/core/ValidatorLauncher.java b/plugins/org.eclipse.wst.validation/validate_core/org/eclipse/wst/validation/internal/core/ValidatorLauncher.java
new file mode 100644
index 0000000..40ca89c
--- /dev/null
+++ b/plugins/org.eclipse.wst.validation/validate_core/org/eclipse/wst/validation/internal/core/ValidatorLauncher.java
@@ -0,0 +1,104 @@
+/*******************************************************************************
+ * Copyright (c) 2001, 2008 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.wst.validation.internal.core;
+
+import java.util.List;
+
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.wst.validation.internal.TaskListUtility;
+import org.eclipse.wst.validation.internal.operations.MessageInfo;
+import org.eclipse.wst.validation.internal.operations.ValidatorManager;
+import org.eclipse.wst.validation.internal.plugin.ValidationPlugin;
+import org.eclipse.wst.validation.internal.provisional.core.IReporter;
+import org.eclipse.wst.validation.internal.provisional.core.IValidationContext;
+import org.eclipse.wst.validation.internal.provisional.core.IValidator;
+import org.eclipse.wst.validation.internal.provisional.core.IValidatorJob;
+
+/**
+ * This singleton launches the validation on a single validator. Clients should call this class's
+ * <code>start</code> method to begin the validation.
+ */
+public class ValidatorLauncher {
+	private static ValidatorLauncher _launcher;
+
+	private ValidatorLauncher() {
+	}
+
+	/**
+	 * @return the singleton launcher.
+	 */
+	public static ValidatorLauncher getLauncher() {
+		if (_launcher == null) {
+			_launcher = new ValidatorLauncher();
+		}
+		return _launcher;
+	}
+
+	/**
+	 * <p>
+	 * This method is the launch point of the validation. It runs validation on the validator
+	 * accessed by the IValidationContext. When the validation is complete, each validator may perform resource
+	 * cleanup, if necessary.
+	 * <p>
+	 * If <code>helper</code>,<code>validator</code>, or <code>reporter</code> are null,
+	 * validation is not performed. <code>changedFiles</code> may be null, or empty, if a full
+	 * build should be done.
+	 * </p>
+	 * 
+	 * @param helper 
+	 * 			loads an object. 
+	 * @param validator
+	 * 			validator object to launch validation.
+	 * @param reporter
+	 * 			Is an instance of an IReporter interface, which is used for interaction with the user.
+	 */
+	public void start(final IValidationContext helper, final IValidator validator, final IReporter reporter) throws ValidationException {
+		if ((helper == null) || (validator == null) || (reporter == null))return;
+
+		// Can't force each validator to check if it's cancelled or not,
+		// so check for cancellation here. Hopefully the user won't wait too long.
+		if (reporter.isCancelled())return;
+		
+
+		// If the validator is about to perform a full build, remove all of its previous validation
+		// messages.
+		if ((helper.getURIs() == null) || (helper.getURIs().length == 0)) {
+			reporter.removeAllMessages(validator);
+		}
+		if( validator instanceof IValidatorJob ){
+			((IValidatorJob)validator).validateInJob(helper, reporter);
+		}else{
+			validator.validate(helper, reporter);
+		}
+		if( validator instanceof IValidatorJob ){
+			//the  validators who have implemented IValidatorJob but are running synchronously
+			//would log messages now ...
+			ValidatorManager mgr = ValidatorManager.getManager();
+			final List<MessageInfo> list = mgr.getMessages((IValidatorJob)validator);
+
+			for(MessageInfo info : list){
+				try {
+					TaskListUtility.addTask( info.getMessageOwnerId(), info.getResource(),
+							info.getLocation(), info.getMsg().getId(), info.getText(),
+							info.getMsg().getSeverity(), info.getMarkerId(), 
+							info.getTargetObjectName(),
+							info.getMsg().getGroupName(), info.getMsg().getOffset(), info.getMsg().getLength());
+				
+				} catch (CoreException e) {
+					ValidationPlugin.getPlugin().handleException(e);
+				}										
+			}
+			mgr.clearMessages( (IValidatorJob)validator );
+		}
+
+	}
+	
+}
diff --git a/plugins/org.eclipse.wst.validation/validate_core/org/eclipse/wst/validation/internal/provisional/core/IMessage.java b/plugins/org.eclipse.wst.validation/validate_core/org/eclipse/wst/validation/internal/provisional/core/IMessage.java
new file mode 100644
index 0000000..5550942
--- /dev/null
+++ b/plugins/org.eclipse.wst.validation/validate_core/org/eclipse/wst/validation/internal/provisional/core/IMessage.java
@@ -0,0 +1,346 @@
+/*******************************************************************************
+ * Copyright (c) 2001, 2008 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.wst.validation.internal.provisional.core;
+
+
+import java.util.HashMap;
+import java.util.Locale;
+
+/**
+ * <p>
+ * This interface represents a locale-independent validation message.
+ * </p>
+ * <p>
+ * Given these three values as input, this interface can be queried for the final message string.
+ * (i.e., the message with the parameters already substituted in.) Either the default Locale can be
+ * used, or the caller can specify a Locale.
+ * </p>
+ * <p>
+ * <b>Provisional API:</b> This class/interface is part of an interim API that is still under development and expected to 
+ * change significantly before reaching stability. It is being made available at this early stage to solicit feedback 
+ * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken 
+ * (repeatedly) as the API evolves.
+ * </p>
+ */
+public interface IMessage {
+	/*
+ * 
+ * [issue: CS - The 'IMessage' interface would be simpler without the bundle related details.  I'd like to understand
+ * why we can 'precompute' the translated message. Is there some benefit to perform 'late computation' of these messages?
+ * How does this compare to the eclipse Marker (as far as I know the Marker's text() is preLocalized).
+ * Here's a list of the methods that are related to 'bundle specific' aspects and could be separate out (or designed away)?
+ *    
+ *   - getId()
+ *   - getBundle(...)
+ *   - getBundleName()
+ *   - getParams()
+ *   - getText(Locale)
+ *   - getText(ClassLoader)
+ *   - getText(Locale, ClassLoader)
+ *   - setId(String)
+ *   - setBundleName(String)
+ *   - setParams(String[])
+ * ]
+ * 
+ *   - void setAttribute(String attributeName, Object value)
+ *   - Object getAttribute(String attributeName);
+ * ]
+	 */
+	int OFFSET_UNSET = -1; // see getLength(), getOffset()
+	int LINENO_UNSET = 0;
+	
+	/**
+	 * Typically used to specify error messages.
+	 */
+	int HIGH_SEVERITY = 0x0001;
+	/**
+	 * Typically used to specify warning messages.
+	 */
+	int NORMAL_SEVERITY = 0x0002;
+	/**
+	 * Typically used to specify information messages.
+	 */
+	int LOW_SEVERITY = 0x0004;
+	/**
+	 * Specify high (error) and normal (warning) messages. Typically used with a MessageFilter, to
+	 * filter out information messages.
+	 */
+	int ERROR_AND_WARNING = HIGH_SEVERITY | NORMAL_SEVERITY;
+	/**
+	 * Specify all types of messages. Typically used with a MessageFilter.
+	 */
+	int ALL_MESSAGES = ERROR_AND_WARNING | LOW_SEVERITY;
+	
+	/** 
+	 * TargetResource - The key to use when associating a resource with a message via an
+	 * attribute. 
+	 * <p>
+	 * Normally, the target is stored using the setTargetObject() method, but
+	 * some of the legacy validators used this field for objects that where not IResources.
+	 * In order to associate the message with the proper IResource the validator can store
+	 * the IResource as an attribute and use this string as the key.
+	 * </p>
+	 */
+	String TargetResource = "TargetResource"; //$NON-NLS-1$
+
+	/**
+	 * @return the name of the bundle which this message is contained in.
+	 */
+	String getBundleName();
+
+	/**
+	 * To support removal of a subset of validation messages, an IValidator may assign group names
+	 * to IMessages. An IMessage subset will be identified by the name of its group. Default (null)
+	 * means no group.
+	 * 
+	 * @return the name of the group to which the message belongs.
+	 */
+	String getGroupName();
+
+	/**
+	 * Returns the id of the message. Message ids are used as the constants in property bundles
+	 * which localize the description of the message in a locale-independent fashion. The id is the
+	 * key, in the resource bundle, which identifies the string to be loaded. The id may not be null
+	 * or the empty string.
+	 * 
+	 * @return the id of the message
+	 */
+	String getId();
+
+	/**
+	 * @return the length of the problem area, starting from the offset. If unset, value =
+	 * IMessage.OFFSET_UNSET.
+	 * 
+	 * @see #getOffset()
+	 */
+	int getLength();
+
+	/**
+	 * If there is a target object associated with this IMessage, and that target object is a file,
+	 * then an optional line number may be set. The line number identifies the location of the
+	 * problem identified by this message. If no line number has been set, #LINENO_UNSET will be
+	 * returned.
+	 * 
+	 * @return line number of the location of the problem.
+	 */
+	int getLineNumber();
+
+	/**
+	 * Returns the offset of the message. If unset, value = IMessage.OFFSET_UNSET. For example, if
+	 * the java compiler were a validator, and it reported that a variable name was unknown, offset
+	 * would identify the position of the first character of the unknown variable. The position is
+	 * identified by the number of characters from the start of the file.
+	 * 
+	 * @return offset of the message
+	 */
+	int getOffset();
+
+	/**
+	 * Returns the parameters of the message. Message parameters are the values which are
+	 * substituted into parameter slots in localized message text descriptions.
+	 * 
+	 * @return parameters of the message
+	 */
+	String[] getParams();
+
+	/**
+	 * <p>
+	 * Returns the severity level of the message. One of SeverityEnum constants.
+	 * 
+	 * @see IMessage#HIGH_SEVERITY
+	 * @see IMessage#NORMAL_SEVERITY
+	 * @see IMessage#LOW_SEVERITY
+	 * </p>
+	 * 
+	 * @return the severity level of the message
+	 */
+	int getSeverity();
+
+	/**
+	 * Return the object that this IMessage is reporting the problem against, if any. null will be
+	 * returned if this is a general message which does not apply to a particular object; for
+	 * example, "internal error".
+	 * 
+	 * @return the target object for the message
+	 */
+	Object getTargetObject();
+
+	/**
+	 * @return a text representation of this message formatted in the default Locale, with the
+	 * bundle loaded by the default ClassLoader.
+	 */
+	String getText();
+
+	/**
+	 * @param classLoader 
+	 * 				The ClassLoader which will be used to load the ResourceBundle.
+	 *            
+	 * @return a text representation of this message formatted in the default locale, with the
+	 * bundle loaded by the specified ClassLoader.
+	 */
+	String getText(ClassLoader classLoader);
+
+	/**
+	 * @param locale
+	 *            The locale to translate the message text into.
+	 *            
+	 * @return a text representation of this message formatted in the specified locale, with the
+	 * bundle loaded by the default ClassLoader.
+	 */
+	String getText(Locale locale);
+
+	/**
+	 * @param locale
+	 *            The locale to translate the message text into.
+	 * @param classLoader
+	 *            The ClassLoader which will be used to load the ResourceBundle.
+	 *            
+	 * @return a text representation of this message formatted in the specified locale, with the
+	 * bundle loaded by the specified ClassLoader.
+	 */
+	String getText(Locale locale, ClassLoader classLoader);
+	
+	/**
+	 * Provides a way to store some additional attributes that a message would like to store
+	 * that can used by some other parties that are interested in those attribute values.
+	 * 
+	 * @param attributeName
+	 * @return an Object basically the value associated with the object name.
+	 */
+	
+	 Object getAttribute(String attributeName);
+	
+	/**
+	 * Set the attributeName and value as key value pair.
+	 * 
+	 * @see #getAttribute(String attributeName)
+	 * @param attributeName
+	 */
+	
+	void setAttribute(String attributeName, Object value);
+	   
+
+	/**
+	 * Set the name of the bundle which this message is contained in.
+	 * 
+	 * @param bundleName 
+	 * 			Name of the bundle which contains the message.
+	 */
+	void setBundleName(String bundleName);
+
+	/**
+	 * To support removal of a subset of validation messages, an IValidator may assign group names
+	 * to IMessages. An IMessage subset will be identified by the name of its group. Default (null)
+	 * means no group.
+	 * 
+	 * @param name
+	 * 			Name of the group.
+	 */
+	void setGroupName(String name);
+
+	/**
+	 * Set the id of the message. Message ids are used as the constants in property bundles which
+	 * localize the description of the message in a locale-independent fashion. The id is the key,
+	 * in the resource bundle, which identifies the string to be loaded. The id may not be null or
+	 * the empty string.
+	 * 
+	 * @param newId
+	 *            Id of the message.
+	 */
+	void setId(String newId);
+
+	/**
+	 * Sets the length of the problem, starting from the offset. If unset, value =
+	 * IMessage.OFFSET_UNSET.
+	 * 
+	 * @see #setOffset(int)
+	 * 
+	 * @param length 
+	 *			Sets the length. 		
+	 */
+	void setLength(int length);
+
+	/**
+	 * If there is a target object associated with this IMessage, and that target object is a file,
+	 * then an optional line number may be set. The line number identifies the location of the
+	 * problem identified by this message. To indicate no line number, use #LINENO_UNSET.
+	 * 
+	 * @param lineNumber 
+	 *			Sets the line number.
+	 */
+	void setLineNo(int lineNumber);
+
+	/**
+	 * Sets the offset of the message. If unset, value = IMessage.OFFSET_UNSET. For example, if the
+	 * java compiler were a validator, and it reported that a variable name was unknown, offset
+	 * would identify the position of the first character of the unknown variable. The position is
+	 * identified by the number of characters from the start of the file.
+	 * 
+	 * @param offset 
+	 *			Sets the offset of the message.
+	 */
+	void setOffset(int offset);
+
+	/**
+	 * Sets the parameters of the message. Message parameters are the values which are substituted
+	 * into parameter slots in localized message text descriptions.
+	 * <p>
+	 * For example, if getId() returns "MY_ID", then the ResourceBundle identified by
+	 * getBundleName() is searched for the message named "MY_ID", and if found,
+	 * has it's parameters set.
+	 * </p>
+	 * 
+	 * @see java.text.MessageFormat#format(String, Object[]) is invoked on the message, with
+	 *      <code>newParams</code> passed in as the Object[].
+	 *      
+	 * @param newParams
+	 *            Parameters of the message.
+	 */
+	void setParams(String[] newParams);
+
+	/**
+	 * Sets the severity level of the message. One of SeverityEnum constants.
+	 * 
+	 * @see IMessage#HIGH_SEVERITY
+	 * @see IMessage#NORMAL_SEVERITY
+	 * @see IMessage#LOW_SEVERITY
+	 * 
+	 * @param newSeverity
+	 *            Severity level of the message.
+	 */
+	void setSeverity(int newSeverity);
+
+	/**
+	 * Associate this IMessage with the object that has the problem. A null value is permitted. If a
+	 * message is applicable to one object, then this value should be set. Otherwise, the default
+	 * value (null) should be kept. Given this target object, it should be possible to calculate the
+	 * exact location of the problem.
+	 * 
+	 * @param obj
+	 *         The object that has the problem.
+	 */
+	void setTargetObject(Object obj);
+	
+	/**
+	 * Return all the attributes of a Message object.
+	 */
+	HashMap getAttributes();
+	
+	/**
+	 * Return the marker id if one is set on this object when created.
+	 */
+	String getMarkerId();
+	
+	/**
+	 * Set the marker id on a Message object.
+	 */
+	 void setMarkerId(String markerId);
+}
diff --git a/plugins/org.eclipse.wst.validation/validate_core/org/eclipse/wst/validation/internal/provisional/core/IMetaModelContext.java b/plugins/org.eclipse.wst.validation/validate_core/org/eclipse/wst/validation/internal/provisional/core/IMetaModelContext.java
new file mode 100644
index 0000000..1ffef39
--- /dev/null
+++ b/plugins/org.eclipse.wst.validation/validate_core/org/eclipse/wst/validation/internal/provisional/core/IMetaModelContext.java
@@ -0,0 +1,25 @@
+/*******************************************************************************
+ * Copyright (c) 2001, 2004 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ * IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.wst.validation.internal.provisional.core;
+
+/**
+ * <p>
+ * <b>Provisional API:</b> This class/interface is part of an interim API that is still under development and expected to 
+ * change significantly before reaching stability. It is being made available at this early stage to solicit feedback 
+ * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken 
+ * (repeatedly) as the API evolves.
+ * </p>
+ */
+public interface IMetaModelContext extends IValidationContext {
+	
+	public Object getModel(String URI);
+
+}
diff --git a/plugins/org.eclipse.wst.validation/validate_core/org/eclipse/wst/validation/internal/provisional/core/IProjectValidationContext.java b/plugins/org.eclipse.wst.validation/validate_core/org/eclipse/wst/validation/internal/provisional/core/IProjectValidationContext.java
new file mode 100644
index 0000000..4210353
--- /dev/null
+++ b/plugins/org.eclipse.wst.validation/validate_core/org/eclipse/wst/validation/internal/provisional/core/IProjectValidationContext.java
@@ -0,0 +1,35 @@
+/*******************************************************************************
+ * Copyright (c) 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
+ *******************************************************************************/
+
+package org.eclipse.wst.validation.internal.provisional.core;
+
+import org.eclipse.core.resources.IProject;
+
+/**
+ * IProjectValidationContext extends IValidationContext to provide access to a
+ * reference to the project on which a validator is being invoked.
+ * <p>
+ * <b>Provisional API:</b> This class/interface is part of an interim API that is still under development and expected to 
+ * change significantly before reaching stability. It is being made available at this early stage to solicit feedback 
+ * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken 
+ * (repeatedly) as the API evolves.
+ * </p>
+ */
+public interface IProjectValidationContext extends IValidationContext
+{
+  /**
+   * Provides the project on which the validator is being invoked.
+   * 
+   * @return an IProject reference to the project on which the validator is
+   *         being invoked.
+   */
+  IProject getProject();
+}
diff --git a/plugins/org.eclipse.wst.validation/validate_core/org/eclipse/wst/validation/internal/provisional/core/IReporter.java b/plugins/org.eclipse.wst.validation/validate_core/org/eclipse/wst/validation/internal/provisional/core/IReporter.java
new file mode 100644
index 0000000..3005139
--- /dev/null
+++ b/plugins/org.eclipse.wst.validation/validate_core/org/eclipse/wst/validation/internal/provisional/core/IReporter.java
@@ -0,0 +1,162 @@
+/*******************************************************************************
+ * Copyright (c) 2001, 2008 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.wst.validation.internal.provisional.core;
+
+import java.util.List;
+
+/*
+ * CCM - Reporter is now passed locale-independent messages.
+ *       Messages should only be translated to a locale upon access.
+ *       Or in special locale-dependent reporter implementations (console logger).
+ */
+
+/**
+ * The interface used by IValidator's to report messages. The implementation of the IReporter could
+ * simply log the messages to stdout, a file, or retain them in a buffer for later access by a user
+ * interface.
+ * <p>
+ * Reporter implementations should keep non-localized versions of their messages.
+ * </p>
+ * <p>
+ * Any messages which need to be displayed to the user are done through this class, and if the user
+ * cancels the current function, this class is the one which registers the cancellation.
+ * </p>
+ * <p>
+ * The IReporter instance is created at the time validation begins and ends when validation is complete.
+ * There is only one IReporter instance created for all validators that are run on a IResource. The IResource
+ * provides a way to get messages put out each validator and add and delete messages for one validator
+ * at a time. 
+ * <p>
+ * <b>Provisional API:</b> This class/interface is part of an interim API that is still under development and expected to 
+ * change significantly before reaching stability. It is being made available at this early stage to solicit feedback 
+ * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken 
+ * (repeatedly) as the API evolves.
+ * </p>
+ */
+public interface IReporter {
+	/**
+	 * <p>
+	 * Add a locale-independent validation message. It will be displayed later, with all of the
+	 * other validation messages.
+	 * </p>
+	 * <p>
+	 * The IValidator passed in is needed for incremental validation (when a message needs to be
+	 * removed, one validator should not remove messages entered by another validator.) The
+	 * validator is also queried for information about its resource bundle, to enable support for
+	 * localization of messages in a client-server environment.
+	 * </p>
+	 * <p>
+	 * Both parameters must not be null.
+	 * </p>
+	 * @param origin
+	 *            The validator which is the source of the message.
+	 * @param message
+	 *            A message to be reported.
+	 */
+	void addMessage(IValidator origin, IMessage message);
+
+	/**
+	 * Show a text representation of this message, formatted in the default
+	 * Locale, to the user immediately. This message indicates which subtask is
+	 * currently being processed. The message is not stored. The subtask message
+	 * in this context is the subtask in a IProgressMontior
+	 * <p>
+	 * Both parameters must not be null.
+	 * </p>
+	 * 
+	 * @param validator
+	 * 		The validator issuing the subtask message.
+	 * @param message
+	 * 		The message to be displayed to the user.
+	 * 
+	 */
+	void displaySubtask(IValidator validator, IMessage message);
+
+	/**
+	 * @return the message access interface to this reporter, or null if message access is not
+	 * supported.
+	 *     
+	 */
+	List getMessages();
+
+	/**
+	 * Return true if the user canceled validation, and false otherwise. This method should be
+	 * called by IValidators periodically, because no event is fired to notify IValidators that the
+	 * user canceled validation. If a validator does not check this method, a cancellation request
+	 * is ignored.
+	 * 
+	 * @return true if the user canceled validation, and false otherwise.
+	 *  
+	 */
+	boolean isCancelled();
+
+	/**
+	 * Remove all validation messages entered by the identified validator. This method is provided
+	 * for incremental validation. 
+	 * <p>
+	 * The IValidator parameter must not be null.
+	 * </p>
+	 * @param origin
+	 * 			Originator validator of the message.  
+	 */
+	void removeAllMessages(IValidator origin);
+
+	/**
+	 * Remove all validation messages, entered by the identified validator,
+	 * pertaining to the Object provided. This method is provided for
+	 * incremental validation. <br>
+	 * <br>
+	 * If <code>object</code> is null, then this method should remove all
+	 * messages owned by the validator. (i.e., the same behaviour as the
+	 * removeAllMessages(IValidator) method.) <br>
+	 * <br>
+	 * <p>
+	 * The IValidator parameter must not be null.
+	 * </p>
+	 * 
+	 * @param origin
+	 * 		Originator validator of the message.
+	 * @param object
+	 * 		Object to which the message belongs. Object is the target object
+	 * 		that was set on the IMessage when adding the message as problem
+	 * 		marker.
+	 * 
+	 */
+	void removeAllMessages(IValidator origin, Object object);
+
+	/**
+	 * To support removal of a subset of validation messages, an IValidator may
+	 * assign group names to IMessages. An IMessage subset will be identified by
+	 * the name of its group. This method will remove only the IMessage's that
+	 * are in the group identified by groupName. 
+	 * <p>
+	 * The IValidator parameter must not be null.
+	 * </p>
+	 * <p>
+	 * If <code>object</code> is null, then this method should remove all
+	 * messages owned by the validator. (i.e., the same behaviour as the
+	 * removeAllMessages(IValidator) method.)
+	 * </p>
+	 * <p>
+	 * If groupName is null, that's the same as no group (i.e., the same
+	 * behaviour as the <code>removeAllMessages(IValidator, Object)</code>
+	 * method.)
+	 * </p>
+	 * 
+	 * @param validator
+	 * 		Originator validator of the message.
+	 * @param obj
+	 * 		Object to which the message belongs.
+	 * @param groupName
+	 * 		Name of the group to which the message belongs.
+	 */
+	void removeMessageSubset(IValidator validator, Object obj, String groupName);
+}
diff --git a/plugins/org.eclipse.wst.validation/validate_core/org/eclipse/wst/validation/internal/provisional/core/IValidationContext.java b/plugins/org.eclipse.wst.validation/validate_core/org/eclipse/wst/validation/internal/provisional/core/IValidationContext.java
new file mode 100644
index 0000000..54a8ce5
--- /dev/null
+++ b/plugins/org.eclipse.wst.validation/validate_core/org/eclipse/wst/validation/internal/provisional/core/IValidationContext.java
@@ -0,0 +1,90 @@
+/*******************************************************************************
+ * Copyright (c) 2001, 2007 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.wst.validation.internal.provisional.core;
+
+/**
+ * This class is used to to separate the IValidator from the model loading. A model 
+ * is a group of object(s) that must follow some rules.
+ * <p>
+ * The model is loaded differently depending on whether the validator is running in 
+ * as-you-type or builder based context. If the <code>loadModel</code> method was a method on the IValidator, 
+ * then there would need to be two versions of validators, one for as-you-type and one for 
+ * builder based. Because <code>loadModel</code> is separate from the IValidator, we provide 
+ * two different IHelpers instead, and ship the one specific to the environment.
+ * </p>
+ * <p>
+ * Each IValidationContext implementation loads a specific model as identified by a String
+ * <code>symbolicName</code>. The symbolicName can be any value except null or the 
+ * empty string. Each validator identifies the symbolic names which it needs, and the
+ * type of model which needs to be returned when that symbolic name is loaded via a 
+ * <code>loadModel</code> method. An IValidationContext can support more than one IValidator; 
+ * the helper needs to support every model that each validator needs.
+ * </p>
+ * <p>
+ * <b>Provisional API:</b> This class/interface is part of an interim API that is still under development and expected to 
+ * change significantly before reaching stability. It is being made available at this early stage to solicit feedback 
+ * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken 
+ * (repeatedly) as the API evolves.
+ * </p>
+ */
+public interface IValidationContext {
+	/**
+	 * <p>
+	 * Load the model identified by <code>symbolicName</code>. <code>symbolicName</code> 
+	 * must not be null or the empty string if the validator needs to be run in both 
+	 * as-you-type and builder based validation.
+	 * </p>
+	 * <p>
+	 * The symbolicName is a string name that is registered in the implementation of the
+	 * IValidatorContext. For an example our internal implementation of the loadModel use
+	 * method names for symbolicNames to load the model object to be validated. Users can
+	 * use their own model load mechanism.
+	 * </p>
+	 * 
+	 * @see <code>WorkbenchContext</code>
+	 */
+	Object loadModel(String symbolicName);
+
+	/*
+	 * 
+	 * [issue : CS - It's not at all clear how these parameters would get passed into a helper.  I'd suggest
+	 * providing getProperty() and setProperty() methods on the class to allow contextual information to be 
+	 * supplied and queried in a generic manner.]
+	 */
+	/**
+	 * <p>
+	 * Load the model identified by <code>symbolicName</code> and <code>parms</code>.
+	 * <code>symbolicName</code> must not be null or the empty string if the validator 
+	 * needs to be run in both as-you-type and builder based validation. 
+	 * If <code>parms</code> is null then this
+	 * method behaves the same as
+	 * 
+	 * @link #loadModel(String).
+	 * 
+	 * This method differs from
+	 * @link #loadModel(String) because it takes parameters, from the IValidator, which 
+	 * 		 are available only at runtime. If you need to pass a live object to the IValidationContext, 
+	 * 		 this is the loadModel method to use.
+	 * </p>
+	 * 
+	 * @param symbolicName String identifier for model.
+	 * @param parms 	   List of parameters that the model takes for invocation.
+	 */
+	Object loadModel(String symbolicName, Object[] parms);
+	
+	/**
+	 * @return a string array with the list of URI's that need to be validated in the
+	 * case of Incremental build.
+	 */
+	
+	String[] getURIs();
+
+}
diff --git a/plugins/org.eclipse.wst.validation/validate_core/org/eclipse/wst/validation/internal/provisional/core/IValidator.java b/plugins/org.eclipse.wst.validation/validate_core/org/eclipse/wst/validation/internal/provisional/core/IValidator.java
new file mode 100644
index 0000000..6fbd55e
--- /dev/null
+++ b/plugins/org.eclipse.wst.validation/validate_core/org/eclipse/wst/validation/internal/provisional/core/IValidator.java
@@ -0,0 +1,74 @@
+/*******************************************************************************
+ * Copyright (c) 2001, 2007 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.wst.validation.internal.provisional.core;
+
+import org.eclipse.wst.validation.internal.core.ValidationException;
+
+/**
+ * This is the base interface for all Validators. A Validator is a class which verifies that objects
+ * follow some rules. For example, in a MOF model which represents an EJB jar, the EJB specification
+ * determines the rules. 
+ * <p>
+ * A validator can perform full validation or incremental validation. All validators must implement
+ * full validation but incremental validation is optional.
+ * </p>
+ * <p>
+ * Each validator must not be tied to any particular workbench implementation.
+ * </p>
+ * <p>
+ * A validator's verification starts when the ValidatorLauncher singleton calls
+ * <code>validate</code>.
+ * </p>
+ * <p>
+ * <b>Provisional API:</b> This class/interface is part of an interim API that is still under development and expected to 
+ * change significantly before reaching stability. It is being made available at this early stage to solicit feedback 
+ * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken 
+ * (repeatedly) as the API evolves.
+ * </p>
+ */
+public interface IValidator{
+	
+	/*
+	 * [issue : CS - Perhaps the IValidator should be required to provide a 'name' that can be used describe 
+	 * the running validation 'Job'.  Then the framework could automatically say something like 'XYZ validator : cleanup'.
+	 * Relying on the IValidator to provide subtask information seems error prone.]
+	 * [issue: LM - Is the cleanup method necessary? Can the framework put a requirement that client validators 'clean up'
+	 *  before returning from the validate method? ] 
+	 */
+	
+	/**
+	 * Perform any resource cleanup once validation is complete. If cleanup will take some time, the
+	 * IValidator should report subtask information to the user through the IReporter parameter. The
+	 * IReporter parameter will not be null.
+	 * 
+	 * @param reporter Used for the interaction with the user.
+	 */
+	void cleanup(IReporter reporter);
+
+	/*
+	 * [issue : CS - I'm curious to understand why the validator is not invoked directly on a file.  It seems it should be the
+	 * domain of another API to manage manage incremental file changes and triggering validations accordingly. 
+	 * Do we have a current use case in WTP where the validator does anything more validate a file from the changedFiles list?]
+	 */
+	/**
+	 * This is the method which performs the validation on the objects.
+	 * <p>
+	 * <code>helper</code> and <code>reporter</code> may not be null. <code>changedFiles</code>
+	 * may be null, if a full build is desired. <br>
+	 * </p>
+	 * @param helper 
+	 * 			Loads an object. 
+	 * @param reporter
+	 * 			Is an instance of an IReporter interface, which is used for interaction with the user.
+	 * 
+	 */
+	void validate(IValidationContext helper, IReporter reporter) throws ValidationException;
+}
diff --git a/plugins/org.eclipse.wst.validation/validate_core/org/eclipse/wst/validation/internal/provisional/core/IValidatorExtender.java b/plugins/org.eclipse.wst.validation/validate_core/org/eclipse/wst/validation/internal/provisional/core/IValidatorExtender.java
new file mode 100644
index 0000000..581a6b0
--- /dev/null
+++ b/plugins/org.eclipse.wst.validation/validate_core/org/eclipse/wst/validation/internal/provisional/core/IValidatorExtender.java
@@ -0,0 +1,11 @@
+package org.eclipse.wst.validation.internal.provisional.core;
+
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.wst.validation.ValidationState;
+
+public interface IValidatorExtender {
+
+	void validationFinishing(IProject project, ValidationState state, IProgressMonitor monitor);
+
+}
diff --git a/plugins/org.eclipse.wst.validation/validate_core/org/eclipse/wst/validation/internal/provisional/core/IValidatorJob.java b/plugins/org.eclipse.wst.validation/validate_core/org/eclipse/wst/validation/internal/provisional/core/IValidatorJob.java
new file mode 100644
index 0000000..a25e7bb
--- /dev/null
+++ b/plugins/org.eclipse.wst.validation/validate_core/org/eclipse/wst/validation/internal/provisional/core/IValidatorJob.java
@@ -0,0 +1,53 @@
+/*******************************************************************************
+ * Copyright (c) 2001, 2007 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.wst.validation.internal.provisional.core;
+
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.core.runtime.jobs.ISchedulingRule;
+import org.eclipse.wst.validation.internal.core.ValidationException;
+
+/**
+ * This is the Job interface for the validator. Validators implementing this interface are executed as
+ * background jobs. 
+ * Following is a sequence of  calls:
+ * <ul>
+ * <li>validator.getSchedulingRule(helper)
+ * <li>validator.validate(reporter)
+ * </ul>
+ */
+public interface IValidatorJob extends IValidator{
+
+	IStatus OK_STATUS = new Status(IStatus.OK, "org.eclipse.wst.validation", 0, "OK", null); //$NON-NLS-1$ //$NON-NLS-2$
+	
+
+
+	/**
+	 * This is the method which performs the validation on the objects.
+	 * <p>
+	 * <code>reporter</code> may not be null. <code>changedFiles</code>
+	 * may be null, if a full build is desired. <br>
+	 * </p>
+     *
+	 * @param reporter
+	 *            Is an instance of an IReporter interface, which is used for interaction with the
+	 *            user.
+	 * @param helper Will not be null, loads an object.
+	 */
+	IStatus validateInJob(IValidationContext helper, IReporter reporter) throws ValidationException;
+
+	/**
+	 * Get the scheduling rule, which the framework applies to the Validator job.
+	 * 
+	 * @param helper Will not be null, loads an object.
+	 */
+	ISchedulingRule getSchedulingRule(IValidationContext helper);
+}
diff --git a/plugins/org.eclipse.wst.validation/validate_core/org/eclipse/wst/validation/internal/provisional/core/MessageLimitException.java b/plugins/org.eclipse.wst.validation/validate_core/org/eclipse/wst/validation/internal/provisional/core/MessageLimitException.java
new file mode 100644
index 0000000..3a86bf4
--- /dev/null
+++ b/plugins/org.eclipse.wst.validation/validate_core/org/eclipse/wst/validation/internal/provisional/core/MessageLimitException.java
@@ -0,0 +1,30 @@
+/*******************************************************************************
+ * Copyright (c) 2001, 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
+ *******************************************************************************/
+package org.eclipse.wst.validation.internal.provisional.core;
+
+/*
+ * [issue: LM - Going along with my comment on the addMessage method in IReporter I 
+ *  think this class should be internal to the validation framework.
+ *  I don't think there's a need for this class to be exposed to clients. If too many
+ *  messages are added the framework should handle this without notifying the client
+ *  validator. ]
+ */
+/**
+ * This exception is thrown by
+ * 
+ * @see IReporter#addMessage(IValidator, IMessage) method if no more messages can be reported
+ *      because the maximum number of messages has been reported.
+ *  @deprecated This class is not longer used by the framework. The framework is
+ *  not going to limit the number of messages displayed by a validator.
+ */
+public class MessageLimitException extends RuntimeException {
+	private final static long serialVersionUID = -7034897190745766940L;
+}
diff --git a/plugins/org.eclipse.wst.validation/validate_core/org/eclipse/wst/validation/internal/provisional/core/package.html b/plugins/org.eclipse.wst.validation/validate_core/org/eclipse/wst/validation/internal/provisional/core/package.html
new file mode 100644
index 0000000..70bdb29
--- /dev/null
+++ b/plugins/org.eclipse.wst.validation/validate_core/org/eclipse/wst/validation/internal/provisional/core/package.html
@@ -0,0 +1,9 @@
+<html>
+<head>
+<title>Validation Framework (Version 1)</title>
+</head>
+<body>
+<p>An earlier framework for calling validators that are build based.</p>
+<p>This framework is being replaced by the <code>newer org.eclipse.wst.validation</code> framework.</p>
+</body>
+</html>
diff --git a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/AbstractValidator.java b/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/AbstractValidator.java
new file mode 100644
index 0000000..83c1d55
--- /dev/null
+++ b/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/AbstractValidator.java
@@ -0,0 +1,194 @@
+/*******************************************************************************
+ * Copyright (c) 2007, 2008 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.wst.validation;
+
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.wst.validation.Validator.V2;
+
+/**
+ * The class that all Validators that wish to use version two of the validation framework must subclass.
+ * <p>
+ * <b>Provisional API:</b> This class/interface is part of an interim API that is still under development and expected to 
+ * change significantly before reaching stability. It is being made available at this early stage to solicit feedback 
+ * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken 
+ * (repeatedly) as the API evolves.
+ * </p>
+ * @author karasiuk
+ *
+ */
+public abstract class AbstractValidator {
+	
+	private V2 _parent;
+	
+	/**
+	 * Validate the resource. The validator is called from a WorkspaceJob, so
+	 * the validator itself does not need to establish it's own IWorkspaceRunnable.
+	 * <p>
+	 * If you override this method then you should not override the other validate method.
+	 * </p>
+	 * 
+	 * @param resource
+	 * 		The resource to be validated.
+	 * 
+	 * @param kind
+	 * 		The way the resource changed. It uses the same values as the kind
+	 * 		parameter in IResourceDelta.
+	 * 
+	 * @param state
+	 * 		A way to pass arbitrary, validator specific, data from one
+	 * 		invocation of a validator to the next, during the validation phase.
+	 * 		At the end of the validation phase, this object will be cleared,
+	 * 		thereby allowing any of this state information to be garbaged
+	 * 		collected.
+	 * 
+	 * @param monitor
+	 * 		A monitor that you can use to report your progress. To be a well
+	 * 		behaved validator you need to check the isCancelled() method at
+	 * 		appropriate times.
+	 * 
+	 * @return the result of the validation. This may be, but usually isn't, null.
+	 */
+	public ValidationResult validate(IResource resource, int kind, ValidationState state, IProgressMonitor monitor){
+		return null;
+	}
+	
+	/**
+	 * Validate the resource. The validator is called from a WorkspaceJob, so
+	 * the validator itself does not need to establish it's own
+	 * IWorkspaceRunnable.
+	 * <p>
+	 * If you override this method then you should not override the other
+	 * validate method.
+	 * </p>
+	 * 
+	 * @param event
+	 *            An object that describes the resource to be validated and why
+	 *            it should be validated.
+	 * 
+	 * @param state
+	 *            A way to pass arbitrary, validator specific, data from one
+	 *            invocation of a validator to the next, during the validation
+	 *            phase. At the end of the validation phase, this object will be
+	 *            cleared, thereby allowing any of this state information to be
+	 *            garbaged collected.
+	 * 
+	 * @param monitor
+	 *            A monitor that you can use to report your progress. To be a
+	 *            well behaved validator you need to check the isCancelled()
+	 *            method at appropriate times.
+	 * 
+	 * @return the result of the validation. Null should never be returned. If
+	 *         null is returned then the other validate method will be called as
+	 *         well.
+	 */
+	public ValidationResult validate(ValidationEvent event, ValidationState state, IProgressMonitor monitor){
+		return null;
+	}
+	
+	
+	/**
+	 * A call back method that lets the validator know that the project is being
+	 * cleaned. This method gives the validator a chance to do any special
+	 * cleanup. The default is to do nothing.
+	 * <p>
+	 * If the entire workspace is being cleaned, then the first call will have a
+	 * null project, and then there will be subsequent calls for each open
+	 * project in the workspace.</p>
+	 * 
+	 * @param project
+	 * 		The project being cleaned. This may be null, which is an indication
+	 * 		that the workspace is being cleaned.
+	 * 
+	 * @param state
+	 * 		A way to pass arbitrary, validator specific, data from one
+	 * 		invocation of a validator to the next, during the validation phase.
+	 * 
+	 * @param monitor
+	 * 		The monitor that should be used for reporting progress if the clean
+	 * 		takes a long time.
+	 */
+	public void clean(IProject project, ValidationState state, IProgressMonitor monitor){		
+	}
+		
+	/**
+	 * This method is called before any validation takes place. It allows
+	 * validators to perform any initialization that they might need.
+	 * 
+	 * @param project
+	 * 		The project that is being validated. For the very first call in the
+	 * 		validation phase, this will be null. A null project is the signal
+	 * 		that a top level validation is starting. Subsequently, the project
+	 * 		will be set, as each of the individual projects are validated.
+	 * 
+	 * @param state
+	 * 		A way to pass arbitrary, validator specific, data from one
+	 * 		invocation of a validator to the next, during the validation phase.
+	 * 
+	 * @param monitor
+	 * 		The monitor that should be used for reporting progress if the initialization
+	 * 		takes a long time.
+	 */
+	public void validationStarting(IProject project, ValidationState state, IProgressMonitor monitor){		
+	}
+	
+	/**
+	 * This method will be called when validation is complete. It allows
+	 * validators to perform any cleanup that they might need to do.
+	 * 
+	 * @param project
+	 * 		The project that was validated. The very last call in the validation
+	 * 		sets this to null so that the validator knows that all the
+	 * 		projects have now been validated.
+	 * 
+	 * @param state
+	 * 		A way to pass arbitrary, validator specific, data from one
+	 * 		invocation of a validator to the next, during the validation phase.
+	 * 
+	 * @param monitor
+	 * 		The monitor that should be used for reporting progress if the cleanup
+	 * 		takes a long time.
+	 */
+	public void validationFinishing(IProject project, ValidationState state, IProgressMonitor monitor){		
+	}
+	
+	/**
+	 * Should the validation framework first clear the markers that this
+	 * validator has placed on this resource? This method can be overridden by
+	 * validator implementors to provide a validator specific behavior.
+	 * 
+	 * @param event
+	 *            The validation event that triggered the validation.
+	 * @return true if the validation framework should first clear all the
+	 *         markers that this validator produced. This is the default
+	 *         behavior. Return false to leave the markers unchanged. It then
+	 *         becomes the responsibility of the validator to manage it's own
+	 *         markers for this resource, for this validation event.
+	 */
+	public boolean shouldClearMarkers(ValidationEvent event){
+		return true;
+	}
+		
+	/**
+	 * Answer the validator that you belong to. The validator controls the
+	 * filters and various other settings.
+	 * 
+	 * @nooverride
+	 */
+	public V2 getParent(){
+		return _parent;
+	}
+	
+	void setParent(V2 parent){
+		_parent = parent;
+	}
+}
diff --git a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/DependentResource.java b/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/DependentResource.java
new file mode 100644
index 0000000..3f1c67d
--- /dev/null
+++ b/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/DependentResource.java
@@ -0,0 +1,55 @@
+/*******************************************************************************
+ * Copyright (c) 2007 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.wst.validation;
+
+import org.eclipse.core.resources.IResource;
+
+/**
+ * A resource that is dependent on another resource.
+ * <p>
+ * This is returned by the IDependencyIndex.
+ * <p>
+ * <b>Provisional API:</b> This class/interface is part of an interim API that is still under development and expected to 
+ * change significantly before reaching stability. It is being made available at this early stage to solicit feedback 
+ * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken 
+ * (repeatedly) as the API evolves.
+ * </p>
+ * @noextend
+ * @see IDependencyIndex
+ * @author karasiuk
+ *
+ */
+public class DependentResource {
+	private IResource 	_resource;
+	private Validator	_validator;
+	
+	/**
+	 * @noreference
+	 */
+	public DependentResource(IResource resource, Validator validator){
+		_resource = resource;
+		_validator = validator;
+	}
+	
+	/**
+	 * Answer the resource that is depended on.
+	 */
+	public IResource getResource() {
+		return _resource;
+	}
+	
+	/**
+	 * Answer the validator that asserted the dependency.
+	 */
+	public Validator getValidator() {
+		return _validator;
+	}
+}
diff --git a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/Friend.java b/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/Friend.java
new file mode 100644
index 0000000..4146636
--- /dev/null
+++ b/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/Friend.java
@@ -0,0 +1,57 @@
+/*******************************************************************************
+ * Copyright (c) 2007, 2008 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.wst.validation;
+
+import java.util.Map;
+
+import org.eclipse.core.resources.IResource;
+import org.eclipse.wst.validation.internal.ContentTypeWrapper;
+import org.eclipse.wst.validation.internal.ValType;
+
+/**
+ * This class is only to be called by the validation framework and it's test cases.
+ * This class is NOT part of the API.
+ * <p>
+ * This class provides access to some internal methods.
+ * </p>
+ * @author karasiuk
+ *
+ */
+public class Friend {
+	
+	public static void setMessages(Validator validator, Map<String, MessageSeveritySetting> map) {
+		validator.setMessages(map);
+	}
+	
+	/**
+	 * Has the validator's implementation been loaded yet? This is used by some test cases to ensure that 
+	 * plug-ins are not loaded too early.
+	 */
+	public static boolean isLoaded(Validator validator){
+		return validator.isLoaded();
+	}
+	
+	public static boolean shouldValidate(Validator validator, IResource resource, boolean isManual, boolean isBuild, 
+			ContentTypeWrapper contentTypeWrapper){
+		return validator.shouldValidate(resource, isManual, isBuild, contentTypeWrapper);
+	}
+	
+	public static boolean shouldValidate(Validator validator, IResource resource, ValType valType, 
+		ContentTypeWrapper contentTypeWrapper){
+		
+		return validator.shouldValidate(resource, valType, contentTypeWrapper);		
+	}
+	
+	public static void setMigrated(Validator validator, boolean migrated){
+		validator.setMigrated(migrated);
+	}
+
+}
diff --git a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/IDependencyIndex.java b/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/IDependencyIndex.java
new file mode 100644
index 0000000..d9d494b
--- /dev/null
+++ b/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/IDependencyIndex.java
@@ -0,0 +1,112 @@
+/*******************************************************************************
+ * Copyright (c) 2007, 2008 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.wst.validation;
+
+import java.util.List;
+
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IResource;
+
+/**
+ * This service is used to specify the resources that a particular resource depends on.
+ * <p>
+ * This is an optional service, validators do not need to use this Interface and can simply supply
+ * their dependency information through the ValidationResult return result.
+ * </p>
+ * <p>
+ * <b>Provisional API:</b> This class/interface is part of an interim API that is still under development and expected to 
+ * change significantly before reaching stability. It is being made available at this early stage to solicit feedback 
+ * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken 
+ * (repeatedly) as the API evolves.
+ * </p>
+ * @noimplement
+ * @see ValidationResult
+ * @author karasiuk
+ *
+ */
+public interface IDependencyIndex {
+	
+	/**
+	 * Assert that one resource depends on another resource as part of it's validity.
+	 * <p>
+	 * For example, if an XML file is dependent on an XSD file to be valid, the
+	 * resource that holds the XML file would be the dependent, and the resource
+	 * that holds the XSD would be the dependsOn.
+	 * </p>
+	 * 
+	 * @param id
+	 * 		The validator id that is asserting that the dependency exists.
+	 * @param dependent
+	 * 		The resource that is dependent on the other resource. For example a XML file.
+	 * @param dependsOn
+	 * 		The resource that this being depended on. For example a XSD file.
+	 */
+	void add(String id, IResource dependent, IResource dependsOn);
+	
+	/**
+	 * Remove all the dependency assertions for this project.
+	 * 
+	 * @param project
+	 * 		The project that will have it's dependency assertions removed.
+	 */
+	void clear(IProject project);
+	
+	/**
+	 * Answer all the resources that depend on this resource. For example, if
+	 * this resource was a XSD, this could answer all the XML files that
+	 * depended on it for their validity.
+	 * 
+	 * @param resource
+	 * 		A resource that other resources may depend on.
+	 * 
+	 * @return the dependent resources.
+	 */
+	List<DependentResource> get(IResource resource);
+	
+	/**
+	 * Answer all the resources that depend on this resource. For example, if
+	 * this resource was a XSD, this could answer all the XML files that
+	 * depended on it for their validity.
+	 * 
+	 * @param id
+	 * 		The validator id that asserted that the dependency exists.
+	 * @param resource
+	 * 		A resource that other resources may depend on.
+	 * 
+	 * @return the dependent resources. This method can return null or an empty array, if
+	 * 	there are no dependent resources.
+	 */
+	IResource[] get(String id, IResource resource);
+	
+	/**
+	 * Answer true if other resources depend on this resource.
+	 * 
+	 * @param resource
+	 * 		The resource being tested.
+	 * 
+	 * @return true if any of the validators asserted a dependency on this resource.
+	 */
+	boolean isDependedOn(IResource resource);
+	
+	/**
+	 * Replace all the resources that the dependent depends on.
+	 * 
+	 * @param id
+	 * 		The validator id that is asserting that the dependency exists.
+	 * @param dependent
+	 * 		The resource that is dependent on the other resource.
+	 * @param dependsOn
+	 * 		All the resources that are depended on. This can be null or a zero
+	 * 		length array. Null or a zero length array removes all the dependencies.
+	 */
+	void set(String id, IResource dependent, IResource[] dependsOn);
+
+}
diff --git a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/IMutableValidator.java b/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/IMutableValidator.java
new file mode 100644
index 0000000..bbb6627
--- /dev/null
+++ b/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/IMutableValidator.java
@@ -0,0 +1,77 @@
+/*******************************************************************************
+ * Copyright (c) 2009 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.wst.validation;
+
+/**
+ * A validator that has fields that can be updated.
+ * <p>
+ * The following procedure is used to change a Validator's settings.
+ * <ol>
+ * <li>An IMutableValidator is retrieved.</li>
+ * <li>The IMutableValidator is changed.</li>
+ * <li>The IMutableValidator is "activated".</li>
+ * </ol>
+ * </p>
+ * <p>The methods {@link ValidationFramework#getProjectSettings(org.eclipse.core.resources.IProject)} and 
+ * {@link ValidationFramework#getWorkspaceSettings()} can be used to retrieve IMutableValidator's.
+ * <p>
+ * <b>Provisional API:</b> This class/interface is part of an interim API that is still under development and expected to 
+ * change significantly before reaching stability. It is being made available at this early stage to solicit feedback 
+ * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken 
+ * (repeatedly) as the API evolves.
+ * </p>
+ * @noextend This interface is not intended to be extended by clients.
+ * @noimplement This interface is not intended to be implemented by clients.
+
+ * @author karasiuk
+ *
+ */
+public interface IMutableValidator {
+	
+	/**
+	 * Answer the validator's id.
+	 * @return
+	 */
+	String getId();
+	
+	/**
+	 * Answer the validator's name.
+	 * @return
+	 */
+	String getName();
+	
+	/**
+	 * Answer the validator's class name.
+	 * @return
+	 */
+	String getValidatorClassname();
+	
+	/**
+	 * Answer if the validator is enabled for build based validation.
+	 */
+	boolean isBuildValidation();
+	
+	/**
+	 * Answer if the validator is enabled for manual based validation.
+	 */
+	boolean isManualValidation();
+	
+	/**
+	 * Set whether the validator should be enabled for build based validation.
+	 */
+	void setBuildValidation(boolean build);
+	
+	/**
+	 * Set whether the validator should be enabled for manual based validation.
+	 */	
+	void setManualValidation(boolean manual);
+
+}
diff --git a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/IPerformanceMonitor.java b/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/IPerformanceMonitor.java
new file mode 100644
index 0000000..b951270
--- /dev/null
+++ b/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/IPerformanceMonitor.java
@@ -0,0 +1,79 @@
+/*******************************************************************************
+ * Copyright (c) 2007, 2008 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.wst.validation;
+
+import java.util.List;
+
+/**
+ * A service that collects performance information on validation operations.
+ * <p>
+ * <b>Provisional API:</b> This class/interface is part of an interim API that is still under development and expected to 
+ * change significantly before reaching stability. It is being made available at this early stage to solicit feedback 
+ * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken 
+ * (repeatedly) as the API evolves.
+ * </p>
+ * @noextend This interface is not intended to be extended by clients.
+ * @noimplement This interface is not intended to be implemented by clients.
+ * @author karasiuk
+ *
+ */
+public interface IPerformanceMonitor {
+	
+	/**
+	 * The level of information to collect.
+	 */
+	public enum CollectionLevel {None, Default}
+	
+	/** 
+	 * Add this performance counter to the monitor. The monitor will decide what to 
+	 * do with the results, it may log them to a file, or it may simply hold on to them.
+	 * 
+	 * @param counters
+	 */
+	public void add(PerformanceCounters counters);
+	
+	/**
+	 * Answer true if the performance monitor is collecting performance events.
+	 */
+	public boolean isCollecting();
+	
+	/** Answer true if only summary information is requested. */
+	public boolean isSummaryOnly();
+	
+	/**
+	 * Set the performance event collection level. This controls which
+	 * performance events are collected, including none of them.
+	 * 
+	 * @param level
+	 * 		The level to collect. The default is to not collect anything.
+	 */
+	public void setCollectionLevel(CollectionLevel level);
+	
+	/**
+	 * Answer the level of performance events that are being collected by the validation framework.
+	 */
+	public CollectionLevel getCollectionLevel();
+	
+	/**
+	 * Answer the performance counters that have been collected so far. Some
+	 * monitors do not save counters, and they will always return an empty list.
+	 * 
+	 * @param asSummary
+	 * 		If this parameter is true, only answer a summary of the counters.
+	 */
+	public List<PerformanceCounters> getPerformanceCounters(boolean asSummary);
+	
+	/**
+	 * Delete the collected performance counters.
+	 */
+	public void resetPerformanceCounters();
+
+}
diff --git a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/IValidatorGroupListener.java b/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/IValidatorGroupListener.java
new file mode 100644
index 0000000..5f4feee
--- /dev/null
+++ b/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/IValidatorGroupListener.java
@@ -0,0 +1,64 @@
+/*******************************************************************************
+ * Copyright (c) 2008 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.wst.validation;
+
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.runtime.IProgressMonitor;
+
+/**
+ * Validators may wish to join validator groups for performance or other
+ * reasons. That way expensive operations like creating and releasing models can
+ * be done in a common location, and be done only once per resource. Group listeners
+ * are declared via the <code>org.eclipse.wst.validation.validatorGroup</code> extension point.
+ * <p>
+ * As validation proceeds, the validation framework, on a resource by resource
+ * bases, determines if any validators that are members of a group are
+ * interested in the resource. If they are, before the first validator in the
+ * group is called, the <code>validationStarting</code> method is called. If this method was
+ * called, then the <code>validationFinishing</code> method will be called once all the
+ * validators have processed the resource.
+ * </p>
+ * <p>
+ * <b>Provisional API:</b> This class/interface is part of an interim API that is still under development and expected to 
+ * change significantly before reaching stability. It is being made available at this early stage to solicit feedback 
+ * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken 
+ * (repeatedly) as the API evolves.
+ * </p>
+ */
+public interface IValidatorGroupListener {
+	/**
+	 * This is called before the first validator in the group that is interested
+	 * in the resource is called. If no validators in the group are interested
+	 * in the resource, then this method is not called.
+	 * 
+	 * @param resource
+	 *            The resource that is being validated.
+	 * @param monitor
+	 *            A progress monitor that the method should use.
+	 * @param state
+	 *            The validation state for the current operation.
+	 */
+	void validationStarting(IResource resource, IProgressMonitor monitor, ValidationState state);
+	
+	/**
+	 * If the validationStarting method was called on the resource, then this
+	 * method will be called after the last validator has processed the
+	 * resource.
+	 * 
+	 * @param resource
+	 * 		The resource that is being validated.
+	 * @param monitor
+	 * 		A progress monitor that the method can use.
+	 * @param state
+	 * 		The validation state for the current operation.
+	 */
+	void validationFinishing(IResource resource, IProgressMonitor monitor, ValidationState state);
+}
diff --git a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/MessageSeveritySetting.java b/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/MessageSeveritySetting.java
new file mode 100644
index 0000000..4eaa3b7
--- /dev/null
+++ b/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/MessageSeveritySetting.java
@@ -0,0 +1,140 @@
+/*******************************************************************************
+ * Copyright (c) 2008 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.wst.validation;
+
+import org.eclipse.core.resources.IMarker;
+import org.eclipse.wst.validation.internal.ValMessages;
+
+/**
+ * Associate a message severity with a message category.
+ * <p>
+ * <b>Provisional API:</b> This class/interface is part of an interim API that is still under development and expected to 
+ * change significantly before reaching stability. It is being made available at this early stage to solicit feedback 
+ * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken 
+ * (repeatedly) as the API evolves.
+ * </p>
+ * @noextend
+ * @author karasiuk
+ *
+ */
+public class MessageSeveritySetting {
+	public enum Severity {
+		Error(ValMessages.SevError, IMarker.SEVERITY_ERROR),
+		Warning(ValMessages.SevWarning, IMarker.SEVERITY_WARNING),
+		Ignore(ValMessages.SevIgnore, IMarker.SEVERITY_INFO);
+		
+		private String _severityLabel;
+		private Severity(String label, int markerSeverity){
+			_severityLabel = label;
+			_markerSeverity = markerSeverity;
+		}
+		private int		_markerSeverity;
+		
+		@Override
+		public String toString() {
+			return _severityLabel;
+		}
+
+		/**
+		 * Answer the associated IMarker severity.
+		 */
+		public int getMarkerSeverity() {
+			return _markerSeverity;
+		}
+		
+	}
+	
+	private String		_id;
+	private String 		_label;
+	private Severity 	_default;
+	private Severity 	_current;
+	
+	/**
+	 * Create an association between a label and a message severity.
+	 * 
+	 * @param id
+	 * 		An id that is used to identify this particular setting. This must be
+	 * 		unique within the scope of this particular validator.
+	 * 
+	 * @param label
+	 * 		An end user string, that can describe either an individual message
+	 * 		or a message category.
+	 * 
+	 * @param defaultSeverity
+	 * 		The default severity for this label. If the end user doesn't change
+	 * 		anything this is what the severity will be.
+	 */
+	public MessageSeveritySetting(String id, String label, Severity defaultSeverity){
+		_id = id;
+		_label = label;
+		_default = defaultSeverity;
+	}
+	
+	@Override
+	public int hashCode() {
+		int h = 0;
+		if (_current != null)h += _current.getMarkerSeverity()*1000;
+		if (_id != null)h += _id.hashCode();
+		return h;
+	}
+
+	public String getLabel() {
+		return _label;
+	}
+
+	/** Answer the default severity as defined by the validator owner. */
+	public Severity getDefault() {
+		return _default;
+	}
+
+	/** 
+	 * Answer the current severity for the message. The end user may have changed this through a
+	 * preference dialog.
+	 */
+	public Severity getCurrent() {
+		if (_current != null)return _current;
+		return _default;
+	}
+
+	/**
+	 * The id that the validator owner assigned to the message.
+	 */
+	public String getId() {
+		return _id;
+	}
+
+	/**
+	 * Set the current message severity.
+	 * 
+	 * @param severity
+	 * @return true if the setting changed
+	 */
+	public boolean setCurrent(Severity severity) {
+		if (_current == severity)return false;
+		_current = severity;
+		return true;
+	}
+	
+	@Override
+	public String toString() {
+		return _id + " " + getCurrent().toString(); //$NON-NLS-1$
+	}
+
+	/**
+	 * Answer a copy of this object.
+	 */
+	public MessageSeveritySetting copy() {
+		MessageSeveritySetting ms = new MessageSeveritySetting(_id, _label, _default);
+		ms._current = _current;
+		return ms;
+	}
+
+}
diff --git a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/MutableProjectSettings.java b/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/MutableProjectSettings.java
new file mode 100644
index 0000000..73bf21c
--- /dev/null
+++ b/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/MutableProjectSettings.java
@@ -0,0 +1,96 @@
+/*******************************************************************************
+ * Copyright (c) 2009 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.wst.validation;
+
+import org.eclipse.core.resources.IProject;
+
+/**
+ * This class holds the overall project validation settings.
+ * <p>
+ * The following procedure is used to change a project's Validation settings.
+ * <ol>
+ * <li>The MutableProjectSettings are retrieved.</li>
+ * <li>The MutableProjectSettings are changed.</li>
+ * <li>The MutableProjectSettings are "applied".</li>
+ * </ol>
+ * </p>
+ * <p>In order for a project's validation setting to be effective, both 
+ * {@link #getOverride()} and {@link MutableWorkspaceSettings#getOverride()}
+ * must be true.
+ * </p>
+ * <p>
+ * These settings can be retrieved with {@link ValidationFramework#getProjectSettings(IProject)}.
+ * </p>
+ * <p>
+ * <b>Provisional API:</b> This class/interface is part of an interim API that is still under development and expected to 
+ * change significantly before reaching stability. It is being made available at this early stage to solicit feedback 
+ * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken 
+ * (repeatedly) as the API evolves.
+ * </p>
+
+ * @author karasiuk
+ *
+ */
+public final class MutableProjectSettings {
+	private final IProject	_project;
+
+	private boolean _override;
+	private boolean	_suspend;
+	private final IMutableValidator[] _validators;
+	
+	public IMutableValidator[] getValidators() {
+		return _validators;
+	}
+
+	public MutableProjectSettings(IProject project, IMutableValidator[] validators){
+		_project = project;
+		_validators = validators;
+	}
+
+	/**
+	 * Can this project override the workspace level validation settings?
+	 */
+	public boolean getOverride() {
+		return _override;
+	}
+
+	/**
+	 * Change whether this project can override workspace level validation settings.
+	 * @param override Set to true if the project is allowed to override workspace level validation settings.
+	 */
+	public void setOverride(boolean override) {
+		_override = override;
+	}
+
+	/**
+	 * Is validation suspended for this project?
+	 */
+	public boolean getSuspend() {
+		return _suspend;
+	}
+
+	/**
+	 * Change whether this project is suspending it's validation.
+	 * @param suspend Set to true, to suspend validation for this project.
+	 */
+	public void setSuspend(boolean suspend) {
+		_suspend = suspend;
+	}
+
+	/**
+	 * Answer the project that these settings are for.
+	 */
+	public IProject getProject() {
+		return _project;
+	}
+
+
+}
diff --git a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/MutableWorkspaceSettings.java b/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/MutableWorkspaceSettings.java
new file mode 100644
index 0000000..80d18f1
--- /dev/null
+++ b/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/MutableWorkspaceSettings.java
@@ -0,0 +1,96 @@
+/*******************************************************************************
+ * Copyright (c) 2009 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.wst.validation;
+
+import org.eclipse.wst.validation.internal.model.GlobalPreferencesValues;
+
+
+/**
+ * This class holds the overall workspace validation settings.
+ * <p>
+ * The following procedure is used to change a project's Validation settings.
+ * <ol>
+ * <li>The MutableWorkspaceSettings are retrieved.</li>
+ * <li>The MutableWorkspaceSettings are changed.</li>
+ * <li>The MutableWorkspaceSettings are "applied".</li>
+ * </ol>
+ * </p>
+ * <p>
+ * These settings can be retrieved with {@link ValidationFramework#getWorkspaceSettings()}.
+ * </p>
+ * <p>
+ * <b>Provisional API:</b> This class/interface is part of an interim API that is still under development and expected to 
+ * change significantly before reaching stability. It is being made available at this early stage to solicit feedback 
+ * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken 
+ * (repeatedly) as the API evolves.
+ * </p>
+
+ * @author karasiuk
+ *
+ */
+public final class MutableWorkspaceSettings {
+
+	private final GlobalPreferencesValues _values;
+	
+	private final IMutableValidator[] _validators;
+	
+	public IMutableValidator[] getValidators() {
+		return _validators;
+	}
+
+	public MutableWorkspaceSettings(IMutableValidator[] validators, GlobalPreferencesValues values){
+		_validators = validators;
+		_values = values;
+	}
+	
+	public GlobalPreferencesValues getGlobalPreferencesValues(){
+		return _values;
+	}
+	
+	public boolean getAutoSave() {
+		return _values.saveAutomatically;
+	}
+
+	public void setAutoSave(boolean autoSave) {
+		_values.saveAutomatically = autoSave;
+	}
+
+	/**
+	 * Can this project override the workspace level validation settings?
+	 */
+	public boolean getOverride() {
+		return _values.override;
+	}
+
+	/**
+	 * Change whether this project can override workspace level validation settings.
+	 * @param override Set to true if the project is allowed to override workspace level validation settings.
+	 */
+	public void setOverride(boolean override) {
+		_values.override = override;
+	}
+
+	/**
+	 * Is validation suspended for this project?
+	 */
+	public boolean getSuspend() {
+		return _values.disableAllValidation;
+	}
+
+	/**
+	 * Change whether this project is suspending it's validation.
+	 * @param suspend Set to true, to suspend validation for this project.
+	 */
+	public void setSuspend(boolean suspend) {
+		_values.disableAllValidation = suspend;
+	}
+
+}
diff --git a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/PerformanceCounters.java b/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/PerformanceCounters.java
new file mode 100644
index 0000000..cf57721
--- /dev/null
+++ b/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/PerformanceCounters.java
@@ -0,0 +1,116 @@
+/*******************************************************************************
+ * Copyright (c) 2007, 2008 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.wst.validation;
+
+import org.eclipse.osgi.util.NLS;
+import org.eclipse.wst.validation.internal.Misc;
+import org.eclipse.wst.validation.internal.ValMessages;
+
+/**
+ * Some performance information for a validation invocation. This object is immutable.
+ * <p>
+ * <b>Provisional API:</b> This class/interface is part of an interim API that is still under development and expected to 
+ * change significantly before reaching stability. It is being made available at this early stage to solicit feedback 
+ * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken 
+ * (repeatedly) as the API evolves.
+ * </p>
+ * @noextend
+ * @author karasiuk
+ *
+ */
+public class PerformanceCounters {
+	
+	private long	_when;
+	private String 	_validatorId;
+	private String	_validatorName;
+	private String	_resourceName;
+	private int		_numberInvocations;
+	private	long	_elapsedTime;
+	private long	_cpuTime;
+	
+	/**
+	 * @param validatorId
+	 * @param validatorName
+	 * @param resourceName 
+	 * @param numberInvocations number of times the validator was invoked
+	 * @param elapsedTime elapsed time in milliseconds
+	 * @param cpuTime CPU time in nanoseconds
+	 */
+	public PerformanceCounters(String validatorId, String validatorName, String resourceName, 
+		int numberInvocations, long elapsedTime, long cpuTime){
+		
+		_when = System.currentTimeMillis();
+		_validatorId = validatorId;
+		_validatorName = validatorName;
+		_resourceName = resourceName;
+		_numberInvocations = numberInvocations;
+		_elapsedTime = elapsedTime;
+		_cpuTime = cpuTime;
+	}
+	
+	public String getValidatorId() {
+		return _validatorId;
+	}
+	public int getNumberInvocations() {
+		return _numberInvocations;
+	}
+	
+	/**
+	 * Answer the elapsed time in milliseconds. 
+	 */
+	public long getElapsedTime() {
+		return _elapsedTime;
+	}
+	
+	/**
+	 * Answer the amount of CPU time in nanoseconds. If this can not be determined,
+	 * answer -1.
+	 */
+	public long getCpuTime() {
+		return _cpuTime;
+	}
+	
+	@Override
+	public String toString() {
+		return NLS.bind(ValMessages.LogValEndTime,	
+			new Object[]{_validatorName, _validatorId, _resourceName, Misc.getTimeMS(_elapsedTime)});
+	}
+	
+	public String toString(boolean asSummary){
+		if (asSummary){
+			if (_cpuTime != -1)return NLS.bind(ValMessages.LogValSummary2, 
+				new Object[]{_validatorName, _validatorId, _numberInvocations, 
+					Misc.getTimeMS(_elapsedTime), Misc.getTimeNano(_cpuTime)});
+			
+			return NLS.bind(ValMessages.LogValSummary, 
+					new Object[]{_validatorName, _validatorId, _numberInvocations, Misc.getTimeMS(_elapsedTime)});
+		}
+		return toString();
+	}
+
+	public String getValidatorName() {
+		return _validatorName;
+	}
+
+	/** 
+	 * Answer when was the event logged. 
+	 * 
+	 * @see System#currentTimeMillis()
+	 */
+	public long getWhen() {
+		return _when;
+	}
+
+	public String getResourceName() {
+		return _resourceName;
+	}
+
+}
diff --git a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/ReporterHelper.java b/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/ReporterHelper.java
new file mode 100644
index 0000000..20876bf
--- /dev/null
+++ b/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/ReporterHelper.java
@@ -0,0 +1,70 @@
+/*******************************************************************************
+ * Copyright (c) 2007, 2008 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.wst.validation;
+
+import java.util.LinkedList;
+import java.util.List;
+
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.wst.validation.internal.MarkerManager;
+import org.eclipse.wst.validation.internal.provisional.core.IMessage;
+import org.eclipse.wst.validation.internal.provisional.core.IReporter;
+import org.eclipse.wst.validation.internal.provisional.core.IValidator;
+
+
+/**
+ * This is a temporary class to ease the transition from the previous validation framework.
+ * <p>
+ * This is not API. 
+ * @author karasiuk
+ *
+ */
+public class ReporterHelper implements IReporter {
+	private IProgressMonitor 	_monitor;
+	private List<IMessage>		_list = new LinkedList<IMessage>();
+	
+	public ReporterHelper(IProgressMonitor monitor){
+		_monitor = monitor;
+	}
+
+	public void addMessage(IValidator origin, IMessage message) {
+		_list.add(message);
+	}
+
+	public void displaySubtask(IValidator validator, IMessage message) {
+		_monitor.subTask(message.getText(validator.getClass().getClassLoader()));
+	}
+
+	public List<IMessage> getMessages() {
+		return _list;
+	}
+
+	public boolean isCancelled() {
+		return _monitor.isCanceled();
+	}
+
+	public void removeAllMessages(IValidator origin) {
+		_list.clear();
+	}
+
+	public void removeAllMessages(IValidator origin, Object object) {
+		_list.clear();
+	}
+
+	public void removeMessageSubset(IValidator validator, Object obj, String groupName) {
+		_list.clear();
+	}
+	
+	public void makeMarkers(){
+		MarkerManager.getDefault().makeMarkers(_list);
+	}
+	
+}
diff --git a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/ValidationEvent.java b/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/ValidationEvent.java
new file mode 100644
index 0000000..528e58e
--- /dev/null
+++ b/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/ValidationEvent.java
@@ -0,0 +1,75 @@
+/*******************************************************************************
+ * Copyright (c) 2008 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.wst.validation;
+
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.resources.IResourceDelta;
+
+/**
+ * An object that describes which object should be validated and what triggered its validation.
+ * <p>
+ * <b>Provisional API:</b> This class/interface is part of an interim API that is still under development and expected to 
+ * change significantly before reaching stability. It is being made available at this early stage to solicit feedback 
+ * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken 
+ * (repeatedly) as the API evolves.
+ * </p>
+ * @author karasiuk
+ *
+ */
+
+public final class ValidationEvent {
+	
+	private IResource 		_resource;
+	private int				_kind;
+	private IResourceDelta 	_dependsOn;
+	
+	/**
+	 * Create an object that describes what should be validated.
+	 * 
+	 * @param resource
+	 *            The resource to be validated.
+	 * @param kind
+	 *            The way the resource changed. It uses the same values as the
+	 *            kind parameter in IResourceDelta.
+	 * @param dependsOn
+	 *            If the resource is being validated because one of it's
+	 *            dependencies has changed, that change is described here. This
+	 *            can be null.
+	 */
+	public ValidationEvent(IResource resource, int kind, IResourceDelta dependsOn){
+		_resource = resource;
+		_kind = kind;
+		_dependsOn = dependsOn;
+	}
+
+	/**
+	 * The resource to be validated.
+	 */
+	public IResource getResource() {
+		return _resource;
+	}
+
+	/**
+	 * The way the resource changed. It uses the same values as the kind
+	 * parameter in IResourceDelta.
+	 */
+	public int getKind() {
+		return _kind;
+	}
+
+	/**
+	 * If the resource is being validated because one of it's dependencies has changed, that change is described here.
+	 * This method will return null when the trigger is not because of a dependency change.
+	 */
+	public IResourceDelta getDependsOn() {
+		return _dependsOn;
+	}
+}
diff --git a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/ValidationFramework.java b/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/ValidationFramework.java
new file mode 100644
index 0000000..41f20b7
--- /dev/null
+++ b/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/ValidationFramework.java
@@ -0,0 +1,724 @@
+/*******************************************************************************
+ * Copyright (c) 2007, 2011 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.wst.validation;
+
+import java.lang.reflect.InvocationTargetException;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.resources.IResourceVisitor;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.OperationCanceledException;
+import org.eclipse.core.runtime.Platform;
+import org.eclipse.core.runtime.jobs.Job;
+import org.eclipse.core.runtime.preferences.IEclipsePreferences;
+import org.eclipse.core.runtime.preferences.InstanceScope;
+import org.eclipse.wst.validation.Validator.V1;
+import org.eclipse.wst.validation.internal.ConfigurationManager;
+import org.eclipse.wst.validation.internal.ContentTypeWrapper;
+import org.eclipse.wst.validation.internal.DebugConstants;
+import org.eclipse.wst.validation.internal.DependencyIndex;
+import org.eclipse.wst.validation.internal.DisabledResourceManager;
+import org.eclipse.wst.validation.internal.DisabledValidatorManager;
+import org.eclipse.wst.validation.internal.GlobalConfiguration;
+import org.eclipse.wst.validation.internal.MarkerManager;
+import org.eclipse.wst.validation.internal.Misc;
+import org.eclipse.wst.validation.internal.PerformanceMonitor;
+import org.eclipse.wst.validation.internal.ProjectUnavailableError;
+import org.eclipse.wst.validation.internal.ValManager;
+import org.eclipse.wst.validation.internal.ValOperation;
+import org.eclipse.wst.validation.internal.ValPrefManagerGlobal;
+import org.eclipse.wst.validation.internal.ValPrefManagerProject;
+import org.eclipse.wst.validation.internal.ValType;
+import org.eclipse.wst.validation.internal.ValidationRunner;
+import org.eclipse.wst.validation.internal.ValidatorMetaData;
+import org.eclipse.wst.validation.internal.ValidatorMutable;
+import org.eclipse.wst.validation.internal.ValManager.UseProjectPreferences;
+import org.eclipse.wst.validation.internal.model.GlobalPreferences;
+import org.eclipse.wst.validation.internal.model.GlobalPreferencesValues;
+import org.eclipse.wst.validation.internal.model.ProjectPreferences;
+import org.eclipse.wst.validation.internal.operations.ValidationBuilder;
+import org.eclipse.wst.validation.internal.operations.ValidatorManager;
+import org.eclipse.wst.validation.internal.operations.WorkbenchReporter;
+import org.eclipse.wst.validation.internal.plugin.ValidationPlugin;
+import org.eclipse.wst.validation.internal.provisional.core.IReporter;
+
+
+/**
+ * The central class of the Validation Framework.
+ * <p>
+ * This is a singleton class that is accessed through the getDefault() method. 
+ * <p>
+ * <b>Provisional API:</b> This class/interface is part of an interim API that is still under development and expected to 
+ * change significantly before reaching stability. It is being made available at this early stage to solicit feedback 
+ * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken 
+ * (repeatedly) as the API evolves.
+ * </p>
+ * @author karasiuk
+ *
+ */
+public final class ValidationFramework {
+	
+	private volatile IDependencyIndex 	_dependencyIndex;
+	private IPerformanceMonitor			_performanceMonitor;
+	
+	private Set<IProject> 				_suspendedProjects;
+	private boolean 					_suspendAllValidation;
+
+	/** 
+	 * Answer the singleton, default instance of this class.
+	 */
+	public static ValidationFramework getDefault(){
+		return Singleton.vf;
+	}
+	
+	private ValidationFramework(){}
+	
+	/**
+	 * Add the validation builder to the project, so that the project can support
+	 * build time validation. It is safe to call this method, if the builder was
+	 * previously added to the project. It will not be added more than once.
+	 * 
+	 * @param project The project that the builder is added to.
+	 */
+	public void addValidationBuilder(IProject project){
+		ValidatorManager.addProjectBuildValidationSupport(project);
+	}
+	
+	/**
+	 * Clear any validation markers that may have been set by this validator.
+	 * 
+	 * @param resource
+	 * 		The resource that may have it's markers cleared.
+	 * @param validatorId
+	 * 		The id of validator that created the marker.
+	 */
+	public void clearMessages(IResource resource, String validatorId) throws CoreException {
+		Validator v = getValidator(validatorId, null);
+		if (v != null)MarkerManager.getDefault().clearMarker(resource, v);
+	}
+	
+	/**
+	 * Disable all validation for the given resource. This method instructs
+	 * the framework to not run any validators on the given resource or any of
+	 * it's children. This setting is persistent. Currently this only works with version 2
+	 * validators.
+	 * <p>
+	 * Use the enableValidation method to restore validation.
+	 * </p>
+	 * 
+	 * @param resource
+	 *            The resource that is having validation disabled. It must be an IFolder or an IFile.
+	 * 
+	 * @see #enableValidation(IResource)
+	 */
+	public void disableValidation(IResource resource){
+		assert resource != null;
+		DisabledResourceManager.getDefault().disableValidation(resource);
+	}
+	
+	/**
+	 * Enable validation for the given resource. If the resource was not
+	 * previously disabled this method call has no effect. Currently this only
+	 * works with version 2 validators.
+	 * 
+	 * @param resource
+	 * 		The resource that is having validation re-enabled.
+	 * 
+	 * @see #disableValidation(IResource)
+	 */
+	public void enableValidation(IResource resource){
+		DisabledResourceManager.getDefault().enableValidation(resource);
+	}
+	
+	/**
+	 * Answer the dependency index. Validators can use this to determine which resources depend on which
+	 * other resources.
+	 */
+	public IDependencyIndex getDependencyIndex(){
+		// note how the _dependencyIndex is volatile so that this double checking approach can be used.
+		if (_dependencyIndex == null){
+			synchronized(this){
+				if (_dependencyIndex == null)_dependencyIndex = new DependencyIndex();
+			}
+		}
+		return _dependencyIndex;
+	}
+
+	/**
+	 * Answer a performance monitor for the validators.
+	 */
+	public synchronized IPerformanceMonitor getPerformanceMonitor(){
+		if (_performanceMonitor == null){
+			boolean traceTimes = Misc.debugOptionAsBoolean(DebugConstants.TraceTimes);
+			String traceFile = Platform.getDebugOption(DebugConstants.TraceTimesFile);
+			boolean useDoubles = Misc.debugOptionAsBoolean(DebugConstants.TraceTimesUseDoubles);
+
+			_performanceMonitor = PerformanceMonitor.create(traceTimes, traceFile, useDoubles);
+		}
+		return _performanceMonitor;
+	}
+	
+	/**
+	 * Answer the preference store that holds the persisted global validation settings.
+	 */
+	public IEclipsePreferences getPreferenceStore(){
+		return new InstanceScope().getNode(ValidationPlugin.PLUGIN_ID);
+	}
+	
+	public IReporter getReporter(IProject project, IProgressMonitor monitor){
+		return new WorkbenchReporter(project, monitor);
+	}
+	
+	/**
+	 * Answer all the validators that are applicable for the given resource. A validator is
+	 * still returned even if it has been turned off by the user.
+	 * <p>
+	 * The caller may still need to test if the validator has been turned off by
+	 * the user, by using the isBuildValidation() and isManualValidation()
+	 * methods.
+	 * </p>
+	 * 
+	 * @param resource
+	 * 		The resource that determines which validators are applicable.
+	 * 
+	 * @param isManual
+	 * 		If true then the validator must be turned on for manual validation.
+	 * 		If false then the isManualValidation setting isn't used to filter
+	 * 		out validators.
+	 * 
+	 * @param isBuild
+	 * 		If true then the validator must be turned on for build based
+	 * 		validation. If false then the isBuildValidation setting isn't used
+	 * 		to filter out validators.
+	 * 
+	 * @see Validator#isBuildValidation()
+	 * @see Validator#isManualValidation()
+	 */
+	public Validator[] getValidatorsFor(IResource resource, boolean isManual, boolean isBuild){
+		IProject project = resource.getProject();
+		List<Validator> list = new LinkedList<Validator>();
+		ContentTypeWrapper ctw = new ContentTypeWrapper();
+		for (Validator val : ValManager.getDefault().getValidators(project)){
+			if (val.shouldValidate(resource, isManual, isBuild, ctw))list.add(val);
+		}
+		
+		Validator[] result = new Validator[list.size()];
+		list.toArray(result);
+		return result;
+	}
+	
+	/**
+	 * Answer all the validators that should not validate the resource, either
+	 * because their filters don't support the resource, or the validator has
+	 * been disabled for both build validation and manual validation.
+	 * 
+	 * @param resource
+	 * 		The resource this is being tested.
+	 */
+	public Set<Validator> getDisabledValidatorsFor(IResource resource){
+		return DisabledValidatorManager.getDefault().getDisabledValidatorsFor(resource);
+	}
+	
+	/**
+	 * Answer the global validator with the given id.
+	 * 
+	 * @deprecated Use getValidator(String id, IProject project) with a null project instead.
+	 * 
+	 * @param id
+	 * @return null if the validator is not found
+	 */
+	public Validator getValidator(String id){
+		return ValManager.getDefault().getValidatorWithId(id, null);
+	}
+	
+	/**
+	 * Answer the validator with the given id that is in effect for the given
+	 * project.
+	 * <p>
+	 * Individual projects may override the global validation preference
+	 * settings. If this is allowed and if the project has it's own settings,
+	 * then those validators are returned via this method.
+	 * </p>
+	 * <p>
+	 * The following approach is used. For version 1 validators, the validator
+	 * is only returned if it is defined to operate on this project type. This
+	 * is the way that the previous version of the framework did it. For version
+	 * 2 validators, they are all returned.
+	 * </p>
+	 * 
+	 * @param id
+	 * 		Validator id.
+	 * @param project
+	 * 		This can be null, in which case all the registered validators are
+	 * 		checked.
+	 * @return null if the validator is not found
+	 */
+	public Validator getValidator(String id, IProject project){
+		return ValManager.getDefault().getValidatorWithId(id, project);
+	}
+	
+	/**
+	 * Answer copies of all the registered validators.
+	 * 
+	 * @return Answer an empty array if there are no validators.
+	 */
+	public Validator[] getValidators(){
+		return ValManager.getDefault().getValidatorsCopy();
+	}
+		
+	/**
+	 * Answer the validation settings that have been defined on the
+	 * project. To "activate" any changes to these settings, the
+	 * {@link #applyChanges(MutableProjectSettings, boolean)} method needs to be
+	 * called.
+	 * 
+	 * @param project The project who's settings you wish to examine or change.
+	 * @return Validation settings that apply to the given project.
+	 */
+	public MutableProjectSettings getProjectSettings(IProject project){
+		ProjectPreferences pp = ValManager.getDefault().getProjectPreferences(project);
+		Validator[] vals = pp.getValidators();
+		ValidatorMutable[] vms = new ValidatorMutable[vals.length];
+		for (int i=0; i<vals.length; i++)vms[i] = new ValidatorMutable(vals[i]);
+
+		MutableProjectSettings mps = new MutableProjectSettings(project, vms);
+		mps.setOverride(pp.getOverride());
+		mps.setSuspend(pp.getSuspend());
+		return mps;
+	}
+	
+	/**
+	 * Answer the validation settings that have been defined at the workspace level.
+	 * To "activate" any changes to these settings, the
+	 * {@link #applyChanges(MutableWorkspaceSettings, boolean)} method needs to be
+	 * called.
+	 * 
+	 * @return Validation settings that apply to the entire workspace.
+	 */
+	public MutableWorkspaceSettings getWorkspaceSettings() throws InvocationTargetException{
+		
+		ValManager vm = ValManager.getDefault();
+		GlobalPreferences gp = vm.getGlobalPreferences();
+		
+		Validator[] vals = vm.getValidators();		
+		ValidatorMutable[] vms = new ValidatorMutable[vals.length];
+		for (int i=0; i<vals.length; i++)vms[i] = new ValidatorMutable(vals[i]);
+
+		MutableWorkspaceSettings mws = new MutableWorkspaceSettings(vms, gp.asValues());
+		return mws;
+	}
+		
+	/**
+	 * Apply the changes that have been been to the validation settings.
+	 * 
+	 * @param settings
+	 *            The project settings.
+	 * @param persist
+	 *            If true then the changes are persisted to the property files.
+	 *            If false the changes are applied to the validators, but are
+	 *            not persisted.
+	 */
+	public void applyChanges(MutableProjectSettings settings, boolean persist){
+		ValPrefManagerProject vpm = new ValPrefManagerProject(settings.getProject());
+		vpm.savePreferences(settings, persist);
+	}
+	
+	/**
+	 * Apply the changes that have been been to the validation settings.
+	 * 
+	 * @param settings
+	 *            The workspace settings.
+	 * @param persist
+	 *            If true then the changes are persisted to the property files.
+	 *            If false the changes are applied to the validators, but are
+	 *            not persisted.
+	 */
+	public void applyChanges(MutableWorkspaceSettings settings, boolean persist){
+		
+		ValManager vm = ValManager.getDefault();
+		GlobalPreferencesValues gpv = settings.getGlobalPreferencesValues();
+		vm.replace(gpv);
+		
+		IMutableValidator[] mvs = settings.getValidators();
+		ValidatorMutable[] vals = new ValidatorMutable[mvs.length];
+		for (int i=0; i<mvs.length; i++)vals[i] = (ValidatorMutable)mvs[i];
+		ValPrefManagerGlobal.getDefault().savePreferences(vm.getGlobalPreferences(), vals, persist);
+		ValPrefManagerGlobal.saveV1Preferences(vals, persist);		
+	}
+	
+	/**
+	 * Validators can use project level settings (Project natures and facets) to
+	 * determine if they are applicable to the project or not.
+	 * 
+	 * @param project
+	 *            The project that the configuration is based on.
+	 * @return The copies of the validators that are configured to run on this project based
+	 *         on the project level settings.
+	 * @throws ProjectUnavailableError
+	 */
+	public Validator[] getValidatorsConfiguredForProject(IProject project) throws ProjectUnavailableError {
+		Validator[] orig = ValManager.getDefault().getValidatorsConfiguredForProject(project, UseProjectPreferences.Normal);
+		Validator[] copy = new Validator[orig.length];
+		for (int i=0; i<orig.length; i++)copy[i] = orig[i].copy();
+		return copy;
+	}
+	
+	/**
+	 * Answer all the validators that are applicable for the given resource.
+	 * 
+	 * @param resource the resource that determines which validators are applicable.
+	 */
+	public Validator[] getValidatorsFor(IResource resource){
+		List<Validator> list = new LinkedList<Validator>();
+		for (Validator v : getValidatorsFor(resource, false, false)){
+			if (v.isBuildValidation() || v.isManualValidation())list.add(v);
+		}
+		Validator[] vals = new Validator[list.size()];
+		return list.toArray(vals);
+	}
+	
+	/**
+	 * Answer true if the resource has any enabled validators.
+	 * 
+	 * @param resource
+	 * 		A file, folder or project.
+	 * 
+	 * @param isManual
+	 * 		If true then the validator must be turned on for manual validation.
+	 * 		If false then the isManualValidation setting isn't used to filter
+	 * 		out validators.
+	 * 
+	 * @param isBuild
+	 * 		If true then the validator must be turned on for build based
+	 * 		validation. If false then the isBuildValidation setting isn't used
+	 * 		to filter out validators.
+	 */
+	public boolean hasValidators(IResource resource, boolean isManual, boolean isBuild){
+		return ValManager.getDefault().hasValidators(resource, isManual, isBuild);
+	}
+	
+	/**
+	 * Answer whether or not the validator has been activated, i.e. has the
+	 * bundle that defines the validator been loaded. We do not want to cause
+	 * unnecessary bundle loading, so this check can be performed by third party
+	 * callers, to prevent making other calls that will force the validator to
+	 * be loaded.
+	 * 
+	 * @param validator
+	 *            The validator that is being tested.
+	 * @return true if the validator has already been loaded.
+	 */
+	public boolean isLoaded(Validator validator){
+		return validator.isLoaded();
+	}
+	
+	/**
+	 * Waits until all the validation jobs and all the other auto build jobs are finished. 
+	 * This method will block the
+	 * calling thread until all such jobs have finished executing, or until this
+	 * thread is interrupted. If there are no relevant jobs that are
+	 * currently waiting, running, or sleeping, this method returns immediately.
+	 * Feedback on how the join is progressing is provided to the progress
+	 * monitor.
+	 * <p>
+	 * If this method is called while the job manager is suspended, only jobs
+	 * that are currently running will be joined. Once there are no jobs in the
+	 * family in the {@link Job#RUNNING} state, this method returns.
+	 * </p>
+	 * <p>
+	 * Note that there is a deadlock risk when using join. If the calling thread
+	 * owns a lock or object monitor that the joined thread is waiting for,
+	 * deadlock will occur. This method can also result in starvation of the
+	 * current thread if another thread continues to add jobs of the given
+	 * family, or if a job in the given family reschedules itself in an infinite
+	 * loop.
+	 * </p>
+	 * 
+	 * <p>If you are interested in only waiting for the validation jobs, see the
+	 * joinValidationOnly method.
+	 * 
+	 * @param monitor
+	 * 		Progress monitor for reporting progress on how the wait is
+	 * 		progressing, or <code>null</code> if no progress monitoring is
+	 * 		required.
+	 * @exception InterruptedException
+	 * 		if this thread is interrupted while waiting
+	 * @exception OperationCanceledException
+	 * 		if the progress monitor is canceled while waiting
+	 * 
+	 * @see #joinValidationOnly(IProgressMonitor)
+	 */
+	public void join(IProgressMonitor monitor) throws InterruptedException, OperationCanceledException {
+		Job.getJobManager().join(ResourcesPlugin.FAMILY_AUTO_BUILD, monitor);
+		Job.getJobManager().join(ValidationBuilder.FAMILY_VALIDATION_JOB, monitor);
+	}
+	
+	/**
+	 * Waits until all the validation jobs are finished. 
+	 * This method will block the
+	 * calling thread until all such jobs have finished executing, or until this
+	 * thread is interrupted. If there are no relevant jobs that are
+	 * currently waiting, running, or sleeping, this method returns immediately.
+	 * Feedback on how the join is progressing is provided to the progress
+	 * monitor.
+	 * <p>
+	 * If this method is called while the job manager is suspended, only jobs
+	 * that are currently running will be joined. Once there are no jobs in the
+	 * family in the {@link Job#RUNNING} state, this method returns.
+	 * </p>
+	 * <p>
+	 * Note that there is a deadlock risk when using join. If the calling thread
+	 * owns a lock or object monitor that the joined thread is waiting for,
+	 * deadlock will occur. This method can also result in starvation of the
+	 * current thread if another thread continues to add jobs of the given
+	 * family, or if a job in the given family reschedules itself in an infinite
+	 * loop.
+	 * </p>
+	 * 
+	 * @param monitor
+	 * 		Progress monitor for reporting progress on how the wait is
+	 * 		progressing, or <code>null</code> if no progress monitoring is
+	 * 		required.
+	 * @exception InterruptedException
+	 * 		if this thread is interrupted while waiting
+	 * @exception OperationCanceledException
+	 * 		if the progress monitor is canceled while waiting
+	 */
+	public void joinValidationOnly(IProgressMonitor monitor) throws InterruptedException, OperationCanceledException {
+		Job.getJobManager().join(ValidationBuilder.FAMILY_VALIDATION_JOB, monitor);
+	}
+	
+	/**
+	 * Suspends, or undoes the suspension of, validation on the current project.
+	 * If <b>suspend</b> is true then validation is suspended and if it's false
+	 * then validation is not suspended on the project. The value of this
+	 * variable is not persisted.
+	 * <p>
+	 * Be <b>very careful</b> when you use this method! Turn validation back on in a
+	 * finally block because if the code which suspended validation crashes, the
+	 * user has no way to reset the suspension. The user will have to shut down
+	 * and restart the workbench to get validation to work again.
+	 * </p>
+	 * 
+	 * @param project
+	 * 		The project that is to be suspended or unsuspended.
+	 * @param suspend
+	 * 		If true, validation on the project will be suspend. If false it will
+	 * 		not be suspended.
+	 */
+	public void suspendValidation(IProject project, boolean suspend) {
+		if (project == null)return;
+		if (suspend)getSuspendedProjects().add(project);
+		else getSuspendedProjects().remove(project);
+	}
+	
+	private synchronized Set<IProject> getSuspendedProjects(){
+		if (_suspendedProjects == null)_suspendedProjects = Collections.synchronizedSet(new HashSet<IProject>(20));
+		return _suspendedProjects;
+	}
+	
+	/**
+	 * Save the validators settings into the persistent store, there by making their settings the active settings.
+	 * <p>
+	 * A common use of this method would be to change whether particular validators are enabled or not. For example
+	 * if you only wanted the JSP validator enabled, you could use code similar to this:
+	 * <pre>
+	 * ValidationFramework vf = ValidationFramework.getDefault();
+	 * Validator[] vals = vf.getValidators();
+	 * for (Validator v : vals){
+	 *   boolean enabled = false;
+	 *   if (v.getValidatorClassname().equals("org.eclipse.jst.jsp.core.internal.validation.JSPBatchValidator"))enabled = true;
+	 *     v.setBuildValidation(enabled);
+	 *     v.setManualValidation(enabled);
+	 *  }
+	 * vf.saveValidators(vals);
+	 * </pre>
+	 * </p> 
+	 * 
+	 * @param validators The validators that you are saving.
+	 * 
+	 * @throws InvocationTargetException
+	 */
+	public void saveValidators(Validator[] validators) throws InvocationTargetException{
+		
+		
+		ValPrefManagerGlobal gp = ValPrefManagerGlobal.getDefault();
+		gp.saveAsPrefs(validators);	
+		
+		GlobalConfiguration gc = ConfigurationManager.getManager().getGlobalConfiguration();
+		
+		List<ValidatorMetaData> manual = new LinkedList<ValidatorMetaData>();
+		List<ValidatorMetaData> build = new LinkedList<ValidatorMetaData>();
+		for (Validator v : validators){
+			V1 v1 = v.asV1Validator();
+			if (v1 == null)continue;
+			if (v1.isManualValidation())manual.add(v1.getVmd());
+			if (v1.isBuildValidation())build.add(v1.getVmd());
+		}
+		
+		ValidatorMetaData[] array = new ValidatorMetaData[manual.size()];
+		gc.setEnabledManualValidators(manual.toArray(array));
+		
+		array = new ValidatorMetaData[build.size()];
+		gc.setEnabledBuildValidators(build.toArray(array));
+
+		gc.passivate();
+		gc.store();		
+	}
+
+	/**
+	 * Suspends, or undoes the suspension of, validation on all projects in the
+	 * workbench. If "suspend" is true then validation is suspended and if it's
+	 * "false" then validation is not suspended. The value of this variable is
+	 * not persisted.
+	 * <p>
+	 * Be <b>very careful</b> when you use this method! Turn validation back on in a
+	 * finally block because if the code which suspended validation crashes, the
+	 * user has no way to reset the suspension. The user will have to shut down
+	 * and restart the workbench to get validation to work again.
+	 * </p>
+	 */
+	public void suspendAllValidation(boolean suspend) {
+		_suspendAllValidation = suspend;
+	}
+
+	/**
+	 * Return true if "suspend all" is enabled, false otherwise.
+	 */
+	public boolean isSuspended() {
+		return _suspendAllValidation;
+	}
+
+	/**
+	 * Returns true if validation will not run on the project because it's been suspended. This
+	 * method checks only the suspension status; if validation cannot run for some other reason (for
+	 * example, there are no enabled validators), yet the IProject is not suspended, this method
+	 * will return true even though validation will not run.
+	 */
+	public boolean isSuspended(IProject project) {
+		if (_suspendAllValidation)return true;
+		if (project == null)return false;
+		return getSuspendedProjects().contains(project);
+	}
+
+	/**
+	 * This method should be called by any code that is preparing to suspend validation on a
+	 * project. Rather than calling isSuspended(IProject), which will also return true if all validation
+	 * has been suspended. 
+	 * 
+	 * @param project the project that is being tested
+	 * @return boolean true if the project has been suspended
+	 */
+	public boolean isProjectSuspended(IProject project) {
+		if (project == null)return false;
+		return getSuspendedProjects().contains(project);
+	}
+	
+	/**
+	 * Validate the projects. Exactly one of isManual or isBuild needs to be true.
+	 * 
+	 * @param projects
+	 *            The projects to be validated.
+	 * 
+	 * @param isManual
+	 *            Is this being done as part of a manual validation? i.e. did
+	 *            the user select the Validate menu item?
+	 * 
+	 * @param isBuild
+	 *            Is this being done as part of a build?
+	 * 
+	 * @param monitor
+	 * 
+	 * @return the validation result which is the combined result for all the
+	 *         resources that were validated.
+	 */
+	public ValidationResults validate(IProject[] projects, final boolean isManual, final boolean isBuild,
+		IProgressMonitor monitor) throws CoreException{
+		ValType type = ValType.Build;
+		if (isManual)type = ValType.Manual;
+		ValOperation vo = ValidationRunner.validate(createMap(projects), type, monitor, true);
+		return vo.getResults();
+	}
+
+	/**
+	 * Validate a specific file resource.
+	 * 
+	 * @param file
+	 *            The file to be validated.
+	 * @param monitor
+	 *            Progress monitor.
+	 * @return the result of validating the file.
+	 */
+  public ValidationResults validate(IFile file, IProgressMonitor monitor) throws CoreException{
+      ValOperation vo = ValidationRunner.validate(file, ValType.Manual, monitor, true);
+      return vo.getResults();
+    }
+	  
+	/**
+	 * Answer all the resources in the projects as a map.
+	 * @param projects
+	 */
+	private Map<IProject, Set<IResource>> createMap(IProject[] projects) throws CoreException{
+		final HashMap<IProject, Set<IResource>> map = new HashMap<IProject, Set<IResource>>(1000);
+			
+		for (IProject p : projects){
+			Set<IResource> set = new HashSet<IResource>(1000);
+			ResourceAdder ra = new ResourceAdder(set);
+			p.accept(ra);
+			map.put(p, set);
+		}
+		return map;
+	}
+	
+	public static class ResourceAdder implements IResourceVisitor {
+		
+		private Set<IResource> _set;
+		
+		/**
+		 * A class that knows how to add resources to a set.
+		 * @param set the set where the resources are added.
+		 */
+		public ResourceAdder(Set<IResource> set){
+			_set = set;
+		}
+
+		public boolean visit(IResource resource) throws CoreException {
+			// [225839] the older validators only expect files and folders.
+			int type = resource.getType();
+			if (type == IResource.FILE || type == IResource.FOLDER)_set.add(resource);
+			return true;
+		}
+		
+	}
+	
+	/**
+	 * Store the singleton for the ValidationFramework. This approach is used to avoid having to synchronize the
+	 * ValidationFramework.getDefault() method.
+	 * 
+	 * @author karasiuk
+	 *
+	 */
+	private static class Singleton {
+		static ValidationFramework vf = new ValidationFramework();
+	}
+
+}
diff --git a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/ValidationResult.java b/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/ValidationResult.java
new file mode 100644
index 0000000..c1714e1
--- /dev/null
+++ b/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/ValidationResult.java
@@ -0,0 +1,385 @@
+/*******************************************************************************
+ * Copyright (c) 2007, 2009 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.wst.validation;
+
+import java.util.LinkedList;
+import java.util.List;
+
+import org.eclipse.core.resources.IMarker;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.wst.validation.internal.core.ValidationException;
+import org.eclipse.wst.validation.internal.provisional.core.IReporter;
+
+/**
+ * The result of running a validate operation. Validators create and return this objects as part of
+ * performing their validation.
+ * <p>
+ * <b>Provisional API:</b> This class/interface is part of an interim API that is still under development and expected to 
+ * change significantly before reaching stability. It is being made available at this early stage to solicit feedback 
+ * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken 
+ * (repeatedly) as the API evolves.
+ * </p>
+ * @author karasiuk
+ *
+ */
+public final class ValidationResult {
+	
+	private final List<ValidatorMessage> _messages = new LinkedList<ValidatorMessage>();
+	
+	private final static ValidatorMessage[] _noMessages = new ValidatorMessage[0];
+	
+	private boolean		_canceled;
+	
+	/** 
+	 * The resources that the validated resource depends on. This can be left null.
+	 * For example, an XML file may depend on a XSD in order to know if it is valid or not.
+	 * It would pass back the XSD file. 
+	 */
+	private IResource[]	_dependsOn;
+	
+	/** 
+	 * The objects that you validated as a side effect of validating this object. The framework will not
+	 * call you with any of these objects (in this validation run). This can be left null.
+	 */
+	private IResource[] _validated;
+	
+	private int			_severityError;
+	private int			_severityWarning;
+	private int			_severityInfo;
+	
+	private IProject	_suspendValidation;
+	
+	/** A count of the number of resources that were validated. */
+	private int			_numberOfValidatedResources = 1;
+	
+	private ReporterHelper	_reporter;
+	private ValidationException	_validationException;
+	
+	/**
+	 * This is an optional method, that a validator can use to return error
+	 * messages. The validation framework converts these into IMarkers.
+	 * <p>
+	 * The scenario that motivated this method, is when a validator is used both
+	 * for <b>as you type</b> validation and <b>build</b> validation. When
+	 * called in as you type mode, the validator doesn't want to directly create IMarkers,
+	 * because the resource hasn't been saved yet. It needs to return something
+	 * other than an IMarker. But when called in build mode, it does ultimately
+	 * want IMarkers. By returning ValidatorMessages, it only needs to return
+	 * one type of message, and those messages can be either be directly used by
+	 * the caller, or automatically converted into IMarkers by the validation
+	 * framework.
+	 * </p>
+	 * <p>
+	 * To make matters even more complicated there is a third way to return
+	 * messages. To make it easier for old validators to port to the new
+	 * framework, they can continue to use an IReporter. If a validator calls
+	 * the getReporter() method then it is assumed by the framework that that is
+	 * the approach that they have chosen.
+	 * </p>
+	 * 
+	 * @see #getReporter(IProgressMonitor)
+	 * 
+	 * @param message
+	 * 		A validation message.
+	 */
+	public void add(ValidatorMessage message){
+		_messages.add(message);
+	}
+	
+	/**
+	 * Answer an IReporter for handing error messages.
+	 * <p>
+	 * This is a transition method, to help old validators port to the new validation framework. If this method
+	 * is called it is assumed by the framework, that this IReporter will be used as the only way of passing messages
+	 * back to the framework.
+	 * 
+	 * @see #add(ValidatorMessage)
+	 * @param monitor
+	 */
+	public IReporter getReporter(IProgressMonitor monitor){
+		if (_reporter == null)_reporter = new ReporterHelper(monitor);
+		return _reporter;
+	}
+	
+	ReporterHelper getReporterHelper(){
+		return _reporter;
+	}
+	
+	/**
+	 * Merge the message counts and messages from an individual validator into this result.
+	 * @param result it can be null, in which case it is ignored.
+	 */
+	public void mergeResults(ValidationResult result){
+		if (result == null)return;
+		
+		ValidatorMessage[] msgs = result.getMessages();
+		for (ValidatorMessage m : msgs){
+			add(m);
+			int severity = m.getAttribute(IMarker.SEVERITY, 0);
+			switch (severity){
+			case IMarker.SEVERITY_ERROR:
+				incrementError(1);
+				break;
+			case IMarker.SEVERITY_WARNING:
+				incrementWarning(1);
+				break;
+			case IMarker.SEVERITY_INFO:
+				incrementInfo(1);
+				break;
+					
+			}
+		}
+		
+		incrementError(result.getSeverityError());
+		incrementWarning(result.getSeverityWarning());
+		incrementInfo(result.getSeverityInfo());
+		
+		_numberOfValidatedResources += result.getNumberOfValidatedResources();
+		
+	}
+
+	/**
+	 * Answer the resources that the validated resource depends on.
+	 */
+	public IResource[] getDependsOn() {
+		return _dependsOn;
+	}
+	
+	/**
+	 * Answer any validation messages that were added by the validator. 
+	 * @return an array is returned even if there are no messages.
+	 */
+	public ValidatorMessage[] getMessages(){
+		if (_messages == null)return _noMessages;
+		ValidatorMessage[] msgs = new ValidatorMessage[_messages.size()];
+		_messages.toArray(msgs);
+		return msgs;
+	}
+		
+	/**
+	 * Answer a copy of any validation messages that were added by the validator. The array is a new
+	 * array, and each message is a copy. 
+	 * @return an array is returned even if there are no messages.
+	 */
+	public synchronized ValidatorMessage[] getMessagesAsCopy(){
+		if (_messages == null)return _noMessages;
+		ValidatorMessage[] msgs = new ValidatorMessage[_messages.size()];
+		int i = 0;
+		for (ValidatorMessage msg : _messages)msgs[i++] = msg.asCopy();
+		return msgs;
+	}
+
+	/**
+	 * Update the resources that the validated resource depends on. This can be
+	 * left null. For example, a XML file may depend on a XSD file in order to
+	 * know if it is valid or not. It would pass back that XSD file.
+	 * 
+	 * @param dependsOn
+	 * 		If this is null then the dependency information is not updated. To
+	 * 		remove the dependency information, an empty array needs to be
+	 * 		supplied. A non null parameter, <b>replaces</b> all the dependency
+	 * 		information for this resource, for this validator.
+	 */
+	public void setDependsOn(IResource[] dependsOn) {
+		_dependsOn = dependsOn;
+	}
+	
+	/**
+	 * @return All the resources that were validated as a side-effect of
+	 * 	validating the main resource, or null if none were.
+	 */
+	public IResource[] getValidated() {
+		return _validated;
+	}
+	
+	/**
+	 * Indicate that additional resources have been validated as part of this
+	 * validate operation. Sometimes in the course of performing a validation on
+	 * one resource it is necessary to validate other resources as well. This
+	 * method is used to let the framework know about these additional validated
+	 * resources, to possibly save them being validated redundantly.
+	 * 
+	 * @param validated
+	 * 		Any additional resources that were validated.
+	 */
+	public void setValidated(IResource[] validated) {
+		_validated = validated;
+	}
+
+	/**
+	 * Answer the number of error messages that were generated as part of this validation operation.
+	 */
+	public int getSeverityError() {
+		return _severityError;
+	}
+
+	/**
+	 * Set the number of error messages that were generated as part of this validation operation.
+	 * <p>
+	 * Messages added through the add(ValidationMessage) method should not be included here, as this
+	 * information will be determined from the ValidationMessage.
+	 * </p>
+	 */
+	public void setSeverityError(int severityError) {
+		_severityError = severityError;
+	}
+	
+
+	/**
+	 * Increment the number of error messages that were generated as part of this validation operation.
+	 * <p>
+	 * Messages added through the add(ValidationMessage) method should not be included here, as this
+	 * information will be determined from the ValidationMessage.
+	 * </p>
+	 * 
+	 * @return the current number of errors.
+	 */
+	public int incrementError(int errors){
+		_severityError += errors;
+		return _severityError;
+	}
+
+	/**
+	 * Answer the number of warning messages that were generated as part of this validation operation.
+	 */
+	public int getSeverityWarning() {
+		return _severityWarning;
+	}
+
+	/**
+	 * Set the number of warning messages that were generated as part of this validation operation.
+	 * <p>
+	 * Messages added through the add(ValidationMessage) method should not be included here, as this
+	 * information will be determined from the ValidationMessage.
+	 * </p>
+	 */
+	public void setSeverityWarning(int severityWarning) {
+		_severityWarning = severityWarning;
+	}
+
+	/**
+	 * Increment the number of warning messages that were generated as part of this validation operation.
+	 * <p>
+	 * Messages added through the add(ValidationMessage) method should not be included here, as this
+	 * information will be determined from the ValidationMessage.
+	 * </p>
+	 * 
+	 * @return the current number of warnings.
+	 */
+	public int incrementWarning(int warnings){
+		_severityWarning += warnings;
+		return _severityWarning;
+	}
+
+	/**
+	 * Answer the number of informational messages that were generated as part of this validation operation.
+	 */
+	public int getSeverityInfo() {
+		return _severityInfo;
+	}
+
+	/**
+	 * Set the number of informational messages that were generated as part of this validation operation.
+	 * <p>
+	 * Messages added through the add(ValidationMessage) method should not be included here, as this
+	 * information will be determined from the ValidationMessage.
+	 * </p>
+	 */
+	public void setSeverityInfo(int severityInfo) {
+		_severityInfo = severityInfo;
+	}
+
+	/**
+	 * Increment the number of informational messages that were generated as part of this validation operation.
+	 * <p>
+	 * Messages added through the add(ValidationMessage) method should not be included here, as this
+	 * information will be determined from the ValidationMessage.
+	 * </p>
+	 * 
+	 * @return the current number of informational message.
+	 */
+	public int incrementInfo(int info){
+		_severityInfo += info;
+		return _severityInfo;
+	}
+
+	/**
+	 * Was the operation canceled before it completed? For example if the validation is being run through the
+	 * user interface, the end user can cancel the operation through the progress monitor.
+	 * 
+	 * @return true if the operation was canceled
+	 */
+	public boolean isCanceled() {
+		return _canceled;
+	}
+
+	/**
+	 * Indicate if the operation was canceled.
+	 * 
+	 * @param canceled
+	 * 		Set to true if it was canceled and false if it was not canceled.
+	 */
+	public void setCanceled(boolean canceled) {
+		_canceled = canceled;
+	}
+
+	/**
+	 * Answer the number of resources that have been validated.
+	 */
+	public int getNumberOfValidatedResources() {
+		if (_validated == null)return _numberOfValidatedResources;
+		return _numberOfValidatedResources + _validated.length;
+	}
+
+	/**
+	 * If the validation ended with an exception, answer it.
+	 * @return null if the validator did not finish with an exception.
+	 */
+	public ValidationException getValidationException() {
+		return _validationException;
+	}
+
+	/**
+	 * If the validation failed with an exception, it can be recorded here.
+	 * <p>
+	 * This method is provided for old validators to ease their transition to the new framework.
+	 * </p>
+	 * @param validationException
+	 */
+	public void setValidationException(ValidationException validationException) {
+		_validationException = validationException;
+	}
+	
+	/**
+	 * Answer the project that the validator would like to have suspended.
+	 * 
+	 * @return the project to suspend or null. The normal result is null, which means that
+	 * the validator wishes to receive normal validation requests. 
+	 */
+	public IProject getSuspendValidation(){
+		return _suspendValidation;
+	}
+
+	/**
+	 * Calling this method will inform the framework, that this validator does not wish to be
+	 * called again for any resources in this project, for the duration of this validation operation.
+	 * <p>
+	 * Some validators may have a rich set of triggers, but once they have been invoked once,
+	 * do not need to be invoked again during the course of the current validation.
+	 * </p>
+	 * @param project The project that this validator no longer wants to be notified on.
+	 */
+	public void setSuspendValidation(IProject project) {
+		_suspendValidation = project;
+	}
+}
diff --git a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/ValidationResults.java b/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/ValidationResults.java
new file mode 100644
index 0000000..ba947f8
--- /dev/null
+++ b/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/ValidationResults.java
@@ -0,0 +1,76 @@
+/*******************************************************************************
+ * Copyright (c) 2007, 2009 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.wst.validation;
+
+
+/**
+ * The combined results of validating multiple resources.
+ * <p>
+ * <b>Provisional API:</b> This class/interface is part of an interim API that is still under development and expected to 
+ * change significantly before reaching stability. It is being made available at this early stage to solicit feedback 
+ * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken 
+ * (repeatedly) as the API evolves.
+ * </p>
+ * @author karasiuk
+ *
+ */
+public final class ValidationResults {
+	
+	private final ValidatorMessage[] _messages;
+	private final int 	_error;
+	private final int	_warn;
+	private final int	_info;
+	
+	public ValidationResults(ValidationResult result){
+		if (result == null){
+			_messages = new ValidatorMessage[0];
+			_error = 0;
+			_warn = 0;
+			_info = 0;
+		}
+		else {
+			_messages = result.getMessagesAsCopy();
+			_error = result.getSeverityError();
+			_warn = result.getSeverityWarning();
+			_info = result.getSeverityInfo();
+		}
+	}
+	
+	/**
+	 * Answer any validation messages that were added by the validation operation.
+	 * @return an array is returned even if there are no messages.
+	 */
+	public ValidatorMessage[] getMessages(){
+		return _messages;
+	}
+
+	/**
+	 * Answer the number of error messages that were generated as part of this validation operation.
+	 */
+	public int getSeverityError() {
+		return _error;
+	}
+
+	/**
+	 * Answer the number of informational messages that were generated as part of this validation operation.
+	 */
+	public int getSeverityInfo() {
+		return _info;
+	}
+	
+	/**
+	 * Answer the number of warning messages that were generated as part of this validation operation.
+	 */
+	public int getSeverityWarning() {
+		return _warn;
+	}
+
+}
diff --git a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/ValidationState.java b/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/ValidationState.java
new file mode 100644
index 0000000..8097de4
--- /dev/null
+++ b/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/ValidationState.java
@@ -0,0 +1,90 @@
+/*******************************************************************************
+ * Copyright (c) 2007, 2008 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.wst.validation;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.eclipse.wst.validation.internal.plugin.ValidationPlugin;
+
+/**
+ * Keep track of arbitrary validation data, during the course of a validation.
+ * <p>
+ * To enable more efficient caching, the validation framework, allows individual validators to cache
+ * arbitrary data during the validation process. Use of this object is completely optional.
+ * <p>
+ * Since some validators wish to share data with other validators, any validator can see the state data for
+ * any other validator, since the id is simply the validator's extension id.
+ * <p>
+ * This object is freed at the end of the validation process.
+ * <p>
+ * <b>Provisional API:</b> This class/interface is part of an interim API that is still under development and expected to 
+ * change significantly before reaching stability. It is being made available at this early stage to solicit feedback 
+ * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken 
+ * (repeatedly) as the API evolves.
+ * </p>
+ * @noextend
+ * @author karasiuk
+ *
+ */
+public final class ValidationState {
+	
+	/**
+	 * This is a special id.
+	 * <p>
+	 * If a resource that is depended on by others is changed, then the
+	 * dependent resources are validated. The depended on resource, which is the
+	 * resource that actually changed, is placed into the ValidationState using
+	 * this id.
+	 * </p>
+	 * @deprecated This approach is not thread safe, the longer form of the AbstractValidator validate method should be used instead.
+	 * @see AbstractValidator#validate(ValidationEvent, ValidationState, org.eclipse.core.runtime.IProgressMonitor)
+	 */
+	public static final String TriggerResource = ValidationPlugin.PLUGIN_ID + ".Trigger"; //$NON-NLS-1$
+
+	// I can't use a ConncurrentHashMap because some of the clients store nulls.
+	private final Map<String, Object> _map = new HashMap<String, Object>(50);
+	
+	public ValidationState(){
+	}
+	
+	/**
+	 * Save some state information.
+	 * 
+	 * @param id
+	 * 		By convention this is the fully qualified validator extension id.
+	 * 		For example: org.eclipse.wst.html.ui.HTMLValidator
+	 * 
+	 * @param value
+	 * 		Any arbitrary data that the validator might find useful. The
+	 * 		validation framework doesn't do anything with this object except
+	 * 		pass it along during the validation process.
+	 */
+	public synchronized void put(String id, Object value){
+		_map.put(id, value);
+	}
+	
+	/**
+	 * Answer the state data for the given validator.
+	 * 
+	 * @param id
+	 * 		By convention this is the fully qualified validator extension point
+	 * 		id. For example org.eclipse.wst.html.ui.HTMLValidator
+	 * 
+	 * @return any arbitrary data that the validator might find useful,
+	 * 	including null.
+	 */
+	public synchronized Object get(String id){
+		return _map.get(id);
+	}
+
+	
+}
diff --git a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/Validator.java b/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/Validator.java
new file mode 100644
index 0000000..88f5ec5
--- /dev/null
+++ b/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/Validator.java
@@ -0,0 +1,1395 @@
+/*******************************************************************************
+ * Copyright (c) 2007, 2010 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.wst.validation;
+
+import java.lang.reflect.InvocationTargetException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.atomic.AtomicBoolean;
+
+import org.eclipse.core.resources.IMarker;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.core.runtime.IConfigurationElement;
+import org.eclipse.core.runtime.IContributor;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.core.runtime.Platform;
+import org.eclipse.osgi.util.NLS;
+import org.eclipse.wst.validation.internal.ConfigurationConstants;
+import org.eclipse.wst.validation.internal.ConfigurationManager;
+import org.eclipse.wst.validation.internal.ContentTypeWrapper;
+import org.eclipse.wst.validation.internal.ExtensionConstants;
+import org.eclipse.wst.validation.internal.MarkerManager;
+import org.eclipse.wst.validation.internal.Misc;
+import org.eclipse.wst.validation.internal.NullValidator;
+import org.eclipse.wst.validation.internal.SummaryReporter;
+import org.eclipse.wst.validation.internal.Tracing;
+import org.eclipse.wst.validation.internal.ValManager;
+import org.eclipse.wst.validation.internal.ValMessages;
+import org.eclipse.wst.validation.internal.ValOperation;
+import org.eclipse.wst.validation.internal.ValPrefManagerGlobal;
+import org.eclipse.wst.validation.internal.ValPrefManagerProject;
+import org.eclipse.wst.validation.internal.ValType;
+import org.eclipse.wst.validation.internal.ValidationConfiguration;
+import org.eclipse.wst.validation.internal.ValidatorExtensionReader;
+import org.eclipse.wst.validation.internal.ValidatorMetaData;
+import org.eclipse.wst.validation.internal.core.ValidatorLauncher;
+import org.eclipse.wst.validation.internal.delegates.ValidatorDelegateDescriptor;
+import org.eclipse.wst.validation.internal.delegates.ValidatorDelegatesRegistry;
+import org.eclipse.wst.validation.internal.model.FilterGroup;
+import org.eclipse.wst.validation.internal.operations.IWorkbenchContext;
+import org.eclipse.wst.validation.internal.operations.WorkbenchContext;
+import org.eclipse.wst.validation.internal.plugin.ValidationPlugin;
+import org.eclipse.wst.validation.internal.provisional.core.IMessage;
+import org.eclipse.wst.validation.internal.provisional.core.IValidator;
+import org.eclipse.wst.validation.internal.provisional.core.IValidatorExtender;
+
+/**
+ * Represents a validator. This gets instantiated through one of the validator extension points.
+ * <p>
+ * <b>This class is not API</b>.
+ * </p>
+ * 
+ * @author karasiuk
+ *
+ */
+public abstract class Validator implements Comparable<Validator> {
+	// Remember if you add a new instance variable, make sure that you update the copy and become methods
+	
+	/**
+	 * The level of configuration for the validator.
+	 * <ul>
+	 * <li>Extension - Defined by an extension point.</li>
+	 * <li>Global - Defined by a global preference.</li>
+	 * <li>Project - Defined by a project property.</li>
+	 * </ul>
+	 */
+	public enum Level {Extension, Global, Project};
+	
+	protected boolean	_buildValidation = true;
+	
+	/** If this is a delegating validator, then this field holds the validator that will be delegated to. */
+	private String 		_delegatingId;
+	
+	/** 
+	 * If this validator is also used to control an ISource validator, the id of the ISource validator is
+	 * registered here.
+	 */
+	private String		_sourceId;
+	
+	protected boolean 	_manualValidation = true;
+	
+	/** An optional customized marker id for this validator. */
+	private String 		_markerId;
+	
+	/** 
+	 * Version of the filter definition. By increasing this number the framework can know that a plug-in has 
+	 * changed it's filters.
+	 */
+	private int			_version = 1;
+	
+	/** Map simple message id's to message settings. */
+	private Map<String, MessageSeveritySetting> _messageSettings;
+	
+	/** The project that you are defined in. This can be null which means that you are a global validator. */
+	protected IProject	_project;
+		
+	/** How many times has a global field in this validator been changed since it was created (or copied)? */
+	protected transient int _changeCountGlobal;
+	
+	/** How many times has a message field in this validator been changed since it was created (or copied)? */
+	protected transient int _changeCountMessages;
+	
+	/** Has the validator been migrated from an earlier version in this session, but not yet saved? */
+	private boolean _migrated;
+	
+	public Validator(IProject project){
+		_project = project;
+	}
+		
+	void setMigrated(boolean migrated){
+		_migrated = migrated;
+	}
+	
+	/**
+	 * Create a new validator based on a abstract validator.
+	 * 
+	 * @param validator
+	 *            The validator that is being wrapped.
+	 * 
+	 * @param project
+	 *            The project that you are defined in. This can be null which
+	 *            means that you are a global validator.
+	 */
+	public static Validator create(IConfigurationElement validator, IProject project) {
+		V2 v2 = new V2(validator, project);
+		return v2;
+	}
+	
+	/**
+	 * Create a new validator based on validator meta data.
+	 * 
+	 * @param project
+	 *            The project that you are defined in. This can be null which
+	 *            means that you are a global validator.
+	 */
+	public static Validator create(ValidatorMetaData vmd, ValidationConfiguration config, IProject project){
+		V1 v1 = new V1(vmd, config, project);
+		return v1;
+	}
+	
+	/**
+	 * If you are a version 1 validator, answer yourself as one, otherwise answer null.
+	 */
+	public V1 asV1Validator(){
+		return null;
+	}
+	
+	/**
+	 * If you are a version 2 validator, answer yourself as one, otherwise answer null.
+	 */
+	public V2 asV2Validator() {
+		return null;
+	}
+	
+	/**
+	 * The project is being cleaned, this method gives the validator a chance to do any special cleanup.
+	 * The default is to do nothing.
+	 * 
+	 * @param project the project being built.
+	 * @param monitor the monitor that should be used for reporting progress if the clean takes a long time.
+	 */
+	public void clean(IProject project, ValOperation operation, IProgressMonitor monitor){
+	}	
+	
+	/**
+	 * Compare yourself based on Validator name.
+	 */
+	public int compareTo(Validator validator) {
+		return getName().compareTo(validator.getName());			
+	}
+	
+	/** Answer a deep copy of yourself. */
+	public Validator copy(){
+		return copy(false);
+	}
+	
+	public abstract Validator copy(boolean includeChangeCounts);
+	
+	/**
+	 * Update your direct, non transient fields from the fields in v.
+	 */
+	protected void copyLocal(Validator v, boolean includeChangeCounts){
+		_buildValidation = v._buildValidation;
+		_delegatingId = v._delegatingId;
+		_manualValidation = v._manualValidation;
+		_markerId = v._markerId;
+		_messageSettings = v._messageSettings;
+		_sourceId = v._sourceId;
+		_version = v._version;
+		_migrated = v._migrated;
+		
+		if (includeChangeCounts){
+			_changeCountGlobal = v._changeCountGlobal;
+			_changeCountMessages = v._changeCountMessages;
+		}
+	}
+	
+	/**
+	 * Should the validation framework first clear the markers that this
+	 * validator has placed on this resource? This method can be overridden by
+	 * validator implementors to provide a validator specific behavior.
+	 * 
+	 * @param event
+	 *            The validation event that triggered the validation.
+	 * @return true if the validation framework should first clear all the
+	 *         markers that this validator produced. This is the default
+	 *         behavior. Return false to leave the markers unchanged. It then
+	 *         becomes the responsibility of the validator to manage it's own
+	 *         markers for this resource, for this validation event.
+	 */
+	public boolean shouldClearMarkers(ValidationEvent event){
+		return true;
+	}
+	
+	/**
+	 * Answer true if this validator, based on it's filters, should validate
+	 * this resource. This method does not check to see if global validation or
+	 * project validation has been suspended or not.
+	 * 
+	 * @param resource
+	 *            The resource to be checked.
+	 * @param isManual
+	 *            If true then this validator must also be enabled for manual
+	 *            validation.
+	 * @param isBuild
+	 *            If true then this validator must also be enabled for builder
+	 *            based validation.
+	 * 
+	 * @return true if the resource should be validated.
+	 */
+	public boolean shouldValidate(IResource resource, boolean isManual, boolean isBuild){
+		return shouldValidate(resource, isManual, isBuild, new ContentTypeWrapper());
+	}
+	
+	/**
+	 * Answer true if this validator, based on it's filters, should validate
+	 * this resource. This method does not check to see if global validation or
+	 * project validation has been suspended or not.
+	 * 
+	 * @param resource
+	 *            The resource to be checked.
+	 * @param isManual
+	 *            If true then this validator must also be enabled for manual
+	 *            validation.
+	 * @param isBuild
+	 *            If true then this validator must also be enabled for builder
+	 *            based validation.
+	 * @param contentTypeWrapper 
+	 *            For repeated calls on the same resource, it is more efficient
+	 *            to remember the content type.
+	 * @return true if the resource should be validated.
+	 * @see Friend#shouldValidate(Validator, IResource, boolean, boolean, ContentTypeWrapper)
+	 */
+	boolean shouldValidate(IResource resource, boolean isManual, boolean isBuild, 
+		ContentTypeWrapper contentTypeWrapper){
+		
+		if (isManual && !_manualValidation)return false;
+		if (isBuild && !_buildValidation)return false;
+		
+		return shouldValidate(resource, contentTypeWrapper);
+	}
+	
+	/**
+	 * Answer true if this validator, based on it's filters, should validate
+	 * this resource. This method does not check to see if global validation or
+	 * project validation has been suspended or not.
+	 * 
+	 * @param resource
+	 *            The resource to be checked.
+	 * @param valType
+	 *            The context to use when performing the check.
+	 * 
+	 * @return true if the resource should be validated.
+	 */
+	public boolean shouldValidate(IResource resource, ValType valType){
+		return shouldValidate(resource, valType, new ContentTypeWrapper());
+	}
+	
+	/**
+	 * Answer true if this validator, based on it's filters, should validate
+	 * this resource. This method does not check to see if global validation or
+	 * project validation has been suspended or not.
+	 * 
+	 * @param resource
+	 *            The resource to be checked.
+	 * @param valType
+	 *            The context to use when performing the check.
+	 * @param contentTypeWrapper
+	 *            For repeated calls on the same resource, it is more efficient
+	 *            to remember the content type.
+	 * 
+	 * @return true if the resource should be validated.
+	 * 
+	 * @see Friend#shouldValidate(Validator, IResource, ValType, ContentTypeWrapper)
+	 */
+	boolean shouldValidate(IResource resource, ValType valType, ContentTypeWrapper contentTypeWrapper){
+		if (Tracing.matchesExtraDetail(getId())){
+			Tracing.log("Validator-01: checking if " + getId() + " should validate " + resource); //$NON-NLS-1$ //$NON-NLS-2$
+		}
+		if (valType == ValType.Manual && !_manualValidation)return false;
+		if (valType == ValType.Build && !_buildValidation)return false;
+		
+		boolean result = shouldValidate(resource, contentTypeWrapper);
+		if (Tracing.matchesExtraDetail(getId())){
+			Tracing.log("Validator-02: result = " + result); //$NON-NLS-1$
+		}
+		
+		return result;
+	}
+	
+	/**
+	 * Answer true if this validator, based on it's filters, should validate this project. This method
+	 * does not check to see if global validation or project validation has been suspended or not.
+	 * 
+	 * @param project the project to be checked
+	 * @param type The type of validation request
+	 * 
+	 * @return true if the project should be validated.
+	 */
+	public boolean shouldValidateProject(IProject project, ValType type){
+		return shouldValidateProject(project, type == ValType.Manual, type == ValType.Build);
+	}
+	
+	/**
+	 * Answer true if this validator, based on it's filters, should validate this project. This method
+	 * does not check to see if global validation or project validation has been suspended or not.
+	 * 
+	 * @param project the project to be checked
+	 * @param isManual if true then this validator must also be enabled for manual validation.
+	 * @param isBuild if true then this validator must also be enabled for builder based validation.
+	 * 
+	 * @return true if the project should be validated.
+	 */
+	public boolean shouldValidateProject(IProject project, boolean isManual, boolean isBuild){
+		if (Tracing.matchesExtraDetail(getId())){
+			Tracing.log("Validator-03: checking if " + getId() + " should validate " + project); //$NON-NLS-1$ //$NON-NLS-2$
+		}
+		if (isManual && !_manualValidation)return false;
+		if (isBuild && !_buildValidation)return false;
+		if (project == null || !project.isOpen())return false;
+		boolean result = shouldValidateProject(project);
+		if (Tracing.matchesExtraDetail(getId())){
+			Tracing.log("Validator-04: result " + result); //$NON-NLS-1$
+		}
+		return result;
+	}
+	
+	/**
+	 * Validate the resource.
+	 * 
+	 * @param resource
+	 *            The resource to be validated.
+	 * @param kind
+	 *            The kind of resource change, see IResourceDelta for values.
+	 * @param operation
+	 *            The operation that this validation is running under. This can
+	 *            be null.
+	 * @param monitor
+	 *            A way to report progress. This can be null.
+	 * 
+	 * @return the result of doing the validation, it can be, but usually isn't
+	 *         null.
+	 */
+	public abstract ValidationResult validate(IResource resource, int kind, ValOperation operation, IProgressMonitor monitor);
+	
+	/**
+	 * Validate the resource.
+	 * 
+	 * @param resource
+	 *            The resource to be validated.
+	 * @param kind
+	 *            The kind of resource change, see IResourceDelta for values.
+	 * @param operation
+	 *            The operation that this validation is running under. This can
+	 *            be null.
+	 * @param monitor
+	 *            A way to report progress. This can be null.
+	 * @param event
+	 *            An event that describes in more detail what should be
+	 *            validated and why it should be validated. This can be null.
+	 * 
+	 * @return the result of doing the validation, it can be, but usually isn't
+	 *         null.
+	 */
+	public ValidationResult validate(IResource resource, int kind, ValOperation operation, IProgressMonitor monitor, ValidationEvent event){
+		// The reason that the resource and kind are still specified, is that I didn't want to remove a public method in the service
+		// stream. 
+		return validate(resource, kind, operation, monitor);		
+	}
+
+	/**
+	 * This method will be called before any validation takes place. It allows validators to perform any
+	 * initialization that they might need. 
+	 *  
+	 * @param project the project that is being validated. For the very first call in the validation phase,
+	 * this will be null. That is the signal to the validator that a top level validation is starting.
+	 * Subsequently, the project will be set, as each of the individual projects are validated.
+	 * 
+	 * @param state a way to pass arbitrary, validator specific, data from one invocation of a validator to
+	 * the next, during the validation phase.
+	 * 
+	 * @param monitor the monitor that should be used for reporting progress if the clean takes a long time.
+	 */
+	public void validationStarting(IProject project, ValidationState state, IProgressMonitor monitor){
+		// subclasses need to override this, if they wish to let their validators know about this event
+	}
+	
+	/**
+	 * This method will be called when validation is complete. It allows validators to perform any
+	 * cleanup that they might need to do.  
+	 *  
+	 * @param project the project that was validated. The very last call in the validation will set this to 
+	 * null so that the validator knows that all the projects have now been validated.
+	 * 
+	 * @param state a way to pass arbitrary, validator specific, data from one invocation of a validator to
+	 * the next, during the validation phase.
+	 * 
+	 * @param monitor the monitor that should be used for reporting progress if the clean takes a long time.
+	 */
+	public void validationFinishing(IProject project, ValidationState state, IProgressMonitor monitor){		
+		// subclasses need to override this, if they wish to let their validators know about this event
+	}
+	
+	void add(MessageSeveritySetting message){
+		// I can't use getMessageSettings() here, as that will put us into an infinite loop
+		if (_messageSettings == null){
+			_messageSettings = new HashMap<String, MessageSeveritySetting>(10);
+		}
+		_messageSettings.put(message.getId(), message);
+		bumpChangeCountMessages();
+	}
+	
+	public IValidator asIValidator(){
+		return null;
+	}
+	
+	protected abstract boolean shouldValidate(IResource resource, ContentTypeWrapper contentTypeWrapper);
+	protected abstract boolean shouldValidateProject(IProject project);
+			
+	public abstract String getId();
+	
+	public MessageSeveritySetting getMessage(String id){
+		return getMessageSettings().get(id);
+	}
+	
+	/**
+	 * Answer all the message settings that this validator has defined.
+	 * 
+	 * @return an empty map if the validator did not define any message settings.
+	 */
+	public Map<String, MessageSeveritySetting> getMessageSettings(){
+		Map<String, MessageSeveritySetting> settings = _messageSettings;
+		if (settings == null){
+			settings = new HashMap<String, MessageSeveritySetting>(10);
+			init(settings);
+			if (ValManager.getDefault().mustUseGlobalValidators(getProject())){
+				ValPrefManagerGlobal gp = ValPrefManagerGlobal.getDefault();
+				gp.loadMessages(this, settings);
+			}
+			else {
+				ValPrefManagerProject vp = new ValPrefManagerProject(getProject());
+				vp.loadMessages(this, settings);				
+			}
+			_messageSettings = settings;
+		}
+		return settings;
+	}
+	
+	/**
+	 * Answer a hash code for the configurable fields so that we can quickly determine if two
+	 * validators are the same.
+	 */
+	public int hashCodeForConfig(){
+		int h = 0;
+		if (_buildValidation)h += 101;
+		if (_delegatingId != null)h += _delegatingId.hashCode();
+		if (_manualValidation)h += 201;
+		if (_messageSettings != null){
+			for (MessageSeveritySetting ms : _messageSettings.values())h += ms.hashCode();
+		}
+		if (_sourceId != null)h += _sourceId.hashCode();
+		h += _version;
+		return h;
+	}
+	
+	private void init(Map<String, MessageSeveritySetting> settings) {
+		for (MessageSeveritySetting ms : ValidatorExtensionReader.getDefault().addMessages(this)){
+			settings.put(ms.getId(), ms);
+		}		
+	}
+
+	public abstract String getName();
+	
+	/**
+	 * Answer the project that you were enabled on. 
+	 * 
+	 * @return null if you are a global (i.e. workspace level) validator.
+	 */
+	public IProject getProject(){
+		return _project;
+	}
+		
+	/**
+	 * Answer the name of the class that implements the validator.
+	 */
+	public abstract String getValidatorClassname();
+	
+	/**
+	 * Is this validator currently enabled for validations that are triggered manually? 
+	 */
+	public boolean isManualValidation() {
+		return _manualValidation;
+	}
+
+	/**
+	 * Set whether this validator should be triggered as part of a manual validation.
+	 * 
+	 * @param manualValidation
+	 * @return true if the setting changed.
+	 */
+	public boolean setManualValidation(boolean manualValidation) {
+		return setManualValidation2(manualValidation);
+	}
+	
+	protected final boolean setManualValidation2(boolean manualValidation) {
+		boolean changed = false;
+		if (_manualValidation != manualValidation){
+			bumpChangeCountGlobal();
+			changed = true;
+			_manualValidation = manualValidation;
+		}
+		return changed;
+	}
+
+	/**
+	 * Is this validator currently enabled for validations that are triggered by builds? 
+	 */
+	public boolean isBuildValidation() {
+		return _buildValidation;
+	}
+	
+	/**
+	 * Has the validator changed since it was last created or copied? Or was it migrated from an earlier version. 
+	 */
+	public boolean isChanged(){
+		if (_changeCountGlobal > 0 || _changeCountMessages > 0 || _migrated)return true;
+		return false;
+	}
+	
+	/**
+	 * Has the validator's implementation been loaded yet? This is used by some test cases to ensure that 
+	 * plug-ins are not loaded too early.
+	 */
+	abstract boolean isLoaded();
+	
+
+	/**
+	 * Set whether this validator should be triggered by the build process.
+	 * 
+	 * @param buildValidation
+	 * @return true if the setting changed.
+	 */
+	public boolean setBuildValidation(boolean buildValidation) {
+		return setBuildValidation2(buildValidation);
+	}
+	
+	protected final boolean setBuildValidation2(boolean buildValidation) {
+		boolean changed = false;
+		if (_buildValidation != buildValidation){
+			bumpChangeCountGlobal();
+			changed = true;
+			_buildValidation = buildValidation;
+		}
+		return changed;
+	}
+
+	/**
+	 * Get the id of the "real" validator, that is the validator that will be called when this delegating
+	 * validator is asked to validate something. If this isn't a delegating validator answer null.
+	 */
+	public String getDelegatingId() {
+		return _delegatingId;
+	}
+	
+	/**
+	 * Set the id of the "real" validator, that is the validator that will be called when this delegating
+	 * validator is asked to validate something.
+	 * 
+	 * @param delegating the id of the validator that is actually going to perform the validation.
+	 */
+	public void setDelegatingId(String delegating) {
+		if (!Misc.same(_delegatingId, delegating)){
+			_delegatingId = delegating;
+			bumpChangeCountGlobal();
+		}
+	}
+	
+	public int getVersion() {
+		return _version;
+	}
+	
+	public void setVersion(int version) {
+		if (_version != version){
+			_version = version;
+			bumpChangeCountGlobal();
+		}
+	}
+	
+	@Override
+	public String toString() {
+		return getName();
+	}
+		
+/**
+ * A validator that uses version 1 of the validation framework.
+ * @author karasiuk
+ *
+ */ 
+public static class V1 extends Validator {
+	private ValidatorMetaData _vmd;
+	
+	/**
+	 * Create a new version 1 validator. 
+	 * @param vmd
+	 * @param config this is used to set the global enablement options. In some case this can be null.
+	 */
+	public V1(ValidatorMetaData vmd, ValidationConfiguration config, IProject project){
+		super(project);
+		_vmd = vmd;
+		if (config != null){
+			setBuildValidation(config.isBuildEnabled(vmd));
+			setManualValidation(config.isManualEnabled(vmd));
+		}
+		setDelegatingId(ValidatorDelegatesRegistry.getInstance().getDefaultDelegate(_vmd.getValidatorUniqueName()));
+		if (_vmd.getMarkerIds() != null && _vmd.getMarkerIds().length > 0)setMarkerId(_vmd.getMarkerIds()[0]);
+		resetChangeCounters();
+	}
+	
+	@Override
+	public void validationFinishing(IProject project, ValidationState state, IProgressMonitor monitor) {
+		if (project != null) {
+			IValidator v = asIValidator();
+			if (v instanceof IValidatorExtender) {
+				IValidatorExtender vExt = (IValidatorExtender) v;
+				vExt.validationFinishing(project, state, monitor);
+			}	
+		}
+	}
+
+	@Override
+	public IValidator asIValidator() {
+		IValidator v = null;
+		try {
+			v = _vmd.getValidator();
+		}
+		catch (InstantiationException e){
+			ValidationPlugin.getPlugin().handleException(e);
+			return null;
+		}
+		return v;
+	}
+	
+	public V1 asV1Validator() {
+		return this;
+	}
+			
+	public Validator copy(boolean includeChangeCounts) {
+		V1 v = new V1Copy(_vmd, null, _project);
+		v.copyLocal(this, includeChangeCounts);
+				
+		return v;
+	}
+	
+	public String getName() {
+		return _vmd.getValidatorDisplayName();
+	}
+	
+	public ValidatorMetaData getVmd(){
+		return _vmd;
+	}
+	
+	public String getValidatorClassname(){
+		String name = ""; //$NON-NLS-1$
+		try {
+			name = _vmd.getValidator().getClass().getName();
+		}
+		catch (Exception e){
+			// eat it
+		}
+		return name;
+	}
+	public String getId() {
+		return _vmd.getValidatorUniqueName();
+	}
+	
+	@Override
+	boolean isLoaded() {
+		return _vmd.isActive();
+	}
+	
+	@Override
+	public boolean setBuildValidation(boolean buildValidation) {
+		boolean changed = super.setBuildValidation(buildValidation);
+		_vmd.setBuildValidation(buildValidation);
+		return changed;
+	}
+	
+	@Override
+	public boolean setManualValidation(boolean manualValidation) {
+		boolean changed = super.setManualValidation(manualValidation);
+		_vmd.setManualValidation(manualValidation);
+		return changed;
+	}
+
+	@Override
+	protected boolean shouldValidate(IResource resource, ContentTypeWrapper contentTypeWrapper) {
+		return _vmd.isApplicableTo(resource);
+	}
+
+	@Override
+	protected boolean shouldValidateProject(IProject project) {
+		// TODO determine if this can be optimized
+		return true;
+	}
+
+	@Override
+	public ValidationResult validate(IResource resource, int kind, ValOperation operation, 
+		IProgressMonitor monitor) {
+		
+		if (monitor == null)monitor = new NullProgressMonitor();
+		
+		ValidationResult vr = new ValidationResult();
+		IValidator v = asIValidator();
+		if (v == null)return null;
+		
+		if (shouldSkipValidator(resource, operation))return null;
+		
+		try {
+			IProject project = resource.getProject();
+			SummaryReporter reporter = new SummaryReporter(project, monitor);
+			IWorkbenchContext helper = _vmd.getHelper(project);
+			if (helper instanceof WorkbenchContext){
+				WorkbenchContext wc = (WorkbenchContext)helper;
+				List<String> files = new LinkedList<String>();
+				// [213631] The JSP validator expects full paths not relative paths, but the XML validator
+				// expects relative paths.
+				files.add(wc.getPortableName(resource));
+				wc.setValidationFileURIs(files);
+			}
+			try {
+				ValidatorLauncher.getLauncher().start(helper, v, reporter);
+			}
+			finally {
+				try {
+					v.cleanup(reporter);
+				}
+				finally {
+					helper.cleanup(reporter);
+				}
+			}
+			
+			vr.incrementError(reporter.getSeverityHigh());
+			vr.incrementWarning(reporter.getSeverityNormal());
+			vr.incrementInfo(reporter.getSeverityLow());
+			
+		}
+		catch (Exception e){
+			ValidationPlugin.getPlugin().handleException(e);
+		}
+		return vr;
+	}
+	
+
+	private static final String VALIDATE_PROJECT_ONCE = "ValidateProjectOnce"; //$NON-NLS-1$
+
+		@SuppressWarnings("unchecked")	
+		private boolean shouldSkipValidator(IResource resource, ValOperation operation) {
+
+			if (_vmd.isValidateByProject())
+			{
+				ValidationState validationState = operation.getState();
+				Set<String> projectsNameSet = (Set<String>)validationState.get(VALIDATE_PROJECT_ONCE);
+				String projectName = resource.getProject().getName();
+
+				if (projectsNameSet == null) {
+					projectsNameSet = new HashSet<String>();
+					validationState.put(VALIDATE_PROJECT_ONCE, projectsNameSet);
+				}
+
+				if (projectsNameSet.contains(projectName))return true;
+				else projectsNameSet.add(projectName);
+			}
+			return false;
+		}
+
+	/*
+	 * GRK - Because I didn't want to try to make a true copy of the V1 validator, (because I didn't
+	 * want to copy the vmd object), I came up with this approach to only copy the fields that
+	 * the preference page was worried about. 
+	 */
+	public final static class V1Copy extends V1 {
+		public V1Copy(ValidatorMetaData vmd, ValidationConfiguration vc, IProject project){
+			super(vmd, vc, project);
+		}
+		
+		@Override
+		public boolean setManualValidation(boolean bool) {
+			return setManualValidation2(bool);
+		}
+		
+		@Override
+		public boolean setBuildValidation(boolean bool) {
+			return setBuildValidation2(bool);
+		}
+				
+	}
+		
+}
+
+/**
+ * A validator that uses version 2 of the validation framework.
+ * @author karasiuk
+ *
+ */
+public final static class V2 extends Validator implements IAdaptable {
+	private AbstractValidator	_validator;
+	
+	private List<FilterGroup>	_groups = new LinkedList<FilterGroup>();
+	private FilterGroup[]		_groupsArray;
+	
+	/** The full id of the extension. */
+	private String			_id;
+	
+	/** Name of the validator. */
+	private String			_name;
+	
+	/** 
+	 * We don't want to create the validator too early, as it may trigger new plug-ins to be loaded.
+	 * We delay that as long as possible, by starting with just the config element.
+	 */
+	private IConfigurationElement _validatorConfigElement;
+	
+	private String	_validatorClassName;
+	
+	/**
+	 * An array containing the validator group IDs for which this validator is a member.
+	 */
+	private String[] _validatorGroupIds;
+		
+	/** 
+	 * If this validator is a delegating validator, then this is the "real" validator (i.e. the one that
+	 * does the work).
+	 */
+	private AbstractValidator	_delegated;
+		
+	/** How many times has a group field in this validator been changed since it was created (or copied)? */
+	protected transient int _changeCountGroups;
+		
+	private Level _level;
+	
+	/**
+	 * Do we still need to invoke the validateStarting method for this validator, for the null project?
+	 * 
+	 * Because we do not want to activate a validator's plug-in too soon, we do not activate the validator
+	 * as a reaction to the global validation starting event. Instead we mark it pending, and wait until
+	 * we are sure that we have something to validate.
+	 * 
+	 * If this flag is true, it means that the validateStarting method still needs to be called for this validator.
+	 */
+	private AtomicBoolean _pendingValidationStarted = new AtomicBoolean();
+	
+	V2(IConfigurationElement configElement, IProject project){
+		super(project);
+		assert configElement != null;
+		_validatorConfigElement = configElement;
+		_validatorClassName = configElement.getAttribute(ExtensionConstants.AttribClass);
+
+		IConfigurationElement[] groupReferenceElements = configElement.getChildren(ExtensionConstants.Group.elementGroup);
+		List<String> validatorGroupIDs = new ArrayList<String>();
+		for (IConfigurationElement groupElement : groupReferenceElements) {
+			String id = groupElement.getAttribute(ExtensionConstants.Group.attId);
+			if (id != null)validatorGroupIDs.add(id);
+		}
+		_validatorGroupIds = validatorGroupIDs.toArray(new String[validatorGroupIDs.size()]);
+			
+		init();
+	}
+	
+	private V2(IProject project, String validatorClassName, AbstractValidator validator){
+		super(project);
+		assert validator != null;
+		
+		_validatorClassName = validatorClassName;
+		_validator = validator;
+		init();
+	}
+	
+	private void init(){
+		try {
+			String id = ConfigurationManager.getManager().getConfiguration(_project).getDelegateForTarget(_validatorClassName);
+			if (id == null) id = ValidatorDelegatesRegistry.getInstance().getDefaultDelegate(_validatorClassName);
+			setDelegatingId(id);
+		}
+		catch (InvocationTargetException e){
+			ValidationPlugin.getPlugin().handleException(e);
+		}
+		resetChangeCounters();		
+	}
+
+	public synchronized void add(FilterGroup fg) {
+		assert fg != null;
+		_groupsArray = null;
+		_groups.add(fg);
+		bumpChangeCountGroups();
+	}
+	
+	@Override
+	public IValidator asIValidator() {
+		AbstractValidator av = getDelegatedValidator();
+		if (av instanceof IValidator)return (IValidator)av;
+		return super.asIValidator();
+	}
+	
+	@Override
+	public V2 asV2Validator() {
+		return this;
+	}
+	
+	/**
+	 * Let the validator know that a clean is about to happen.
+	 * 
+	 * @param project the project that is being cleaned. This can be null which means that the workspace
+	 * is being cleaned (in which case a separate call will be made for each open project).
+	 * 
+	 */
+	@Override
+	public void clean(IProject project, ValOperation operation, IProgressMonitor monitor) {
+		getDelegatedValidator().clean(project, operation.getState(), monitor);
+	}
+	
+	@Override
+	public Validator copy(boolean includeChangeCounts) {
+		V2 v = null;
+		if (_validatorConfigElement != null)v = new V2(_validatorConfigElement, _project);
+		else v = new V2(_project, _validatorClassName, _validator);
+		v.copyLocal(this, includeChangeCounts);
+		
+		if (includeChangeCounts)v._changeCountGroups = _changeCountGroups;
+		
+		FilterGroup[] groups = getGroups();
+		v._groupsArray = new FilterGroup[groups.length];
+		for (int i=0; i<groups.length; i++){
+			v._groupsArray[i] = groups[i];
+			v._groups.add(groups[i]);
+		}
+
+		v._id = _id;
+		v._name = _name;
+		v._validatorGroupIds = _validatorGroupIds;
+		v._pendingValidationStarted = _pendingValidationStarted;
+				
+		return v;
+	}
+	
+	public int getChangeCountGroups(){
+		return _changeCountGroups;
+	}
+	
+	public void bumpChangeCountGroups(){
+		_changeCountGroups++;
+	}
+	
+	public Level getLevel() {
+		return _level;
+	}
+
+	public void setLevel(Level level) {
+		assert _level == null;
+		_level = level;
+	}
+	
+	/**
+	 * Answer the actual validator that is going to perform the validation. If this is a normal validator this
+	 * method will simply answer itself. However if this is a delegating validator, then this will answer the
+	 * "real" validator.
+	 */
+	public AbstractValidator getDelegatedValidator(){
+		AbstractValidator delegated = _delegated;
+		if (delegated != null)return delegated;
+		else if (getDelegatingId() == null)return getValidator();
+		try {
+			ValidatorDelegateDescriptor vdd = ValidatorDelegatesRegistry.getInstance()
+				.getDescriptor(getValidatorClassname(), getDelegatingId());
+			if (vdd == null)return getValidator();
+			delegated = vdd.getValidator2();
+		}
+		catch (Exception e){
+			ValidationPlugin.getPlugin().handleException(e);
+			delegated = new NullValidator();
+		}
+		delegated.setParent(this);
+		_delegated = delegated;
+		return delegated;
+	}
+		
+	@Override
+	public String getId() {
+		return _id;
+	}
+	
+	/**
+	 * Answer the validator's filter groups.
+	 * @return an empty array if the validator does not have any filter groups.
+	 */
+	public synchronized FilterGroup[] getGroups(){
+		FilterGroup[] groups = _groupsArray;
+		if (groups == null){
+			groups = new FilterGroup[_groups.size()];
+			_groups.toArray(groups);
+			_groupsArray = groups;
+		}
+		return groups;
+	}
+	
+	@Override
+	public String getName() {
+		return _name;
+	}
+	
+	public AbstractValidator getValidator() {
+		if (_validator == null){
+			try {
+				_validator = (AbstractValidator)_validatorConfigElement.createExecutableExtension(ExtensionConstants.AttribClass);
+			}
+			catch (Exception e){
+				ValidationPlugin.getPlugin().handleException(e);
+				IContributor contrib = _validatorConfigElement.getContributor();
+				String message = NLS.bind(ValMessages.ErrConfig, contrib.getName());
+				ValidationPlugin.getPlugin().logMessage(IStatus.ERROR, message);
+				_validator = new NullValidator();
+			}
+			_validator.setParent(this);
+			_validatorConfigElement = null;
+
+		}
+		return _validator;
+	}
+	
+	@Override
+	public String getValidatorClassname(){
+		return _validatorClassName;
+	}
+	
+	public String[] getValidatorGroups(){
+		return _validatorGroupIds;
+	}
+	
+	@Override
+	public int hashCodeForConfig() {
+		int h =  super.hashCodeForConfig();
+		if (_id != null)h += _id.hashCode();
+		if (_groups != null){
+			for (FilterGroup fg : _groups)h += fg.hashCodeForConfig();
+		}
+		return h;
+	}
+	
+	@Override
+	public boolean isChanged() {
+		if (_changeCountGroups > 0)return true;
+		return super.isChanged();
+	}
+	
+	@Override
+	boolean isLoaded() {
+		return _validator != null;
+	}
+	
+	@Override
+	public boolean shouldClearMarkers(ValidationEvent event) {
+		return getValidator().shouldClearMarkers(event);
+	}
+		
+	/**
+	 * Answer true if this validator, based on it's filters, should validate this resource.
+	 * 
+	 * @return true if the resource should be validated.
+	 */
+	@Override
+	protected boolean shouldValidate(IResource resource, ContentTypeWrapper contentTypeWrapper) {
+	    if (resource.isDerived()){
+	      return false;
+	    }
+		FilterGroup[] groups = getGroups();
+		IProject project = resource.getProject();
+		for (FilterGroup group : groups){
+			if (!group.shouldValidate(project, resource, contentTypeWrapper))return false;
+		}
+		return true;
+	}
+	
+	
+	@Override
+	public void setDelegatingId(String delegating) {
+		super.setDelegatingId(delegating);
+		_delegated = null;
+	}
+	
+	public synchronized void setGroups(List<FilterGroup> groups){
+		_groups = groups;
+		_groupsArray = null;
+		bumpChangeCountGroups();
+	}
+
+	public void setId(String id) {
+		if (!Misc.same(_id, id)){
+			_id = id;
+			bumpChangeCountGlobal();
+		}
+	}
+	
+	public void setName(String name) {
+		if (!Misc.same(_name, name)){
+			_name = name;
+			bumpChangeCountGlobal();
+		}
+	}
+	
+	@Override
+	public ValidationResult validate(IResource resource, int kind, ValOperation operation, IProgressMonitor monitor){
+		return validate(resource, kind, operation, monitor, null);
+	}
+	
+	@Override
+	public ValidationResult validate(IResource resource, int kind, ValOperation operation, IProgressMonitor monitor, ValidationEvent event) {
+		ValidationResult vr = null;
+		if (operation == null)operation = new ValOperation();
+		if (monitor == null)monitor = new NullProgressMonitor();
+		try {
+			if (event == null)event = new ValidationEvent(resource, kind, null);
+			vr = getDelegatedValidator().validate(event, operation.getState(), monitor);
+			if (vr == null)vr = getDelegatedValidator().validate(resource, kind, operation.getState(), monitor);
+		}
+		catch (Exception e){
+			try {
+				String msg = NLS.bind(ValMessages.LogValEnd, getName(), resource.getLocationURI());
+				ValidationPlugin.getPlugin().logMessage(IStatus.ERROR, msg);
+			}
+			catch (Exception e2 ){
+				// ignore it
+			}
+			ValidationPlugin.getPlugin().handleException(e);
+		}
+		
+		if (vr != null){
+			if (vr.getValidationException() != null){
+				ValidationPlugin.getPlugin().handleException(vr.getValidationException());
+			}
+			updateResults(vr);
+			if (vr.getDependsOn() != null){
+				ValidationFramework.getDefault().getDependencyIndex().set(getId(), resource, vr.getDependsOn());
+			}
+			IResource[] validated = vr.getValidated();
+			if (validated != null){
+				for (int i=0; i<validated.length; i++){
+					operation.addValidated(getId(), validated[i]);
+				}
+			}
+			
+			ValidatorMessage[] msgs = vr.getMessages();
+//			if (sanityTest(msgs.length, resource)){
+				MarkerManager mm = MarkerManager.getDefault();
+				for (ValidatorMessage m : msgs){
+					mm.createMarker(m, getId());
+				}
+//			}
+//			else {
+//				setBuildValidation(false);
+//				setManualValidation(false);
+//			}
+		}
+		return vr;		
+	}
+	
+	/**
+	 * Perform a simple sanity test to ensure that the validator is configured correctly.
+	 * @param numberofMessages number of messages that the validator produced.
+	 * @return true if the test passed
+	 */
+//	private boolean sanityTest(int numberofMessages, IResource resource) {
+//		if (numberofMessages < 201)return true;
+//		
+//		String resName = ""; //$NON-NLS-1$
+//		if (resource != null)resName = resource.getName();
+//		String message = NLS.bind(ValMessages.ConfigError, new Object[]{
+//				getName(), getId(), String.valueOf(numberofMessages), resName});
+//		ValidationPlugin.getPlugin().logMessage(IStatus.ERROR, message);
+//		
+//		return false;
+//	}
+
+	/**
+	 * If the validator is using a report helper then update it with any of the messages that were
+	 * added directly to the validation result.
+	 * @param vr
+	 */
+	private void updateResults(ValidationResult vr) {
+		ReporterHelper rh = vr.getReporterHelper();
+		if (rh == null)return;
+		ClassLoader classloader = getDelegatedValidator().getClass().getClassLoader();
+		for (IMessage message : rh.getMessages()){
+			Object target = message.getTargetObject();
+			if (target != null){
+				IResource res = null;
+				if (target instanceof IResource)res = (IResource)target;
+				if (res == null){
+					target = message.getAttribute(IMessage.TargetResource);
+					if (target != null && target instanceof IResource)res = (IResource)target;
+				}
+				if (res != null){
+					
+					ValidatorMessage vm = ValidatorMessage.create(message.getText(classloader), res);
+					if (getMarkerId() != null)vm.setType(getMarkerId());
+					vr.add(vm);
+					int markerSeverity = IMarker.SEVERITY_INFO;
+					int sev = message.getSeverity();
+					if ((sev & IMessage.HIGH_SEVERITY) != 0)markerSeverity = IMarker.SEVERITY_ERROR;
+					else if ((sev & IMessage.NORMAL_SEVERITY) != 0)markerSeverity = IMarker.SEVERITY_WARNING;
+					vm.setAttribute(IMarker.SEVERITY, markerSeverity);
+					vm.setAttribute(IMarker.LINE_NUMBER, message.getLineNumber());
+					int offset = message.getOffset();
+					if (offset != IMessage.OFFSET_UNSET){
+						vm.setAttribute(IMarker.CHAR_START, offset);
+						int len = message.getLength();
+						if (len != IMessage.OFFSET_UNSET){
+							vm.setAttribute(IMarker.CHAR_START, offset);
+							vm.setAttribute(IMarker.CHAR_END, offset+len);
+						}
+					}
+					String groupName = message.getGroupName();
+					if (groupName != null){
+						vm.setAttribute(ConfigurationConstants.VALIDATION_MARKER_GROUP, groupName);
+					}
+					
+					copyAttributes(message, vm);
+				}
+			}
+		}		
+	}
+
+	@SuppressWarnings("unchecked")
+	private void copyAttributes(IMessage message, ValidatorMessage vm) {
+		// I made this a separate method, so that I could localize the suppression of unchecked warnings.
+		Map attributes = message.getAttributes();
+		if (attributes != null){						
+			for (Iterator it = attributes.entrySet().iterator(); it.hasNext();){
+				Map.Entry me = (Map.Entry)it.next();
+				String key = (String)me.getKey();
+				vm.setAttribute(key, me.getValue());
+			}
+		}
+	}
+	
+	@Override
+	public void validationStarting(IProject project, ValidationState state, IProgressMonitor monitor) {
+		if (project == null)_pendingValidationStarted.set(true);
+		else {
+			AbstractValidator val = getDelegatedValidator();
+			if (_pendingValidationStarted.getAndSet(false)){
+				val.validationStarting(null, state, monitor);
+			}
+			val.validationStarting(project, state, monitor);
+		}
+	}
+	
+	@Override
+	public void validationFinishing(IProject project, ValidationState state, IProgressMonitor monitor) {
+		if (project == null){
+			if (!_pendingValidationStarted.getAndSet(false))getDelegatedValidator().validationFinishing(null, state, monitor);
+		}
+		else getDelegatedValidator().validationFinishing(project, state, monitor);
+	}
+
+	@SuppressWarnings("unchecked")
+	public Object getAdapter(Class adapter) {
+		return Platform.getAdapterManager().getAdapter(this, adapter);
+	}
+
+	public synchronized void remove(FilterGroup group) {
+		_groups.remove(group);
+		_groupsArray = null;	
+		bumpChangeCountGroups();
+	}
+	
+	@Override
+	public void resetChangeCounters() {
+		super.resetChangeCounters();
+		_changeCountGroups = 0;
+	}
+
+	@Override
+	protected boolean shouldValidateProject(IProject project) {
+		FilterGroup[] groups = getGroups();
+		ContentTypeWrapper ctw = new ContentTypeWrapper();
+		for (FilterGroup group : groups){
+			if (!group.shouldValidate(project, null, ctw))return false;
+		}
+		return true;
+	}
+	
+	public synchronized void replaceFilterGroup(FilterGroup existing, FilterGroup merged) {
+		remove(existing);
+		add(merged);
+	}
+
+}
+
+public String getSourceId() {
+	return _sourceId;
+}
+
+public void setSourceId(String sourceId) {
+	if (!Misc.same(_sourceId, sourceId)){
+		_sourceId = sourceId;
+		bumpChangeCountGlobal();
+	}
+}
+
+
+void setMessages(Map<String, MessageSeveritySetting> map) {
+	_messageSettings = map;
+	bumpChangeCountMessages();
+}
+
+public int getChangeCountGlobal() {
+	return _changeCountGlobal;
+}
+
+public boolean hasGlobalChanges(){
+	return _migrated || _changeCountGlobal > 0;
+}
+
+public int getChangeCountMessages() {
+	return _changeCountMessages;
+}
+
+public void bumpChangeCountMessages(){
+	_changeCountMessages++;
+}
+
+public void resetChangeCounters() {
+	_changeCountGlobal = 0;
+	_changeCountMessages = 0;
+}
+
+public void bumpChangeCountGlobal(){
+	_changeCountGlobal++;
+}
+
+/**
+ * Answer true if you have the same configuration settings as validator.
+ * @param validator this can be null.
+ */
+public boolean sameConfig(Validator validator) {
+	if (validator == null)return false;
+	return hashCodeForConfig() == validator.hashCodeForConfig();
+}
+
+public String getMarkerId() {
+	return _markerId;
+}
+
+public void setMarkerId(String markerId) {
+	_markerId = markerId;
+	if (markerId != null)MarkerManager.getDefault().getMarkers().add(markerId);
+}
+
+}
diff --git a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/ValidatorMessage.java b/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/ValidatorMessage.java
new file mode 100644
index 0000000..a16c26e
--- /dev/null
+++ b/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/ValidatorMessage.java
@@ -0,0 +1,296 @@
+/*******************************************************************************
+ * Copyright (c) 2007, 2008 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.wst.validation;
+
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.eclipse.core.resources.IMarker;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.runtime.Assert;
+import org.eclipse.wst.validation.internal.Tracing;
+import org.eclipse.wst.validation.internal.ValConstants;
+import org.eclipse.wst.validation.internal.plugin.ValidationPlugin;
+
+/**
+ * This class provides a way for a validator to return messages, that are easily
+ * converted into IMarkers.
+ * <p>
+ * This class is completely optional for validators. A validator can choose to
+ * directly manage IMarkers. However, some validators want to be used in
+ * multiple contexts, for example as-you-type validation and build based
+ * validation. For these types of validators it is not possible for them to use
+ * only IMarkers, because often the Resource has not been saved yet.
+ * </p>
+ * <p>
+ * <b>Provisional API:</b> This class/interface is part of an interim API that
+ * is still under development and expected to change significantly before
+ * reaching stability. It is being made available at this early stage to solicit
+ * feedback from pioneering adopters on the understanding that any code that
+ * uses this API will almost certainly be broken (repeatedly) as the API
+ * evolves.
+ * </p>
+ */
+public class ValidatorMessage {
+	
+	public static final String ValidationId = "ValidationId"; //$NON-NLS-1$
+	
+	/** Associate some arbitrary attributes with a message. */
+	private final Map<String, Object>	_map = new HashMap<String, Object>(5);
+	
+	private IResource	_resource;
+	
+	/** The type of marker. */
+	private String		_type;
+	
+	/**
+	 * Create a new validation message.
+	 * 
+	 * @param message
+	 * 		The localized message that will be displayed to the user.
+	 * 
+	 * @param resource
+	 * 		The resource that the message is associated with.
+	 */
+	public static ValidatorMessage create(String message, IResource resource){
+		ValidatorMessage msg = new ValidatorMessage();
+		msg._type = ValConstants.ProblemMarker;
+		msg._resource = resource;
+		msg.setAttribute(IMarker.MESSAGE, ValidationPlugin.getPlugin().isDebugging() ? 
+			Tracing.timestampIt(message): message);
+		return msg;
+	}
+	
+	private ValidatorMessage(){}
+	
+	/**
+	 * Answer a copy of yourself.
+	 */
+	public ValidatorMessage asCopy(){
+		ValidatorMessage msg = new ValidatorMessage();
+		msg._resource = _resource;
+		msg._type = _type;
+		msg._map.putAll(_map);
+		return msg;
+	}
+	
+	/**
+	 * Returns the attribute with the given name. The result is an instance of
+	 * one of the following classes: <code>String</code>, <code>Integer</code>,
+	 * or <code>Boolean</code>. Returns <code>null</code> if the attribute is
+	 * undefined.
+	 * 
+	 * @param attributeName
+	 * 		The name of the attribute.
+	 * @return the value, or <code>null</code> if the attribute is undefined.
+	 */
+	public Object getAttribute(String attributeName){
+		return _map.get(attributeName);
+	}
+
+	/**
+	 * Returns the integer valued attribute with the given name. Returns the
+	 * given default value if the attribute is undefined or the marker does not
+	 * exist or is not an integer value.
+	 * 
+	 * @param attributeName
+	 * 		The name of the attribute.
+	 * @param defaultValue
+	 * 		The value to use if no integer value is found.
+	 * @return the value or the default value if no integer value was found.
+	 */
+	public int getAttribute(String attributeName, int defaultValue){
+		Integer value = null;
+		try {
+			value = (Integer)_map.get(attributeName);
+		}
+		catch (Exception e){
+			// eat it
+		}
+		if (value == null)return defaultValue;
+		return value.intValue();
+	}
+
+	/**
+	 * Returns the string valued attribute with the given name. Returns the
+	 * given default value if the attribute is undefined or the marker does not
+	 * exist or is not a string value.
+	 * 
+	 * @param attributeName
+	 * 		The name of the attribute.
+	 * @param defaultValue
+	 * 		The value to use if no value is found.
+	 * @return the value or the default value if no value was found.
+	 */
+	public String getAttribute(String attributeName, String defaultValue){
+		String value = null;
+		try {
+			value = (String)_map.get(attributeName);
+		}
+		catch (Exception e){
+			// eat it
+		}
+		if (value == null)return defaultValue;
+		return value;
+		
+	}
+
+	/**
+	 * Returns the boolean valued attribute with the given name. Returns the
+	 * given default value if the attribute is undefined or the marker does not
+	 * exist or is not a boolean value.
+	 * 
+	 * @param attributeName
+	 * 		The name of the attribute.
+	 * @param defaultValue
+	 * 		The value to use if no value is found.
+	 * @return the value or the default value if no value was found.
+	 */
+	public boolean getAttribute(String attributeName, boolean defaultValue){
+		Boolean value = null;
+		try {
+			value = (Boolean)_map.get(attributeName);
+		}
+		catch (Exception e){
+			// eat it
+		}
+		if (value == null)return defaultValue;
+		return value.booleanValue();
+		
+	}
+
+	/**
+	 * Returns a map with all the attributes for the marker. If the marker has
+	 * no attributes then <code>null</code> is returned.
+	 * 
+	 * @return a map of attribute keys and values (key type :
+	 * 	<code>String</code> value type : <code>String</code>,
+	 * 	<code>Integer</code>, or <code>Boolean</code>) or <code>null</code>.
+	 */
+	@SuppressWarnings("unchecked")
+	public Map getAttributes() {
+		return _map;
+	}
+		
+	/**
+	 * Returns the resource with which this marker is associated. 
+	 *
+	 * @return the resource with which this marker is associated
+	 */
+	public IResource getResource(){
+		return _resource;		
+	}
+
+	/**
+	 * Returns the type of this marker. The returned marker type will not be 
+	 * <code>null</code>.
+	 *
+	 * @return the type of this marker
+	 */
+	public String getType() {
+		return _type;
+	}
+	
+	/**
+	 * Sets the marker type.
+	 * 
+	 * @param type The marker id to use when creating new markers.
+	 */
+	public void setType(String type){
+		assert type != null;
+		_type = type;
+	}
+		
+	/**
+	 * Sets the integer valued attribute with the given name.
+	 * <p>
+	 * This method changes resources; these changes will be reported in a
+	 * subsequent resource change event, including an indication that this
+	 * marker has been modified.
+	 * </p>
+	 * 
+	 * @param attributeName
+	 * 		The name of the attribute.
+	 * @param value
+	 * 		The value.
+	 */
+	public void setAttribute(String attributeName, int value){
+		_map.put(attributeName, new Integer(value));
+		
+	}
+
+	/**
+	 * Sets the attribute with the given name. The value must be
+	 * <code>null</code> or an instance of one of the following classes:
+	 * <code>String</code>, <code>Integer</code>, or <code>Boolean</code>.
+	 * 
+	 * @param attributeName
+	 * 		The name of the attribute.
+	 * @param value
+	 * 		The value, or <code>null</code> if the attribute is to be undefined.
+	 */
+	public void setAttribute(String attributeName, Object value){
+		_map.put(attributeName, value);
+	}
+
+	/**
+	 * Sets the boolean valued attribute with the given name.
+	 * 
+	 * @param attributeName
+	 * 		The name of the attribute.
+	 * @param value
+	 * 		The value.
+	 */
+	public void setAttribute(String attributeName, boolean value){
+		_map.put(attributeName, value ? Boolean.TRUE : Boolean.FALSE);		
+	}
+
+	/**
+	 * Sets the given attribute key-value pairs on this marker. The values must
+	 * be <code>null</code> or an instance of one of the following classes:
+	 * <code>String</code>, <code>Integer</code>, or <code>Boolean</code>. If a
+	 * value is <code>null</code>, the new value of the attribute is considered
+	 * to be undefined.
+	 * 
+	 * @param attributeNames
+	 * 		An array of attribute names.
+	 * @param values
+	 * 		An array of attribute values.
+	 */
+	public void setAttributes(String[] attributeNames, Object[] values){
+		Assert.isTrue(attributeNames.length == values.length);
+		for (int i=0; i<attributeNames.length; i++){
+			setAttribute(attributeNames[i], values[i]);			
+		}
+	}
+
+	/**
+	 * Sets the attributes for this marker to be the ones contained in the given
+	 * table. The values must be an instance of one of the following classes:
+	 * <code>String</code>, <code>Integer</code>, or <code>Boolean</code>.
+	 * Attributes previously set on the marker but not included in the given map
+	 * are considered to be removals. This includes the text of the message.
+	 * Setting the given map to be
+	 * <code>null</code> is equivalent to removing all marker attributes.
+	 * 
+	 * @param attributes
+	 * 		A map of attribute names to attribute values (key type :
+	 * 		<code>String</code> value type : <code>String</code>,
+	 * 		<code>Integer</code>, or <code>Boolean</code>) or <code>null</code>.
+	 */
+	public void setAttributes(Map<String, Object> attributes) {
+		_map.clear();
+		_map.putAll(attributes);
+		
+	}
+
+}
diff --git a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/doc-files/faq.html b/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/doc-files/faq.html
new file mode 100644
index 0000000..8096d0a
--- /dev/null
+++ b/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/doc-files/faq.html
@@ -0,0 +1,40 @@
+<html>
+<head>
+<title>Validation Framework - Frequently Asked Questions</title>
+</head>
+<body>
+<h1>Validation Framework - Frequently Asked Questions</h1>
+<h3>How do I create Problem Markers?</h3>
+<p>There are three different ways to create problem markers.</p>
+<ol>
+	<li>Use the native support in the validation framework.</li>
+	<li>Manage your own markers.</li>
+	<li>Use the support in the previous version of the validation framework.</li>
+</ol>
+<p>The first approach, is the recommended approach.</p>
+
+<h4>1. Use the native support in the validation framework</h4>
+<p>After you have finished performing your validation, and are returning control back to
+the validation framework, add your messages into the 
+<a href="../ValidationResult.html">ValidationResult</a> by using
+the <a href="../ValidationResult.html#add(org.eclipse.wst.validation.ValidatorMessage)">add(ValidatorMessage message)</a> method.
+
+<h4>2. Manage your own markers</h4>
+
+<p>Create and remove your own markers. So that summary information can still be displayed, set the counts of any newly
+created markers in the <a href="../ValidationResult.html">ValidationResult</a> by using the setSeverityXXX() methods.
+For example, if this validation pass generated two error markers, you would call 
+<a href="../ValidationResult.html#setSeverityError(int)">setSeverityError(2)</a>. 
+</p>
+
+<h4>3. Use the support in the previous version of the validation framework</h4>
+
+<p>If you are porting a validator that used the previous version of the validation framework, and you wish to continue to use an
+<A HREF="../../../../../org/eclipse/wst/validation/internal/provisional/core/IReporter.html">IReporter</a> to
+report your markers, you can continue to do so.</p>
+<p>For this approach, use the
+<a href="../ValidationResult.html#getReporter(IProgressMonitor)">getReporter(IProgressMonitor&nbsp;monitor)</a> method,
+and return your messages through the IReporter. If this method is called it is assumed by the framework, 
+that this IReporter will be used as the only way of passing messages back to the framework. 
+</body>
+</html>
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/ContentTypeWrapper.java b/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/ContentTypeWrapper.java
new file mode 100644
index 0000000..53dd045
--- /dev/null
+++ b/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/ContentTypeWrapper.java
@@ -0,0 +1,53 @@
+/*******************************************************************************
+ * Copyright (c) 2008 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.wst.validation.internal;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.content.IContentDescription;
+import org.eclipse.core.runtime.content.IContentType;
+import org.eclipse.wst.validation.internal.plugin.ValidationPlugin;
+
+/**
+ * Since it can be expense to determine a content type, we provide a wrapper so that we only
+ * need to get it once, as we validate a resource.
+ * @author karasiuk
+ *
+ */
+public class ContentTypeWrapper {
+	
+	private IContentType _type;
+	private boolean 	_initialized;
+	
+	public IContentType getContentType(IFile file){
+		if (_initialized)return _type;
+		
+		IContentDescription cd = null;
+		try {
+			cd = file.getContentDescription();
+		}
+		catch (CoreException e){
+			try {
+				file.refreshLocal(IResource.DEPTH_ZERO, null);
+				cd = file.getContentDescription();
+			}
+			catch (CoreException e2){
+				if (Tracing.isLogging())ValidationPlugin.getPlugin().handleException(e2);
+			}
+		}
+		if (cd == null)return null;
+		_type = cd.getContentType();
+		_initialized = true;
+		return _type;
+	}
+
+}
diff --git a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/DebugConstants.java b/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/DebugConstants.java
new file mode 100644
index 0000000..a466241
--- /dev/null
+++ b/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/DebugConstants.java
@@ -0,0 +1,55 @@
+/*******************************************************************************
+ * Copyright (c) 2007, 2009 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.wst.validation.internal;
+
+import org.eclipse.wst.validation.internal.plugin.ValidationPlugin;
+
+public interface DebugConstants {
+	
+	/** matches - trace filter matches. */
+	String TraceMatches = ValidationPlugin.PLUGIN_ID+"/matches"; //$NON-NLS-1$
+	
+	/** timings - trace the times of the validators. */
+	String TraceTimes = ValidationPlugin.PLUGIN_ID+"/timings"; //$NON-NLS-1$
+	
+	/** v1 - trace the v1 validators. */
+	String TraceV1 = ValidationPlugin.PLUGIN_ID+"/v1"; //$NON-NLS-1$
+	
+	/** timings/tracefile - file that stores the trace events */
+	String TraceTimesFile = ValidationPlugin.PLUGIN_ID+"/timings/tracefile"; //$NON-NLS-1$
+	
+	/** 
+	 * timings/useDoubles - By default times that are written to the trace file are
+	 * in milliseconds for elapsed time and nanoseconds for cpu time. 
+	 * If you find these times easier to read as seconds as expressed by a double, 
+	 * the following flag can be turned on.
+	 */
+	String TraceTimesUseDoubles = ValidationPlugin.PLUGIN_ID+"/timings/useDoubles"; //$NON-NLS-1$
+	
+	/** 
+	 * extraValDetail - If extra detail is needed for a particular validator it's id can be specified here. 
+	 * For example, if you wanted more detail on the XML validator you would use org.eclipse.wst.xml.core.xml 
+	 */
+	String ExtraValDetail = ValidationPlugin.PLUGIN_ID+"/extraValDetail"; //$NON-NLS-1$
+	
+	/** 
+	 * filter/allExcept - If supplied, it is as if this is the only validator that gets defined via
+	 * the extension point. All the other validators are ignored.
+	 */
+	String FilterAllExcept = ValidationPlugin.PLUGIN_ID+"/filter/allExcept"; //$NON-NLS-1$
+	
+	/**
+	 * trace/level - The tracing level. If not supplied a default of zero is used. The higher the number the
+	 * more verbose the tracing.
+	 */
+	String TraceLevel = ValidationPlugin.PLUGIN_ID+"/trace/level"; //$NON-NLS-1$
+
+}
diff --git a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/DependencyIndex.java b/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/DependencyIndex.java
new file mode 100644
index 0000000..074593b
--- /dev/null
+++ b/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/DependencyIndex.java
@@ -0,0 +1,381 @@
+/*******************************************************************************
+ * Copyright (c) 2007, 2008 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.wst.validation.internal;
+
+import java.io.DataInputStream;
+import java.io.DataOutputStream;
+import java.io.EOFException;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.resources.ISaveContext;
+import org.eclipse.core.resources.ISaveParticipant;
+import org.eclipse.core.resources.IWorkspaceRoot;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.osgi.util.NLS;
+import org.eclipse.wst.validation.DependentResource;
+import org.eclipse.wst.validation.IDependencyIndex;
+import org.eclipse.wst.validation.Validator;
+import org.eclipse.wst.validation.internal.plugin.ValidationPlugin;
+
+/**
+ * A simple implementation of the IDependencyIndex. This will probably be
+ * replaced with a higher performance, more robust index, at some point in the
+ * future.
+ * <p>
+ * The format of the index is:
+ * 
+ * <pre>
+ * Version number
+ * Number of depends on entries
+ *   depends on file name
+ *   number of dependent entries
+ *     dependent file name
+ *     number of validators
+ *       validator id
+ * </pre>
+ * 
+ * @author karasiuk
+ */
+public class DependencyIndex implements IDependencyIndex, ISaveParticipant {
+	
+	/**
+	 * An index so that we can determine which things depend on this resource.
+	 */
+	private Map<IResource,Set<Depends>>		_dependsOn;
+	
+	/**
+	 * An index so that we can determine who the resource depends on.
+	 */
+	private Map<IResource,Set<Depends>>		_dependents;
+	private boolean _dirty;
+	
+	private static IResource[] EmptyResources = new IResource[0];
+	
+	/** Version of the persistent index. */
+	private static final int CurrentVersion = 1;
+
+	public synchronized void add(String id, IResource dependent, IResource dependsOn) {
+		init();
+		if (dependsOn == null || dependent == null)return;
+		Depends d = getOrCreateDepends(dependent, dependsOn);
+		if (d.getValidators().add(id))_dirty = true;
+	}
+	
+	private Depends getOrCreateDepends(IResource dependent, IResource dependsOn) {
+		Set<Depends> set = getSet(_dependents, dependent);
+		for (Depends d : set){
+			if (d.getDependsOn() != null && d.getDependsOn().equals(dependsOn)) return d;
+		}
+		Depends d = new Depends(dependent, dependsOn);
+		_dirty = true;
+		set.add(d);
+		
+		getSet(_dependsOn, dependsOn).add(d);
+		return d;
+	}
+
+	/**
+	 * Answer the set for the resource, creating it if you need to.
+	 */
+	private Set<Depends> getSet(Map<IResource, Set<Depends>> map, IResource resource) {
+		Set<Depends> set = map.get(resource);
+		if (set == null){
+			set = new HashSet<Depends>(5);
+			map.put(resource, set);
+		}
+		return set;
+	}
+
+	/**
+	 * Restore the dependency index. See the class comment for the structure.
+	 */	
+	private void init() {
+		if (_dependsOn != null)return;
+		
+		boolean error = false;
+		File f = getIndexLocation();
+		if (!f.exists()){
+			_dependsOn = new HashMap<IResource,Set<Depends>>(100);
+			_dependents = new HashMap<IResource,Set<Depends>>(100);
+		}
+		else {
+			String errorMessage = ValMessages.Error21; 
+			DataInputStream in = null;
+			try {
+				IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot();
+				in = new DataInputStream(new FileInputStream(f));
+				
+				int version = in.readInt();
+				if (version != CurrentVersion){
+					error = true;
+					String msg = NLS.bind(ValMessages.ErrDependencyVersion, CurrentVersion);
+					throw new IllegalStateException(msg);
+				}
+				int numDependsOn = in.readInt();
+				_dependsOn = new HashMap<IResource,Set<Depends>>(numDependsOn+100);
+				_dependents = new HashMap<IResource,Set<Depends>>(numDependsOn+100);
+				for (int i=0; i<numDependsOn; i++){
+					String v = in.readUTF();
+					IResource dependsOn = root.findMember(v);
+					if (dependsOn == null){
+						Tracing.log(NLS.bind(errorMessage, v));
+					}
+					int numDependents = in.readInt();
+					for (int j=0; j<numDependents; j++){
+						v = in.readUTF();
+						IResource dependent = root.findMember(v);
+						if (dependent == null){
+							Tracing.log(NLS.bind(errorMessage, v));
+						}
+						int numVal = in.readInt();
+						for (int k=0; k<numVal; k++){
+							String id = in.readUTF();
+							if (dependent != null && dependsOn != null)add(id, dependent, dependsOn);
+						}
+					}					
+				}				
+			}
+			catch (EOFException e){
+				Tracing.log("Unable to read the dependency index file because of EOF exception");  //$NON-NLS-1$
+			}
+			catch (IOException e){
+				error = true;
+				ValidationPlugin.getPlugin().handleException(e);
+			}
+			finally {
+				Misc.close(in);
+				if (error){
+					_dependsOn = new HashMap<IResource,Set<Depends>>(100);
+					_dependents = new HashMap<IResource,Set<Depends>>(100);
+					f.delete();
+				}
+			}			
+		}
+	}
+
+	public synchronized void clear(IProject project) {
+		init();
+		for (Map.Entry<IResource,Set<Depends>> me : _dependents.entrySet()){
+			IResource key = me.getKey();
+			if (key != null && key.getProject() == project){
+				for (Depends d : me.getValue()){
+					if (d.delete())_dirty = true;
+				}
+			}
+		}
+	}
+
+	public synchronized IResource[] get(String validatorId, IResource dependsOn) {
+		init();
+		List<IResource> list = new LinkedList<IResource>();
+		Set<Depends> set = getSet(_dependsOn, dependsOn);
+		for (Depends d : set){
+			for (String id : d.getValidators()){
+				if (validatorId.equals(id))list.add(d.getDependent());
+			}
+		}
+		
+		if (list.size() == 0)return EmptyResources;
+		IResource[] resources = new IResource[list.size()];
+		list.toArray(resources);
+		return resources;
+	}
+
+	
+	public synchronized List<DependentResource> get(IResource dependsOn) {
+		init();
+		List<DependentResource> list = new LinkedList<DependentResource>();
+		Set<Depends> set = getSet(_dependsOn, dependsOn);
+		ValManager vm = ValManager.getDefault();
+		for (Depends d : set){
+			for (String id : d.getValidators()){
+				Validator v = vm.getValidator(id, d.getDependent().getProject());
+				if (v != null)list.add(new DependentResource(d.getDependent(), v));
+			}
+		}
+		return list;
+	}
+
+
+	public synchronized void set(String id, IResource dependent, IResource[] dependsOn) {
+		init();
+		Set<Depends> set = getSet(_dependents, dependent);
+		for (Depends d : set){
+			if (d.delete(id))_dirty = true;
+		}
+		if (dependsOn != null){
+			for (IResource d : dependsOn)add(id, dependent, d);
+		}
+	}
+		
+	public synchronized boolean isDependedOn(IResource resource) {
+		init();
+		Set<Depends> set = _dependsOn.get(resource);
+		if (set == null || set.size() == 0)return false;
+		return true;
+	}
+
+	public void doneSaving(ISaveContext context) {	
+	}
+	
+	public void prepareToSave(ISaveContext context) throws CoreException {	
+	}
+	
+	public void rollback(ISaveContext context) {
+	}
+	
+	/**
+	 * Persist the dependency index. See the class comment for the structure.
+	 */
+	public synchronized void saving(ISaveContext context) throws CoreException {
+		if (!_dirty)return;
+		_dirty = false;
+		boolean error = false;
+		DataOutputStream out = null;
+		File f = null;
+		try {
+			f = getIndexLocation();
+			out = new DataOutputStream(new FileOutputStream(f));
+			out.writeInt(CurrentVersion);
+			Map<String, Set<DependsResolved>> map = compress(_dependsOn);
+			out.writeInt(map.size());
+			for (Map.Entry<String, Set<DependsResolved>> me : map.entrySet()){
+				out.writeUTF(me.getKey());
+				Set<DependsResolved> set = me.getValue();
+				out.writeInt(set.size());
+				for (DependsResolved d : set){
+					out.writeUTF(d.resource);
+					out.writeInt(d.validators.size());
+					for (String id : d.validators){
+						out.writeUTF(id);
+					}
+				}
+			}
+		}
+		catch (IOException e){
+			error = true;
+			ValidationPlugin.getPlugin().handleException(e);
+		}
+		finally {		
+			Misc.close(out);
+			if (error)f.delete();
+		}
+	}
+
+	private Map<String, Set<DependsResolved>> compress(Map<IResource, Set<Depends>> dependsOn) {
+		Map<String, Set<DependsResolved>> map = new HashMap<String, Set<DependsResolved>>(dependsOn.size());
+		for (Map.Entry<IResource, Set<Depends>> me : dependsOn.entrySet()){
+			Set<DependsResolved> set = new HashSet<DependsResolved>(me.getValue().size());
+			for (Depends d : me.getValue()){
+				IPath path = d.getDependent().getFullPath();
+				if (path != null){
+					DependsResolved dr = new DependsResolved(path.toPortableString(), d.getValidators());
+					if (dr.validators.size() > 0){
+						set.add(dr);
+					}
+				}				
+			}
+			if (set.size() > 0){
+				IResource res = me.getKey();
+				if (res != null){
+					IPath path = res.getFullPath();
+					if (path != null)map.put(path.toPortableString(), set);
+				}
+			}
+		}
+		return map;
+	}
+
+	private File getIndexLocation() {
+		IPath path = ValidationPlugin.getPlugin().getStateLocation().append("dep.index"); //$NON-NLS-1$
+		return path.toFile();
+	}
+
+	/**
+	 * Keep track of a relationship between a dependent and the thing that it
+	 * depends on.
+	 * 
+	 * @author karasiuk
+	 * 
+	 */
+	private final static class Depends {
+
+		/** The resource that is being depended on, for example a.xsd */
+		private final IResource _dependsOn;
+
+		/** The resource that is dependent, for example a.xml */
+		private final IResource _dependent;
+
+		/** The id's of the validators that have asserted the dependency. */
+		private final Set<String> _validators;
+
+		public Depends(IResource dependent, IResource dependsOn) {
+			_dependent = dependent;
+			_dependsOn = dependsOn;
+			_validators = new HashSet<String>(5);
+		}
+
+		/**
+		 * Answer true if the id was deleted.
+		 */
+		public boolean delete(String id) {
+			return _validators.remove(id);
+		}
+
+		/**
+		 * Delete all the dependency assertions for all of your validators.
+		 * @return false if there was nothing to delete
+		 */
+		public boolean delete() {
+			boolean deleted = _validators.size() > 0;
+			if (deleted)_validators.clear();
+			return deleted;
+		}
+
+		public IResource getDependsOn() {
+			return _dependsOn;
+		}
+
+		public IResource getDependent() {
+			return _dependent;
+		}
+
+		public Set<String> getValidators() {
+			return _validators;
+		}
+}
+
+	private final static class DependsResolved {
+		final String 		resource;
+		final Set<String> validators;
+		
+		DependsResolved(String resource, Set<String> validators){
+			this.resource = resource;
+			this.validators = validators;
+			
+		}
+	}
+
+
+}
diff --git a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/Deserializer.java b/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/Deserializer.java
new file mode 100644
index 0000000..b1af963
--- /dev/null
+++ b/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/Deserializer.java
@@ -0,0 +1,63 @@
+/*******************************************************************************
+ * Copyright (c) 2008 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.wst.validation.internal;
+
+/**
+ * A simple deserializer that knows how to retrieve booleans, integers and strings, from a string
+ * that was encoded by the Serializer class.
+ * 
+ *  @see Serializer
+ * @author karasiuk
+ *
+ */
+public class Deserializer {
+	private char[] 	_buffer;
+	private int		_posn;
+	
+	public Deserializer(String value){
+		_buffer = value.toCharArray();
+	}
+	
+	public boolean getBoolean(){
+		boolean result = false;
+		if (_buffer[_posn] == 'T')result = true;
+		else if (_buffer[_posn] == 'F')result = false;
+		else throw new IllegalStateException(ValMessages.DecodeError1);
+		
+		_posn++;
+		return result;
+	}
+	
+	public String getString(){
+		int len = getInt();
+		String result = new String(_buffer, _posn, len);
+		_posn += len;
+		return result;		
+	}
+	
+	public int getInt(){
+		Integer len = new Integer(String.valueOf(_buffer[_posn]));
+		_posn++;
+		
+		String s = String.valueOf(_buffer, _posn, len+1);
+		_posn += len+1;
+		return Integer.parseInt(s);
+	}
+
+	/**
+	 * Are there any more items?
+	 * @return
+	 */
+	public boolean hasNext() {
+		if (_posn >= _buffer.length)return false;
+		return true;
+	}
+}
diff --git a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/DisabledResourceManager.java b/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/DisabledResourceManager.java
new file mode 100644
index 0000000..120180f
--- /dev/null
+++ b/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/DisabledResourceManager.java
@@ -0,0 +1,158 @@
+/*******************************************************************************
+ * Copyright (c) 2008 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.wst.validation.internal;
+
+import java.util.HashSet;
+import java.util.Set;
+
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.Path;
+import org.eclipse.wst.validation.internal.plugin.ValidationPlugin;
+import org.osgi.service.prefs.BackingStoreException;
+
+/**
+ * Validators can assert that certain resources (usually folders) are not validated. This class keeps track of those
+ * assertions.
+ * @author karasiuk
+ *
+ */
+public class DisabledResourceManager implements IProjectChangeListener {
+	
+	public static DisabledResourceManager getDefault(){
+		return Singleton.disabledResourceManager;
+	}
+	
+	private Set<IResource> _disabled = new HashSet<IResource>(100);
+	private Set<IProject>	_loadedProjects = new HashSet<IProject>(40);
+	
+	private DisabledResourceManager(){
+		EventManager.getManager().addProjectChangeListener(this);
+	}
+	
+	public void disableValidation(IResource resource){
+		// We check for two reasons, 1) we may save some work, 2) we force the project to be loaded 
+		if (isDisabled(resource))return;
+		
+		Set<IResource> copy = new HashSet<IResource>(_disabled.size()+2);
+		copy.addAll(_disabled);
+		copy.add(resource);
+		save(copy, resource.getProject());
+		_disabled = copy;
+	}
+	
+	public void enableValidation(IResource resource){
+		// We check for two reasons, 1) we may save some work, 2) we force the project to be loaded 
+		if (!isDisabled(resource))return;
+		
+		Set<IResource> copy = new HashSet<IResource>(_disabled.size()+2);
+		copy.addAll(_disabled);
+		copy.remove(resource);
+		save(copy, resource.getProject());
+		_disabled = copy;		
+	}
+		
+	private void save(Set<IResource> disabled, IProject project) {
+		Serializer ser = new Serializer(200);
+		for (IResource resource : disabled){
+			if (project == resource.getProject()){
+				ser.put(resource.getProjectRelativePath().toPortableString());
+			}
+		}
+		PreferencesWrapper prefs = PreferencesWrapper.getPreferences(project, null);
+		prefs.put(PrefConstants.disabled, ser.toString());
+		try {
+			prefs.flush();
+		}
+		catch (BackingStoreException e){
+			ValidationPlugin.getPlugin().handleException(e);
+		}
+	}
+	
+	private void load(IProject project){
+		Set<IResource> copy = new HashSet<IResource>(_disabled.size()+10);
+		copy.addAll(_disabled);
+		PreferencesWrapper prefs = PreferencesWrapper.getPreferences(project, null);
+		String disabled = prefs.get(PrefConstants.disabled, ""); //$NON-NLS-1$
+		if (disabled.length() > 0){
+			Deserializer des = new Deserializer(disabled);
+			while(des.hasNext()){
+				String pathString = des.getString();
+				IPath path = Path.fromPortableString(pathString);
+				IResource resource = project.findMember(path);
+				copy.add(resource);
+			}
+		}
+		_disabled = copy;
+	}
+
+	public void dispose(){
+		EventManager.getManager().removeProjectChangeListener(this);
+	}
+	
+	/**
+	 * Answer true if this resource should not be validated.
+	 * 
+	 * @param resource the resource that is being tested.
+	 * @return true if the resource should not be validated.
+	 */
+	public boolean isDisabled(IResource resource){
+		IProject project = resource.getProject();
+		if (_loadedProjects.contains(project))return _disabled.contains(resource);
+		return isDisabled(resource, project); 		
+	}
+	
+	private synchronized boolean isDisabled(IResource resource, IProject project){
+		if (!_loadedProjects.contains(project)){
+			load(project);
+			_loadedProjects.add(project);
+		}
+		return _disabled.contains(resource);
+	}
+	
+	public void addDisabled(IResource resource){
+		_disabled.add(resource);
+	}
+
+	public void projectChanged(IProject project, int type) {
+		switch (type) {
+		case IProjectChangeListener.ProjectDeleted:
+		case IProjectChangeListener.ProjectClosed:
+			projectRemoved(project);
+			break;
+			
+		}
+		
+	}
+	
+	private synchronized void projectRemoved(IProject project) {
+		_loadedProjects.remove(project);
+		Set<IResource> copy = new HashSet<IResource>(100);
+		for (IResource resource : _disabled){
+			if (resource.getProject() != project)copy.add(resource);
+		}
+		_disabled = copy;
+	}
+	
+	/**
+	 * Store the singleton for the DisabledResourceManager. This approach is used to avoid having to synchronize the
+	 * DisabledResourceManager.getDefault() method.
+	 * 
+	 * @author karasiuk
+	 *
+	 */
+	private static class Singleton {
+		static DisabledResourceManager disabledResourceManager = new DisabledResourceManager();
+	}
+
+
+}
diff --git a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/DisabledValidatorManager.java b/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/DisabledValidatorManager.java
new file mode 100644
index 0000000..8a141c5
--- /dev/null
+++ b/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/DisabledValidatorManager.java
@@ -0,0 +1,135 @@
+/*******************************************************************************
+ * Copyright (c) 2008 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.wst.validation.internal;
+
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.atomic.AtomicInteger;
+
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.wst.validation.Validator;
+import org.eclipse.wst.validation.internal.model.IValidatorVisitor;
+
+/**
+ * Keep track of the disabled validators.
+ * @author karasiuk
+ *
+ */
+public final class DisabledValidatorManager implements IValChangedListener {
+	
+	private static final AtomicInteger _counter = new AtomicInteger();
+	private static final int CacheSize = 5;
+	
+	private final Map<IResource, LRUSet> _map = Collections.synchronizedMap(new HashMap<IResource, LRUSet>(5));
+	
+	public static DisabledValidatorManager getDefault(){
+		return Singleton.disabledValidatorManager;
+	}
+	
+	private DisabledValidatorManager(){
+		ValPrefManagerProject.addListener(this);
+	}
+	
+	/*
+	 * Although this is currently not called, it should be if this ever stops being a singleton.
+	 */
+	public void dispose(){
+		ValPrefManagerProject.removeListener(this);
+	}
+
+	public Set<Validator> getDisabledValidatorsFor(IResource resource) {
+		LRUSet set = _map.get(resource);
+		if (set != null){
+			set.counter = _counter.getAndIncrement();
+			return set.validators;
+		}
+		
+		DisabledValidationFinder dvf = new DisabledValidationFinder();
+		Set<Validator> vset = dvf.findDisabledValidatorsFor(resource);
+		insert(resource, vset);
+		return vset;		
+	}
+	
+	private synchronized void insert(IResource resource, Set<Validator> vset) {
+		if (_map.size() >= CacheSize ){
+			IResource oldest = null;
+			int current = Integer.MAX_VALUE;
+			for (Map.Entry<IResource, LRUSet> me : _map.entrySet()){
+				if (me.getValue().counter < current){
+					oldest = me.getKey();
+					current = me.getValue().counter;
+				}
+			}
+			_map.remove(oldest);
+		}
+		LRUSet set = new LRUSet();
+		set.counter = _counter.getAndIncrement();
+		set.validators = vset;
+		_map.put(resource, set);		
+	}
+
+
+	private final static class LRUSet {
+		int counter;
+		Set<Validator> validators;
+	}
+	
+	private final static class DisabledValidationFinder implements IValidatorVisitor {
+		
+		private Map<String, Validator> _validators;
+
+		public void visit(Validator validator, IProject project, ValType valType, ValOperation operation,
+				IProgressMonitor monitor) {
+			
+			_validators.remove(validator.getId());
+			
+		}
+		
+		public Set<Validator> findDisabledValidatorsFor(IResource resource) {
+			ValManager vm = ValManager.getDefault();
+			Validator[] vals = vm.getValidatorsCopy();
+			_validators = new HashMap<String, Validator>(100);
+			for (Validator v : vals)_validators.put(v.getId(), v);
+						
+			IProject project = resource.getProject();
+			vm.accept(this, project, resource, ValType.Build, new ValOperation(), new NullProgressMonitor());
+			Set<Validator> set = new HashSet<Validator>(_validators.size());
+			set.addAll(_validators.values());
+			return set;
+		}
+		
+		
+	}
+
+	public void validatorsForProjectChanged(IProject project, boolean configSettingChanged) {
+		_map.clear();
+	}
+	
+	
+	/**
+	 * Store the singleton for the DisabledValidatorManager. This approach is used to avoid having to synchronize the
+	 * DisabledValidatorManager.getDefault() method.
+	 * 
+	 * @author karasiuk
+	 *
+	 */
+	private final static class Singleton {
+		final static DisabledValidatorManager disabledValidatorManager = new DisabledValidatorManager();
+	}
+
+
+}
diff --git a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/ExtensionConstants.java b/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/ExtensionConstants.java
new file mode 100644
index 0000000..c0b4bda
--- /dev/null
+++ b/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/ExtensionConstants.java
@@ -0,0 +1,194 @@
+/*******************************************************************************
+ * Copyright (c) 2005, 2010 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.wst.validation.internal;
+
+/**
+ * Constants used in the extension points.
+ * @author karasiuk
+ *
+ */
+public interface ExtensionConstants {
+	
+	/** validatorV2 - extension point for registering validators that use version 2 of the validation framework. */
+	String validator = "validatorV2"; //$NON-NLS-1$
+	
+	/** exclude - extension point for adding extra exclusion filters to a validator. */ 
+	String excludeExtension = "exclude"; //$NON-NLS-1$
+	
+	/** build - is the validator enabled by default for build based validations? true or false */
+	String build = "build"; //$NON-NLS-1$
+	
+	/** class - name of the attribute that holds the validator class. */
+	String AttribClass = "class"; //$NON-NLS-1$
+	
+	/** manual - is the validator enabled by default for manual based validations? true or false */
+	String manual = "manual"; //$NON-NLS-1$
+	
+	/** 
+	 * markerId - the marker id that the framework should use when creating customized markers for this validator.
+	 * This is an optional attribute. If it is not supplied than the standard validation marker type will be used.
+	 */
+	String markerId = "markerId"; //$NON-NLS-1$
+	
+	/** 
+	 * sourceid - If this validator also serves as an as-you-type validator (also know as an ISourceValidator) 
+	 * then it's source id is specified here, so that the two validators can be associated with one 
+	 * another. By source id, we mean the id that is used in the org.eclipse.wst.sse.ui.sourceValidation 
+	 * extension point.
+	 */
+	String sourceId = "sourceid"; //$NON-NLS-1$
+	
+	/** 
+	 * version - the version of this definition. The attribute is a simple integer, and if not specified it
+	 * is assumed to be 1. This allows the filter settings to be changed in the future.
+	 */
+	String version = "version";  //$NON-NLS-1$
+	
+	/** 
+	 * include - a group of inclusion rules. At least one rule in this group needs to match in order for the resource
+	 * to to considered to be validated.
+	 */
+	String include = "include"; //$NON-NLS-1$
+	
+	/** exclude - a group of exclusion rules. If any of these rules match the resource is not validated. */
+	String exclude = "exclude"; //$NON-NLS-1$
+	
+	/** rules - a group of inclusion or exclusion rules. */
+	String rules = "rules"; //$NON-NLS-1$
+	
+	/** rules - extension point to declare a validator group */
+	String group = "validatorGroup"; //$NON-NLS-1$
+	
+	/** removeV2Validator - extension point to remove a V2 validator */
+	String removedValidatorExtension = "removeV2Validator"; //$NON-NLS-1$
+	
+
+	interface Group {
+		/*
+		 * The group sub-element for either the validatorGroup or validator
+		 * extension points.
+		 */
+		String elementGroup = "group"; //$NON-NLS-1$
+		// a validator group identifier
+		String attId = "id"; //$NON-NLS-1$
+		// the listener sub-element
+		String elementListener = "listener"; //$NON-NLS-1$
+		// the group listener class name
+		String attClass = "class"; //$NON-NLS-1$
+	}
+	
+	/** Different types of rules for filtering validation. */
+	interface Rule {
+		
+		/** projectNature - filter by project nature. */
+		String projectNature = "projectNature"; //$NON-NLS-1$
+		
+		/** fileext - filter by file extension. */
+		String fileext = "fileext"; //$NON-NLS-1$
+		
+		/** file - a file name, it can include path information as well. */
+		String file = "file"; //$NON-NLS-1$
+		
+		/** facet - filter by facet id. */
+		String facet = "facet"; //$NON-NLS-1$
+		
+		/** contentType - filter by content type. */
+		String contentType = "contentType"; //$NON-NLS-1$
+		
+		/** targetRuntime - filter by targetRuntime. */
+		String targetRuntime = "targetRuntime"; //$NON-NLS-1$
+		
+		/** pattern - filter paths by regular expression. */
+		String pattern = "pattern"; //$NON-NLS-1$
+	}
+	
+	/** Rule attributes */
+	interface RuleAttrib {
+		
+		/** caseSensitive - true or false. */
+		String caseSensitive = "caseSensitive"; //$NON-NLS-1$
+		
+		/** 
+		 * exactMatch - true or false, default is true. It is used to decide whether content types need to match
+		 * exactly, or whether sub types should also be considered.
+		 */
+		String exactMatch = "exactMatch"; //$NON-NLS-1$
+		
+		/** ext - a file extension, for example "html". */
+		String ext = "ext"; //$NON-NLS-1$
+		
+		/** id - an identifier. */
+		String id = "id"; //$NON-NLS-1$
+		
+		/** name - a file name. */
+		String name = "name"; //$NON-NLS-1$
+		
+		/** regex - a Java regular expression. */
+		String regex = "regex"; //$NON-NLS-1$
+		
+		/** 
+		 * type - the type of file to be matched:
+		 * <ul>
+		 * <li>folder - project relative folder name
+		 * <li>file - simple file name
+		 * <li>full - fully qualified, project relative file name
+		 * </ul>
+		 */
+		String fileType = "type"; //$NON-NLS-1$
+		
+		/** version - facet version expression. See the facet framework for the exact syntax of this expression. */
+		String version = "version"; //$NON-NLS-1$
+	}
+	
+	interface FileType {
+		/** folder - project relative folder name */
+		String folder = "folder"; //$NON-NLS-1$
+		
+		/** file - simple file name */
+		String file = "file"; //$NON-NLS-1$
+		
+		/** full - fully qualified, project relative file name */
+		String full = "full"; //$NON-NLS-1$
+	}
+	
+	interface MessageCategory {
+		/** messageCategory - name of the message category element. */
+		String name = "messageCategory"; //$NON-NLS-1$
+		
+		/** id - simple id of the message. */
+		String id = "id"; //$NON-NLS-1$
+		
+		/** label = human readable label of the message category. */
+		String label = "label"; //$NON-NLS-1$
+		
+		/** severity - message severity, it must be one of error, warning or ignore. */
+		String severity = "severity"; //$NON-NLS-1$
+		
+		String sevError = "error"; //$NON-NLS-1$
+		String sevWarning = "warning"; //$NON-NLS-1$
+		String sevIgnore = "ignore";  //$NON-NLS-1$
+	}
+	
+	interface Exclude {
+		/** id - fully qualified id of the validator that is being extended. */
+		String id = "id"; //$NON-NLS-1$
+	}
+	
+	interface RemovedValidator {
+		/** validatorId - the validator ID. The String represents the validator that will be removed */
+		String validatorIDAttr = "validatorId"; //$NON-NLS-1$
+	}
+	/** true */
+	String True = "true"; //$NON-NLS-1$
+	
+	/** false */
+	String False = "false"; //$NON-NLS-1$
+}
diff --git a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/ExtensionValidators.java b/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/ExtensionValidators.java
new file mode 100644
index 0000000..090f4af
--- /dev/null
+++ b/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/ExtensionValidators.java
@@ -0,0 +1,110 @@
+/*******************************************************************************
+ * Copyright (c) 2008 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.wst.validation.internal;
+
+import java.lang.reflect.InvocationTargetException;
+import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+
+import org.eclipse.core.resources.IProject;
+import org.eclipse.wst.validation.Validator;
+import org.eclipse.wst.validation.internal.plugin.ValidationPlugin;
+
+/**
+ * The validators that have been defined by the validator extension points.
+ * @author karasiuk
+ *
+ */
+public final class ExtensionValidators {
+	private static ExtensionValidators _me;
+	
+	/** All the registered validators. The key is the validator id and the value is the validator. */
+	private final Map<String, Validator> _map;
+	
+	public synchronized static ExtensionValidators instance(){
+		if (_me == null){
+			_me = new ExtensionValidators();
+		}
+		return _me;
+	}
+
+	private ExtensionValidators(){
+		_map = new HashMap<String, Validator>(100);
+		for (Validator v : ValidatorExtensionReader.getDefault().process()){
+			_map.put(v.getId(), v);
+		}		
+	}
+	
+	/**
+	 * Answer all the v2 validators that have been defined by the extension point. This is the real
+	 * map (not a copy).
+	 * 
+	 * @return The key is the validator id and the value is the validator.
+	 */
+	public Map<String, Validator> getMapV2() {
+		return _map;
+	}
+
+	/**
+	 * Answer all the v2 validators that have been defined by the extension point. This is a copy of
+	 * the map, but not a copy of the validators.
+	 * 
+	 * @return The key is the validator id and the value is the validator.
+	 */
+	public Map<String, Validator> getMapV2Copy() {
+		HashMap<String, Validator> map = new HashMap<String, Validator>(_map.size());
+		map.putAll(_map);
+		return map;
+	}
+	
+	
+	/**
+	 * Answer all the validators that have been defined by extension points. This includes all
+	 * the v2 validators, and all of the v1 validators that have been defined just on this project.
+	 * 
+	 * @return The key is the validator id and the value is the validator.
+	 */
+	public Map<String, Validator> getMap(IProject project) {
+		//TODO I may want to consider caching this, but then again if the v1 validators are going away
+		// it may not be worth it.
+		Map<String, Validator> map = new HashMap<String, Validator>();
+		map.putAll(_map);
+		
+		for (Validator v : getV1Validators(project))map.put(v.getId(), v);
+		
+		return map;
+	}
+	
+	/**
+	 * Answer the v1 validators that have been defined just on this project.
+	 * @param project
+	 * @return
+	 */
+	List<Validator> getV1Validators(IProject project){
+		List<Validator> list = new LinkedList<Validator>();
+		try {
+			ProjectConfiguration pc = new ProjectConfiguration(project);
+			pc.resetToDefault();
+			for (ValidatorMetaData vmd : pc.getValidators()){
+				Validator v = Validator.create(vmd, pc, project);
+				list.add(v);
+			}
+		}
+		catch (InvocationTargetException e){
+			ValidationPlugin.getPlugin().handleException(e);
+		}
+
+		return list;
+	}
+
+}
diff --git a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/FullBuildJob.java b/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/FullBuildJob.java
new file mode 100644
index 0000000..332a2c7
--- /dev/null
+++ b/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/FullBuildJob.java
@@ -0,0 +1,29 @@
+package org.eclipse.wst.validation.internal;
+
+import org.eclipse.core.resources.IncrementalProjectBuilder;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.resources.WorkspaceJob;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.wst.validation.internal.plugin.ValidationPlugin;
+
+public class FullBuildJob extends WorkspaceJob {
+	
+	public FullBuildJob(){
+		super(ValMessages.JobName);
+	}
+
+	@Override
+	public IStatus runInWorkspace(IProgressMonitor monitor) throws CoreException {
+		try {
+			ResourcesPlugin.getWorkspace().build(IncrementalProjectBuilder.FULL_BUILD, monitor);
+		}
+		catch (Exception e){
+			return new Status(IStatus.ERROR,ValidationPlugin.PLUGIN_ID, e.toString(), e);
+		}
+		return Status.OK_STATUS;
+	}
+
+}
diff --git a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/IProjectChangeListener.java b/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/IProjectChangeListener.java
new file mode 100644
index 0000000..6788534
--- /dev/null
+++ b/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/IProjectChangeListener.java
@@ -0,0 +1,39 @@
+/*******************************************************************************
+ * Copyright (c) 2008 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.wst.validation.internal;
+
+import org.eclipse.core.resources.IProject;
+
+/**
+ * A call back for listeners that are interested when a project changes.
+ * @author karasiuk
+ *
+ */
+public interface IProjectChangeListener {
+	
+	int ProjectOpened = 1;
+	int ProjectClosed = 2;
+	int ProjectDeleted = 4;
+	
+	/** 8 - Something in the project description has changed. For example, a Nature was added. */
+	int ProjectChanged = 8;
+	
+	/** 16 - The project has been added. */
+	int ProjectAdded = 16;
+	
+	/**
+	 * The project has changed in some way.
+	 * 
+	 * @param project The project that has changed.
+	 * @param type The type of change. This will be one of the Project constants;
+	 */
+	void projectChanged(IProject project, int type);
+}
diff --git a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/IValChangedListener.java b/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/IValChangedListener.java
new file mode 100644
index 0000000..a2d26d8
--- /dev/null
+++ b/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/IValChangedListener.java
@@ -0,0 +1,31 @@
+/*******************************************************************************
+ * Copyright (c) 2007, 2008 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.wst.validation.internal;
+
+/**
+ * A class that wants to be notified when the validator preferences change.
+ * @author karasiuk
+ *
+ */
+public interface IValChangedListener {
+	
+	/**
+	 * The validators for the project have changed.
+	 *  
+	 * @param project the project can be null, which means that the global validation preferences have
+	 * changed.
+	 * 
+	 * @param configSettingChanged If true a setting that could effect what gets validated has changed.
+	 * If false, then only other types of settings (like whether to show a results dialog or not) have
+	 * changed. 
+	 */
+	public void validatorsForProjectChanged(org.eclipse.core.resources.IProject project, boolean configSettingChanged);
+}
diff --git a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/MarkerManager.java b/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/MarkerManager.java
new file mode 100644
index 0000000..8776525
--- /dev/null
+++ b/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/MarkerManager.java
@@ -0,0 +1,205 @@
+/*******************************************************************************
+ * Copyright (c) 2007, 2008 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.wst.validation.internal;
+
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import org.eclipse.core.resources.IMarker;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.wst.validation.Validator;
+import org.eclipse.wst.validation.ValidatorMessage;
+import org.eclipse.wst.validation.internal.plugin.ValidationPlugin;
+import org.eclipse.wst.validation.internal.provisional.core.IMessage;
+
+/**
+ * A central place to manage all of the V2 validation markers.
+ * @author karasiuk
+ *
+ */
+public class MarkerManager {
+	
+	private Set<String> _markers = new HashSet<String>(50);
+	
+	public static MarkerManager getDefault(){
+		return Singleton.markerManager;
+	}
+	
+	private MarkerManager(){
+		_markers.add(ValConstants.ProblemMarker);
+		_markers.add(ConfigurationConstants.VALIDATION_MARKER);
+	}
+	
+	/**
+	 * Clear any validation markers that may have been set by this validator.
+	 * 
+	 * @param resource
+	 *            The resource that may have it's markers cleared. It can be
+	 *            null, in which case the operation is a no-op.
+	 * @param validator
+	 *            The validator that created the marker.
+	 */
+	public void clearMarker(IResource resource, Validator validator) throws CoreException {
+		if (resource == null)return;
+		hook(resource);
+		
+		String id = validator.getMarkerId();
+		if (id != null){
+			try {
+				resource.deleteMarkers(id, true, IResource.DEPTH_ZERO);
+			}
+			catch (CoreException e){
+				// Nothing that we can do. This is not worth logging.
+			}
+			return;
+		}
+				
+		IMarker[] markers = resource.findMarkers(ValConstants.ProblemMarker, true, IResource.DEPTH_ZERO);
+		String valId = validator.getId();
+		for (IMarker marker : markers){
+			id = marker.getAttribute(ValidatorMessage.ValidationId, null);
+			if (valId.equals(id))marker.delete();
+		}
+	}
+	
+	@SuppressWarnings("unchecked")
+	public void createMarker(ValidatorMessage m, String id){
+		try {
+			IResource resource = m.getResource();
+			hook(resource);
+			IMarker marker = resource.createMarker(m.getType());
+			Map map = m.getAttributes();
+			if (map.get(ValidatorMessage.ValidationId) == null)
+				map.put(ValidatorMessage.ValidationId, id);
+			marker.setAttributes(map);
+		}
+		catch (CoreException e){
+			if (!m.getResource().exists())throw new ResourceUnavailableError(m.getResource());
+			ValidationPlugin.getPlugin().handleException(e);
+		}
+		
+	}
+	
+	/**
+	 * Delete all the markers on this resource that were created before the
+	 * operation start time.
+	 * 
+	 * @param resource
+	 *            The resource that is having it's markers deleted.
+	 * @param operationStartTime
+	 *            The time as returned by System.currentTimeMillis().
+	 * @param depth
+	 *            The depth of the markers to clear. It is one of the
+	 *            IResource.DEPTH_XXX constants.
+	 */
+	public void deleteMarkers(IResource resource, long operationStartTime, int depth){
+		try {
+			hook(resource); 
+			IMarker[] markers = resource.findMarkers(null, true, depth);
+			String markerType;
+			for (IMarker marker : markers){
+				try {
+					markerType = marker.getType();
+				}
+				catch (CoreException e)
+				{
+					//ignore the marker
+					return;
+				}
+				if (_markers.contains(markerType)){
+					long createTime = marker.getCreationTime();
+					if (createTime < operationStartTime){
+						try {
+							marker.delete();
+						}
+						catch (CoreException e){
+							// eat it - there is nothing we can do about this.
+						}
+					}
+				}
+			}
+		}
+		catch (CoreException e){
+			IProject project = resource.getProject();
+			if (!project.exists() || !project.isOpen())throw new ProjectUnavailableError(project);
+			if (!resource.exists())throw new ResourceUnavailableError(resource);
+			ValidationPlugin.getPlugin().handleException(e);
+		}		
+	}
+	
+	public void makeMarkers(List<IMessage> list){
+		for (IMessage message : list){
+			IResource res = null;
+			Object target = message.getTargetObject();
+			if (target != null && target instanceof IResource)res = (IResource)target;
+			if (res == null){
+				target = message.getAttribute(IMessage.TargetResource);
+				if (target != null && target instanceof IResource)res = (IResource)target;
+			}
+			if (res != null){
+				try {
+					hook(res);
+					String id = message.getMarkerId();
+					if (id == null)id = ConfigurationConstants.VALIDATION_MARKER;
+					IMarker marker = res.createMarker(id);
+					marker.setAttributes(message.getAttributes());
+					marker.setAttribute(IMarker.MESSAGE, message.getText());
+					int markerSeverity = IMarker.SEVERITY_INFO;
+					int sev = message.getSeverity();
+					if ((sev & IMessage.HIGH_SEVERITY) != 0)markerSeverity = IMarker.SEVERITY_ERROR;
+					else if ((sev & IMessage.NORMAL_SEVERITY) != 0)markerSeverity = IMarker.SEVERITY_WARNING;
+					marker.setAttribute(IMarker.SEVERITY, markerSeverity);
+					marker.setAttribute(IMarker.LINE_NUMBER, message.getLineNumber());
+				}
+				catch (CoreException e){
+					ValidationPlugin.getPlugin().handleException(e);
+				}				
+			}
+		}
+	}
+	
+	/**
+	 * A debugging method. A place to put break points, so that you can figure out what sort of marker
+	 * changes are happening.
+	 * 
+	 * @param resource
+	 */
+	public void hook(IResource resource){
+//		String name = "first.test2x";
+//		if (resource.getName().equals(name)){
+//			String markers = Misc.listMarkers(resource);
+//			Tracing.log("MarkerManager has hooked: ", name); //$NON-NLS-1$
+//			RuntimeException rt = new RuntimeException("hooking " + name);
+//			rt.printStackTrace();
+//		}
+	}
+
+	public Set<String> getMarkers() {
+		return _markers;
+	}
+	
+	/**
+	 * Store the singleton for the MarkerManager. This approach is used to avoid having to synchronize the
+	 * MarkerManager.getDefault() method.
+	 * 
+	 * @author karasiuk
+	 *
+	 */
+	private static class Singleton {
+		static MarkerManager markerManager = new MarkerManager();
+	}
+
+
+}
diff --git a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/Misc.java b/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/Misc.java
new file mode 100644
index 0000000..ceafc41
--- /dev/null
+++ b/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/Misc.java
@@ -0,0 +1,155 @@
+/*******************************************************************************
+ * Copyright (c) 2008 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.wst.validation.internal;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.lang.management.ManagementFactory;
+import java.lang.management.ThreadMXBean;
+
+import org.eclipse.core.resources.IMarker;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.resources.IResourceChangeEvent;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.Platform;
+import org.eclipse.osgi.util.NLS;
+
+/**
+ * Some miscellaneous helper methods. 
+ * @author karasiuk
+ *
+ */
+public final class Misc {
+	
+	public static void close(InputStream in){
+		if (in == null)return;
+		try {
+			in.close();
+		}
+		catch (IOException e){
+			// eat it
+		}
+	}
+
+	public static void close(OutputStream out) {
+		if (out == null)return;
+		try {
+			out.close();
+		}
+		catch (IOException e){
+			// eat it
+		}		
+	}
+	
+	public static boolean debugOptionAsBoolean(String option){
+		String opt = Platform.getDebugOption(option);
+		if (opt == null)return false;
+		opt = opt.toLowerCase();
+		if ("true".equals(opt))return true; //$NON-NLS-1$
+		if ("yes".equals(opt))return true; //$NON-NLS-1$
+		return false;
+	}
+	
+	
+	/**
+	 * Answer a units appropriate string for the time.
+	 * @param time time in nano seconds
+	 */
+	public static String getTimeNano(long time){
+		if (time <= 1000)return NLS.bind(ValMessages.TimeNano, time);
+		if (time <= 1000000)return NLS.bind(ValMessages.TimeMicro, time/1000);
+		return getTimeMS(time/1000000);
+	}
+	
+	/**
+	 * Answer the CPU time consumed by this thread in nano seconds.
+	 * @return -1 if the time can not be determined.
+	 */
+	public static long getCPUTime(){
+		long cpuTime = -1;
+		ThreadMXBean tb = ManagementFactory.getThreadMXBean();
+		if (tb.isCurrentThreadCpuTimeSupported()){
+			cpuTime = tb.getCurrentThreadCpuTime();
+		}
+		return cpuTime;
+	}
+	
+	/**
+	 * Answer a units appropriate string for the time.
+	 * @param time time in milliseconds
+	 */
+	public static String getTimeMS(long time) {
+		if (time <= 1000)return ValMessages.TimeUnder;
+		if (time <= 60000)return NLS.bind(ValMessages.TimeSec, time/1000);
+		return NLS.bind(ValMessages.TimeMin, time/60000);
+	}
+
+	/**
+	 * Used in debugging so we can see what types of markers there are.
+	 * @param resource
+	 */
+	public static String listMarkers(IResource resource){
+		StringBuffer b = new StringBuffer(2000);
+		try {
+			IMarker[] markers = resource.findMarkers(null, true, IResource.DEPTH_ZERO);
+			for (IMarker m : markers){
+				Object o = m.getAttribute(IMarker.MESSAGE);
+				if (o != null){
+					b.append(o);
+				}
+				o = m.getAttribute(IMarker.SEVERITY);
+				if (o != null){
+					b.append(", Severity="); //$NON-NLS-1$
+					b.append(o);
+				}
+				b.append("; "); //$NON-NLS-1$
+			}
+		}
+		catch (CoreException e){
+			
+		}
+		return b.toString();
+	}
+	
+	/**
+	 * Answer true if they are the same. If they are both null then they are the same. 
+	 * @param s1 the string to compare. It can be null.
+	 * @param s2 the string to compare. It can be null.
+	 */
+	public static boolean same(String s1, String s2){
+		if (s1 == null && s2 == null)return true;
+		if (s1 == null)return false;
+		return s1.equals(s2);
+	}
+	
+	public static void niy(String msg){
+		if (msg == null)msg = "Sorry, this function is not implemented yet"; //$NON-NLS-1$
+		throw new RuntimeException(msg);
+	}
+	
+	/**
+	 * Answer the type as a human readable string. This is only used for debugging.
+	 * @param type
+	 * @return
+	 */
+	public static String resourceChangeEventType(int type){
+		StringBuffer b = new StringBuffer(200);
+		if ((type & IResourceChangeEvent.POST_BUILD) != 0)b.append("post_build "); //$NON-NLS-1$
+		if ((type & IResourceChangeEvent.POST_CHANGE) != 0)b.append("post_change "); //$NON-NLS-1$
+		if ((type & IResourceChangeEvent.PRE_BUILD) != 0)b.append("pre_build "); //$NON-NLS-1$
+		if ((type & IResourceChangeEvent.PRE_CLOSE) != 0)b.append("pre_close "); //$NON-NLS-1$
+		if ((type & IResourceChangeEvent.PRE_DELETE) != 0)b.append("pre_delete "); //$NON-NLS-1$
+		return b.toString();
+	}
+	
+}
diff --git a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/NullValidator.java b/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/NullValidator.java
new file mode 100644
index 0000000..9f057aa
--- /dev/null
+++ b/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/NullValidator.java
@@ -0,0 +1,32 @@
+/*******************************************************************************
+ * Copyright (c) 2008 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.wst.validation.internal;
+
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.wst.validation.AbstractValidator;
+import org.eclipse.wst.validation.ValidationResult;
+import org.eclipse.wst.validation.ValidationState;
+
+/**
+ * A null validator that is used in error cases. It simply no-ops.
+ * @author karasiuk
+ *
+ */
+public class NullValidator extends AbstractValidator {
+
+	@Override
+	public ValidationResult validate(IResource resource, int kind, ValidationState state, IProgressMonitor monitor) {
+		return null;
+	}
+
+}
diff --git a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/PerformanceMonitor.java b/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/PerformanceMonitor.java
new file mode 100644
index 0000000..f00e93d
--- /dev/null
+++ b/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/PerformanceMonitor.java
@@ -0,0 +1,192 @@
+/*******************************************************************************
+ * Copyright (c) 2007, 2008 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.wst.validation.internal;
+
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+
+import org.eclipse.osgi.util.NLS;
+import org.eclipse.wst.validation.IPerformanceMonitor;
+import org.eclipse.wst.validation.PerformanceCounters;
+import org.eclipse.wst.validation.internal.plugin.ValidationPlugin;
+
+public class PerformanceMonitor implements IPerformanceMonitor {
+	
+	private CollectionLevel _level = CollectionLevel.None;
+	private boolean			_summaryOnly;
+	
+	/**
+	 * Create a performance monitor.
+	 * 
+	 * @param traceTimes
+	 *            Should the monitor be turned on?
+	 * @param file
+	 *            Should the events be logged to a file. If this is null or the
+	 *            empty string the events will be written to stderr. Otherwise
+	 *            the events are appended to a file with this name.
+	 * 
+	 * @param logInSeconds
+	 *            Set this to true if you want the times that are logged in the
+	 *            trace file normalized to seconds. Otherwise the default units are used,
+	 *            milliseconds for elapsed time and nanoseconds for cpu time.
+	 */
+	public static PerformanceMonitor create(boolean traceTimes, String file, boolean logInSeconds){
+		PerformanceMonitor pm = null;
+		if (file == null || file.length() == 0)pm = new PerformanceMonitor();
+		else pm = new ToFile(file, logInSeconds);
+		
+		if (traceTimes)pm.setCollectionLevel(CollectionLevel.Default);
+		
+		return pm;
+	}
+	
+	private PerformanceMonitor(){};
+	
+	public CollectionLevel getCollectionLevel() {
+		return _level;
+	}
+
+	public void setCollectionLevel(CollectionLevel level) {
+		_level = level;
+	}
+
+	public List<PerformanceCounters> getPerformanceCounters(boolean asSummary) {
+		return new LinkedList<PerformanceCounters>();
+	}
+
+
+	public void resetPerformanceCounters() {
+	}
+
+	public boolean isCollecting() {
+		return _level != CollectionLevel.None;
+	}
+	
+	public boolean isSummaryOnly() {
+		return _summaryOnly;
+	}
+	
+	public void add(PerformanceCounters counters){
+		Tracing.write(counters.toString());
+	}
+	
+	public static class Counters{
+		String	name;
+		int 	numberInvocations;
+		
+		/** Elapsed time in milliseconds. */
+		long	elapsedTime;
+		
+		/** CPU time in nanoseconds, or -1 if unknown. */
+		long	cpuTime;		
+	}
+	
+	public static class ToFile extends PerformanceMonitor {
+		
+		private String 		_fileName;
+		private boolean		_logInSeconds;
+		
+		private PrintWriter _pw;
+		private static final String Comma=","; //$NON-NLS-1$
+		private static DateFormat 	_df = new SimpleDateFormat("HH:mm:ss.SSSS"); //$NON-NLS-1$
+		
+		private ToFile(String fileName, boolean logInSeconds){
+			_fileName = fileName;
+			_logInSeconds = logInSeconds;
+		}
+		
+		@Override
+		public synchronized void add(PerformanceCounters pc) {
+			try {
+				PrintWriter pw = getWriter();
+				pw.print(_df.format(pc.getWhen()) + Comma + 
+					pc.getValidatorId() + Comma + pc.getNumberInvocations() + Comma);
+				if (_logInSeconds){
+					double sec = ((double)pc.getElapsedTime()) / 1000.0;
+					pw.print(sec);
+					pw.print(Comma);
+					sec = ((double)pc.getCpuTime()) / 1000000000.0;
+					pw.print(sec);
+				}
+				else {
+					pw.print(pc.getElapsedTime()+Comma+pc.getCpuTime());
+				}
+				pw.println(Comma + pc.getResourceName());
+				pw.flush();
+			}
+			catch (IOException e){
+				ValidationPlugin.getPlugin().handleException(e);
+			}
+		}
+		
+		private PrintWriter getWriter() throws IOException {
+			if (_pw == null){
+				_pw = new PrintWriter(new FileOutputStream(_fileName, true));
+				DateFormat df = DateFormat.getDateTimeInstance();
+				_pw.println("# " + NLS.bind(ValMessages.LogSession,  //$NON-NLS-1$
+					df.format(new Date(System.currentTimeMillis()))));
+				if (_logInSeconds)
+					_pw.println("# when, id, invocation count, elapsed time (seconds), cpu time (seconds), resource"); //$NON-NLS-1$
+				else 
+					_pw.println("# when, id, invocation count, elapsed time (ms), cpu time (ns), resource"); //$NON-NLS-1$
+			}
+			return _pw;
+			
+		}
+	}
+	
+	public static class Collecting extends PerformanceMonitor {
+		private List<PerformanceCounters>	_counters = new LinkedList<PerformanceCounters>();
+		
+		public void add(PerformanceCounters counters){
+			_counters.add(counters);
+		}
+		
+		public List<PerformanceCounters> getPerformanceCounters(boolean asSummary) {
+			if (asSummary){
+				Map<String, Counters> map = new HashMap<String, Counters>(40);
+				for (PerformanceCounters pc : _counters){
+					Counters c = map.get(pc.getValidatorId());
+					if (c == null){
+						c = new Counters();
+						c.name = pc.getValidatorName();
+						map.put(pc.getValidatorId(), c);
+					}
+					c.numberInvocations += pc.getNumberInvocations();
+					c.elapsedTime += pc.getElapsedTime();
+					if (pc.getCpuTime() != -1)c.cpuTime += pc.getCpuTime();
+					else c.cpuTime = -1;
+				}
+				List<PerformanceCounters> list = new LinkedList<PerformanceCounters>();
+				for (Map.Entry<String, Counters> me : map.entrySet()){
+					Counters c = me.getValue();
+					list.add(new PerformanceCounters(me.getKey(), c.name, null, c.numberInvocations, c.elapsedTime, c.cpuTime));
+				}
+				return list;
+			}
+			return _counters;
+		}
+		
+		public void resetPerformanceCounters() {
+			_counters.clear();
+		}
+
+	}
+
+}
diff --git a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/PrefConstants.java b/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/PrefConstants.java
new file mode 100644
index 0000000..3bac075
--- /dev/null
+++ b/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/PrefConstants.java
@@ -0,0 +1,116 @@
+/*******************************************************************************
+ * Copyright (c) 2007, 2008 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.wst.validation.internal;
+
+/**
+ * The constants that are used in the preference store so save the validator configurations. 
+ * <p>
+ * The entries in the preference hierarchy are organized something like this:
+ * <pre>
+ * /instance/frame-work-id/saveAuto=true|false
+ * /instance/frame-work-id/suspend=true|false
+ * /instance/frame-work-id/vf.version=2
+ * /instance/frame-work-id/filters/val-id/build=true|false
+ * /instance/frame-work-id/filters/val-id/manual=true|false
+ * /instance/frame-work-id/filters/val-id/version=someNumber
+ * /instance/frame-work-id/filters/val-id/groups/0/type=include|exclude
+ * /instance/frame-work-id/filters/val-id/groups/0/rules/0/type=file|fileext|projectNature|...
+ * /instance/frame-work-id/filters/val-id/groups/0/rules/0/pattern=...
+ * /instance/frame-work-id/filters/val-id/groups/0/rules/1/type=file|fileext|projectNature|...
+ * /instance/frame-work-id/filters/val-id/groups/0/rules/1/pattern=...
+ * </pre>
+ * <p>
+ * New approach
+ * <pre>
+ * vals/val-id/global=TF[version][len]delegate-id
+ * vals/val-id/groups=[groups]
+ * </pre>
+ * 
+ * 
+ * @author karasiuk
+ *
+ */
+public interface PrefConstants {
+	
+	/** filters - node where all the filters are saved. */
+	String filters = "filters"; //$NON-NLS-1$
+	
+	/** build - is the validator enabled for builds? */
+	String build = "build"; //$NON-NLS-1$
+	
+	/** delegate - the delegating implementation to use */
+	String delegate = "delegate"; //$NON-NLS-1$
+	
+	/** disabled - the list of disabled resources in the project. */
+	String disabled = "disabled"; //$NON-NLS-1$
+	
+	/** exactMatch - must the content type match exactly? */
+	String exactMatch = "exactMatch"; //$NON-NLS-1$
+	
+	/** manual - is the validator enabled for manual validation? */
+	String manual = "manual"; //$NON-NLS-1$
+	
+	/** msgs - node where all the message severity mappings are stored. */
+	String msgs = "msgs"; //$NON-NLS-1$
+	
+	/** 
+	 * version - version of the filter definition. This is something that a client can use to keep track
+	 * of changes that they might make to their validation extension.
+	 */
+	String version = "version"; //$NON-NLS-1$
+	
+	/** vf.version - version of the validation framework. */
+	String frameworkVersion = "vf.version"; //$NON-NLS-1$
+	
+	/** groups - filter group. */
+	String groups = "groups"; //$NON-NLS-1$
+	
+	/** type - type of group, either include or exclude. */
+	String type = "type"; //$NON-NLS-1$
+	
+	/** type - the type of rule. */
+	String ruleType = "type"; //$NON-NLS-1$
+	
+	/** rules - a filter rule. */
+	String rules = "rules"; //$NON-NLS-1$
+	
+	/** pattern - the pattern part of the rule. */
+	String pattern = "pattern"; //$NON-NLS-1$
+	
+	/** saveAuto - can we save all the resources automatically? true/false */
+	String saveAuto = "saveAuto"; //$NON-NLS-1$
+	
+	/** stateTS - plug-in state time stamp */
+	String stateTS = "stateTS"; //$NON-NLS-1$
+	
+	/** suspend - suspend all validation? true/false */
+	String suspend = "suspend"; //$NON-NLS-1$
+	
+	/** case - is this case sensitive? */
+	String caseSensitive = "case"; //$NON-NLS-1$
+	
+	/** fileType - the type of file, see FilterRule.File */
+	String fileType = "fileType"; //$NON-NLS-1$
+	
+	/** confirmDialog - should we show a confirmation dialog when doing a manual validation? */
+	String confirmDialog = "confirmDialog"; //$NON-NLS-1$
+	
+	/** override - should we show projects to override the global preferences? */
+	String override = "override"; //$NON-NLS-1$
+	
+	/** vals - the validators are grouped under this node. */
+	String vals = "vals"; //$NON-NLS-1$
+	
+	/** global - some global validation settings. */
+	String global = "global"; //$NON-NLS-1$
+	
+	
+}
diff --git a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/PreferencesWrapper.java b/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/PreferencesWrapper.java
new file mode 100644
index 0000000..0f3a5e7
--- /dev/null
+++ b/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/PreferencesWrapper.java
@@ -0,0 +1,431 @@
+/*******************************************************************************
+ * Copyright (c) 2009 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.wst.validation.internal;
+
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.atomic.AtomicReference;
+
+import org.eclipse.core.resources.IProject;
+import org.eclipse.wst.validation.ValidationFramework;
+import org.eclipse.wst.validation.internal.plugin.ValidationPlugin;
+import org.osgi.service.prefs.BackingStoreException;
+import org.osgi.service.prefs.Preferences;
+
+/**
+ * The subset of the IEclipsePreferences interface that the framework needs to
+ * be able to persist preferences.
+ * @author karasiuk
+ *
+ */
+public abstract class PreferencesWrapper {
+	
+	private static final WrapperManger _manager = new WrapperManger();
+	
+	/**
+	 * Answer the preferences for the project. If project is null answer the global preferences.
+	 * @param project
+	 * @param persistent if null the default preferences are returned, if True the persisted 
+	 * preferences are return and if False the transient preferences are returned.
+	 * @return
+	 */
+	public static PreferencesWrapper getPreferences(IProject project, Boolean persistent){
+		return _manager.get(project, persistent);
+	}
+		
+	/**
+	 * These are the names of the node entries.
+	 * @return
+	 * @throws BackingStoreException
+	 */
+	public abstract String[] childrenNames() throws BackingStoreException;
+	
+	public void flush() throws BackingStoreException {
+	}
+	
+	public abstract boolean getBoolean(String key, boolean def);
+	
+	public abstract String get(String key, String def);
+	
+	public abstract int getInt(String key, int def);
+	
+	public abstract long getLong(String key, long def);
+
+	public abstract String[] keys() throws BackingStoreException;
+
+	public boolean isPersistent(){
+		return false;
+	}
+
+	public boolean isTransient(){
+		return false;
+	}
+	
+	public abstract void put(String key, String value);
+	
+	public abstract void putBoolean(String key, boolean value);
+	
+	public abstract void putLong(String key, long value);
+	
+	public abstract void putInt(String key, int value);
+	
+	/**
+	 * Unlike the more sophisticated org.osgi.service.prefs.Preferences support, 
+	 * this is currently limited to simple node names.
+	 */
+	public abstract PreferencesWrapper node(String nodeName);
+	
+	public abstract boolean nodeExists();
+	
+	public abstract boolean nodeExists(String pathName)  throws BackingStoreException;
+	
+	public abstract void removeNode()  throws BackingStoreException;
+
+
+public final static class PreferencesWrapperPersistent extends PreferencesWrapper {
+	
+	private final Preferences _preferences;
+	
+	public PreferencesWrapperPersistent(Preferences preferences){
+		_preferences = preferences;
+	}
+	
+	@Override
+	public String[] childrenNames() throws BackingStoreException {
+		return _preferences.childrenNames();
+	}
+	
+	public void flush() throws BackingStoreException {
+		_preferences.flush();
+	}
+	
+	@Override
+	public String get(String key, String def) {
+		return _preferences.get(key, def);
+	}
+	
+	@Override
+	public boolean getBoolean(String key, boolean def) {
+		return _preferences.getBoolean(key, def);
+	}
+	
+	@Override
+	public int getInt(String key, int def) {
+		return _preferences.getInt(key, def);
+	}
+	
+	@Override
+	public long getLong(String key, long def) {
+		return _preferences.getLong(key, def);
+	}
+	
+	@Override
+	public String[] keys() throws BackingStoreException {
+		return _preferences.keys();
+	}
+	
+	@Override
+	public boolean isPersistent() {
+		return true;
+	}
+	
+	@Override
+	public void put(String key, String value) {
+		_preferences.put(key, value);
+	}
+	
+	@Override
+	public PreferencesWrapper node(String path) {
+		Preferences prefs = _preferences.node(path);
+		return new PreferencesWrapperPersistent(prefs);
+	}
+	
+	@Override
+	public boolean nodeExists() {
+		try {
+			return nodeExists(""); //$NON-NLS-1$
+		}
+		catch (BackingStoreException e){
+		
+		}
+		return false;
+	}
+	
+	@Override
+	public boolean nodeExists(String pathName) throws BackingStoreException  {
+		return _preferences.nodeExists(pathName);
+	}
+	
+	public void putBoolean(String key, boolean value) {
+		_preferences.putBoolean(key, value);	
+	}
+	
+	public void putLong(String key, long value){
+		_preferences.putLong(key, value);
+	}
+	
+	@Override
+	public void putInt(String key, int value) {
+		_preferences.putInt(key, value);
+	}
+	
+	@Override
+	public void removeNode() throws BackingStoreException {
+		_preferences.removeNode();
+	}
+}
+
+public final static class PreferencesWrapperTransient extends PreferencesWrapper {
+	
+	private final PreferencesWrapperTransient _parent;
+	private final Map<String, String> _children = Collections.synchronizedMap(new HashMap<String, String>(10));
+	private final Map<String, PreferencesWrapperTransient> _nodes = Collections.synchronizedMap(new HashMap<String, PreferencesWrapperTransient>(10));
+	
+	public PreferencesWrapperTransient(PreferencesWrapperTransient parent){
+		_parent = parent;
+	}
+	
+	public PreferencesWrapperTransient(PreferencesWrapper pw, PreferencesWrapperTransient parent) {
+		_parent = parent;
+		try {
+			for (String key : pw.keys()){
+				put(key, pw.get(key, null));
+			}
+			
+			
+			for (String nodeName : pw.childrenNames()){
+				PreferencesWrapper p = pw.node(nodeName);
+				PreferencesWrapperTransient pwt = new PreferencesWrapperTransient(p, this);
+				_nodes.put(nodeName, pwt);
+			}
+		}
+		catch (BackingStoreException e){
+			
+		}
+	}
+
+	@Override
+	public String[] childrenNames() throws BackingStoreException {
+		Set<String> keys = _nodes.keySet();
+		String names[] = new String[keys.size()];
+		keys.toArray(names);
+		return names;
+	}
+	
+	@Override
+	public String get(String key, String def) {
+		String value = _children.get(key);
+		if (value != null)return value;
+		return def;
+	}
+	
+	@Override
+	public boolean getBoolean(String key, boolean def) {
+		String value = _children.get(key);
+		if (value == null)return def;
+		value = value.toLowerCase();
+		if ("true".equals(value))return true; //$NON-NLS-1$
+		if ("false".equals(value))return false; //$NON-NLS-1$
+		return def;
+	}
+	
+	@Override
+	public int getInt(String key, int def) {
+		String value = _children.get(key);
+		if (value == null)return def;
+		try {
+			return Integer.parseInt(value);
+		}
+		catch (NumberFormatException e){
+		}
+		return def;
+	}
+	
+	@Override
+	public long getLong(String key, long def) {
+		String value = _children.get(key);
+		if (value == null)return def;
+		try {
+			return Long.parseLong(value);
+		}
+		catch (NumberFormatException e){
+		}
+		return def;
+	}
+	
+	@Override
+	public boolean isTransient() {
+		return true;
+	}
+	
+	@Override
+	public synchronized String[] keys() throws BackingStoreException {
+		String[] keys = new String[_children.size()];
+		_children.keySet().toArray(keys);
+		return keys;
+	}
+	
+	@Override
+	public synchronized PreferencesWrapper node(String name) {
+		PreferencesWrapperTransient pw  = _nodes.get(name);
+		if (pw != null)return pw;
+		pw = new PreferencesWrapperTransient(this);
+		_nodes.put(name, pw);
+		return pw;
+	}
+	
+	@Override
+	public boolean nodeExists() {
+		return true;
+	}
+	
+	@Override
+	public boolean nodeExists(String key) throws BackingStoreException {
+		PreferencesWrapperTransient pw = _nodes.get(key);
+		if (pw != null)return true;
+		return false;
+	}
+	
+	@Override
+	public void put(String key, String value) {
+		_children.put(key, value);
+	}
+	
+	@Override
+	public void putBoolean(String key, boolean bool) {
+		String value = bool ? "true" : "false";  //$NON-NLS-1$//$NON-NLS-2$
+		_children.put(key, value);
+	}
+	
+	@Override
+	public void putInt(String key, int value) {
+		_children.put(key, String.valueOf(value));
+	}
+	
+	@Override
+	public void putLong(String key, long value) {
+		_children.put(key, String.valueOf(value));
+	}
+	
+	@Override
+	public void removeNode() throws BackingStoreException {
+		if (_parent == null)return;
+		_parent.removeNode(this);
+	}
+	
+	private synchronized void removeNode(PreferencesWrapperTransient node){
+		String key = null;
+		for (Map.Entry<String, PreferencesWrapperTransient> me : _nodes.entrySet()){
+			if (me.getValue().equals(node)){
+				key = me.getKey();
+				break;
+			}
+		}
+		if (key != null)_nodes.remove(key);
+	}
+}
+
+private final static class WrapperManger implements IProjectChangeListener {
+	
+	private final Map<IProject, PreferencesWrapper> _map = new HashMap<IProject, PreferencesWrapper>(20); 
+	private final AtomicReference<PreferencesWrapper> _global = new AtomicReference<PreferencesWrapper>();
+	
+	private WrapperManger(){
+		EventManager.getManager().addProjectChangeListener(this);
+	}
+	
+	/**
+	 * Currently this object never goes away, but if that was ever to change then we would need to dispose it.
+	 */
+	@Override
+	protected void finalize() throws Throwable {
+		dispose();
+	}
+	
+	public void dispose(){
+		EventManager.getManager().removeProjectChangeListener(this);
+	}
+
+	public PreferencesWrapper get(IProject project, Boolean persistent) {
+		if (project == null)return globalPreferences(persistent);
+		PreferencesWrapper pw = null;
+		synchronized(_map){
+			pw = _map.get(project);
+		}
+		
+		if (pw != null && (persistent == null || persistent == pw.isPersistent()))return pw;
+		
+		if (pw == null)pw = new PreferencesWrapperPersistent(ValidationPlugin.getPreferences(project));
+		if (persistent != null && persistent && pw.isTransient())pw = new PreferencesWrapperPersistent(ValidationPlugin.getPreferences(project));
+		if (persistent != null && !persistent && pw.isPersistent())pw = new PreferencesWrapperTransient(pw, null);
+		
+		synchronized(_map){
+			_map.put(project, pw);
+		}
+		
+		return pw;
+	}
+
+	/**
+		 * Answer the appropriate global preferences.
+		 * 
+		 * @param persistent
+		 *            If null then answer the current saved global preferences,
+		 *            creating a new persistent one if there is none. If True,
+		 *            then ensure that the preferences are persistent. If False,
+		 *            ensure that the preferences are transient.
+		 * @return
+		 */
+	private PreferencesWrapper globalPreferences(Boolean persistent) {
+		PreferencesWrapper pw = _global.get();
+		
+		while(pw == null){
+			PreferencesWrapper newPW = createGlobal(persistent);
+			if (_global.compareAndSet(null, newPW))pw = newPW;
+			else pw = _global.get();
+		}
+		
+		while (persistent != null && !persistent && !pw.isTransient()){
+			PreferencesWrapper newPW = new PreferencesWrapperTransient(pw, null);
+			if (_global.compareAndSet(pw, newPW))pw = newPW;
+			else pw = _global.get();
+		}
+		
+		while (persistent != null && persistent && !pw.isPersistent()){
+			PreferencesWrapper newPW = new PreferencesWrapperPersistent(ValidationFramework.getDefault().getPreferenceStore());
+			if (_global.compareAndSet(pw, newPW))pw = newPW;
+			else pw = _global.get();			
+		}
+		return pw;
+	}
+	
+	private PreferencesWrapper createGlobal(Boolean persistent){
+		PreferencesWrapper pw = new PreferencesWrapperPersistent(ValidationFramework.getDefault().getPreferenceStore());
+		if (persistent == null || persistent)return pw;
+		return new PreferencesWrapperTransient(pw, null);
+	}
+
+	public void projectChanged(IProject project, int type) {
+		int interested = IProjectChangeListener.ProjectClosed | IProjectChangeListener.ProjectDeleted;
+		if ((type & interested) != 0){
+			synchronized (_map) {
+				_map.remove(project);
+			}
+		}
+		
+	}
+	
+}
+
+
+}
diff --git a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/ProjectUnavailableError.java b/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/ProjectUnavailableError.java
new file mode 100644
index 0000000..03e2b65
--- /dev/null
+++ b/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/ProjectUnavailableError.java
@@ -0,0 +1,41 @@
+/*******************************************************************************
+ * Copyright (c) 2005, 2008 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.wst.validation.internal;
+
+import org.eclipse.core.resources.IProject;
+
+/**
+ * This internal error is used to signal that a project is now unavailable.
+ * <p>
+ * We could be in the middle of validating a large project, and the project could be closed. 
+ * This error is used to "exit" the validation framework.
+ * <p>
+ * This is an error rather than a runtime exception, because some parts of Eclipse like to
+ * trap RuntimeExceptions and log them.
+ * @author karasiuk
+ *
+ */
+public class ProjectUnavailableError extends Error {
+	
+	private IProject _project;
+
+	private static final long serialVersionUID = 200801281118L;
+	
+	public ProjectUnavailableError(IProject project){
+		super();
+		_project = project;
+	}
+
+	public IProject getProject() {
+		return _project;
+	}
+
+}
diff --git a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/ResourceUnavailableError.java b/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/ResourceUnavailableError.java
new file mode 100644
index 0000000..9543670
--- /dev/null
+++ b/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/ResourceUnavailableError.java
@@ -0,0 +1,40 @@
+/*******************************************************************************
+ * Copyright (c) 2005, 2008 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.wst.validation.internal;
+
+import org.eclipse.core.resources.IResource;
+
+/**
+ * This internal error is used to signal that a resource is now unavailable.
+ * <p>
+ * This error is used to "exit" the validation framework. 
+ * <p>
+ * This is an error rather than a runtime exception, because some parts of Eclipse like to
+ * trap RuntimeExceptions and log them.
+ * @author karasiuk
+ *
+ */
+public class ResourceUnavailableError extends Error {
+
+	private static final long serialVersionUID = 200801290853L;
+	
+	private IResource _resource;
+	
+	public ResourceUnavailableError(IResource resource){
+		super();
+		_resource = resource;
+	}
+
+	public IResource getResource() {
+		return _resource;
+	}
+
+}
diff --git a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/Serializer.java b/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/Serializer.java
new file mode 100644
index 0000000..22da768
--- /dev/null
+++ b/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/Serializer.java
@@ -0,0 +1,48 @@
+/*******************************************************************************
+ * Copyright (c) 2008 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.wst.validation.internal;
+
+/**
+ * A simple encoder that knows how to convert booleans, integers and strings, into a single string.
+ * 
+ * @see Deserializer
+ * @author karasiuk
+ *
+ */
+public class Serializer {
+	private StringBuffer _buffer;
+	
+	public Serializer(int size){
+		_buffer = new StringBuffer(size);
+	}
+	
+	public void put(boolean bool){
+		_buffer.append(bool ? 'T' : 'F');
+	}
+	
+	public void put(String string){
+		put(string.length());
+		_buffer.append(string);
+	}
+	
+	public void put(int anInt){
+		String s = String.valueOf(anInt);
+		int len = s.length();
+		_buffer.append(len-1);
+		_buffer.append(s);
+	}
+	
+	@Override
+	public String toString() {
+		return _buffer.toString();
+	}
+
+}
diff --git a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/SummaryReporter.java b/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/SummaryReporter.java
new file mode 100644
index 0000000..5a19332
--- /dev/null
+++ b/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/SummaryReporter.java
@@ -0,0 +1,63 @@
+/*******************************************************************************
+ * Copyright (c) 2005, 2007 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.wst.validation.internal;
+
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.wst.validation.internal.operations.WorkbenchReporter;
+import org.eclipse.wst.validation.internal.provisional.core.IMessage;
+import org.eclipse.wst.validation.internal.provisional.core.IValidator;
+
+/**
+ * This class extends the workbench reporter by capturing some summary information about any added
+ * messages.
+ * @author karasiuk
+ *
+ */
+public class SummaryReporter extends WorkbenchReporter {
+	
+	private int _severityHigh;
+	private int _severityNormal;
+	private int	_severityLow;
+
+	public SummaryReporter(IProject project, IProgressMonitor monitor) {
+		super(project, monitor);
+	}
+	
+	@Override
+	public void addMessage(IValidator validator, IMessage message) {
+		super.addMessage(validator, message);
+		switch (message.getSeverity()){
+		case IMessage.HIGH_SEVERITY: 
+			_severityHigh++;
+			break;
+		case IMessage.NORMAL_SEVERITY: 
+			_severityNormal++;
+			break;
+		case IMessage.LOW_SEVERITY:
+			_severityLow++;
+			break;
+		}
+	}
+
+	public int getSeverityHigh() {
+		return _severityHigh;
+	}
+
+	public int getSeverityNormal() {
+		return _severityNormal;
+	}
+
+	public int getSeverityLow() {
+		return _severityLow;
+	}
+
+}
diff --git a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/Tracing.java b/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/Tracing.java
new file mode 100644
index 0000000..77e49cb
--- /dev/null
+++ b/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/Tracing.java
@@ -0,0 +1,208 @@
+/*******************************************************************************
+ * Copyright (c) 2005, 2009 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.wst.validation.internal;
+
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+import org.eclipse.core.resources.IResourceDelta;
+import org.eclipse.core.resources.IResourceDeltaVisitor;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.Platform;
+import org.eclipse.wst.validation.internal.plugin.ValidationPlugin;
+
+/**
+ * Control the tracing that this plug-in performs. This is used for service.
+ * @author karasiuk
+ *
+ */
+public final class Tracing {
+	
+	private final static DateFormat _df = new SimpleDateFormat("HH:mm:ss.SSSS"); //$NON-NLS-1$
+	private final static boolean	_isLogging = ValidationPlugin.getPlugin().isDebugging();
+	private final static boolean	_traceMatches = Misc.debugOptionAsBoolean(DebugConstants.TraceMatches);
+	private final static boolean	_traceV1 = Misc.debugOptionAsBoolean(DebugConstants.TraceV1);
+	private final static String		_extraValDetail = Platform.getDebugOption(DebugConstants.ExtraValDetail);
+	private final static int 		_tracingLevel;
+	
+	private final static String		_filter = Platform.getDebugOption(DebugConstants.FilterAllExcept);
+	
+	static {
+		String traceLevel = Platform.getDebugOption(DebugConstants.TraceLevel);
+		int level = 0;
+		if (traceLevel != null){
+			try {
+				level = Integer.parseInt(traceLevel);
+			}
+			catch (Exception e){
+			}
+		}
+		_tracingLevel = level;
+	}
+	
+	/**
+	 * Answer true if the filters allow this validator to be enabled. Normally this method will answer true.
+	 * It is only when filters are activated via the debugging options, that this method might return false.
+	 * This is used to aid in debugging by making it look like only one validator has been registered.
+	 * 
+	 * @param validatorId the validator id.
+	 * @return true if the validator should be registered via an extension point.
+	 */
+	public static boolean isEnabled(String validatorId){
+		if (_filter == null || _filter.length() == 0)return true;
+		return (_filter.equals(validatorId));		
+	}
+	
+	/**
+	 * Are we in logging/debugging mode?
+	 */
+	public static boolean isLogging(){
+		return _isLogging;
+	}
+	
+	/**
+	 * Answer true if we are in logging mode, and if the current logging level is greater than or
+	 * equal to level.
+	 * @param level The logging level that we are testing. The higher the level the more verbose
+	 * the tracing.
+	 */
+	public static boolean isLogging(int level){
+		if (_isLogging){
+			return _tracingLevel >= level;
+		}
+		return false;
+	}
+	
+	public static boolean isTraceMatches(){
+		return _traceMatches;
+	}
+	
+	public static boolean isTraceV1(){
+		return _traceV1;
+	}
+	
+	public static boolean matchesExtraDetail(String validatorId){
+		if (_extraValDetail == null)return false;
+		return _extraValDetail.equals(validatorId);
+	}
+
+	/**
+	 * Write a line to the console for debugging, if in debugging mode.
+	 * @param line
+	 */
+	public static void log(String line){
+		if (isLogging())write(line);
+	}
+	
+	public static void log(Object... parts){
+		if (isLogging()){
+			StringBuffer b = new StringBuffer(200);
+			for (Object p : parts)b.append(p);
+			write(b.toString());
+		}
+	}
+
+	/**
+	 * Write a line to the log. Include a time stamp with the line.
+	 * @param line
+	 */
+	public static void write(String line){
+		System.err.println(timestampIt(line));
+	}
+
+	public static String timestampIt(String line){
+		Date date = new Date();
+		String thread = Thread.currentThread().getName();
+		return _df.format(date) + " " + thread + " " + line;  //$NON-NLS-1$//$NON-NLS-2$		
+	}
+
+	/**
+	 * If we are in logging mode, log the item, and then reset the string buffer.
+	 */
+	public static void log(StringBuffer b){
+		log(b.toString());
+		b.setLength(0);
+	}
+
+	/**
+	 * This method doesn't do anything, and will be removed.
+	 * 
+	 * @deprecated
+	 */
+	public static void setForceLogging(boolean forceLogging) {
+	}
+	
+	/**
+	 * Log up to maxNumber deltas to the log.
+	 * @param delta The deltas to log.
+	 * @param maxNumber The maximum number of deltas to log.
+	 */
+	public static void logResourceDeltas(IResourceDelta delta, int maxNumber){
+		if (!isLogging())return;
+		if (delta == null)Tracing.log("  ResourceDelta: null"); //$NON-NLS-1$
+		else {
+			DeltaLogger logger = new DeltaLogger(maxNumber);
+			try {
+				delta.accept(logger);
+				if (logger.getCount() == 0)Tracing.log("  ResourceDelta: no deltas"); //$NON-NLS-1$
+			}
+			catch (CoreException e){
+				// eat it
+			}
+		}
+	}
+	
+	/**
+	 * A debugging class that prints out some resource delta's.
+	 * @author karasiuk
+	 *
+	 */
+	private final static class DeltaLogger implements IResourceDeltaVisitor {
+		
+		private final int 	_max;
+		private int 		_count;
+		public int getCount() {
+			return _count;
+		}
+
+		private StringBuffer _b = new StringBuffer(200);
+		
+		public DeltaLogger(int max){
+			_max = max;
+		}
+
+		public boolean visit(IResourceDelta delta) throws CoreException {
+			if (_count++ > _max)return false;
+			int kind = delta.getKind();
+			String type = "unknown"; //$NON-NLS-1$
+			switch (kind){
+			case IResourceDelta.ADDED:
+				type = "Added"; //$NON-NLS-1$
+				break;
+			case IResourceDelta.CHANGED:
+				type = "Changed"; //$NON-NLS-1$
+				break;
+			case IResourceDelta.REMOVED:
+				type = "Removed"; //$NON-NLS-1$
+				break;				
+			}
+			_b.append("  ResourceDelta "); //$NON-NLS-1$
+			_b.append(type);
+			_b.append(' ');
+			_b.append(delta.getResource());
+			Tracing.log(_b);
+			return true;
+		}
+		
+	}
+
+}
diff --git a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/ValBuilderJob.java b/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/ValBuilderJob.java
new file mode 100644
index 0000000..e40b2ba
--- /dev/null
+++ b/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/ValBuilderJob.java
@@ -0,0 +1,352 @@
+/*******************************************************************************
+ * Copyright (c) 2007, 2011 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.wst.validation.internal;
+
+import java.text.MessageFormat;
+import java.util.LinkedList;
+import java.util.Queue;
+
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.resources.IResourceDelta;
+import org.eclipse.core.resources.IResourceDeltaVisitor;
+import org.eclipse.core.resources.IResourceProxy;
+import org.eclipse.core.resources.IResourceProxyVisitor;
+import org.eclipse.core.resources.IResourceVisitor;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.resources.WorkspaceJob;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.core.runtime.SubMonitor;
+import org.eclipse.wst.validation.DependentResource;
+import org.eclipse.wst.validation.Friend;
+import org.eclipse.wst.validation.IDependencyIndex;
+import org.eclipse.wst.validation.ValidationEvent;
+import org.eclipse.wst.validation.ValidationFramework;
+import org.eclipse.wst.validation.ValidationState;
+import org.eclipse.wst.validation.Validator;
+import org.eclipse.wst.validation.internal.model.IValidatorVisitor;
+import org.eclipse.wst.validation.internal.operations.ValidationBuilder;
+import org.eclipse.wst.validation.internal.plugin.ValidationPlugin;
+
+
+/**
+ * Run all the v2 validators through this job.
+ * <p>
+ * This is the main class for supporting build based validation. When triggered it looks at all of the
+ * resource changes and determines what needs to be validated. 
+ * </p>
+ * @author karasiuk
+ *
+ */
+public final class ValBuilderJob extends WorkspaceJob {
+	
+	private static ValBuilderJob _job;
+	private static Queue<ValidationRequest> _work = new LinkedList<ValidationRequest>();
+	
+	private final ValOperation _operation = new ValOperation();
+		
+	/** The types of changes we are interested in. */
+	private final static int	InterestedFlags = IResourceDelta.CONTENT | IResourceDelta.ENCODING |
+		IResourceDelta.MOVED_FROM | IResourceDelta.MOVED_TO;
+	
+	public static synchronized void validateProject(IProject project, IResourceDelta delta, int buildKind){
+		ValidationRequest request = new ValidationRequest(project, delta, buildKind);
+		if (_job == null){
+			_job = new ValBuilderJob();
+			_job.add(request);
+			_job.schedule();
+		}
+		else {
+			_job.add(request);
+		}
+	}
+	
+	private static synchronized ValidationRequest getRequest(){
+		ValidationRequest request = _work.poll();
+		if (request == null){
+			_job = null;
+		}
+		return request;
+	}
+	
+	/**
+	 * Each validation run is done in it's own job.
+	 * 
+	 * @param project the project that is being validated
+	 * @param delta the delta that is being validated. This may be null, in which case we do a 
+	 * full validation of the project.
+	 * 
+	 * @param buildKind the kind of build.
+	 * @see org.eclipse.core.resources.IncrementalProjectBuilder#AUTO_BUILD
+	 * @see org.eclipse.core.resources.IncrementalProjectBuilder#CLEAN_BUILD
+	 * @see org.eclipse.core.resources.IncrementalProjectBuilder#FULL_BUILD
+	 * @see org.eclipse.core.resources.IncrementalProjectBuilder#INCREMENTAL_BUILD
+	 * 
+	 * @param operation some global context for the validation operation
+	 * 
+	 */
+	private ValBuilderJob(){
+		super(ValMessages.JobName);
+	}
+	
+	private void add(ValidationRequest request){
+		_work.add(request);
+	}
+	
+	@Override
+	public boolean belongsTo(Object family) {
+		if (family == ResourcesPlugin.FAMILY_MANUAL_BUILD)return true;
+		if (family == ValidationBuilder.FAMILY_VALIDATION_JOB){
+			return true;
+		}
+			
+		return super.belongsTo(family);
+	}
+
+	@Override
+	public IStatus runInWorkspace(IProgressMonitor monitor) {
+		Tracing.log("ValBuilderJob-01: Starting"); //$NON-NLS-1$
+		
+		try {
+			startingValidation(monitor);
+			
+			ValidationRequest request = getRequest();
+			while(request != null){
+				run(request, monitor);
+				request = getRequest();
+			}
+		}
+		finally {
+			finishingValidation(monitor);
+		}
+		
+		Tracing.log("ValBuilderJob-02: Finished"); //$NON-NLS-1$
+		return Status.OK_STATUS;
+	}
+
+	private void startingValidation(IProgressMonitor monitor) {
+        IValidatorVisitor startingVisitor = new IValidatorVisitor(){
+
+            public void visit(Validator validator, IProject project, ValType valType, 
+                ValOperation operation, IProgressMonitor monitor) {
+                
+                validator.validationStarting(project, operation.getState(), monitor);                   
+            }               
+        };
+
+        ValManager.getDefault().accept(startingVisitor, null, ValType.Build, getOperation(), monitor);
+	}
+	
+	private void finishingValidation(IProgressMonitor monitor) {
+		
+		IValidatorVisitor finishedVisitor = new IValidatorVisitor(){
+
+		    public void visit(Validator validator, IProject project, ValType valType,
+		      ValOperation operation, IProgressMonitor monitor) {
+
+		      validator.validationFinishing(project, operation.getState(), monitor);              
+		    }           
+		  };
+		  ValManager.getDefault().accept(finishedVisitor, null, ValType.Build, getOperation(), monitor);
+	}
+
+	private void run(ValidationRequest request, IProgressMonitor monitor){
+		setName(MessageFormat.format(ValMessages.JobNameWithProjectName,new Object[] { request.getProject().getName() })); 
+		try {		
+	        IValidatorVisitor startingVisitor = new IValidatorVisitor(){
+
+	            public void visit(Validator validator, IProject project, ValType valType, 
+	                ValOperation operation, IProgressMonitor monitor) {
+	                
+	                validator.validationStarting(project, operation.getState(), monitor);                   
+	            }               
+	        };
+
+	        ValManager.getDefault().accept(startingVisitor, request.getProject(), ValType.Build, getOperation(), monitor);
+		  
+			if (request.getDelta() == null)fullBuild(request, monitor);
+			else deltaBuild(request, monitor);
+
+			
+		}
+		catch (ProjectUnavailableError e){
+			ValidationPlugin.getPlugin().handleProjectUnavailableError(e);
+		}
+		catch (ResourceUnavailableError e){
+			ValidationPlugin.getPlugin().handleResourceUnavailableError(e);
+		}
+		catch (CoreException e){
+			ValidationPlugin.getPlugin().handleException(e);
+		}
+		finally {
+		  IValidatorVisitor finishedVisitor = new IValidatorVisitor(){
+
+		    public void visit(Validator validator, IProject project, ValType valType,
+		      ValOperation operation, IProgressMonitor monitor) {
+
+		      validator.validationFinishing(project, operation.getState(), monitor);              
+		    }           
+		  };
+          ValManager.getDefault().accept(finishedVisitor, request.getProject(), ValType.Build, getOperation(), monitor);
+		}
+		
+	}
+
+	private void deltaBuild(ValidationRequest request, IProgressMonitor monitor) throws CoreException {
+		ResourceCounter counter = new ResourceCounter();
+		request.getDelta().accept(counter);
+		SubMonitor subMonitor = SubMonitor.convert(monitor, counter.getCount());
+		Visitor vistitor = new Visitor(request, subMonitor, monitor, getOperation());
+		request.getDelta().accept(vistitor);		
+	}
+
+	private void fullBuild(ValidationRequest request, IProgressMonitor monitor) throws CoreException {
+		ResourceCounter counter = new ResourceCounter();
+		request.getProject().accept(counter, 0);
+		SubMonitor subMonitor = SubMonitor.convert(monitor, counter.getCount());
+		Visitor vistitor = new Visitor(request, subMonitor, monitor, getOperation());
+		request.getProject().accept(vistitor);
+		
+	}
+	
+	private ValOperation getOperation(){
+		return _operation;
+	}
+
+	static final class ResourceCounter implements IResourceProxyVisitor, IResourceDeltaVisitor {
+		
+		private int _count;
+
+		public int getCount() {
+			return _count;
+		}
+
+		public boolean visit(IResourceProxy proxy) throws CoreException {
+			_count++;
+			return true;
+		}
+
+		public boolean visit(IResourceDelta delta) throws CoreException {
+			_count++;
+			return true;
+		}		
+	}
+	
+	static final class ValidationRequest {
+		/** The project that is being built. */
+		private final IProject 			_project;
+		
+		/** The resource delta that triggered the build, it will be null for a full build. */
+		private final IResourceDelta	_delta;
+		
+		/** 
+		 * The kind of build.
+		 * 
+		 *  @see org.eclipse.core.resources.IncrementalProjectBuilder
+		 */
+		private final int					_buildKind;
+		
+		public ValidationRequest(IProject project, IResourceDelta delta, int buildKind){
+			_project = project;
+			_delta = delta;
+			_buildKind = buildKind;
+		}
+
+		public IProject getProject() {
+			return _project;
+		}
+
+		public IResourceDelta getDelta() {
+			return _delta;
+		}
+
+		public int getBuildKind() {
+			return _buildKind;
+		}
+	}
+	
+	private final static class Visitor implements IResourceDeltaVisitor, IResourceVisitor{
+		
+		private final ValidationRequest 	_request;
+		private final SubMonitor 			_subMonitor;
+		private final IProgressMonitor 		_monitor;
+		private final ValOperation			_operation;
+		
+		public Visitor(ValidationRequest request, SubMonitor subMonitor, IProgressMonitor monitor, ValOperation operation){
+			_request = request;
+			_subMonitor = subMonitor;
+			_monitor = monitor;
+			_operation = operation;
+		}
+		
+		public boolean visit(IResource resource) throws CoreException {
+			try {
+				if (DisabledResourceManager.getDefault().isDisabled(resource)){
+					MarkerManager.getDefault().deleteMarkers(resource, _operation.getStarted(), IResource.DEPTH_INFINITE);
+					return false;
+				}
+				ValManager.getDefault().validate(_request.getProject(), resource, IResourceDelta.NO_CHANGE, ValType.Build, 
+					_request.getBuildKind(), _operation, _subMonitor.newChild(1));
+			}
+			catch (ResourceUnavailableError e){
+				if (Tracing.isLogging())Tracing.log("ValBuilderJob-02: " + e.toString()); //$NON-NLS-1$
+				return false;
+			}
+			return true;
+		}
+		
+		@SuppressWarnings("deprecation")
+		public boolean visit(IResourceDelta delta) throws CoreException {
+			IResource resource = delta.getResource();
+			if (DisabledResourceManager.getDefault().isDisabled(resource)){
+				MarkerManager.getDefault().deleteMarkers(resource, _operation.getStarted(), IResource.DEPTH_INFINITE);
+				return false;
+			}
+			int kind = delta.getKind();
+			boolean isChanged = (kind & IResourceDelta.CHANGED) != 0;
+			if (isChanged &&  (delta.getFlags() & InterestedFlags) == 0)return true;
+			
+			// Check for file ADDED and REMOVED events, which means that the file may have moved to a new
+			// project. To be safe we clear it's cached list of validators.
+			if (((kind & (IResourceDelta.ADDED | IResourceDelta.REMOVED)) != 0)	&& resource.getType() == IResource.FILE) {
+				ValManager.getDefault().clearValProperty(resource);
+			}
+
+			if ((kind & (IResourceDelta.ADDED | IResourceDelta.CHANGED)) != 0){
+				ValManager.getDefault().validate(_request.getProject(), resource, delta.getKind(), ValType.Build, 
+					_request.getBuildKind(), _operation, _subMonitor.newChild(1));
+			}
+					
+			IDependencyIndex index = ValidationFramework.getDefault().getDependencyIndex();
+			if (index.isDependedOn(resource)){
+				MarkerManager mm = MarkerManager.getDefault();
+				for (DependentResource dr : index.get(resource)){
+					Validator val = dr.getValidator();
+					if (Friend.shouldValidate(val, dr.getResource(), ValType.Build, new ContentTypeWrapper())){
+						_operation.getState().put(ValidationState.TriggerResource, resource);
+						ValidationEvent event = new ValidationEvent(dr.getResource(), IResourceDelta.NO_CHANGE, delta);
+						if (val.shouldClearMarkers(event))mm.clearMarker(dr.getResource(), val); 
+						ValManager.getDefault().validate(val, _operation, dr.getResource(), 
+							IResourceDelta.NO_CHANGE, _monitor, event);
+					}
+				}
+			}
+					
+			return true;
+		}
+
+		
+	}
+
+}
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/IRootObjectResource.java b/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/ValConstants.java
similarity index 64%
rename from plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/IRootObjectResource.java
rename to plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/ValConstants.java
index 7048136..ab2aebf 100644
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/IRootObjectResource.java
+++ b/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/ValConstants.java
@@ -8,12 +8,12 @@
  * Contributors:
  *     IBM Corporation - initial API and implementation
  *******************************************************************************/
-package org.eclipse.wst.common.internal.emf.resource;
+package org.eclipse.wst.validation.internal;
 
-import org.eclipse.emf.ecore.EObject;
+import org.eclipse.wst.validation.internal.plugin.ValidationPlugin;
 
-public interface IRootObjectResource {
-
-	public EObject getRootObject();
+public interface ValConstants {
+	/** problem marker for version 2 of the validation framework. */
+	String ProblemMarker =  ValidationPlugin.PLUGIN_ID +".problemmarker2"; //$NON-NLS-1$
 
 }
diff --git a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/ValManager.java b/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/ValManager.java
new file mode 100644
index 0000000..0fd1c2a
--- /dev/null
+++ b/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/ValManager.java
@@ -0,0 +1,1283 @@
+/*******************************************************************************
+ * Copyright (c) 2007, 2011 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.wst.validation.internal;
+
+import java.lang.reflect.InvocationTargetException;
+import java.util.BitSet;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.TreeSet;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.concurrent.atomic.AtomicReference;
+
+import org.eclipse.core.resources.IFolder;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.resources.IResourceStatus;
+import org.eclipse.core.resources.IResourceVisitor;
+import org.eclipse.core.resources.IWorkspaceRoot;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.ISafeRunnable;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.QualifiedName;
+import org.eclipse.core.runtime.SafeRunner;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.core.runtime.SubMonitor;
+import org.eclipse.osgi.util.NLS;
+import org.eclipse.wst.common.project.facet.core.FacetedProjectFramework;
+import org.eclipse.wst.common.project.facet.core.events.IFacetedProjectEvent;
+import org.eclipse.wst.common.project.facet.core.events.IFacetedProjectListener;
+import org.eclipse.wst.validation.Friend;
+import org.eclipse.wst.validation.IPerformanceMonitor;
+import org.eclipse.wst.validation.IValidatorGroupListener;
+import org.eclipse.wst.validation.PerformanceCounters;
+import org.eclipse.wst.validation.ValidationEvent;
+import org.eclipse.wst.validation.ValidationFramework;
+import org.eclipse.wst.validation.ValidationResult;
+import org.eclipse.wst.validation.ValidationState;
+import org.eclipse.wst.validation.Validator;
+import org.eclipse.wst.validation.internal.model.GlobalPreferences;
+import org.eclipse.wst.validation.internal.model.GlobalPreferencesValues;
+import org.eclipse.wst.validation.internal.model.IValidatorVisitor;
+import org.eclipse.wst.validation.internal.model.ProjectPreferences;
+import org.eclipse.wst.validation.internal.operations.ManualValidatorsOperation;
+import org.eclipse.wst.validation.internal.plugin.ValidationPlugin;
+import org.osgi.service.prefs.BackingStoreException;
+
+/**
+ * A central place to keep track of all the validators.
+ * @author karasiuk
+ *
+ */
+public final class ValManager implements IValChangedListener, IFacetedProjectListener, IProjectChangeListener {
+	
+	/**
+	 * Projects may be allowed to override the global validation settings. If that is the case then those
+	 * project specific settings are saved here. If the key exists, but the value is null, then that
+	 * means that the project has been checked and it does not have any specific settings.
+	 */
+	private final Map<IProject, ProjectPreferences> _projectPreferences = 
+		Collections.synchronizedMap(new HashMap<IProject, ProjectPreferences>(50));
+	
+	private final AtomicReference<GlobalPreferences> _globalPreferences = new AtomicReference<GlobalPreferences>();
+		
+	/**
+	 * This number increases each time any of the validation configurations change. It is used to determine
+	 * if information that we have cached in the ValProperty is stale or not. This starts off at zero, each time
+	 * the workbench is started.
+	 */
+	private final AtomicInteger _configNumber = new AtomicInteger();
+	
+	private final ValidatorIdManager _idManager = new ValidatorIdManager();
+	private final ValidatorCache 	_cache = new ValidatorCache();
+		
+	private static final QualifiedName StatusBuild = new QualifiedName(ValidationPlugin.PLUGIN_ID, "sb"); //$NON-NLS-1$
+	private static final QualifiedName StatusManual = new QualifiedName(ValidationPlugin.PLUGIN_ID, "sm"); //$NON-NLS-1$
+
+	
+	public static ValManager getDefault(){
+		return Singleton.valManager;
+	}
+	
+	private ValManager(){
+		ValPrefManagerGlobal.getDefault().addListener(this);
+		ValPrefManagerProject.addListener(this);
+		FacetedProjectFramework.addListener(this, IFacetedProjectEvent.Type.PROJECT_MODIFIED);
+		EventManager.getManager().addProjectChangeListener(this);
+	}
+	
+	/**
+	 * This needs to be called if the ValManager is ever deleted.
+	 */
+	public void dispose(){
+		// currently nobody calls this method, because this instance is never removed, but the method is
+		// here for completeness none the less.
+		ValPrefManagerGlobal.getDefault().removeListener(this);
+		ValPrefManagerProject.removeListener(this);
+		FacetedProjectFramework.removeListener(this);
+		EventManager.getManager().removeProjectChangeListener(this);	
+	}
+	
+	/**
+	 * Answer all the registered validators. If you are planning on making changes to the validators,
+	 * and then saving them in a preference store then you probably want the getValidatorsCopy method.
+	 * Because if you make changes to the original validators, and since we only save differences,
+	 * there won't be any differences. 
+	 * 
+	 * @return Answer the validators in name sorted order. Answer an empty array if there are no validators.
+	 * 
+	 * @see #getValidatorsCopy()
+	 */
+	public Validator[] getValidators(){
+		return getValidators(null);
+	}
+	
+	/**
+	 * Answer copies of all the registered validators. If you are going to be making changes to the validators
+	 * and then saving them backing into the preference store, then this is the method to use.
+	 * 
+	 * @return Answer an empty array if there are no validators.
+	 */
+	public Validator[] getValidatorsCopy(){
+		Validator[] orig = getValidators();
+		Validator[] copy = new Validator[orig.length];
+		for (int i=0; i<orig.length; i++)copy[i] = orig[i].copy();
+		return copy;
+	}
+	
+	/**
+	 * Answer all the validators for the given project.
+	 * <p>
+	 * Individual projects may override the global validation preference
+	 * settings. If the project has it's own settings, then those validators are
+	 * returned via this method.
+	 * </p>
+	 * <p>
+	 * The following approach is used. For version 1 validators, the validator
+	 * is only returned if it is defined to operate on this project type. This
+	 * is the way that the previous version of the framework did it. For version
+	 * 2 validators, they are all returned.
+	 * </p>
+	 * 
+	 * @param project
+	 *            this may be null, in which case the global preferences are
+	 *            returned.
+	 * @param respectOverrideSettings
+	 *            if this is true then the validators that get returned are
+	 *            based on the override settings. So for example, if the global
+	 *            preferences do not allow project overrides then none of the
+	 *            project settings are used. Normal validation would set this to true.
+	 *            The properties page would set this to false.
+	 *            
+	 * @deprecated Use {@link #getValidatorsNotCached(IProject)} instead            
+	 */
+	public Validator[] getValidators(IProject project, boolean respectOverrideSettings) throws ProjectUnavailableError {
+		return getValidators(project);
+	}
+	
+	/**
+	 * Answer a cached copy of the the validators for a given project. This is a front end method, 
+	 * for the getValidatorsNotCached() method.
+	 * <p>
+	 * Individual projects may override the global validation preference
+	 * settings. If the project has it's own settings, then those validators are
+	 * returned via this method.
+	 * </p>
+	 * <p>
+	 * The following approach is used. For version 1 validators, the validator
+	 * is only returned if it is defined to operate on this project type. This
+	 * is the way that the previous version of the framework did it. For version
+	 * 2 validators, they are all returned.
+	 * </p>
+	 * 
+	 * @param project
+	 *            This may be null, in which case the global preferences are
+	 *            returned.
+	 * 
+	 * @return The validators in name sorted order.
+	 */
+	public Validator[] getValidators(IProject project) throws ProjectUnavailableError {
+		return _cache.getValidatorsCached(project);
+	}
+	
+	/**
+	 * Answer all the validators for the given project.
+	 * <p>
+	 * Individual projects may override the global validation preference
+	 * settings. If the project has it's own settings, then those validators are
+	 * returned via this method.
+	 * </p>
+	 * <p>
+	 * The following approach is used. For version 1 validators, the validator
+	 * is only returned if it is defined to operate on this project type. This
+	 * is the way that the previous version of the framework did it. For version
+	 * 2 validators, they are all returned.
+	 * </p>
+	 * 
+	 * @param project
+	 *            This may be null, in which case the global preferences are
+	 *            returned.
+	 * 
+	 * @return The validators in name sorted order.
+	 */
+	private Validator[] getValidatorsNotCached(IProject project) throws ProjectUnavailableError {
+		Map<String,Validator> v2Vals = getV2Validators(project, UseProjectPreferences.Normal);
+		TreeSet<Validator> sorted = new TreeSet<Validator>();
+		sorted.addAll(v2Vals.values());
+		
+		try {
+			ValidationConfiguration vc = ConfigurationManager.getManager().getConfiguration(project);
+			if (project == null){
+				// If the project is null we need to use this approach, since you can not use new ManualValidatorsOperation(null)
+				ValidatorMetaData[] vmds = vc.getValidators();
+				for (ValidatorMetaData vmd : vmds){
+					Validator v = Validator.create(vmd, vc, project);
+					sorted.add(v);
+				}
+			}
+			else {
+				ManualValidatorsOperation mvo = new ManualValidatorsOperation(project);
+				Set<ValidatorMetaData> vmds = mvo.getEnabledValidators();
+				for (ValidatorMetaData vmd : vmds){
+					Validator v = Validator.create(vmd, vc, project);
+					sorted.add(v);
+				}
+			}
+		}
+		catch (InvocationTargetException e){
+			ValidationPlugin.getPlugin().handleException(e);
+		}
+		
+		Validator[] vals = new Validator[sorted.size()];
+		sorted.toArray(vals);
+		return vals;
+	}
+	/**
+	 * Validators can use project level settings (Project natures and facets) to
+	 * determine if they are applicable to the project or not.
+	 * 
+	 * @param project
+	 *            The project that the configuration is based on.
+	 * @param mustUseProjectSettings
+	 *            Force the project properties to be used. There is a case where the user has toggled the
+	 *            Enable project specific settings checkbox in the dialog, but has not yet committed the
+	 *            changes. This allows that setting to be passed through.
+	 * @return The validators that are configured to run on this project based
+	 *         on the project level settings. These are the "live" validators, they are not copies.
+	 * @throws ProjectUnavailableError
+	 * 
+	 * @deprecated Use getValidatorsConfiguredForProject(IProject project, UseProjectPreferences useProject)
+	 */
+	public Validator[] getValidatorsConfiguredForProject(IProject project, boolean mustUseProjectSettings) throws ProjectUnavailableError {
+		UseProjectPreferences useProject = UseProjectPreferences.Normal;
+		return getValidatorsConfiguredForProject(project, useProject);
+	}
+	
+	/**
+	 * Validators can use project level settings (Project natures and facets) to
+	 * determine if they are applicable to the project or not.
+	 * 
+	 * @param project
+	 *            The project that the configuration is based on.
+	 * @param useProject
+	 *            Specifies how to use the project preferences. This can be used
+	 *            to force the project properties to be used. There is a case
+	 *            where the user has toggled the Enable project specific
+	 *            settings checkbox in the dialog, but has not yet committed the
+	 *            changes. This allows that setting to be passed through.
+	 * @return The validators that are configured to run on this project based
+	 *         on the project level settings. These are the "live" validators,
+	 *         they are not copies.
+	 * @throws ProjectUnavailableError
+	 */
+	public Validator[] getValidatorsConfiguredForProject(IProject project, UseProjectPreferences useProject) throws ProjectUnavailableError {
+		Map<String,Validator> v2Vals = getV2Validators(project, useProject);
+		TreeSet<Validator> sorted = new TreeSet<Validator>();
+		sorted.addAll(v2Vals.values());
+		
+		if (useProject == UseProjectPreferences.MustNotUse){
+			sorted.addAll(ExtensionValidators.instance().getV1Validators(project));
+		}
+		else {
+			try {
+				ValidationConfiguration vc = ConfigurationManager.getManager().getProjectConfiguration(project);
+				ValidatorMetaData[] vmds = vc.getValidators();
+				for (ValidatorMetaData vmd : vmds) {
+					Validator v = Validator.create(vmd, vc, project);
+					sorted.add(v);
+				}
+			}
+			catch (InvocationTargetException e){
+				ValidationPlugin.getPlugin().handleException(e);
+			}
+		}
+				
+		List<Validator> list = new LinkedList<Validator>();
+		for (Validator v : sorted){
+			if (v.shouldValidateProject(project, false, false))list.add(v);
+		}
+		
+		Validator[]vals = new Validator[list.size()];
+		list.toArray(vals);
+		return vals;
+	}
+	
+	/**
+	 * Answer the V2 validators that are in effect for this project. The
+	 * following approach is used:
+	 * <ol>
+	 * <li>The validators that are defined by the extension point are loaded.</li>
+	 * <li>They are customized by any global preferences.</li>
+	 * <li>If project customizations are allowed, they are customized by the
+	 * project preferences.
+	 * </ol>
+	 * 
+	 * @param project
+	 *            This may be null, in which case only the global preferences
+	 *            are used.
+	 * @param useProject
+	 *            Specifies how to use the project preferences. This can be used
+	 *            to force the project properties to be used. There is a case
+	 *            where the user has toggled the Enable project specific
+	 *            settings checkbox in the dialog, but has not yet committed the
+	 *            changes. This allows that setting to be passed through.
+	 *            
+	 * @return
+	 */
+	private Map<String,Validator> getV2Validators(IProject project, UseProjectPreferences useProject){
+		Map<String,Validator> extVals = ExtensionValidators.instance().getMapV2Copy();
+		try {
+			List<Validator> vals = ValPrefManagerGlobal.getDefault().getValidators();
+			for (Validator v : vals)extVals.put(v.getId(), v);
+			
+			if (useProject != UseProjectPreferences.MustNotUse){
+				if (useProject == UseProjectPreferences.MustUse || !mustUseGlobalValidators(project)){
+					//TODO should probably cache this vpm
+					ValPrefManagerProject vpm = new ValPrefManagerProject(project);
+					vals = vpm.getValidators(extVals);
+					for (Validator v : vals)extVals.put(v.getId(), v);
+					
+					for (Validator v : getProjectPreferences(project).getValidators())extVals.put(v.getId(), v);
+				}	
+			}
+		}
+		catch (BackingStoreException e){
+			ValidationPlugin.getPlugin().handleException(e);
+		}
+		return extVals;
+	}
+	
+
+	/**
+	 * Answer true if we must use the global settings for this project. If the global preferences do not
+	 * allow overrides, or if this project does not allow overrides then the global preferences must be used.
+	 *  
+	 * @param project project that is being tested. It can be null, in which case the global preferences must be used.
+	 * @return true if the global preferences must be used.
+	 */
+	public boolean mustUseGlobalValidators(IProject project){
+		if (project == null)return true;
+		if (!getGlobalPreferences().getOverride())return true;
+		ProjectPreferences pp = _projectPreferences.get(project);
+		if (pp != null)return !pp.getOverride();
+		
+		ValPrefManagerProject vpm = new ValPrefManagerProject(project);
+		return !vpm.getOverride();
+	}
+	
+	/**
+	 * Answer the validator with the given id that is in effect for the given project.
+	 * 
+	 * @param id The validator id.
+	 * @param project
+	 * @return null if the validator is not found
+	 */
+	public Validator getValidator(String id, IProject project){
+		Validator[] vals = getValidators(project);
+		for (Validator v : vals){
+			if (v.getId().equals(id))return v;
+		}
+		return null;
+	}
+	
+	/**
+	 * @see ValidationFramework#getValidator(String, IProject)
+	 */
+	public Validator getValidatorWithId(String id, IProject project){
+		Validator[] vals = getValidators(project);
+		for (Validator v : vals){
+			if (v.getId().equals(id))return v;
+		}
+		return null;
+	}
+					
+	/**
+	 * Answer true if the resource has any enabled validators.
+	 * 
+	 * @param resource a file, folder or project.
+	 * 
+	 * @param isManual if true then the validator must be turned on for manual validation. 
+	 * If false then the isManualValidation setting isn't used to filter out validators.
+	 *   
+	 * @param isBuild if true then the validator must be turned on for build based validation.
+	 * If false then the isBuildValidation setting isn't used to filter out validators.  
+	 */
+	public boolean hasValidators(IResource resource, boolean isManual, boolean isBuild){
+		if (resource instanceof IProject){
+			IProject project = (IProject)resource;
+			return ValManager.getDefault().getValidators(project).length > 0;
+		}
+		else if (resource instanceof IFolder){
+			IFolder folder = (IFolder)resource;
+			HasValidatorVisitor v = new HasValidatorVisitor(isManual, isBuild);
+			return v.hasValidator(folder);
+		}
+		else {
+			ContentTypeWrapper ctw = new ContentTypeWrapper();
+			for (Validator val : ValManager.getDefault().getValidators(resource.getProject())){
+				if (Friend.shouldValidate(val, resource, isManual, isBuild, ctw))return true;
+			}			
+		}
+		return false;
+	}
+	
+	/**
+	 * Answer true if the project has disabled all of it's validators, or if project overrides are not
+	 * allowed if global validation has been disabled.
+	 * 
+	 * @param project the project that is being consulted, or null if only the global settings are to be 
+	 * checked.
+	 */
+	public boolean isDisabled(IProject project){
+		GlobalPreferences gp = getGlobalPreferences();
+		if (!gp.getOverride() || project == null)return gp.getDisableAllValidation();
+		
+		ProjectPreferences pp = _projectPreferences.get(project);
+		if (pp == null)return gp.getDisableAllValidation();
+		return pp.getSuspend();		
+	}
+			
+	/**
+	 * Answer all the registered validators as they were defined by the extension points. That is
+	 * answer the validators as if the user has never applied any customizations.
+	 * 
+	 * @return Answer an empty array if there are no validators.
+	 */
+	public static Validator[] getDefaultValidators() throws InvocationTargetException {
+		Map<String,Validator> extVals = ExtensionValidators.instance().getMapV2();
+		TreeSet<Validator> sorted = new TreeSet<Validator>();
+		for (Validator v : extVals.values())sorted.add(v);
+		
+		IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot();
+		GlobalConfiguration gc = new GlobalConfiguration(root);
+		gc.resetToDefault();
+		for (ValidatorMetaData vmd : gc.getValidators()){
+			Validator v = Validator.create(vmd, gc, null);
+			v.setBuildValidation(vmd.isBuildValidation());
+			v.setManualValidation(vmd.isManualValidation());
+			sorted.add(v);
+		}
+		
+		Validator[] val = new Validator[sorted.size()];
+		sorted.toArray(val);
+		return val;
+	}
+	
+	public static Validator[] getDefaultValidators(IProject project) throws InvocationTargetException {
+		Map<String,Validator> extVals = ExtensionValidators.instance().getMap(project);
+		Validator[] val = new Validator[extVals.size()];
+		extVals.values().toArray(val);
+		return val;
+	}
+
+	/**
+	 * Answer all the registered validators.
+	 * 
+	 * @param project the project to use for getting the version 1 validator settings. This can
+	 * be null in which case the global preferences are used.
+	 * 
+	 * @return Answer an empty array if there are no validators.
+	 */
+//	Validator[] getValidators2(IProject project) throws ProjectUnavailableError {
+//		// If I use a local variable I don't need to synchronize the method.
+//		
+//		Validator[] validators = _validators;
+//		if (project == null && validators != null)return validators;
+//				
+//		Validator[] val = loadExtensions(false, project);
+//		ValPrefManagerGlobal vpm = ValPrefManagerGlobal.getDefault();
+//		if (!vpm.loadPreferences(val)){
+//			val = restoreDefaults2(project);
+//			saveStateTimestamp();				
+//		}
+//		else {
+//			if (getGlobalPreferences().getStateTimeStamp() != Platform.getStateStamp())
+//				val = migrateSettings(val, project);
+//		}
+//		
+//		TreeSet<Validator> set = new TreeSet<Validator>();
+//		for (Validator v : val)set.add(v);
+//		
+//		List<Validator> list = new LinkedList<Validator>();
+//		try {
+//			ValidationConfiguration vc = ConfigurationManager.getManager().getConfiguration(project);
+//			for (ValidatorMetaData vmd : vc.getValidators()){
+//				list.add(Validator.create(vmd, vc, project));
+//			}							
+//			
+//		}
+//		catch (InvocationTargetException e){
+//			if (project != null && (!project.exists() || !project.isOpen()))
+//				throw new ProjectUnavailableError(project);
+//			ValidationPlugin.getPlugin().handleException(e);
+//		}
+//		
+//		set.addAll(list);
+//		val = new Validator[set.size()];
+//		set.toArray(val);
+//		if (project == null)_validators = val;
+//		return val;
+//	}
+	
+	/**
+	 * This method needs to be called whenever the validation configuration has changed.
+	 */
+	private void configHasChanged(){
+		_configNumber.incrementAndGet();
+		ValidatorProjectManager.reset();
+		_cache.reset();
+	}
+		
+	/**
+	 * Answer the global validation preferences.
+	 */
+	public GlobalPreferences getGlobalPreferences(){
+		GlobalPreferences gp = _globalPreferences.get();
+		if (gp == null){
+			ValPrefManagerGlobal vpm = ValPrefManagerGlobal.getDefault();
+			gp = vpm.loadGlobalPreferences();
+			if (!_globalPreferences.compareAndSet(null, gp))gp = _globalPreferences.get();
+		}
+		return gp;
+	}
+	
+	/**
+	 * Update the global preferences, but only if something has actually changed.
+	 * @param values The global settings.
+	 * @return a bit mask of the changes between the old values and the new values. See the GlobalPreferences
+	 * constants for the bit mask values. If a zero is return there were no changes.
+	 */
+	public int replace(GlobalPreferencesValues values){
+		GlobalPreferences gp = new GlobalPreferences(values);
+		GlobalPreferences old = getGlobalPreferences();
+		int changes = old.compare(gp);
+		if (changes != 0){
+			_globalPreferences.set(gp);
+		}
+		return changes;
+	}
+		
+	/**
+	 * Answer the project preferences for this project.
+	 * @param project The project, this may be null.
+	 */
+	public ProjectPreferences getProjectPreferences(IProject project) {
+		ProjectPreferences pp = _projectPreferences.get(project);
+		if (pp != null)return pp;
+		
+		/* hopefully we rarely get this far */
+		
+		Map<String,Validator> extVals = ExtensionValidators.instance().getMapV2Copy();
+		try {
+			List<Validator> vals = ValPrefManagerGlobal.getDefault().getValidators();
+			for (Validator v : vals)extVals.put(v.getId(), v);
+			
+			pp = getProjectPreferences(project, extVals);
+		}
+		catch (BackingStoreException e){
+			ValidationPlugin.getPlugin().handleException(e);
+		}	
+		return pp;
+	}
+
+	/**
+	 * 
+	 * @param project The project, this may be null.
+	 * @param baseValidators
+	 */
+	private ProjectPreferences getProjectPreferences(IProject project, Map<String, Validator> baseValidators) 
+		throws BackingStoreException {
+		ProjectPreferences pp = _projectPreferences.get(project);
+		if (pp != null)return pp;
+		
+		ValPrefManagerProject vpm = new ValPrefManagerProject(project);
+		pp = vpm.loadProjectPreferences(project, baseValidators);
+		_projectPreferences.put(project, pp);
+		return pp;		
+	}
+		
+	/**
+	 * Restore all the validation defaults, as defined by the individual validators via the
+	 * validation extension point.
+	 */
+//	public synchronized void restoreDefaults() {
+//		getGlobalPreferences().resetToDefault();
+//		_validators = null;
+//		getValidators(true);
+//	}
+	
+
+	/**
+	 * Run all the validators that are applicable to this resource.
+	 * <p>
+	 * If this is a manual validation both the version 1 and version 2 validators are run. If it
+	 * is a build validation, then only the version 2 validators are run, because the old framework handles
+	 * the running of the old validators.
+	 * </p>
+	 * 
+	 * @param project project that is being validated
+	 * 
+	 * @param resource the resource that is being validated
+	 * 
+	 * @param kind the kind of resource delta. It will be one of the IResourceDelta constants, like
+	 * IResourceDelta.CHANGED for example.
+	 * 
+	 * @param valType The type of validation request.
+	 * @param buildKind the kind of build that triggered this validation. See IncrementalProjectBuilder for values.
+	 * @param operation the operation that this validation is running under
+	 * @param monitor the monitor to use to report progress 
+	 */
+	public void validate(IProject project, final IResource resource, final int kind, ValType valType, 
+		int buildKind, ValOperation operation, final IProgressMonitor monitor) {
+		
+		MarkerManager.getDefault().deleteMarkers(resource, operation.getStarted(), IResource.DEPTH_ZERO);
+		
+		IValidatorVisitor visitor = new IValidatorVisitor(){
+
+			public void visit(Validator validator, IProject project, ValType vt,
+				ValOperation operation, IProgressMonitor monitor) {
+								
+				Validator.V1 v1 = validator.asV1Validator();
+				if (vt == ValType.Build && v1 != null)return;
+				
+				SubMonitor subMonitor = SubMonitor.convert(monitor);
+				String task = NLS.bind(ValMessages.LogValStart, validator.getName(), resource.getName());
+				subMonitor.beginTask(task, 1);
+
+				if (project.isOpen())
+					validate(validator, operation, resource, kind, subMonitor.newChild(1), null);
+			}			
+		};
+		SubMonitor sm = SubMonitor.convert(monitor, getValidators(project).length);
+		accept(visitor, project, resource, valType, operation, sm);
+		
+	}
+	
+	/**
+	 * Validate a single resource with a single validator. This will call the validator whether the validator
+	 * is enabled or not.
+	 * <p>
+	 * Callers of this method should ensure that the shouldValidate was tested before making this call.
+	 * 
+	 * @param validator the validator
+	 * @param operation the operation that the validation is running in.
+	 * @param resource the resource to validate
+	 * @param kind the kind of resource change. See IResourceDelta.
+	 * @param monitor
+	 */
+	public void validate(Validator validator, ValOperation operation, IResource resource, int kind, 
+			IProgressMonitor monitor, ValidationEvent event){
+		if (operation.isValidated(validator.getId(), resource))return;
+		long time = 0;
+		long cpuTime = -1;
+		String msg1 = NLS.bind(ValMessages.LogValStart, validator.getName(), resource.getName());
+		monitor.subTask(msg1);
+		IPerformanceMonitor pm = ValidationFramework.getDefault().getPerformanceMonitor();
+		if (pm.isCollecting()){
+			time = System.currentTimeMillis();
+			cpuTime = Misc.getCPUTime();
+		}
+		
+		if (Tracing.matchesExtraDetail(validator.getId())){
+			Tracing.log("ValManager-03: validating ", resource); //$NON-NLS-1$
+		}
+	
+		if (resource.exists())
+		{	
+			ValidationResult vr = validator.validate(resource, kind, operation, monitor, event);
+	
+			if (pm.isCollecting()){
+				if (cpuTime != -1){
+					cpuTime = Misc.getCPUTime() - cpuTime;
+				}
+				int num = 0;
+				if (vr != null)num = vr.getNumberOfValidatedResources();
+				PerformanceCounters pc = new PerformanceCounters(validator.getId(), 
+					validator.getName(), resource.getName(),
+					num, System.currentTimeMillis()-time, cpuTime);
+				pm.add(pc);
+			}
+			if (ValidationPlugin.getPlugin().isDebugging() && !pm.isCollecting()){
+				String msg = time != 0 ? 
+					NLS.bind(ValMessages.LogValEndTime,	new Object[]{validator.getName(), 
+						validator.getId(), resource, Misc.getTimeMS(System.currentTimeMillis()-time)}) :
+					NLS.bind(ValMessages.LogValEnd, validator.getName(), resource);
+				Tracing.log("ValManager-01: " + msg); //$NON-NLS-1$
+			}
+			if (vr != null){
+				operation.mergeResults(vr);
+				if (vr.getSuspendValidation() != null)operation.suspendValidation(vr.getSuspendValidation(), validator);
+			}
+		}
+	}
+	
+	/**
+	 * Accept a visitor for all the validators that are enabled for the given project.
+	 * 
+	 * @param visitor
+	 * @param project
+	 * @param valType the type of validation
+	 * @param operation
+	 * @param monitor
+	 */
+	public void accept(IValidatorVisitor visitor, IProject project, ValType valType, 
+		ValOperation operation, IProgressMonitor monitor){
+		
+		if (isDisabled(project))return;
+		
+		for (Validator val : getValidators(project)){
+			if (monitor.isCanceled())return;
+			if (!ValidatorProjectManager.get().shouldValidate(val, project, valType))continue;
+			if (operation.isSuspended(val, project))continue;
+			try {
+				visitor.visit(val, project, valType, operation, monitor);
+			}
+			catch (Exception e){
+				ValidationPlugin.getPlugin().handleException(e);
+			}
+		}		
+	}
+	
+	/**
+	 * Accept a visitor for all the validators that are enabled for the given project, resource, 
+	 * and validation mode.
+	 * 
+	 * @param valType the type of validation request
+	 */
+	public void accept(IValidatorVisitor visitor, IProject project, IResource resource, 
+			ValType valType, ValOperation operation, IProgressMonitor monitor){
+		
+		if (isDisabled(project))return;
+		
+		Map<String,IValidatorGroupListener[]> groupListeners = new HashMap<String,IValidatorGroupListener[]>();
+		
+		ValProperty vp = getValProperty(resource, valType, _configNumber.get());
+		if (vp != null){
+			BitSet bs = vp.getConfigSet();
+			for (Validator val : getValidators(project)){
+				if (!monitor.isCanceled()) {
+					if (!bs.get(_idManager.getIndex(val.getId())))continue;
+					if (operation.isSuspended(val, project))continue;
+					Validator.V2 v2 = val.asV2Validator();
+					if (v2 != null) {
+						notifyGroupListenersStarting(resource, operation.getState(), monitor, groupListeners, v2);
+					}
+					try {
+						visitor.visit(val, project, valType, operation, monitor);
+					}
+					catch (Exception e){
+						ValidationPlugin.getPlugin().handleException(e);
+					}
+				}
+			}
+			notifyGroupFinishing(resource, operation.getState(), monitor, groupListeners);
+			return;
+		}
+		
+		vp = new ValProperty();
+		vp.setConfigNumber(_configNumber.get());
+		ContentTypeWrapper ctw = new ContentTypeWrapper();
+		for (Validator val : getValidators(project)){
+			if (!monitor.isCanceled()) {
+				if (!ValidatorProjectManager.get().shouldValidate(val, project, valType))continue;
+				if (Friend.shouldValidate(val, resource, valType, ctw)){
+					vp.getConfigSet().set(_idManager.getIndex(val.getId()));
+					// we do the suspend check after figuring out if it needs to be validated, because we save
+					// this information for the session.
+					if (operation.isSuspended(val, project))continue;
+					Validator.V2 v2 = val.asV2Validator();
+					if (v2 != null) {
+						notifyGroupListenersStarting(resource, operation.getState(), monitor, groupListeners, v2);
+					}
+					try {
+						visitor.visit(val, project, valType, operation, monitor);
+					}
+					catch (Exception e){
+						ValidationPlugin.getPlugin().handleException(e);
+					}
+				}
+			}
+		}
+		notifyGroupFinishing(resource, operation.getState(), monitor, groupListeners);
+		putValProperty(vp, resource, valType);
+	}
+
+	/**
+	 * Let the group listeners know that validation might be starting for the group of validators. 
+	 */
+	private void notifyGroupListenersStarting(final IResource resource,	 
+			final ValidationState state, final IProgressMonitor monitor, 
+			Map<String, IValidatorGroupListener[]> groupListeners, Validator.V2 v2) {
+		
+		String[] groups = v2.getValidatorGroups();
+		for (String group : groups) {
+			if (!groupListeners.containsKey(group)) {
+				IValidatorGroupListener[] createdListeners = null;
+				try {
+					createdListeners = ValidatorGroupExtensionReader.getDefault().createListeners(group);
+				}
+				catch (CoreException e){
+					String msg = NLS.bind(ValMessages.ErrConfig, v2.getId());
+					Status status = new Status(IStatus.ERROR, ValidationPlugin.PLUGIN_ID, msg);
+					CoreException core = new CoreException(status);
+					ValidationPlugin.getPlugin().handleException(core);
+					ValidationPlugin.getPlugin().handleException(e);
+					
+					// we create this to ensure that we don't signal the same exception over and over. 
+					createdListeners = new IValidatorGroupListener[0];
+				}
+				
+				// create and notify just this once
+				final IValidatorGroupListener[] listeners = createdListeners;
+					
+				groupListeners.put(group, listeners);
+				for (final IValidatorGroupListener listener : listeners) {
+					SafeRunner.run(new ISafeRunnable() {
+						public void run() throws Exception {
+							listener.validationStarting(resource, monitor, state);
+						}
+
+						public void handleException(Throwable exception) {
+							ValidationPlugin.getPlugin().handleException(exception);
+						}
+					});
+				}
+			}
+		}
+	}
+
+	/**
+	 * Let the group listeners know that validation is finished for the group of validators. 
+	 */
+	private void notifyGroupFinishing(final IResource resource, 
+			final ValidationState state, final IProgressMonitor monitor,
+			Map<String, IValidatorGroupListener[]> groupListeners) {
+		for (final IValidatorGroupListener[] listeners : groupListeners.values()) {
+			for (final IValidatorGroupListener listener : listeners) {
+				SafeRunner.run(new ISafeRunnable() {
+					public void run() throws Exception {
+						listener.validationFinishing(resource, monitor, state);
+					}
+
+					public void handleException(Throwable exception) {
+						ValidationPlugin.getPlugin().handleException(exception);
+					}
+				});
+			}
+		}
+	}
+
+	private ValProperty getValProperty(IResource resource, ValType valType, int configNumber) {
+		ValProperty vp = null;
+		try {
+			if (valType == ValType.Build)vp = (ValProperty)resource.getSessionProperty(StatusBuild);
+			else if (valType == ValType.Manual)vp = (ValProperty)resource.getSessionProperty(StatusManual);
+		}
+		catch (CoreException e){
+			// don't care about this one
+		}
+		if (vp == null)return null;
+		if (vp.getConfigNumber() != _configNumber.get())return null;
+		return vp;
+	}
+	
+	/**
+	 * Let the validation manager know that a project has been changed.
+	 * 
+	 * @param project The project that has been opened, created, or had it's description change.
+	 */
+	public void projectChanged(IProject project){
+		ValidatorProjectManager.reset();
+		_projectPreferences.remove(project);
+		_cache.reset(project);
+	}
+	
+	/**
+	 * Let the validation manager know that a project has been removed.
+	 * 
+	 * @param project The project that has been closed or deleted.
+	 * 
+	 */
+	public void projectRemoved(IProject project){
+		ValidatorProjectManager.reset();
+		_projectPreferences.remove(project);
+		_cache.reset(project);
+	}
+	
+	/**
+	 * Clear the validation properties.
+	 * @param resource
+	 */
+	public void clearValProperty(IResource resource){
+		if (!resource.isAccessible())return;
+		try {
+			resource.setSessionProperty(StatusBuild, null);
+			resource.setSessionProperty(StatusManual, null);
+		} 
+		catch (CoreException e) {
+		}		
+	}
+	
+	private void putValProperty(ValProperty vp, IResource resource, ValType valType) {
+		try {
+			if (!(resource.isAccessible())) return;
+			if (valType == ValType.Build)resource.setSessionProperty(StatusBuild, vp);
+			else if (valType == ValType.Manual)resource.setSessionProperty(StatusManual, vp);
+		} 
+		catch (CoreException e) {
+	        // If the resource is not found, it is likely just been deleted 
+	        // and there is no need to do anything. 
+	        // See https://bugs.eclipse.org/bugs/show_bug.cgi?id=269022
+	        if (!e.getStatus().equals(IResourceStatus.RESOURCE_NOT_FOUND)) {
+	                ValidationPlugin.getPlugin().handleException(e, IStatus.WARNING);
+	        }
+		}
+	}
+
+	/**
+	 * Let each of the enabled validators know that a clean has been requested.
+	 * 
+	 * @param project the project that is being cleaned, or null if the entire workspace is being cleaned.
+	 * @param monitor
+	 */
+	void clean(final IProject project, final ValOperation operation, final IProgressMonitor monitor) {
+		IValidatorVisitor visitor = new IValidatorVisitor(){
+
+			public void visit(Validator validator, IProject project, ValType valType,
+				ValOperation operation, IProgressMonitor monitor) {
+				validator.clean(project, operation, monitor);					
+			}
+			
+		};
+		accept(visitor, project, ValType.Build, operation, monitor);
+	}
+	
+	/**
+	 * Let each of the enabled validators know that a clean has been requested.
+	 * 
+	 * @param project the project that is being cleaned, or null if the entire workspace is being cleaned.
+	 * @param monitor
+	 */
+	public void clean(IProject project, IProgressMonitor monitor){
+		IValidatorVisitor visitor = new IValidatorVisitor(){
+
+			public void visit(Validator validator, IProject project, ValType valType,
+				ValOperation operation, IProgressMonitor monitor) {
+				validator.clean(project, operation, monitor);					
+			}
+			
+		};
+		ValidationFramework.getDefault().getDependencyIndex().clear(project);
+		ValOperation operation = new ValOperation();
+		accept(visitor, project, ValType.Build, operation, monitor);
+	}
+
+	public void validatorsForProjectChanged(IProject project, boolean validationSettingChanged) {
+		if (validationSettingChanged){
+			if (project != null)_projectPreferences.remove(project);
+			configHasChanged();
+		}
+	}
+		
+	private final class HasValidatorVisitor implements IResourceVisitor {
+		
+		private boolean 			_hasValidator;
+		private final boolean		_isManual;
+		private final boolean		_isBuild;
+		
+		public HasValidatorVisitor(boolean isManual, boolean isBuild){
+			_isManual = isManual;
+			_isBuild = isBuild;			
+		}
+		
+		public boolean hasValidator(IFolder folder){
+			try {
+				folder.accept(this);
+			}
+			catch (CoreException e){
+				ValidationPlugin.getPlugin().handleException(e);
+			}
+			return _hasValidator;
+		}
+
+		public boolean visit(IResource resource) throws CoreException {
+			if (resource instanceof IFolder)return true;
+			if (hasValidators(resource, _isManual, _isBuild)){
+				_hasValidator = true;
+				return false;
+			}
+			return true;
+		}
+	}
+	
+	/**
+	 * Map validator id's to an index number on a bit set, so that we can quickly determine if a
+	 * particular validator needs to validate a particular resource.
+	 * @author karasiuk
+	 *
+	 */
+	private final static class ValidatorIdManager {
+		
+		/**
+		 * Map validator id's to Integers. The integers correspond to bits in the ValProperty instances.
+		 */
+		private final Map<String, Integer> _map = new HashMap<String, Integer>(100);
+		
+		/** Next available bit. */
+		private int _next;
+		
+		/**
+		 * Answer the index number for this validator. If we haven't seen it yet allocate a new index number.
+		 * @param id validator id.
+		 * @return index into the validator bit mask.
+		 */
+		public synchronized int getIndex(String id){
+			Integer i = _map.get(id);
+			if (i != null)return i;
+			
+			i = _next++;
+			_map.put(id, i);
+			
+			return i;
+		}				
+	}
+	
+	/**
+	 * This is used to keep track of which validators are enabled with which projects. We want to ensure
+	 * that we don't activate a validator (and it's plug-in) if it has nothing to validate in the workspace.
+	 * This is an immutable object.
+	 * @author karasiuk
+	 *
+	 */
+	private final static class ValidatorProjectManager {
+		
+		private final static AtomicReference<ValidatorProjectManager> _me = new AtomicReference<ValidatorProjectManager>();
+		private final static AtomicInteger _counter = new AtomicInteger();
+		
+		private final ValProjectMap _manual = new ValProjectMap(ValType.Manual);
+		private final ValProjectMap _build = new ValProjectMap(ValType.Build);
+		private final int _sequence;
+		
+		/**
+		 * Answer the most current ValidatorProjectManager creating a new one if you have to.
+		 * @return
+		 */
+		public static ValidatorProjectManager get(){
+			ValidatorProjectManager vpm = _me.get();
+			if (vpm != null)return vpm;
+			
+			int next = _counter.incrementAndGet();
+			ValidatorProjectManager newVpm = null;
+			boolean looking = true;
+			while(looking){
+				vpm = _me.get();
+				if (vpm == null || next > vpm.getSequence()){
+					if (newVpm == null)newVpm = new ValidatorProjectManager(next);
+					if (_me.compareAndSet(vpm, newVpm))return newVpm;
+				}
+				else looking = false;
+			}
+			return vpm;
+		}
+		
+		/**
+		 * Reset the ValidatorProjectManager to null, which will force a newer one to be created the next time
+		 * that it is requested.
+		 */
+		public static void reset(){
+			int next = _counter.incrementAndGet();
+			ValidatorProjectManager vpm = _me.get();
+			if ( vpm == null)return;
+			if (next > vpm.getSequence())_me.compareAndSet(vpm, null);
+		}
+		
+		private ValidatorProjectManager(int sequence){
+			_sequence = sequence;
+		}
+		
+		int getSequence(){
+			return _sequence;
+		}
+		
+		/**
+		 * Should this validator attempt to validate any resources in this project?
+		 * 
+		 * @param validator
+		 *            The validator that is being tested.
+		 * @param project
+		 *            The project that is being tested. This can be null, which
+		 *            means that all projects will be tested.
+		 * @param type
+		 *            The type of validation operation.
+		 * @return true if the validator should attempt to validate.
+		 */
+		public boolean shouldValidate(Validator validator, IProject project, ValType type){
+			if (type == ValType.Build)return _build.shouldValidate(validator, project);
+			if (type == ValType.Manual)return _manual.shouldValidate(validator, project);
+				
+			return false;
+		}		
+				
+		/**
+		 * This is used to keep track of which validators are enabled for which projects. We want to ensure
+		 * that we don't activate a validator (and it's plug-in) if it has nothing to validate in the workspace.
+		 * <p>
+		 * There are two reasons why a validator may not be enabled. It's current project level filters may not match
+		 * the project. Or the entire validator may have been turned off for the project. 
+		 * </p>
+		 * @author karasiuk
+		 *
+		 */
+		private final static class ValProjectMap {
+			/**
+			 * Map a validator to the projects that it validates. This is an immutable object.
+			 * <p>
+			 * I've gone back and forth on whether the key should
+			 * be a Validator or the validator id. I'm back to it being the id because I was
+			 * running into cases where because of copying I wasn't getting the matches that I expected and I
+			 * want to ensure that I don't leak validators. If I run into
+			 * false matches, it is probably because reset isn't being called when it should be.
+			 * </p>
+			 */
+			private final Map<String, Set<IProject>> _map;
+			
+			private final ValType _type;
+						
+			public ValProjectMap(ValType type){
+				_type = type;
+				_map = load();
+			}
+			
+			/**
+			 * Should this validator attempt to validate any resources in this project?
+			 * 
+			 * @param validator
+			 *            The validator that is being tested.
+			 * @param project
+			 *            The project that is being tested. This can be null, which
+			 *            means that all projects will be tested, and if any of them return true, 
+			 *            then true is answered for this method.
+			 *            
+			 * @return true if the validator should attempt to validate.
+			 */
+			public boolean shouldValidate(Validator validator, IProject project){
+				String vid = validator.getId();
+				Set<IProject> projects = _map.get(vid);
+				if (projects == null)return false;
+				if (project == null)return projects.size() > 0;
+				return projects.contains(project);
+			}
+			
+			/**
+			 * For each of the projects in the workspace, load which validators are currently prepared to validate things.
+			 */
+			private Map<String, Set<IProject>> load() {
+				Map<String, Set<IProject>> map = new HashMap<String, Set<IProject>>(50);
+				ValManager vm = ValManager.getDefault();
+				IProject[] projects = ResourcesPlugin.getWorkspace().getRoot().getProjects();
+				Tracing.log("ValManager-02: loading " + projects.length + " projects");  //$NON-NLS-1$//$NON-NLS-2$
+				for (IProject project : projects){
+					if (!project.isOpen())continue;
+					Validator[] vals = vm.getValidators(project);
+					for (Validator v : vals){
+						String vid = v.getId();
+						Set<IProject> set = map.get(vid);
+						if (set == null){
+							set = new HashSet<IProject>(50);
+							map.put(vid, set);
+						}
+						
+						if (v.shouldValidateProject(project, _type))set.add(project);
+					}					
+				}
+				return map;
+			}
+			
+		}
+		
+	}
+
+	public void handleEvent(IFacetedProjectEvent event) {
+		_configNumber.incrementAndGet();
+		projectChanged(event.getProject().getProject());
+	}
+
+	public void projectChanged(IProject project, int type) {
+		switch (type){
+		case IProjectChangeListener.ProjectClosed:
+		case IProjectChangeListener.ProjectDeleted:
+			projectRemoved(project);
+			break;
+		case IProjectChangeListener.ProjectOpened:
+		case IProjectChangeListener.ProjectChanged:
+		case IProjectChangeListener.ProjectAdded:
+			projectChanged(project);
+			break;
+		}		
+	}
+	
+	/**
+	 * Store the singleton for the ValManager. This approach is used to avoid having to synchronize the
+	 * ValManager.getDefault() method.
+	 * 
+	 * @author karasiuk
+	 *
+	 */
+	private static class Singleton {
+		static ValManager valManager = new ValManager();
+	}
+	
+	private final class ValidatorCache {
+		private final ConcurrentMap<IProject, Validator[]> _cache = new ConcurrentHashMap<IProject, Validator[]>(50);
+		private final AtomicReference<Validator[]> _global = new AtomicReference<Validator[]>();
+		
+		public Validator[] getValidatorsCached(IProject project) throws ProjectUnavailableError {
+			Validator[] vals = null;
+			if (project == null){
+				vals = _global.get();
+				if (vals == null){				
+					vals = getValidatorsNotCached(project);
+					_global.set(vals);
+				}
+			}
+			else {
+				vals = _cache.get(project);
+				if (vals == null){
+					vals = getValidatorsNotCached(project);
+					_cache.put(project, vals);
+				}
+			}
+			return vals;
+		}
+		
+		public void reset(){
+			_cache.clear();
+			_global.set(null);
+		}
+		
+		public void reset(IProject project){
+			if (project != null)_cache.remove(project);
+		}
+
+	}
+	
+	public enum UseProjectPreferences {Normal, MustUse, MustNotUse}
+
+}
diff --git a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/ValMessages.java b/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/ValMessages.java
new file mode 100644
index 0000000..2835105
--- /dev/null
+++ b/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/ValMessages.java
@@ -0,0 +1,95 @@
+/*******************************************************************************
+ * Copyright (c) 2007, 2010 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.wst.validation.internal;
+
+import org.eclipse.osgi.util.NLS;
+
+public class ValMessages extends NLS {
+	
+	private static final String BUNDLE_NAME = "org.eclipse.wst.validation.internal.messages"; //$NON-NLS-1$
+	   
+	public static String ConfigError;
+	
+	public static String DecodeError1;
+	public static String Error20;
+	public static String Error21;
+	
+	public static String ErrConfig;	
+	public static String ErrFilterRule;	  
+	public static String ErrGroupName;
+	public static String ErrDependencyVersion;
+	
+	public static String ErrGroupNoType;
+	public static String ErrGroupInvalidType;
+	
+	public static String ErrPatternAttrib;
+	public static String ErrTypeReq;
+	public static String ErrType;
+	
+	public static String VbfExcSyntaxNoValClass;
+	public static String VbfExcSyntaxNoValRun;
+	public static String VbfExcSyntaxNoValNull;
+	
+	public static String GroupInclude;
+	
+	public static String GroupExclude;
+	
+	public static String JobName;
+	public static String JobNameWithProjectName;
+	public static String JobNameMonitor;
+	
+	public static String JobIndexSave;
+	
+	public static String LogValStart;
+	public static String LogValEnd;
+	public static String LogValEndTime;
+	public static String LogValSummary;
+	public static String LogValSummary2;
+	public static String LogSession;
+	
+	public static String MigrationJobName;
+	
+	public static String RogueValidator;
+	
+	public static String RuleProjectNature;
+	public static String RuleFileExt;
+	public static String RuleFile;
+	public static String RuleFolder;
+	public static String RuleFull;
+	public static String RuleContentType;
+	public static String RuleFacet;
+	public static String RulePattern;
+	public static String RuleTargetRuntime;
+	
+	public static String ContentTypeExact;
+	public static String ContentTypeNotExact;
+	
+	public static String FileExtWithCase;
+	public static String FileExtWithoutCase;
+
+	public static String SevError;
+	public static String SevWarning;
+	public static String SevIgnore;
+
+	public static String TimeUnder;
+	public static String TimeNano;
+	public static String TimeMicro;
+	public static String TimeSec;
+	public static String TimeMin;
+	
+	public static String TypeInclude;
+	public static String TypeExclude;
+	
+	static {
+		NLS.initializeMessages(BUNDLE_NAME, ValMessages.class);
+	  }
+
+}
diff --git a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/ValOperation.java b/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/ValOperation.java
new file mode 100644
index 0000000..44c78ec
--- /dev/null
+++ b/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/ValOperation.java
@@ -0,0 +1,205 @@
+/*******************************************************************************
+ * Copyright (c) 2007, 2008 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.wst.validation.internal;
+
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.wst.validation.ValidationResult;
+import org.eclipse.wst.validation.ValidationResults;
+import org.eclipse.wst.validation.ValidationState;
+import org.eclipse.wst.validation.Validator;
+
+/**
+ * This represents a validation operation, i.e. the running of a set of validators in response to some change. 
+ * It may be a large operation, as would happen on a clean build, or it may be the validation of just a single
+ * resource.
+ * <p>
+ * The operation can, but doesn't need to, span multiple projects.
+ * </p>
+ * <p>
+ * Once the operation has finished, this object goes away.
+ * </p>     
+ * @author karasiuk
+ *
+ */
+public final class ValOperation {
+	
+	private final ValidationState 	_state = new ValidationState();
+	private final ValidationResult	_result = new ValidationResult();
+	
+	/**
+	 * Each project can have a set of validators that are suspended for the duration of the validation operation.
+	 * The set contains the validator's id.
+	 */
+	private final Map<IProject, Set<String>> _suspended = new HashMap<IProject, Set<String>>(40);
+	
+	/** The time that the operation started. */
+	private final long	_started = System.currentTimeMillis();
+	
+	/** 
+	 * Are we in a multi project validation? That is, could we be validating several
+	 * projects at the same time? This can be triggered by either clean all or 
+	 * if auto build is turned off, a build all. 
+	 */
+	private final boolean	_multiProject;
+	
+	/** 
+	 * Holds all the resources that have been validated as a side-effect of running other validations.
+	 * The key is the validator id and the value is a Set of IResources.
+	 */
+	private final Map<String, Set<IResource>> 	_validated = new HashMap<String, Set<IResource>>(20);
+	
+	public ValOperation(){
+		_multiProject = false;
+	}
+	
+	/**
+	 * 
+	 * @param multiProject Set to true if we could be validating several projects at the same time.
+	 */
+	public ValOperation(boolean multiProject){
+		_multiProject = multiProject;
+	}
+	
+	public ValidationState getState() {
+		return _state;
+	}
+	
+	/**
+	 * Answer a summary of the validation results.
+	 * @return
+	 */
+	public ValidationResultSummary getResult() {
+		synchronized(_result){
+			ValidationResultSummary vrs = new ValidationResultSummary(_result.getSeverityError(), 
+				_result.getSeverityWarning(), _result.getSeverityInfo());
+			return vrs;
+		}
+	}
+		
+	/**
+	 * Answer a copy of the ValidationResult.
+	 * @return
+	 */
+	public ValidationResults getResults(){
+		return new ValidationResults(_result);
+	}
+	
+	/**
+	 * Remember that this resource has already been validated as a side-effect.
+	 *  
+	 * @param id id of the validator
+	 * @param resource resource that has been validated.
+	 */
+	public void addValidated(String id, IResource resource){
+		synchronized(_validated){
+			Set<IResource> set = _validated.get(id);
+			if (set == null){
+				set = new HashSet<IResource>(20);
+				_validated.put(id, set);
+			}
+			set.add(resource);
+		}
+	}
+	
+	/**
+	 * Answer if this resource has already been validated as a side-effect of some other validation by the
+	 * given validator.
+	 * 
+	 * @param id
+	 * @param resource
+	 */
+	public boolean isValidated(String id, IResource resource){
+		synchronized(_validated){
+			Set<IResource> set = _validated.get(id);
+			if (set == null)return false;
+			
+			return set.contains(resource);
+		}
+	}
+
+	/**
+	 * Has this validator been suspended for the duration of this operation on this project?
+	 * 
+	 * @param val
+	 *            The validator that is being checked.
+	 * @param project
+	 *            Can be null, in which case we return false.
+	 * 
+	 * @return true if this validator should not run on this project.
+	 */
+	public boolean isSuspended(Validator val, IProject project) {
+		if (project == null)return false;
+		synchronized(_suspended){
+			Set<String> set = getSuspended(project);		
+			return set.contains(val.getId());
+		}
+	}
+	
+	private Set<String> getSuspended(IProject project){
+		Set<String> set = _suspended.get(project);
+		if (set == null){
+			set = new HashSet<String>(5);
+			_suspended.put(project, set);
+		}
+		return set;
+	}
+
+	void suspendValidation(IProject project, Validator validator) {
+		if (project == null)return;
+		if (validator == null)return;
+		getSuspended(project).add(validator.getId());
+	}
+
+	public long getStarted() {
+		return _started;
+	}
+
+	public boolean isMultiProject() {
+		return _multiProject;
+	}
+
+	/**
+	 * Indicate if the operation was canceled.
+	 * 
+	 * @param canceled
+	 * 		Set to true if it was canceled and false if it was not canceled.
+	 */
+	public void setCanceled(boolean canceled) {
+		synchronized (_result) {
+			_result.setCanceled(canceled);
+		}
+		
+	}
+
+	/**
+	 * Was the operation canceled before it completed? For example if the validation is being run through the
+	 * user interface, the end user can cancel the operation through the progress monitor.
+	 * 
+	 * @return true if the operation was canceled
+	 */
+	public boolean isCanceled() {
+		synchronized (_result) {
+			return _result.isCanceled();
+		}
+	}
+
+	public void mergeResults(ValidationResult vr) {
+		synchronized (_result) {
+			_result.mergeResults(vr);
+		}
+	}
+}
diff --git a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/ValPrefManagerGlobal.java b/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/ValPrefManagerGlobal.java
new file mode 100644
index 0000000..16389dc
--- /dev/null
+++ b/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/ValPrefManagerGlobal.java
@@ -0,0 +1,668 @@
+/*******************************************************************************
+ * Copyright (c) 2007, 2011 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.wst.validation.internal;
+
+import java.lang.reflect.InvocationTargetException;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.CopyOnWriteArraySet;
+import java.util.concurrent.atomic.AtomicReference;
+
+import org.eclipse.wst.validation.Friend;
+import org.eclipse.wst.validation.MessageSeveritySetting;
+import org.eclipse.wst.validation.Validator;
+import org.eclipse.wst.validation.Validator.V2;
+import org.eclipse.wst.validation.internal.model.FilterGroup;
+import org.eclipse.wst.validation.internal.model.GlobalPreferences;
+import org.eclipse.wst.validation.internal.model.GlobalPreferencesValues;
+import org.eclipse.wst.validation.internal.plugin.ValidationPlugin;
+import org.osgi.service.prefs.BackingStoreException;
+
+/**
+ * A class that knows how to manage the global persisted validation settings.
+ * @author karasiuk
+ */
+public final class ValPrefManagerGlobal {
+	
+	/** 
+	 * Version of the framework properties.
+	 * <ul>
+	 * <li>Version 2 - used the filter approach
+	 * <li>Version 3 - switched to a difference based approach. (See Bugzilla 224179)
+	 * </ul>
+	 * 
+	 */
+	public final static int frameworkVersion = 3;
+	
+	private final Set<IValChangedListener> _listeners = new CopyOnWriteArraySet<IValChangedListener>();
+	
+	private final AtomicReference<List<Validator>> _validators = new AtomicReference<List<Validator>>();
+	
+	private ValPrefManagerGlobal(){}
+	
+	public static ValPrefManagerGlobal getDefault(){
+		return Singleton.valPrefManagerGlobal;
+	}
+	
+	public void addListener(IValChangedListener listener){
+		_listeners.add(listener);
+	}
+	
+	public void removeListener(IValChangedListener listener){
+		_listeners.remove(listener);
+	}
+	
+	private void updateListeners(boolean validationSettingChanged){
+		for (IValChangedListener cl : _listeners)cl.validatorsForProjectChanged(null, validationSettingChanged); 
+	}
+			
+	/**
+	 * Update the validator filters from the preference store.
+	 *  
+	 * @param val
+	 * 
+	 * @return false if there are no preferences, that means that the user has never changed any
+	 * of the default settings. Also answer false if there was some sort of error, which essentially
+	 * means that the preferences aren't valid for whatever reason.   
+	 * 
+	 * @deprecated
+	 */
+//	public boolean loadPreferences(Validator[] val) {
+//	
+//		try {
+//			IEclipsePreferences pref = ValidationFramework.getDefault().getPreferenceStore();
+//			if (!pref.nodeExists(PrefConstants.filters))return false;
+//		
+//			Preferences filters = pref.node(PrefConstants.filters);
+//			for (Validator v : val){
+//				String id = v.getId();
+//				if (filters.nodeExists(id)){
+//					Preferences vp = filters.node(id);
+//					loadPreferences(v, vp);
+//				}
+//			}			
+//		}
+//		catch (Exception e){
+//			ValidationPlugin.getPlugin().handleException(e);
+//			return false;
+//		}
+//		
+//		return true;
+//	}
+	
+	/**
+	 * Answer the v2 validators that have been overridden by the global preferences.
+	 */
+	public List<Validator> getValidators() throws BackingStoreException {
+		List<Validator> vals = _validators.get();
+		while (vals == null){
+			vals = loadValidators();
+			if (!_validators.compareAndSet(null, vals))vals = _validators.get();
+		}
+		return vals;
+	}
+	
+	/**
+	 * Load the validators from the preference store.
+	 * @return the validators that have been overridden by the global references.
+	 */
+	private List<Validator> loadValidators() throws BackingStoreException {
+		LinkedList<Validator> list = new LinkedList<Validator>();
+		PreferencesWrapper pref = PreferencesWrapper.getPreferences(null, null);
+		if (pref.nodeExists(PrefConstants.vals)){
+			PreferencesWrapper vals = pref.node(PrefConstants.vals);
+			for (String id : vals.childrenNames()){
+				Validator base = ExtensionValidators.instance().getMapV2().get(id);
+				Validator v = loadValidator(id, vals, base);
+				if (v != null){
+					V2 v2 = v.asV2Validator();
+					if (v2 != null)v2.setLevel(Validator.Level.Global);					
+					list.add(v);
+				}
+			}
+		}
+		return list;
+	}
+
+	/**
+	 * Answer a copy of the validator that has been updated with the given preferences.
+	 * 
+	 * @param id
+	 *            Validator id.
+	 * @param valsNode
+	 *            The /vals node in the preference store.
+	 * @param base
+	 *            The base validator that is being customized. This can be null,
+	 *            in which case null will be returned.
+	 * 
+	 * @return A new validator that is a copy of the extension point validator
+	 *         with the updates from the preference store.
+	 */
+	static Validator loadValidator(String id, PreferencesWrapper valsNode, Validator base) {
+		if (base == null)return null;
+		
+		PreferencesWrapper vp = valsNode.node(id);
+		base = base.copy();
+		V2 v2 = base.asV2Validator();
+
+		String global = vp.get(PrefConstants.global, ""); //$NON-NLS-1$
+		if (global.length() > 0){
+		Global g = new Global(global);
+			base.setBuildValidation(g.isBuild());
+			base.setManualValidation(g.isManual());
+			base.setDelegatingId(g.getDelegating());
+		}
+		
+		if (v2 != null){
+			String groups = vp.get(PrefConstants.groups, ""); //$NON-NLS-1$
+			if (groups.length() > 0){
+				List<FilterGroup> list = new LinkedList<FilterGroup>();
+				Deserializer des = new Deserializer(groups);
+				while(des.hasNext())list.add(FilterGroup.create(des));
+				v2.setGroups(list);
+			}
+			
+			String settings = vp.get(PrefConstants.msgs, ""); //$NON-NLS-1$
+			if (settings.length() >0)
+			{
+				Map<String, MessageSeveritySetting.Severity> map = Msgs.deserialize(settings);
+				Map<String, MessageSeveritySetting> msg = base.getMessageSettings();
+			
+				for (Map.Entry<String, MessageSeveritySetting.Severity> me : map.entrySet()){
+					MessageSeveritySetting ms = msg.get(me.getKey());
+					if (ms != null)ms.setCurrent(me.getValue());
+				}	
+			}
+		}					
+		return base;
+	}
+
+	/**
+	 * The only valid way to get the global preferences is through the ValManager.
+	 * 
+	 * @see ValManager#getGlobalPreferences()
+	 */
+	public GlobalPreferences loadGlobalPreferences() {
+		PreferencesWrapper pref = PreferencesWrapper.getPreferences(null, null);
+		GlobalPreferencesValues gp = new GlobalPreferencesValues();
+		gp.saveAutomatically = pref.getBoolean(PrefConstants.saveAuto, GlobalPreferences.DefaultAutoSave);
+		gp.disableAllValidation = pref.getBoolean(PrefConstants.suspend, GlobalPreferences.DefaultSuspend);
+		gp.confirmDialog = pref.getBoolean(PrefConstants.confirmDialog, GlobalPreferences.DefaultConfirm);
+		gp.override = pref.getBoolean(PrefConstants.override, GlobalPreferences.DefaultOverride);
+		gp.version = pref.getInt(PrefConstants.frameworkVersion, GlobalPreferences.DefaultFrameworkVersion);
+		gp.stateTimeStamp = pref.getLong(PrefConstants.stateTS, 0);
+		
+		if (gp.version != frameworkVersion)migrate(gp.version, pref);
+		return new GlobalPreferences(gp);
+	}
+	
+	/**
+	 * If necessary migrate the preferences.
+	 * @param version The incoming version of the preferences.
+	 * @param pref the root of the preference store
+	 */
+	static void migrate(int version, PreferencesWrapper pref) {
+		try {
+			boolean update = false;
+			if (version == 2){
+				if (pref.nodeExists(PrefConstants.filters)){
+					pref.node(PrefConstants.filters).removeNode();
+					update = true;
+				}
+				if (pref.nodeExists(PrefConstants.msgs)){
+					pref.node(PrefConstants.msgs).removeNode();
+					update = true;
+				}
+			}
+			if (update){
+				pref.putInt(PrefConstants.frameworkVersion, frameworkVersion);
+				pref.flush();
+			}
+		}
+		catch (BackingStoreException e){
+			ValidationPlugin.getPlugin().handleException(e);
+		}		
+	}
+
+	/**
+	 * Load the preferences for a validator.
+	 * 
+	 * @param v the validator that is being built up
+	 * @param p the node in the preference tree for the validator, 
+	 * 	e.g. /instance/validator-framework-id/filters/validator-id
+	 * 
+	 * @deprecated
+	 */
+//	static void loadPreferences(Validator v, Preferences p) throws BackingStoreException {
+//		v.setBuildValidation(p.getBoolean(PrefConstants.build, true));
+//		v.setManualValidation(p.getBoolean(PrefConstants.manual, true));
+//		v.setVersion(p.getInt(PrefConstants.version, 1));
+//		v.setDelegatingId(p.get(PrefConstants.delegate, null));
+//		
+//		Validator.V2 v2 = v.asV2Validator();
+//		if (v2 == null)return;
+//		if (!p.nodeExists(PrefConstants.groups))return;
+//		
+//		Preferences groupNode = p.node(PrefConstants.groups);
+//		for (String groupName : groupNode.childrenNames()){
+//			Preferences group = groupNode.node(groupName);
+//			String type = group.get(PrefConstants.type, null);
+//			if (type == null)throw new IllegalStateException(ValMessages.ErrGroupNoType);
+//			FilterGroup fg = FilterGroup.create(type);
+//			if (fg == null)throw new IllegalStateException(NLS.bind(ValMessages.ErrGroupInvalidType, type));
+//			v2.add(fg);
+//			
+//			if (group.nodeExists(PrefConstants.rules)){
+//				Preferences ruleNode = group.node(PrefConstants.rules);
+//				for (String ruleName : ruleNode.childrenNames()){
+//					Preferences rule = ruleNode.node(ruleName);
+//					FilterRule fr = FilterRule.create(rule.get(PrefConstants.ruleType, null));
+//					if (fr != null){
+//						fr.load(rule);
+//						fg.add(fr);
+//					}
+//				}
+//			}
+//		}		
+//	}
+	
+	/**
+	 * Save the validator into the preference store.
+	 * 
+	 * @param validator
+	 *            The validator being saved.
+	 * 
+	 * @param root
+	 *            The top of the preference tree for validators, i.e.
+	 *            /instance/validator-framework-id/vals for workspace validators
+	 *            and /vals for project validators.
+	 *            
+	 * @param baseValidators
+	 *            A map of the validators that are one level higher in the
+	 *            storage hierarchy. So if we are updating the preference page
+	 *            validators, then this map would be the extension point
+	 *            validators. If we are updating a project's validators, then
+	 *            this map would be the preference page validators.
+	 */
+	static void save(Validator validator, PreferencesWrapper root, Map<String, Validator> baseValidators) throws BackingStoreException {
+		Validator.V2 v2 = validator.asV2Validator();
+		if (v2 == null)return;
+		
+		final String id = validator.getId();
+		boolean hasNode = root.nodeExists(id);
+		
+		if (validator.sameConfig(baseValidators.get(id))){
+			if (hasNode){
+				PreferencesWrapper vp = root.node(id);
+				vp.removeNode();
+			}
+			return;
+		}
+		if (!validator.isChanged())return;
+		PreferencesWrapper vp = root.node(id);
+		if (validator.hasGlobalChanges()){
+			Global g = new Global(validator.isManualValidation(), validator.isBuildValidation(), validator.getVersion(),
+				validator.getDelegatingId());
+			vp.put(PrefConstants.global, g.serialize());
+			Friend.setMigrated(validator, false);
+		}
+		
+		if (validator.getChangeCountMessages() > 0){
+			Collection<MessageSeveritySetting> msgs = validator.getMessageSettings().values();
+			if (msgs.size() > 0){
+				vp.put(PrefConstants.msgs, Msgs.serialize(msgs));
+			}
+		}
+		
+		if (v2.getChangeCountGroups() > 0){
+			FilterGroup[] groups = v2.getGroups();
+			if (groups.length > 0){
+				Serializer ser = new Serializer(500);
+				for (FilterGroup group : groups)group.save(ser);
+				vp.put(PrefConstants.groups, ser.toString());
+			}
+		}
+	}
+	/**
+	 * Save the validator into the preference store.
+	 * 
+	 * @param validator
+	 *            The validator being saved.
+	 * 
+	 * @param root
+	 *            The top of the preference tree for validators, i.e.
+	 *            /instance/validator-framework-id/vals for workspace validators
+	 *            and /vals for project validators.
+	 *            
+	 * @param baseValidators
+	 *            A map of the validators that are one level higher in the
+	 *            storage hierarchy. So if we are updating the preference page
+	 *            validators, then this map would be the extension point
+	 *            validators. If we are updating a project's validators, then
+	 *            this map would be the preference page validators.
+	 */
+	static void save(ValidatorMutable validator, PreferencesWrapper root, Map<String, Validator> baseValidators) throws BackingStoreException {
+		if (!validator.isV2Validator())return;
+		
+		PreferencesWrapper vp = root.node(validator.getId());
+		if (validator.sameConfig(baseValidators.get(validator.getId()))){
+			vp.removeNode();
+			return;
+		}
+		if (!validator.isChanged())return;
+		if (validator.hasGlobalChanges()){
+			Global g = new Global(validator.isManualValidation(), validator.isBuildValidation(), validator.getVersion(),
+				validator.getDelegatingId());
+			vp.put(PrefConstants.global, g.serialize());
+//			Friend.setMigrated(validator, false);
+		}
+				
+		if (validator.getChangeCountGroups() > 0){
+			FilterGroup[] groups = validator.getGroups();
+			if (groups.length > 0){
+				Serializer ser = new Serializer(500);
+				for (FilterGroup group : groups)group.save(ser);
+				vp.put(PrefConstants.groups, ser.toString());
+			}
+		}
+		if (validator.getChangeCountMessages() > 0){
+			Collection<MessageSeveritySetting> msgs = validator.getMessageSettings().values();
+			if (msgs.size() > 0){
+				vp.put(PrefConstants.msgs, Msgs.serialize(msgs));
+			}
+		}
+		
+	}
+	
+	public void saveAsPrefs(Validator[] val) {
+		try {
+			PreferencesWrapper pref = PreferencesWrapper.getPreferences(null, null);
+			PreferencesWrapper vals = pref.node(PrefConstants.vals);
+			Map<String, Validator> base = ExtensionValidators.instance().getMapV2();
+			for (Validator v : val)save(v, vals, base);
+			pref.flush();
+			_validators.set(null);
+			updateListeners(true);
+		}
+		catch (BackingStoreException e){
+			throw new RuntimeException(e);
+		}
+	}
+
+	
+	/**
+	 * Save the global preferences and the validators.
+	 */
+	public synchronized void savePreferences(GlobalPreferences gp, Validator[] validators){
+		try {
+			PreferencesWrapper prefs = PreferencesWrapper.getPreferences(null, null);
+			savePreferences(prefs, gp);
+			PreferencesWrapper vals = prefs.node(PrefConstants.vals);
+
+			Map<String, Validator> base = ExtensionValidators.instance().getMapV2();
+			for (Validator v : validators)save(v, vals, base);
+			prefs.flush();
+			_validators.set(null);
+			updateListeners(true);
+		}
+		catch (BackingStoreException e){
+			ValidationPlugin.getPlugin().handleException(e);
+		}
+	}
+	
+	/**
+	 * Save the global preferences and the validators.
+	 */
+	public synchronized void savePreferences(GlobalPreferences gp, ValidatorMutable[] validators, Boolean persist){
+		try {
+			PreferencesWrapper prefs = PreferencesWrapper.getPreferences(null, persist);
+			savePreferences(prefs, gp);
+			PreferencesWrapper vals = prefs.node(PrefConstants.vals);
+			Map<String, Validator> base = ExtensionValidators.instance().getMapV2();
+			for (ValidatorMutable v : validators)save(v, vals, base);
+
+			prefs.flush();
+			_validators.set(null);
+			updateListeners(true);
+		}
+		catch (BackingStoreException e){
+			ValidationPlugin.getPlugin().handleException(e);
+		}
+	}
+		
+	/**
+	 * Save the V1 preferences, so that the old validators continue to work.
+	 */
+	public static void saveV1Preferences(ValidatorMutable[] validators, Boolean persistent){
+		try {
+			GlobalConfiguration gc = ConfigurationManager.getManager().getGlobalConfiguration();
+			gc.setEnabledManualValidators(getEnabledManualValidators(validators));				
+			gc.setEnabledBuildValidators(getEnabledBuildValidators(validators));
+
+			gc.passivate();
+			gc.store(persistent);
+		}
+		catch (InvocationTargetException e){
+			ValidationPlugin.getPlugin().handleException(e);
+		}			
+	}
+
+	/**
+	 * Answer all the V1 validators that are manually enabled.
+	 * @return
+	 */
+	private static ValidatorMetaData[] getEnabledManualValidators(ValidatorMutable[] validators) {
+		List<ValidatorMetaData> list = new LinkedList<ValidatorMetaData>();
+		for (ValidatorMutable v : validators){
+			if (v.isManualValidation() && v.isV1Validator())list.add(v.getVmd());
+		}
+		ValidatorMetaData[] result = new ValidatorMetaData[list.size()];
+		list.toArray(result);
+		return result;
+	}
+
+	/**
+	 * Answer all the V1 validators that are enabled for build.
+	 * @return
+	 */
+	private static ValidatorMetaData[] getEnabledBuildValidators(ValidatorMutable[] validators) {
+		List<ValidatorMetaData> list = new LinkedList<ValidatorMetaData>();
+		for (ValidatorMutable v : validators){
+			if (v.isBuildValidation() && v.isV1Validator())list.add(v.getVmd());
+		}
+		ValidatorMetaData[] result = new ValidatorMetaData[list.size()];
+		list.toArray(result);
+		return result;
+	}
+
+	
+	/**
+	 * Save the global preferences and the validators.
+	 */
+	public synchronized void savePreferences(){
+		try {
+			GlobalPreferences gp = ValManager.getDefault().getGlobalPreferences();
+			PreferencesWrapper prefs = PreferencesWrapper.getPreferences(null, null);
+			savePreferences(prefs, gp);
+			prefs.flush();
+			updateListeners(true);
+		}
+		catch (BackingStoreException e){
+			ValidationPlugin.getPlugin().handleException(e);
+		}
+	}
+	
+	/**
+	 * Save the global preferences and the validators.
+	 */
+	private void savePreferences(PreferencesWrapper prefs, GlobalPreferences gp){
+		prefs.putBoolean(PrefConstants.saveAuto, gp.getSaveAutomatically());
+		prefs.putBoolean(PrefConstants.suspend, gp.getDisableAllValidation());
+		prefs.putLong(PrefConstants.stateTS, gp.getStateTimeStamp());
+		prefs.putBoolean(PrefConstants.confirmDialog, gp.getConfirmDialog());
+		prefs.putBoolean(PrefConstants.override, gp.getOverride());
+		prefs.putInt(PrefConstants.frameworkVersion, ValPrefManagerGlobal.frameworkVersion);
+	}
+
+	/**
+	 * Update any message preferences in the map.
+	 * @param validator
+	 * @param settings
+	 */
+	public void loadMessages(Validator validator, Map<String, MessageSeveritySetting> settings) {
+		PreferencesWrapper pref = PreferencesWrapper.getPreferences(null, null);
+		try {
+			loadMessageSettings(validator, settings, pref);
+		}
+		catch (BackingStoreException e){
+			ValidationPlugin.getPlugin().handleException(e);
+		}
+	}
+		
+	/**
+	 * Load the message preferences for the validator into the map.
+	 * 
+	 * @param val
+	 * @param settings
+	 * @param root the root of the preference store
+	 */
+	static void loadMessageSettings(Validator val, Map<String, MessageSeveritySetting> settings, PreferencesWrapper root) 
+		throws BackingStoreException {
+		if (!root.nodeExists(PrefConstants.vals))return;
+		
+		PreferencesWrapper vals = root.node(PrefConstants.vals); 
+		if (!vals.nodeExists(val.getId()))return;
+		
+		PreferencesWrapper valPrefs = vals.node(val.getId());
+		String msgs = valPrefs.get(PrefConstants.msgs, ""); //$NON-NLS-1$
+		if (msgs.length() == 0)return;
+		
+		Map<String, MessageSeveritySetting.Severity> map = Msgs.deserialize(msgs);
+		
+		for (Map.Entry<String, MessageSeveritySetting.Severity> me : map.entrySet()){
+			MessageSeveritySetting ms = settings.get(me.getKey());
+			if (ms != null)ms.setCurrent(me.getValue());
+		}		
+	}
+
+	/**
+	 * Save whether the validator is enabled or not. 
+	 * @param validator
+	 * @param prefs up to the filter part of the preference tree
+	 */
+//	private void saveShallowPreference(Validator validator, Preferences prefs) {
+//		if (validator.asV2Validator() == null)return;
+//		Preferences val = prefs.node(validator.getId());
+//		val.putBoolean(PrefConstants.build, validator.isBuildValidation());
+//		val.putBoolean(PrefConstants.manual, validator.isManualValidation());
+//		val.putInt(PrefConstants.version, validator.getVersion());
+//	}
+	
+//	/**
+//	 * Load the customized message settings from the preference store.
+//	 * @param messageSettings
+//	 */
+//	public void loadMessageSettings(Validator val, MessageCategory[] messageSettings) {
+//		try {
+//			loadMessageSettings(val, messageSettings, ValidationFramework.getDefault().getPreferenceStore());
+//		}
+//		catch (Exception e){
+//			ValidationPlugin.getPlugin().handleException(e);
+//		}
+//	}
+	
+	private final static class Global {
+		private final boolean 	_manual;
+		private final boolean 	_build;
+		private final int		_version;
+		private final String	_delegating;
+		
+		public Global(String value){
+			Deserializer d = new Deserializer(value);
+			_manual = d.getBoolean();
+			_build = d.getBoolean();
+			_version = d.getInt();
+			_delegating = d.hasNext() ? d.getString() : null;
+		}
+		
+		public Global(boolean manual, boolean build, int version, String delegating){
+			_manual = manual;
+			_build = build;
+			_version = version;
+			_delegating = delegating;
+		}
+		
+		public String serialize(){
+			Serializer s = new Serializer(50);
+			s.put(_manual);
+			s.put(_build);
+			s.put(_version);
+			if (_delegating != null)s.put(_delegating);
+			return s.toString();
+		}
+
+		public boolean isManual() {
+			return _manual;
+		}
+
+		public boolean isBuild() {
+			return _build;
+		}
+
+		public String getDelegating() {
+			return _delegating;
+		}
+	}
+	
+	private final static class Msgs {
+		public static String serialize(Collection<MessageSeveritySetting> messages){
+			Serializer s = new Serializer(100);
+			for (MessageSeveritySetting ms : messages){
+				s.put(ms.getId());
+				s.put(ms.getCurrent().ordinal());
+			}
+			return s.toString();	
+		}
+		
+		/**
+		 * Answer a map for all the messages.
+		 * The key is the message id and the value is the current setting for that message
+		 * @param v
+		 * @return
+		 */
+		public static Map<String, MessageSeveritySetting.Severity> deserialize(String v){
+			Map<String, MessageSeveritySetting.Severity> map = new HashMap<String, MessageSeveritySetting.Severity>(10);
+			Deserializer d = new Deserializer(v);
+			while(d.hasNext()){
+				String id = d.getString();
+				int sev = d.getInt();
+				map.put(id, MessageSeveritySetting.Severity.values()[sev]);
+			}
+			return map;
+		}
+	}
+	
+	/**
+	 * Store the singleton for the ValPrefManagerGlobal. This approach is used to avoid having to synchronize the
+	 * ValPrefManagerGlobal.getDefault() method.
+	 * 
+	 * @author karasiuk
+	 *
+	 */
+	private final static class Singleton {
+		final static ValPrefManagerGlobal valPrefManagerGlobal = new ValPrefManagerGlobal();
+	}
+
+}
diff --git a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/ValPrefManagerProject.java b/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/ValPrefManagerProject.java
new file mode 100644
index 0000000..c28b031
--- /dev/null
+++ b/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/ValPrefManagerProject.java
@@ -0,0 +1,388 @@
+/*******************************************************************************
+ * Copyright (c) 2007, 2008 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.wst.validation.internal;
+
+import java.lang.reflect.InvocationTargetException;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import org.eclipse.core.resources.IProject;
+import org.eclipse.wst.validation.Friend;
+import org.eclipse.wst.validation.IMutableValidator;
+import org.eclipse.wst.validation.MessageSeveritySetting;
+import org.eclipse.wst.validation.MutableProjectSettings;
+import org.eclipse.wst.validation.Validator;
+import org.eclipse.wst.validation.Validator.V2;
+import org.eclipse.wst.validation.internal.model.ProjectPreferences;
+import org.eclipse.wst.validation.internal.plugin.ValidationPlugin;
+import org.osgi.service.prefs.BackingStoreException;
+
+/**
+ * A class that knows how to manage the project level persisted validation settings.
+ * @author karasiuk
+ *
+ */
+public final class ValPrefManagerProject {
+	
+	private final IProject	_project;
+	private final static List<IValChangedListener> _listeners = new LinkedList<IValChangedListener>();
+	
+	/**
+	 * The validators that are in the project preference file, but have
+	 * only been configured to the global preference level. That is they have not had
+	 * any project level customizations applied yet.
+	 */
+	private List<Validator> _validators;
+	
+	public ValPrefManagerProject(IProject project){
+		assert project != null;
+		_project = project;
+	}
+	
+	public static void addListener(IValChangedListener listener){
+		if (_listeners.contains(listener))return;
+		_listeners.add(listener);
+	}
+	
+	public static void removeListener(IValChangedListener listener){
+		_listeners.remove(listener);
+	}
+	
+	private static void updateListeners(IProject project){
+		for (IValChangedListener cl : _listeners)cl.validatorsForProjectChanged(project, true); 
+	}
+
+	
+	/**
+	 * Answer whether or not this project has validation settings.
+	 *   
+	 * @return true if it has settings. This does not mean that the settings are enabled, only that it
+	 * has settings.
+	 * 
+	 * @deprecated
+	 */
+	public boolean hasProjectSpecificSettings(){
+		PreferencesWrapper pref = getPreferences(null);
+		
+		if (pref == null)return false;
+		return true;
+	}
+	
+	/**
+	 * Answer the v2 validators that have been overridden by the project
+	 * preferences. The validators will not have the preference store's
+	 * customizations applied yet. The purpose of this method, is to identify the subset of validators 
+	 * that may later be configured.
+	 * 
+	 * @param baseValidators
+	 *            V2 validators from the extension points, and customized by any
+	 *            global preferences.
+	 */
+	public List<Validator> getValidators(Map<String, Validator> baseValidators) throws BackingStoreException {
+		List<Validator> vals = _validators;
+		if (vals == null){
+			vals = loadValidators(baseValidators);
+			_validators = vals;
+		}
+		return vals;
+	}
+	
+	/**
+	 * Load the validators from the preference store. The validators will not have the preference store's
+	 * customizations applied yet. The purpose of this method, is to identify the subset of validators 
+	 * that may later be configured.
+	 * 
+	 * @param baseValidators
+	 *            V2 validators from the extension points, and customized by any
+	 *            global preferences.
+	 * @return the validators that are in the project preference file, but have
+	 *         only been configured to the global preference level. That is they have not had
+	 *         any project level customizations applied yet.
+	 */
+	private List<Validator> loadValidators(Map<String, Validator> baseValidators) throws BackingStoreException {
+		List<Validator> list = new LinkedList<Validator>();
+		PreferencesWrapper pref = getPreferences(null);
+		if (pref.nodeExists(PrefConstants.vals)){
+			PreferencesWrapper vals = pref.node(PrefConstants.vals);
+			for (String id : vals.childrenNames()){
+				Validator base = baseValidators.get(id);
+				Validator v = ValPrefManagerGlobal.loadValidator(id, vals, base);
+				if (v != null){
+					V2 v2 = v.asV2Validator();
+					if (v2 != null)v2.setLevel(Validator.Level.Project);					
+					list.add(v);
+				}
+			}
+		}
+		return list;
+	}
+		
+	/**
+	 * Answer the setting of the getOverride field.
+	 */
+	public boolean getOverride(){
+		PreferencesWrapper pref = getPreferences(null);
+		
+		if (!pref.nodeExists())return ProjectPreferences.DefaultOverride;
+		
+		int version = pref.getInt(PrefConstants.frameworkVersion, 0);
+		if (version == 0){
+			try {
+				ProjectConfiguration pc = ConfigurationManager.getManager().getProjectConfiguration(_project);
+				return pc.getDoesProjectOverride();
+			}
+			catch (InvocationTargetException e){
+				// eat it, if it fails we just go with the defaults
+			}
+		}
+		return pref.getBoolean(PrefConstants.override, ProjectPreferences.DefaultOverride);
+	}
+
+	private ProjectPreferences migrateFromBeforeWTP30(IProject project, Map<String, Validator> baseValidators) {
+		try {
+			ProjectConfiguration pc = ConfigurationManager.getManager().getProjectConfiguration(project);
+			
+			List<Validator> list = migrateFromBeforeWTP30(baseValidators, pc);
+			Validator[] vals = new Validator[list.size()];
+			list.toArray(vals);
+			return new ProjectPreferences(project, pc.getDoesProjectOverride(), pc.isDisableAllValidation(), vals);
+		}
+		catch (InvocationTargetException e){
+			// eat it, if it fails we just go with the defaults
+		}
+		return new ProjectPreferences(project);
+	}
+
+	private List<Validator> migrateFromBeforeWTP30(Map<String, Validator> baseValidators, ProjectConfiguration pc)
+			throws InvocationTargetException {
+				
+		Set<String> build = pc.getEnabledBuildlValidators();
+		Set<String> manual = pc.getEnabledManualValidators();
+		
+		List<Validator> list = new LinkedList<Validator>();
+		for (Validator v : baseValidators.values()){
+			V2 v2 = v.asV2Validator();
+			if (v2 != null){
+				boolean isBuild = build == null || build.contains(v2.getValidatorClassname());
+				boolean isManual = manual == null || manual.contains(v2.getValidatorClassname());
+				if ((v.isBuildValidation() != isBuild) || (v.isManualValidation() != isManual)){
+					V2 copy = v2.copy().asV2Validator();
+					copy.setBuildValidation(isBuild);
+					copy.setManualValidation(isManual);
+					copy.setLevel(Validator.Level.Project);
+					Friend.setMigrated(copy, true);
+					list.add(copy);
+				}
+			}
+		}
+		return list;
+	}
+	
+	
+	/**
+	 * Answer the project preferences from the preference store.
+	 * @return null if the project does not have any specific preferences.
+	 */
+	public ProjectPreferences loadProjectPreferences(IProject project, Map<String, Validator> baseValidators) 
+		throws BackingStoreException {
+		
+		PreferencesWrapper pref = getPreferences(null);
+
+		if (pref == null)return null;
+		int version = pref.getInt(PrefConstants.frameworkVersion, 0);
+		if (version == 0){
+			// This means that we have a project that is before WTP 3.0
+			return migrateFromBeforeWTP30(project, baseValidators);
+		}
+		
+		if (version != ValPrefManagerGlobal.frameworkVersion)ValPrefManagerGlobal.migrate(version, pref);
+
+		if (!pref.nodeExists(PrefConstants.vals)){
+			return new ProjectPreferences(project, pref.getBoolean(PrefConstants.override, ProjectPreferences.DefaultOverride),
+				pref.getBoolean(PrefConstants.suspend, ProjectPreferences.DefaultSuspend), new Validator[0]);
+		}
+		
+		PreferencesWrapper vp = pref.node(PrefConstants.vals);
+		List<Validator> list = new LinkedList<Validator>();
+		for (String id : vp.childrenNames()){
+			Validator base = baseValidators.get(id);
+			Validator v = ValPrefManagerGlobal.loadValidator(id, vp, base);
+			if (v != null){
+				V2 v2 = v.asV2Validator();
+				if (v2 != null)v2.setLevel(Validator.Level.Project);
+				list.add(v);
+			}
+		}
+		Validator[] vals = new Validator[list.size()];
+		list.toArray(vals);
+		return new ProjectPreferences(project, pref.getBoolean(PrefConstants.override, ProjectPreferences.DefaultOverride),
+			pref.getBoolean(PrefConstants.suspend, ProjectPreferences.DefaultSuspend), vals);
+	}
+
+	private PreferencesWrapper getPreferences(Boolean persist) {
+		return PreferencesWrapper.getPreferences(_project, persist);
+	}
+
+	public void savePreferences(ProjectPreferences projectPreferences) {
+		Validator[] validators = projectPreferences.getValidators();
+		PreferencesWrapper pref = getPreferences(null);
+		pref.putBoolean(PrefConstants.suspend, projectPreferences.getSuspend());
+		pref.putBoolean(PrefConstants.override, projectPreferences.getOverride());
+		pref.putInt(PrefConstants.frameworkVersion, ValPrefManagerGlobal.frameworkVersion);
+		PreferencesWrapper vals = pref.node(PrefConstants.vals);
+		try {
+			Validator[] workspaceVals = ValManager.getDefault().getValidators();
+			Map<String, Validator> base = new HashMap<String, Validator>(workspaceVals.length);
+			for (Validator v : workspaceVals)base.put(v.getId(), v);
+			for (Validator v : validators)ValPrefManagerGlobal.save(v, vals, base);
+			pref.flush();
+			ProjectConfiguration pc = ConfigurationManager.getManager()
+				.getProjectConfiguration(projectPreferences.getProject());
+			pc.setEnabledBuildValidators(getEnabledBuildValidators(validators));
+			pc.setEnabledManualValidators(getEnabledManualValidators(validators));
+			pc.passivate();
+			pc.store();
+			updateListeners(_project);
+		}
+		catch (Exception e){
+			ValidationPlugin.getPlugin().handleException(e);
+		}		
+	}
+
+	public void savePreferences(ProjectPreferences projectPreferences, ValidatorMutable[] validators) {
+		PreferencesWrapper pref = getPreferences(null);
+		pref.putBoolean(PrefConstants.suspend, projectPreferences.getSuspend());
+		pref.putBoolean(PrefConstants.override, projectPreferences.getOverride());
+		pref.putInt(PrefConstants.frameworkVersion, ValPrefManagerGlobal.frameworkVersion);
+		try {
+			savePreferences(validators, false, null);
+			pref.flush();
+			updateListeners(_project);
+		}
+		catch (Exception e){
+			ValidationPlugin.getPlugin().handleException(e);
+		}		
+	}
+	
+	public void savePreferences(MutableProjectSettings settings, Boolean persist){
+		IProject project = settings.getProject();
+		PreferencesWrapper pref = PreferencesWrapper.getPreferences(project, persist);
+		pref.putBoolean(PrefConstants.suspend, settings.getSuspend());
+		pref.putBoolean(PrefConstants.override, settings.getOverride());
+		pref.putInt(PrefConstants.frameworkVersion, ValPrefManagerGlobal.frameworkVersion);
+		
+		IMutableValidator[] vms = settings.getValidators();
+		ValidatorMutable[] validators = new ValidatorMutable[vms.length];
+		for (int i=0; i<vms.length;i++)validators[i] = (ValidatorMutable)vms[i];
+		
+		try {
+			savePreferences(validators, false, persist);
+			pref.flush();
+			updateListeners(project);
+		}
+		catch (Exception e){
+			if (project.isAccessible())ValidationPlugin.getPlugin().handleException(e);
+		}
+	}
+	
+	public void savePreferences(ValidatorMutable[] validators, boolean flush, Boolean persist){
+		PreferencesWrapper pref = getPreferences(persist);
+		pref.putInt(PrefConstants.frameworkVersion, ValPrefManagerGlobal.frameworkVersion);
+		PreferencesWrapper vals = pref.node(PrefConstants.vals);
+		try {
+			Validator[] workspaceVals = ValManager.getDefault().getValidators();
+			Map<String, Validator> base = new HashMap<String, Validator>(workspaceVals.length);
+			for (Validator v : workspaceVals)base.put(v.getId(), v);
+			for (ValidatorMutable v : validators)ValPrefManagerGlobal.save(v, vals, base);
+			ProjectConfiguration pc = ConfigurationManager.getManager().getProjectConfiguration(_project);
+			pc.setEnabledBuildValidators(getEnabledBuildValidators(validators));
+			pc.setEnabledManualValidators(getEnabledManualValidators(validators));
+			pc.passivate();
+			pc.store();
+			if (flush){
+				pref.flush();
+				updateListeners(_project);
+			}
+		}
+		catch (Exception e){
+			ValidationPlugin.getPlugin().handleException(e);
+		}		
+		
+	}
+	
+	/**
+	 * Answer all the V1 validators that are enabled for build.
+	 * @return
+	 */
+	private Set<ValidatorMetaData> getEnabledBuildValidators(Validator[] validators) {
+		Set<ValidatorMetaData> set = new HashSet<ValidatorMetaData>(50);
+		for (Validator v : validators){
+			if (v.isBuildValidation()){
+				Validator.V1 v1 = v.asV1Validator();
+				if (v1 != null)set.add(v1.getVmd());
+			}
+		}
+		return set;
+	}
+	
+	/**
+	 * Answer all the V1 validators that are enabled for build.
+	 * @return
+	 */
+	private Set<ValidatorMetaData> getEnabledBuildValidators(ValidatorMutable[] validators) {
+		Set<ValidatorMetaData> set = new HashSet<ValidatorMetaData>(50);
+		for (ValidatorMutable v : validators){
+			if (v.isBuildValidation() && v.isV1Validator())set.add(v.getVmd());
+		}
+		return set;
+	}
+	
+	/**
+	 * Answer all the V1 validators that are enabled for manual validation.
+	 * @return
+	 */
+	private Set<ValidatorMetaData> getEnabledManualValidators(Validator[] validators) {
+		Set<ValidatorMetaData> set = new HashSet<ValidatorMetaData>(50);
+		for (Validator v : validators){
+			if (v.isManualValidation()){
+				Validator.V1 v1 = v.asV1Validator();
+				if (v1 != null)set.add(v1.getVmd());
+			}
+		}
+		return set;
+	}
+	
+	/**
+	 * Answer all the V1 validators that are enabled for manual validation.
+	 * @return
+	 */
+	private Set<ValidatorMetaData> getEnabledManualValidators(ValidatorMutable[] validators) {
+		Set<ValidatorMetaData> set = new HashSet<ValidatorMetaData>(50);
+		for (ValidatorMutable v : validators){
+			if (v.isManualValidation() && v.isV1Validator())set.add(v.getVmd());
+		}
+		return set;
+	}
+	
+	public void loadMessages(Validator validator, Map<String, MessageSeveritySetting> settings) {
+		try {
+			ValPrefManagerGlobal.loadMessageSettings(validator, settings, getPreferences(null));
+		}
+		catch (BackingStoreException e){
+			ValidationPlugin.getPlugin().handleException(e);
+		}		
+	}
+
+}
diff --git a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/ValProperty.java b/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/ValProperty.java
new file mode 100644
index 0000000..fd001dc
--- /dev/null
+++ b/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/ValProperty.java
@@ -0,0 +1,53 @@
+/*******************************************************************************
+ * Copyright (c) 2007, 2008 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.wst.validation.internal;
+
+import java.util.BitSet;
+
+/**
+ * A resource session property, that is used to improve the performance of the validation framework. This is placed
+ * on each resource and it enables the framework to quickly determine if the resource needs to be processed.
+ * @author karasiuk
+ *
+ */
+public class ValProperty {
+/*
+ * I did some performance measurements on the IResource#setSessionProperty() and IResource#getSessionProperty()
+ * methods, and they were very fast. I used a very large workspace (over 17,000) resources, and you could set (or get)
+ * a property on all the resources in under 100ms. 
+ */
+	
+	private int 	_configNumber;
+	private BitSet	_configSet = new BitSet(100);
+	
+	private int		_validationNumber;
+	private BitSet	_validationSet = new BitSet(100);
+	
+	public int getConfigNumber() {
+		return _configNumber;
+	}
+	public void setConfigNumber(int configNumber) {
+		_configNumber = configNumber;
+	}
+	public BitSet getConfigSet() {
+		return _configSet;
+	}
+	public int getValidationNumber() {
+		return _validationNumber;
+	}
+	public void setValidationNumber(int validationNumber) {
+		_validationNumber = validationNumber;
+	}
+	public BitSet getValidationSet() {
+		return _validationSet;
+	}
+	
+}
diff --git a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/ValType.java b/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/ValType.java
new file mode 100644
index 0000000..8a97136
--- /dev/null
+++ b/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/ValType.java
@@ -0,0 +1,24 @@
+/*******************************************************************************
+ * Copyright (c) 2008 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.wst.validation.internal;
+
+/**
+ * Type of validation. Build or Manual?
+ * @author karasiuk
+ *
+ */
+public enum ValType {
+	/** The validation is triggered via a resource change and the build process. */
+	Build, 
+	
+	/** The user manually requested the validation. */
+	Manual,
+}
diff --git a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/ValidationResultSummary.java b/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/ValidationResultSummary.java
new file mode 100644
index 0000000..9e91217
--- /dev/null
+++ b/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/ValidationResultSummary.java
@@ -0,0 +1,42 @@
+/*******************************************************************************
+ * Copyright (c) 2008, 2009 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.wst.validation.internal;
+
+/**
+ * An immutable object that holds a summary of the validation.
+ * @author karasiuk
+ *
+ */
+public final class ValidationResultSummary {
+	
+	private final int 	_error;
+	private final int 	_warning;
+	private final int	_info;
+	
+	public ValidationResultSummary(int error, int warning, int info){
+		_error = error;
+		_warning = warning;
+		_info = info;
+	}
+
+	public int getSeverityError() {
+		return _error;
+	}
+
+	public int getSeverityWarning() {
+		return _warning;
+	}
+
+	public int getSeverityInfo() {
+		return _info;
+	}
+
+}
diff --git a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/ValidationRunner.java b/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/ValidationRunner.java
new file mode 100644
index 0000000..01bf297
--- /dev/null
+++ b/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/ValidationRunner.java
@@ -0,0 +1,151 @@
+/*******************************************************************************
+ * Copyright (c) 2007, 2009 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.wst.validation.internal;
+
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.resources.IResourceDelta;
+import org.eclipse.core.resources.IWorkspace;
+import org.eclipse.core.resources.IWorkspaceRunnable;
+import org.eclipse.core.resources.IncrementalProjectBuilder;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.wst.validation.Validator;
+import org.eclipse.wst.validation.internal.model.IValidatorVisitor;
+
+/**
+ * Run the validators on a selected set of resources.
+ * <p>
+ * This is used to run manual validations (i.e. the user selects the Validate menu item), 
+ * or it is invoked programmatically by a third party through the ValidationFramework API.
+ * It is not used for the build based invocation.
+ * </p> 
+ * @author karasiuk
+ *
+ */
+public final class ValidationRunner implements IWorkspaceRunnable {
+	
+	private Map<IProject, Set<IResource>>		_projects;
+	private	ValType			_valType;
+	private ValOperation	_valOperation;
+	
+	/**
+	 * Validate the selected projects and/or resources.
+	 * 
+	 * @param projects
+	 *            The selected projects. The key is an IProject and the value is
+	 *            the Set of IResources that were selected. Often this will be
+	 *            every resource in the project.
+	 * 
+	 * @param valType
+	 *            The type of validation that has been requested.
+	 * 
+	 * @param monitor
+	 *            Progress monitor.
+	 * 
+	 * @param atomic
+	 *            Run as an atomic workspace operation?
+	 */
+	public static ValOperation validate(Map<IProject, Set<IResource>> projects, ValType valType, 
+		IProgressMonitor monitor, boolean atomic) throws CoreException{
+		ValidationRunner me = new ValidationRunner(projects, valType);
+		if (atomic)ResourcesPlugin.getWorkspace().run(me, null, IWorkspace.AVOID_UPDATE, monitor);
+		else me.execute(monitor);
+		return me._valOperation;
+	}
+	
+	/**
+	 * Validate the selected file. This is a convenience method, it simply calls the more flexible 
+	 * validate with Map method. 
+	 * 
+	 * @param file
+	 *            The file to be validated.
+	 * 
+	 * @param valType
+	 *            The type of validation that has been requested.
+	 * 
+	 * @param monitor
+	 *            Progress monitor.
+	 * 
+	 * @param atomic
+	 *            Run as an atomic workspace operation?
+	 */
+	public static ValOperation validate(IFile file, ValType valType, IProgressMonitor monitor, boolean atomic) throws CoreException{
+	    final Map<IProject, Set<IResource>> map = new HashMap<IProject, Set<IResource>>(1);
+	      
+	    Set<IResource> set = new HashSet<IResource>(1);
+	    set.add(file);
+	    map.put(file.getProject(), set);
+	    return validate(map, valType, monitor, atomic);		
+	}
+	
+	private ValidationRunner(Map<IProject, Set<IResource>> projects, ValType valType){
+		_projects = projects;
+		_valType = valType;
+		
+	}
+	
+	private ValOperation execute(IProgressMonitor monitor){
+		_valOperation = new ValOperation();
+		ValManager manager = ValManager.getDefault();
+		
+		IValidatorVisitor startingVisitor = new IValidatorVisitor(){
+			public void visit(Validator validator, IProject project, ValType valType,
+				ValOperation operation, IProgressMonitor monitor) {
+				validator.validationStarting(project, operation.getState(), monitor);
+			}			
+		};
+		
+		IValidatorVisitor finishedVisitor = new IValidatorVisitor(){
+
+			public void visit(Validator validator, IProject project, ValType valType,
+				ValOperation operation, IProgressMonitor monitor) {
+
+				validator.validationFinishing(project, operation.getState(), monitor);				
+			}			
+		};
+		
+		manager.accept(startingVisitor, null, _valType, _valOperation, monitor);
+				
+		for (Map.Entry<IProject, Set<IResource>> me : _projects.entrySet()){
+			if (monitor.isCanceled()){
+				_valOperation.setCanceled(true);
+				return _valOperation;
+			}
+			IProject project = me.getKey();
+			manager.accept(startingVisitor, project, _valType, _valOperation, monitor);
+			for (IResource resource : me.getValue()){
+				try {
+					manager.validate(project, resource, IResourceDelta.NO_CHANGE, _valType, 
+							IncrementalProjectBuilder.AUTO_BUILD, _valOperation, monitor);
+				}
+				catch (ResourceUnavailableError error){
+					// if the resource is no longer available, we can't validate it, so we should just move on. 
+				}
+			}
+			manager.accept(finishedVisitor, project, _valType, _valOperation, monitor);
+		}
+		manager.accept(finishedVisitor, null, _valType, _valOperation, monitor);
+		return _valOperation;
+	}
+
+	public void run(IProgressMonitor monitor) throws CoreException {
+		execute(monitor);		
+	}
+
+}
diff --git a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/ValidatorExtensionReader.java b/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/ValidatorExtensionReader.java
new file mode 100644
index 0000000..0c78ad5
--- /dev/null
+++ b/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/ValidatorExtensionReader.java
@@ -0,0 +1,396 @@
+/*******************************************************************************
+ * Copyright (c) 2007, 2010 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.wst.validation.internal;
+
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IConfigurationElement;
+import org.eclipse.core.runtime.IContributor;
+import org.eclipse.core.runtime.IExtension;
+import org.eclipse.core.runtime.IExtensionPoint;
+import org.eclipse.core.runtime.IExtensionRegistry;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Platform;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.osgi.util.NLS;
+import org.eclipse.wst.validation.MessageSeveritySetting;
+import org.eclipse.wst.validation.Validator;
+import org.eclipse.wst.validation.Validator.V2;
+import org.eclipse.wst.validation.internal.model.FilterGroup;
+import org.eclipse.wst.validation.internal.model.FilterRule;
+import org.eclipse.wst.validation.internal.plugin.ValidationPlugin;
+
+/**
+ * Process the validator (version 2) extension point.
+ * 
+ * @author karasiuk
+ *
+ */
+public class ValidatorExtensionReader {
+	
+	private static ValidatorExtensionReader _me = new ValidatorExtensionReader();
+	
+	public  static ValidatorExtensionReader getDefault(){
+		return _me;
+	}
+	
+	private ValidatorExtensionReader(){}
+	
+	/**
+	 * Process the v2 extensions, returning all the v2 validators.
+	 */
+	Collection<Validator> process() {
+		Map<String,Validator> map = new HashMap<String, Validator>(100);
+		IExtensionPoint extensionPoint = getExtensionPoint();
+		if (extensionPoint == null)return map.values();
+				
+		for (IExtension ext : extensionPoint.getExtensions()){
+			for (IConfigurationElement validator : ext.getConfigurationElements()){
+				String id = ext.getUniqueIdentifier();
+				if (Tracing.isEnabled(id)){
+					Validator v = processValidator(validator, id, ext.getLabel(), null);
+					if (v != null)map.put(v.getId(),v);
+				}
+			}
+		}
+		
+		extensionPoint = getExtensionPointExclude();
+		if (extensionPoint != null){
+			for (IExtension ext : extensionPoint.getExtensions()){
+				for (IConfigurationElement validator : ext.getConfigurationElements()){
+					String id = validator.getAttribute(ExtensionConstants.Exclude.id);
+					Validator v = map.get(id);
+					V2 v2 = null;
+					if (v != null)v2 = v.asV2Validator();
+
+					if (v2 == null){
+						String msg = NLS.bind("Plug-in configuration error, extension {0} references validator id {1} but this id does not exist.",  //$NON-NLS-1$
+							extensionPoint.getUniqueIdentifier(), id);
+						CoreException ex = new CoreException(new Status(IStatus.ERROR, ValidationPlugin.PLUGIN_ID, msg));
+						ValidationPlugin.getPlugin().handleException(ex);
+					}
+					else {
+						for (IConfigurationElement exclude : validator.getChildren()){
+							FilterGroup fg = null;
+							try {
+								fg = createFilterGroup(exclude);
+							}
+							catch (Exception e){
+								ValidationPlugin.getPlugin().handleException(e);
+								IContributor contrib = validator.getContributor();
+								String message = NLS.bind(ValMessages.ErrConfig, contrib.getName());
+								ValidationPlugin.getPlugin().logMessage(IStatus.ERROR, message);								
+							}
+							if (fg != null && fg.isExclude()){
+								mergeExcludeGroup(v2, fg);
+							}
+						}
+					}					
+				}
+			}
+			
+		}
+		
+		for (String removedValidator : getRemovedValidators()){
+			if (removedValidator != null) {
+				map.remove(removedValidator);
+			}
+		}
+
+		return map.values();
+		
+	}
+	
+	/**
+	 * Merge the rules from the filter group into the current exclude group, creating a current exclude
+	 * group if need be.
+	 * @param v2
+	 * @param fg
+	 */
+	private void mergeExcludeGroup(V2 v2, FilterGroup fg){
+		FilterGroup existing = null;
+		for (FilterGroup group : v2.getGroups()){
+			if (group.isExclude()){
+				existing = group;
+				break;
+			}
+		}
+		if (existing == null)v2.add(fg);
+		else {
+			List<FilterRule> rules = new LinkedList<FilterRule>();
+			for (FilterRule rule : existing.getRules())rules.add(rule);
+			
+			for (FilterRule rule : fg.getRules())rules.add(rule);
+			
+			FilterRule[] filterRules = new FilterRule[rules.size()];
+			rules.toArray(filterRules);
+			FilterGroup merged = FilterGroup.create(existing.isExclude(), filterRules);
+			
+			v2.replaceFilterGroup(existing, merged);
+		}
+	}
+	
+	/**
+	 * Process the validator element in a validator extension.
+	 * 
+	 * @param validator
+	 *            The validator element.
+	 * 
+	 * @param deep
+	 *            If true load all the configuration elements for each
+	 *            validator, if false do a shallow load, where only the
+	 *            validator class, id and name's are loaded.
+	 * 
+	 * @param project
+	 *            The project that you are defined in. This can be null which
+	 *            means that you are a global validator.
+	 * 
+	 * @return a configured validator or null if there was an error.
+	 */
+	private Validator processValidator(IConfigurationElement validator, String id, String label, IProject project) {
+		Validator.V2 v = null;
+		try {
+			v = Validator.create(validator, project).asV2Validator();
+			v.setLevel(Validator.Level.Extension);
+			v.setId(id);
+			v.setName(label);
+			v.setBuildValidation(getAttribute(validator, ExtensionConstants.build, true));
+			v.setManualValidation(getAttribute(validator, ExtensionConstants.manual, true));
+			v.setMarkerId(validator.getAttribute(ExtensionConstants.markerId));
+			v.setVersion(getAttribute(validator, ExtensionConstants.version, 1));
+			v.setSourceId(validator.getAttribute(ExtensionConstants.sourceId));
+			IConfigurationElement[] children = validator.getChildren();
+			for (IConfigurationElement child : children)processIncludeAndExcludeElement(v, child);
+		}
+		catch (Exception e){
+			ValidationPlugin.getPlugin().handleException(e);
+			IContributor contrib = validator.getContributor();
+			String message = NLS.bind(ValMessages.ErrConfig, contrib.getName());
+			ValidationPlugin.getPlugin().logMessage(IStatus.ERROR, message);
+		}
+		return v;
+	}
+	
+	/**
+	 * Answer all the messages that this validator has defined.
+	 * @param v
+	 * @return an empty list if the validator did not define any messages.
+	 */
+	public List<MessageSeveritySetting> addMessages(Validator v){
+		List<MessageSeveritySetting> list = new LinkedList<MessageSeveritySetting>();
+		IExtensionPoint extensionPoint = getExtensionPoint();
+		if (extensionPoint == null)return list;
+		IExtension ext = extensionPoint.getExtension(v.getId());
+		if (ext == null)return list;
+		
+		for (IConfigurationElement elem : ext.getConfigurationElements()){
+			for (IConfigurationElement ce : elem.getChildren(ExtensionConstants.MessageCategory.name)){
+				list.add(processMessage(ce));
+			}
+		}
+
+		return list;
+	}
+
+	/**
+	 * Answer the extension point for the v2 validators.
+	 * 
+	 * @return null if there is a problem or no extensions.
+	 */
+	private IExtensionPoint getExtensionPoint() {
+		IExtensionRegistry registry = Platform.getExtensionRegistry();
+		return registry.getExtensionPoint(ValidationPlugin.PLUGIN_ID, ExtensionConstants.validator);
+	}
+
+	/**
+	 * Answer the extension point for adding exclusion filters. This is where another validator can
+	 * further restrict an existing validator.
+	 * 
+	 * @return null if there is a problem or no extensions.
+	 */
+	private IExtensionPoint getExtensionPointExclude() {
+		IExtensionRegistry registry = Platform.getExtensionRegistry();
+		return registry.getExtensionPoint(ValidationPlugin.PLUGIN_ID, ExtensionConstants.excludeExtension);
+	}
+	
+	/**
+	 * Answer the extension point for removing a validator. 
+	 * 
+	 * @return list of validator ID or null if no validator will be removed
+	 */
+	private List<String> getRemovedValidators(){
+		IExtensionRegistry registry = Platform.getExtensionRegistry();
+		IExtensionPoint extensionPoint = registry.getExtensionPoint(ValidationPlugin.PLUGIN_ID, ExtensionConstants.removedValidatorExtension);
+		List<String> val = new LinkedList<String>();
+		for (IExtension ext : extensionPoint.getExtensions()){
+			for (IConfigurationElement validator : ext.getConfigurationElements()){
+				val.add(validator.getAttribute(ExtensionConstants.RemovedValidator.validatorIDAttr));
+			}
+		}
+		return val;
+	}
+	/**
+	 * Process a message element for the validator, by creating a MessageCategory for it.
+	 * 
+	 * @param ce a MessageCategory element.
+	 */
+	private MessageSeveritySetting processMessage(IConfigurationElement ce) {
+		String s = ce.getAttribute(ExtensionConstants.MessageCategory.severity);
+		MessageSeveritySetting.Severity sev = null;
+		if (ExtensionConstants.MessageCategory.sevError.equals(s))sev = MessageSeveritySetting.Severity.Error;
+		else if (ExtensionConstants.MessageCategory.sevWarning.equals(s))sev = MessageSeveritySetting.Severity.Warning;
+		else if (ExtensionConstants.MessageCategory.sevIgnore.equals(s))sev = MessageSeveritySetting.Severity.Ignore;
+		
+		return new MessageSeveritySetting(ce.getAttribute(ExtensionConstants.MessageCategory.id), 
+			ce.getAttribute(ExtensionConstants.MessageCategory.label), sev);		
+	}
+
+	/** 
+	 * Process the include and exclude elements.
+	 * 
+	 *  @param v The validator that we are building up.
+	 *  @param group The children of the validator tag. This may included include and exclude elements.
+	 *  Other elements are ignored. 
+	 */
+	private void processIncludeAndExcludeElement(Validator.V2 v, IConfigurationElement group) {
+		FilterGroup fg = createFilterGroup(group);
+		if (fg != null)v.add(fg);
+	}
+	
+	/**
+	 * Process an include or exclude element, returning a filter group for it.
+	 * 
+	 * @param group
+	 *            An include, exclude or some other element. Only include and
+	 *            exclude elements are processed, other types are ignored.
+	 *            
+	 * @return a filter group that corresponds to the include or exclude
+	 *         element, or null if the element was not an include or exclude
+	 *         element.
+	 */
+	private FilterGroup createFilterGroup(IConfigurationElement group){
+		String name = group.getName();
+		if (!FilterGroup.isKnownName(name))return null; 
+		
+		
+		IConfigurationElement[] rules = group.getChildren(ExtensionConstants.rules);
+		// there should only be one
+		List<FilterRule> list = new LinkedList<FilterRule>();
+		for (int i=0; i<rules.length; i++){
+			IConfigurationElement[] r = rules[i].getChildren();
+			for(int j=0; j<r.length; j++){
+				list.add(processRule(r[j]));
+			}
+		}
+		FilterRule[] filterRules = new FilterRule[list.size()];
+		list.toArray(filterRules);
+		return FilterGroup.create(name, filterRules);
+	}
+
+	/**
+	 * Process a rule in one of the rule groups.
+	 * 
+	 * @param rule a rule in the group, like fileext.
+	 */
+	private FilterRule processRule(IConfigurationElement rule) {
+		FilterRule fr = FilterRule.create(rule);
+		if (fr == null){
+			String contributor = ""; //$NON-NLS-1$
+			String name = ""; //$NON-NLS-1$
+			try {
+				contributor = rule.getDeclaringExtension().getContributor().getName();
+				name = rule.getName();
+			}
+			catch (Exception e){
+				// eat it
+			}
+			throw new IllegalStateException(NLS.bind(ValMessages.ErrFilterRule, contributor, name));
+		}
+		return fr;
+	}
+	
+	/**
+	 * Determine if any of the validators need to be migrated, and if so answer a new
+	 * Validator array.
+	 * 
+	 * @param validators the existing validators (from the preferences).
+	 *  
+	 * @return null if no validators needed to be migrated.
+	 */
+	Validator[] migrate(Validator[] validators, IProject project) {
+		int count = 0;
+		Map<String, Validator> map = new HashMap<String, Validator>(validators.length);
+		for (Validator v : validators)map.put(v.getId(), v);
+		
+		IExtensionPoint extensionPoint = getExtensionPoint();
+		if (extensionPoint == null)return null;
+				
+		for (IExtension ext : extensionPoint.getExtensions()){
+			for (IConfigurationElement validator : ext.getConfigurationElements()){
+				Validator v = processValidator(validator, ext.getUniqueIdentifier(), ext.getLabel(), project);
+				if (v == null)continue;
+				Validator old = map.get(v.getId());
+				if (old == null || old.getVersion() < v.getVersion()){
+					//TODO we may be replacing user preferences, at some point we may want to do a real migration.
+					map.put(v.getId(), v);
+					count++;
+				}
+			}
+		}
+		
+		if (count > 0){
+			Validator[] vals = new Validator[map.size()];
+			map.values().toArray(vals);
+			return vals;
+		}
+		return null;
+	}
+	
+	private boolean getAttribute(IConfigurationElement element, String name, boolean dft){
+		String v = element.getAttribute(name);
+		if (v == null)return dft;
+		if ("true".equalsIgnoreCase(v))return true; //$NON-NLS-1$
+		if ("false".equalsIgnoreCase(v))return false; //$NON-NLS-1$
+		return dft;
+	}
+	
+	private int getAttribute(IConfigurationElement element, String name, int dft){
+		String v = element.getAttribute(name);
+		if (v == null)return dft;
+		try {
+			return Integer.parseInt(v);
+		}
+		catch (Exception e){
+			// eat it.
+		}
+		return dft;
+	}
+	
+//	/**
+//	 * This method is only used for debugging.
+//	 * @param elem
+//	 */
+//	private static void dump(IConfigurationElement elem){
+//		String name = elem.getName();
+//		String[] attribs = elem.getAttributeNames();
+//		String[] vals = new String[attribs.length];
+//		for (int i=0; i<vals.length; i++)vals[i] = elem.getAttribute(attribs[i]);
+//		String v = elem.getValue();
+//		IConfigurationElement[] children = elem.getChildren();
+//		for (int i=0; i<children.length; i++)dump(children[i]);
+//	}
+}
diff --git a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/ValidatorGroupExtensionReader.java b/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/ValidatorGroupExtensionReader.java
new file mode 100644
index 0000000..62543f7
--- /dev/null
+++ b/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/ValidatorGroupExtensionReader.java
@@ -0,0 +1,140 @@
+/*******************************************************************************
+ * Copyright (c) 2008 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.wst.validation.internal;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IConfigurationElement;
+import org.eclipse.core.runtime.IExtension;
+import org.eclipse.core.runtime.IExtensionPoint;
+import org.eclipse.core.runtime.IExtensionRegistry;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Platform;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.osgi.util.NLS;
+import org.eclipse.wst.validation.IValidatorGroupListener;
+import org.eclipse.wst.validation.internal.plugin.ValidationPlugin;
+
+/**
+ * Process the validator group (for use with validator version 2 only) extension point.
+ * 
+ * @author nitin
+ * 
+ */
+public class ValidatorGroupExtensionReader {
+
+	private static final String DOT = "."; //$NON-NLS-1$
+	private static ValidatorGroupExtensionReader _instance;
+
+	public static ValidatorGroupExtensionReader getDefault() {
+		if (_instance == null)_instance = new ValidatorGroupExtensionReader();
+		return _instance;
+	}
+
+	/**
+	 * Map of group IDs to configuration elements
+	 */
+	private Map<String, List<IConfigurationElement>> _map;
+	
+	/**
+	 * Map of group ID's to resolved configuration elements.
+	 */
+	private Map<String, IValidatorGroupListener[]> _resolved;
+
+	private ValidatorGroupExtensionReader() {
+		init();
+	}
+
+	/**
+	 * Answer the listeners with this group id.
+	 * @param groupID
+	 * @return an empty array there are no listeners for this group id.
+	 */
+	IValidatorGroupListener[] createListeners(String groupID) throws CoreException {
+		IValidatorGroupListener[] result = _resolved.get(groupID);
+		if (result != null)return result;
+				
+		List<IConfigurationElement> elements = _map.get(groupID);
+		if (elements == null){
+			_resolved.put(groupID, new IValidatorGroupListener[0]);
+			String msg = NLS.bind("Configuration error, there is no validation listener group with id: {0}", groupID); //$NON-NLS-1$
+			Status status = new Status(IStatus.ERROR, ValidationPlugin.PLUGIN_ID, msg);
+			throw new CoreException(status);
+		}
+		
+		List<IValidatorGroupListener> listeners = new ArrayList<IValidatorGroupListener>(elements.size());
+		for (IConfigurationElement element : elements) {
+			IValidatorGroupListener listener;
+			try {
+				listener = (IValidatorGroupListener) element.createExecutableExtension(ExtensionConstants.Group.attClass);
+				listeners.add(listener);
+			}
+			catch (Exception e) {
+				ValidationPlugin.getPlugin().handleException(e);
+				listeners = new ArrayList<IValidatorGroupListener>();
+			}
+		}
+
+		result = listeners.toArray(new IValidatorGroupListener[listeners.size()]);
+		_resolved.put(groupID, result);
+		return result;
+	}
+
+	/**
+	 * Answer the extension point for the validatorGroups.
+	 * 
+	 * @return null if there is a problem or no extensions.
+	 */
+	private IExtensionPoint getExtensionPoint() {
+		IExtensionRegistry registry = Platform.getExtensionRegistry();
+		return registry.getExtensionPoint(ValidationPlugin.PLUGIN_ID, ExtensionConstants.group);
+	}
+
+	private void init() {
+		_map = new HashMap<String, List<IConfigurationElement>>(4);
+		_resolved = new HashMap<String, IValidatorGroupListener[]>(4);
+
+		IExtensionPoint extensionPoint = getExtensionPoint();
+		if (extensionPoint != null) {
+			for (IExtension ext : extensionPoint.getExtensions()) {
+				for (IConfigurationElement group : ext.getConfigurationElements()) {
+					processGroupElement(group);
+				}
+			}
+		}
+	}
+
+	private void processGroupElement(IConfigurationElement element) {
+		if (!ExtensionConstants.Group.elementGroup.equals(element.getName()))return;
+		
+		String id = element.getAttribute(ExtensionConstants.Group.attId);
+		if (id == null)throw new IllegalStateException("Configuration error, the " +  //$NON-NLS-1$
+			ExtensionConstants.Group.attId + " is required"); //$NON-NLS-1$
+		// force the use of a qualified ID
+		if (id.indexOf(DOT) < 0) {
+			id = element.getContributor().getName() + DOT + id;
+		}
+		IConfigurationElement[] newElements = element.getChildren(ExtensionConstants.Group.elementListener);
+		if (newElements.length > 0) {
+			List<IConfigurationElement> elements = _map.get(id);
+			if (elements == null) {
+				elements = new ArrayList<IConfigurationElement>();
+				_map.put(id, elements);
+			}
+			elements.addAll(Arrays.asList(newElements));
+		}
+	}
+}
diff --git a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/ValidatorMutable.java b/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/ValidatorMutable.java
new file mode 100644
index 0000000..5ab29c5
--- /dev/null
+++ b/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/ValidatorMutable.java
@@ -0,0 +1,262 @@
+package org.eclipse.wst.validation.internal;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.core.runtime.Platform;
+import org.eclipse.wst.validation.IMutableValidator;
+import org.eclipse.wst.validation.MessageSeveritySetting;
+import org.eclipse.wst.validation.Validator;
+import org.eclipse.wst.validation.Validator.V1;
+import org.eclipse.wst.validation.Validator.V2;
+import org.eclipse.wst.validation.internal.model.FilterGroup;
+
+/**
+ * The mutable fields that a user can change through the preference or property page.
+ * @author karasiuk
+ *
+ */
+public final class ValidatorMutable implements IAdaptable, IMutableValidator {
+	
+	private boolean _build;
+	private boolean	_manual;
+	private String _delegatingId;
+	
+	private int _changeCountGroups;
+	private int _changeCountMessages;
+	
+	private final String	_name;
+	private final String 	_sourceId;
+	private final boolean _isV1;
+	private final boolean _isV2;
+	private final ValidatorMetaData _vmd;
+	private final String _id;
+	private final int	_version;
+
+	private FilterGroup[] _groups;
+	private final Map<String, MessageSeveritySetting> _messageSettings;
+	private final String _validatorClassname;
+	
+	private final boolean 	_origBuild;
+	private final boolean 	_origManual;
+	private final String	_origDelegating;
+
+	public ValidatorMutable(Validator validator) {
+		_name = validator.getName();
+		_sourceId = validator.getSourceId();
+		_manual = validator.isManualValidation();
+		_build = validator.isBuildValidation();
+		V2 v2 = validator.asV2Validator();
+		_isV2 = v2 != null;
+		_delegatingId = validator.getDelegatingId();
+		
+		V1 v1 = validator.asV1Validator();
+		_isV1 = v1 != null;
+		_vmd = _isV1 ? v1.getVmd() : null;
+		_id = validator.getId();
+		
+		_origBuild = _build;
+		_origDelegating = _delegatingId;
+		_origManual = _manual;
+		_version = validator.getVersion();
+		_validatorClassname = validator.getValidatorClassname();
+		_messageSettings = new HashMap<String, MessageSeveritySetting>(10); 
+		for (Map.Entry<String, MessageSeveritySetting> me : validator.getMessageSettings().entrySet()){
+			_messageSettings.put(me.getKey(), me.getValue().copy());
+		}
+		
+		if (v2 != null){
+			FilterGroup[] groups = v2.getGroups();
+			_groups = new FilterGroup[groups.length];
+			System.arraycopy(groups, 0, _groups, 0, groups.length);
+		}
+	}
+
+	public ValidatorMutable(ValidatorMutable val) {
+		_build = val._build;
+		_delegatingId = val._delegatingId;
+		FilterGroup[] groups = val.getGroups();
+		_groups = new FilterGroup[groups.length];
+		System.arraycopy(groups, 0, _groups, 0, groups.length);
+		
+		_id = val._id;
+		_isV1 = val._isV1;
+		_isV2 = val._isV2;
+		_manual = val._manual;
+		_messageSettings = new HashMap<String, MessageSeveritySetting>(10); 
+		for (Map.Entry<String, MessageSeveritySetting> me : val.getMessageSettings().entrySet()){
+			_messageSettings.put(me.getKey(), me.getValue().copy());
+		}
+
+		_name = val._name;
+		_origBuild = val._origBuild;
+		_origDelegating = val._origDelegating;
+		_origManual = val._origManual;
+		_sourceId = val._sourceId;
+		_validatorClassname = val._validatorClassname;
+		_version = val._version;
+		_vmd = val._vmd;
+	}
+
+	public void setBuildValidation(boolean build) {
+		_build = build;		
+	}
+
+	public void setManualValidation(boolean manual) {
+		_manual = manual;
+	}
+
+	public String getName() {
+		return _name;
+	}
+
+	public boolean isManualValidation() {
+		return _manual;
+	}
+
+	public boolean isBuildValidation() {
+		return _build;
+	}
+
+	public boolean isV2Validator() {
+		return _isV2;
+	}
+
+	public String getDelegatingId() {
+		return _delegatingId;
+	}
+
+	/**
+	 * The caller of this method must not change the ValidatorMetaData.
+	 */
+	public ValidatorMetaData getVmd() {
+		return _vmd;
+	}
+
+	public boolean isV1Validator() {
+		return _isV1;
+	}
+
+	public String getId() {
+		return _id;
+	}
+
+	/**
+	 * Answer true if any of your settings have changed.
+	 */
+	public boolean isChanged() {
+		if (hasGlobalChanges())return true;
+		if (_changeCountGroups > 0 || _changeCountMessages > 0)return true;
+		return false;
+	}
+
+	public boolean hasGlobalChanges() {
+		if (_origBuild != _build)return true;
+		if (_origManual != _manual)return true;
+		if (!Misc.same(_origDelegating, _delegatingId))return true;
+		return false;
+	}
+
+	public int getVersion() {
+		return _version;
+	}
+
+	public void replaceFilterGroup(FilterGroup existing, FilterGroup merged) {
+		int i = find(existing);
+		if (i == -1)add(merged);  // this should never happen
+		else {
+			_groups[i] = merged;
+			bumpChangeCountGroups();
+		}
+	}
+	
+	public void remove(FilterGroup group) {
+		int i = find(group);
+		if (i == -1)return;
+		
+		FilterGroup[] groups = new FilterGroup[_groups.length-1];
+		if (i > 0)System.arraycopy(_groups, 0, groups, 0, i);
+		if (i < groups.length)System.arraycopy(_groups, i+1, groups, i, groups.length-i);
+		_groups = groups;
+		bumpChangeCountGroups();
+	}
+	
+	private int find(FilterGroup group) {
+		for (int i=0; i<_groups.length; i++)if (group == _groups[i])return i;
+		return -1;
+	}
+
+	public void add(FilterGroup fg) {
+		assert fg != null;
+		FilterGroup[] groups = new FilterGroup[_groups.length+1];
+		System.arraycopy(_groups, 0, groups, 0, _groups.length);
+		groups[_groups.length] = fg;
+		_groups = groups;
+		bumpChangeCountGroups();
+	}
+	
+	private void bumpChangeCountGroups(){
+		_changeCountGroups++;
+	}
+
+	public int getChangeCountGroups() {
+		return _changeCountGroups;
+	}
+	
+	public FilterGroup[] getGroups(){
+		return _groups;
+	}
+
+	public void setDelegatingId(String id) {
+		_delegatingId = id;	
+	}
+
+	public Map<String, MessageSeveritySetting> getMessageSettings() {
+		return _messageSettings;
+	}
+
+	public int getChangeCountMessages(){
+		return _changeCountMessages;
+	}
+	
+	public void bumpChangeCountMessages(){
+		_changeCountMessages++;
+	}
+
+	public String getValidatorClassname() {
+		return _validatorClassname;
+	}
+
+	@SuppressWarnings("unchecked")
+	public Object getAdapter(Class adapter) {
+		return Platform.getAdapterManager().getAdapter(this, adapter);
+	}
+
+	public boolean sameConfig(Validator validator) {
+		if (validator == null)return false;
+		return hashCodeForConfig() == validator.hashCodeForConfig();
+	}
+
+	private int hashCodeForConfig() {
+		int h = 0;
+		if (_build)h += 101;
+		if (_delegatingId != null)h += _delegatingId.hashCode();
+		if (_manual)h += 201;
+		if (_messageSettings != null){
+			for (MessageSeveritySetting ms : _messageSettings.values())h += ms.hashCode();
+		}
+		if (_sourceId != null)h += _sourceId.hashCode();
+		h += _version;
+		if (_id != null)h += _id.hashCode();
+		for (FilterGroup fg : _groups)h += fg.hashCodeForConfig();
+		return h;
+	}
+
+	@Override
+	public String toString() {
+		return _name;
+	}
+
+
+}
diff --git a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/model/FilterGroup.java b/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/model/FilterGroup.java
new file mode 100644
index 0000000..6d20dd5
--- /dev/null
+++ b/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/model/FilterGroup.java
@@ -0,0 +1,253 @@
+/*******************************************************************************
+ * Copyright (c) 2005, 2009 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.wst.validation.internal.model;
+
+import java.util.LinkedList;
+import java.util.List;
+
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.core.runtime.Platform;
+import org.eclipse.wst.validation.internal.ContentTypeWrapper;
+import org.eclipse.wst.validation.internal.Deserializer;
+import org.eclipse.wst.validation.internal.ExtensionConstants;
+import org.eclipse.wst.validation.internal.Serializer;
+import org.eclipse.wst.validation.internal.ValMessages;
+
+/**
+ * An immutable group of filter rules.
+ * @author karasiuk
+ *
+ */
+public abstract class FilterGroup implements IAdaptable {
+	
+	private final FilterRule[] _rules;
+	
+	/** The version number of the serialization (in case we ever need to change this) */
+	private static final int SerializationVersion = 1;
+
+	/**
+	 * Answer a filter group based on the type of the group.
+	 * 
+	 * @param name either "include" or "exclude"
+	 * 
+	 * @return null if the name parameter isn't correct.
+	 */
+	public static FilterGroup create(String name, FilterRule[] rules) {
+		if (ExtensionConstants.include.equals(name))return new FilterIncludeGroup(rules);
+		if (ExtensionConstants.exclude.equals(name))return new FilterExcludeGroup(rules);
+		return null;
+	}
+	
+	/**
+	 * Answer a filter group from a deserializer.
+	 * @param des
+	 * 
+	 * @see FilterGroup#save(Serializer)
+	 */
+	public static FilterGroup create(Deserializer des){
+		des.getInt(); // get the version
+		String type = des.getString();
+		
+		int numberRules = des.getInt();
+		List<FilterRule> list = new LinkedList<FilterRule>();
+		for (int i=0; i<numberRules; i++)list.add(FilterRule.create(des));
+		FilterRule[] rules = new FilterRule[list.size()];
+		list.toArray(rules);
+
+		return create(type, rules);
+	}
+
+	/**
+	 * Answer a new filter group.
+	 * 
+	 * @param exclude if true an exclusion group is returned, otherwise an inclusion group is returned.
+	 */
+	public static FilterGroup create(boolean exclude, FilterRule[] rules){
+		if (exclude) return new FilterExcludeGroup(rules);
+		return new FilterIncludeGroup(rules);
+	}
+
+	/**
+	 * Answer true if this is a supported type of group.
+	 * @param name Type of group that is being tested.
+	 * @return
+	 */
+	public static boolean isKnownName(String name) {
+		if (ExtensionConstants.include.equals(name))return true;
+		if (ExtensionConstants.exclude.equals(name))return true;
+		return false;
+	}
+
+	
+	private FilterGroup(FilterRule[] rules){
+		_rules = rules;
+	}
+		
+	/**
+	 * The rules in the group.
+	 */
+	public final FilterRule[] getRules(){
+		FilterRule[] rules = new FilterRule[_rules.length];
+		System.arraycopy(_rules, 0, rules, 0, _rules.length);
+		return rules;
+	}
+		
+	/**
+	 * Answer the internal type of group, e.g. "include" or "exclude".
+	 */
+	public abstract String getType();
+	
+	/** Answer the type as a type that can be displayed to a user, that is it has been localized. */
+	public abstract String getDisplayableType();
+	
+	@SuppressWarnings("unchecked")
+	public Object getAdapter(Class adapter) {
+		return Platform.getAdapterManager().getAdapter(this, adapter);
+	}
+	
+	public static final class FilterIncludeGroup extends FilterGroup {
+		
+		private FilterIncludeGroup(FilterRule[] rules){
+			super(rules);
+		}
+
+		public String getType() {
+			return ExtensionConstants.include;
+		}
+		
+		public String getDisplayableType() {
+			return ValMessages.GroupInclude;
+		}
+		
+		public boolean isInclude() {
+			return true;
+		}
+		
+	}
+	
+	
+	public static final class FilterExcludeGroup extends FilterGroup {
+		
+		private FilterExcludeGroup(FilterRule[] rules){
+			super(rules);
+		}
+		public String getType() {
+			return ExtensionConstants.exclude;
+		}
+		
+		public String getDisplayableType() {
+			return ValMessages.GroupExclude;
+		}
+		
+		public boolean isExclude() {
+			return true;
+		}		
+	}
+		
+	/**
+	 * Save your settings into the serializer.
+	 * @param ser
+	 */
+	public void save(Serializer ser){
+		ser.put(SerializationVersion);
+		ser.put(getType());
+		ser.put(_rules.length);
+		for (FilterRule rule : _rules)rule.save(ser);		
+	}
+
+	/**
+	 * Answer whether or not we should validate the resource based on the filters in this group.
+	 * 
+	 * @param project the project that is being validated.
+	 * @param resource the resource that is being validated. This can be null, in which case
+	 * only the project level checks are performed.
+	 */
+	public boolean shouldValidate(IProject project, IResource resource, ContentTypeWrapper contentTypeWrapper) {
+		boolean exclude = isExclude();
+		boolean include = isInclude();
+		int count = 0;
+		for (FilterRule rule : _rules){
+			if (resource != null){
+				Boolean match = rule.matchesResource(resource, contentTypeWrapper);
+				if (match != null)count++;
+				if (exclude && match != null && match)return false;
+				if (include && match != null && match)return true;
+			}
+			
+			Boolean match = rule.matchesProject(project);
+			if (match != null)count++;
+			if (exclude && match != null && match)return false;
+			if (include && match != null && match)return true;
+		}
+		if (exclude)return true;
+		if (count == 0)return true;
+		return false;
+	}
+
+	/** 
+	 * Answer true if this is an inclusion filter, that is at least one of the rules must
+	 * match in order to validate the resource.
+	 */
+	public boolean isInclude() {
+		return false;
+	}
+
+	/**
+	 * Answer true if this is an exclusion filter, that is if any of the rules match the 
+	 * resource is not validated.
+	 */
+	public boolean isExclude() {
+		return false;
+	}
+	
+	public int hashCodeForConfig() {
+		int h = 0;
+		if (isExclude())h += 13;
+		for (FilterRule fr : _rules)h += fr.hashCodeForConfig();
+		return h;
+	}
+
+	/**
+	 * Create a new group by adding a rule to an existing group.
+	 * @param baseGroup The group that holds the existing rules.
+	 * @param rule The new rule that is being added
+	 * @return
+	 */
+	public static FilterGroup addRule(FilterGroup baseGroup, FilterRule rule) {
+		List<FilterRule> list = new LinkedList<FilterRule>();
+		for (FilterRule r : baseGroup._rules)list.add(r);
+		list.add(rule);
+		
+		FilterRule[] rules = new FilterRule[list.size()];
+		list.toArray(rules);
+		return FilterGroup.create(baseGroup.isExclude(), rules);
+	}
+
+	/**
+	 * Create a new group by removing a rule from an existing group.
+	 * @param baseGroup The group that holds the existing rules.
+	 * @param rule The rule that is being removed
+	 * @return
+	 */
+	public static FilterGroup removeRule(FilterGroup baseGroup,	FilterRule rule) {
+		List<FilterRule> list = new LinkedList<FilterRule>();
+		for (FilterRule r : baseGroup._rules){
+			if (!r.equals(rule))list.add(r);
+		}
+		
+		FilterRule[] rules = new FilterRule[list.size()];
+		list.toArray(rules);
+		return FilterGroup.create(baseGroup.isExclude(), rules);
+	}	
+
+}
diff --git a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/model/FilterRule.java b/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/model/FilterRule.java
new file mode 100644
index 0000000..12c8d0c
--- /dev/null
+++ b/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/model/FilterRule.java
@@ -0,0 +1,635 @@
+/*******************************************************************************
+ * Copyright (c) 2007, 2011 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.wst.validation.internal.model;
+
+import java.util.regex.Pattern;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IProjectNatureDescriptor;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.core.runtime.IConfigurationElement;
+import org.eclipse.core.runtime.Platform;
+import org.eclipse.core.runtime.content.IContentType;
+import org.eclipse.osgi.util.NLS;
+import org.eclipse.wst.common.project.facet.core.FacetedProjectFramework;
+import org.eclipse.wst.common.project.facet.core.IProjectFacet;
+import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
+import org.eclipse.wst.validation.internal.ContentTypeWrapper;
+import org.eclipse.wst.validation.internal.Deserializer;
+import org.eclipse.wst.validation.internal.ExtensionConstants;
+import org.eclipse.wst.validation.internal.Serializer;
+import org.eclipse.wst.validation.internal.Tracing;
+import org.eclipse.wst.validation.internal.ValMessages;
+import org.eclipse.wst.validation.internal.plugin.ValidationPlugin;
+
+/**
+ * A rule that is used to filter out (or in) validation on a resource.
+ * The concrete classes are all immutable.
+ * @author karasiuk
+ *
+ */
+public abstract class FilterRule implements IAdaptable {
+	
+	protected final String _pattern;
+	
+	protected static final String PortableFileDelim = "/"; //$NON-NLS-1$
+	
+	/**
+	 * Create a rule based on a configuration element.
+	 * 
+	 * @param rule
+	 *            The configuration element, see the extension point for details.
+	 * @return null if there is a problem.
+	 */
+	public static FilterRule create(IConfigurationElement rule){
+		String name = rule.getName();
+		if (ExtensionConstants.Rule.fileext.equals(name))return new FileExt(rule);
+		if (ExtensionConstants.Rule.projectNature.equals(name))return new ProjectNature(rule);
+		if (ExtensionConstants.Rule.file.equals(name))return File.createFile(rule);
+		if (ExtensionConstants.Rule.contentType.equals(name))return ContentType.createContentType(rule);
+		if (ExtensionConstants.Rule.facet.equals(name))return new Facet(rule);
+		if (ExtensionConstants.Rule.pattern.equals(name))return FilePattern.createFilePattern(rule);
+		if (ExtensionConstants.Rule.targetRuntime.equals(name))return new TargetRuntime(rule);
+		return null;
+	}
+	
+	static FilterRule create(Deserializer des) {
+		String type = des.getString();
+		if (ExtensionConstants.Rule.fileext.equals(type)){
+			String pattern = des.getString();
+			boolean caseSensitive = des.getBoolean();
+			return new FileExt(pattern, caseSensitive);
+		}
+		
+		if (ExtensionConstants.Rule.projectNature.equals(type)){
+			String pattern = des.getString();
+			return new ProjectNature(pattern);
+		}
+		
+		if (ExtensionConstants.Rule.file.equals(type)){
+			String pattern = des.getString();
+			boolean caseSensitive = des.getBoolean();
+			int fileType = des.getInt();
+			return new File(pattern, caseSensitive, fileType);
+		}
+		
+		if (ExtensionConstants.Rule.contentType.equals(type)){
+			String pattern = des.getString();
+			boolean exactMatch = des.getBoolean();
+			return new ContentType(pattern, exactMatch);
+		}
+		
+		if (ExtensionConstants.Rule.facet.equals(type)){
+			String pattern = des.getString();
+			return new Facet(pattern, null);
+		}
+		
+		if (ExtensionConstants.Rule.targetRuntime.equals(type)){
+			String pattern = des.getString();
+			return new TargetRuntime(pattern);
+		}
+		
+		if (ExtensionConstants.Rule.pattern.equals(type)){
+			String pattern = des.getString();
+			boolean caseSensitive = des.getBoolean();
+			return new FilePattern(pattern, caseSensitive);
+		}
+		return null;
+	}
+
+	
+	public static FilterRule createFile(String pattern, boolean caseSensitive, int type){
+		return new File(pattern, caseSensitive, type);
+	}
+	
+	public static FilterRule createFileExt(String pattern, boolean caseSensitive){
+		FileExt ext = new FileExt(pattern, caseSensitive);
+		return ext;
+	}
+	
+	public static FilterRule createFacet(String facetId){
+		return new Facet(facetId, null);
+	}
+	
+	public static FilterRule createProject(String projectNature){
+		return new ProjectNature(projectNature);
+	}
+	
+	public static FilterRule createContentType(String contentType, boolean exactMatch){
+		return new ContentType(contentType, exactMatch);
+	}
+	
+	public static FilterRule createTargetRuntime(String targetRuntime){
+		return new TargetRuntime(targetRuntime);
+	}
+		
+	protected FilterRule(String pattern){
+		_pattern = pattern;
+	}
+
+	/** 
+	 * Answer true if the rule matches the resource, false if it doesn't, and
+	 * null if the rule does not apply to resources.
+	 * 
+	 * 	@param resource the resource that is being validated.
+	 */
+	public Boolean matchesResource(IResource resource, ContentTypeWrapper contentTypeWrapper){
+		return null;
+	}
+
+	/** 
+	 * Answer true if the rule matches the project, false if it doesn't, and null if the
+	 * rule does not apply.
+	 * 
+	 * 	@param project the project that is being validated.
+	 */
+	public Boolean matchesProject(IProject project){
+		return null;
+	}
+		
+	public String toString() {
+		return getDisplayableType() + ": " + _pattern; //$NON-NLS-1$
+	}
+	
+	/** Answer a name of the rule, that can be displayed to a user. */
+	public String getName(){
+		return toString();
+	}
+	
+	public String getPattern(){
+		return _pattern;
+	}
+	
+	/** Answer the type of rule. */
+	public abstract String getType();
+	
+	/** Answer a type that can be displayed to an end user. */
+	public abstract String getDisplayableType();
+	
+	public static boolean asBoolean(String value, boolean aDefault){
+		if (value == null)return aDefault;
+		if (value.equals(ExtensionConstants.True))return true;
+		if (value.equals(ExtensionConstants.False))return false;
+		return aDefault;
+	}
+	
+	@SuppressWarnings("unchecked")
+	public Object getAdapter(Class adapter) {
+		return Platform.getAdapterManager().getAdapter(this, adapter);
+	}
+	
+	public static abstract class FilterRuleCaseSensitive extends FilterRule {
+				
+		public FilterRuleCaseSensitive(String pattern, boolean caseSensitive) {
+			super(pattern);
+			_caseSensitive = caseSensitive;
+		}
+		
+		private final boolean _caseSensitive;
+				
+		@Override
+		public int hashCodeForConfig() {
+			int h =  super.hashCodeForConfig();
+			if (_caseSensitive)h += 401;
+			return h;
+		}
+				
+		@Override
+		public void save(Serializer ser) {
+			super.save(ser);
+			ser.put(_caseSensitive);
+		}
+						
+		public boolean isCaseSensitive() {
+			return _caseSensitive;
+		}
+				
+	}
+	
+	public static final class ProjectNature extends FilterRule {
+		
+		private String patternLabel = null;
+		
+		private ProjectNature(IConfigurationElement rule) {
+			super(rule.getAttribute(ExtensionConstants.RuleAttrib.id));
+			
+		}
+		
+		public ProjectNature(String projectNature) {
+			super(projectNature);
+			
+			IProjectNatureDescriptor nature = ResourcesPlugin.getWorkspace().getNatureDescriptor(projectNature);
+			
+			if(nature != null){
+				patternLabel = nature.getLabel();
+			}
+		}
+
+		public String getDisplayableType() {
+			return ValMessages.RuleProjectNature;
+		}
+		
+		public String getType() {
+			return ExtensionConstants.Rule.projectNature;
+		}
+		
+		public Boolean matchesProject(IProject project) {
+			try {
+				return project.hasNature(_pattern);
+			}
+			catch (CoreException e){
+			}
+			return Boolean.FALSE;
+		}
+		
+		public String toString()
+		{
+			if(patternLabel != null && patternLabel.length() > 0){
+				return getDisplayableType() + ": " + patternLabel.concat(" - ").concat(_pattern); //$NON-NLS-1$ //$NON-NLS-2$
+			}
+
+			return getDisplayableType() + ": " + _pattern; //$NON-NLS-1$
+		}		
+	}
+	
+	public static final class FileExt extends FilterRuleCaseSensitive {
+		
+		private FileExt(IConfigurationElement rule){
+			super(rule.getAttribute(ExtensionConstants.RuleAttrib.ext), 
+				asBoolean(rule.getAttribute(ExtensionConstants.RuleAttrib.caseSensitive), false));
+		}
+				
+		private FileExt(String pattern, boolean caseSensitive) {
+			super(pattern, caseSensitive);
+		}
+
+		public String getType() {
+			return ExtensionConstants.Rule.fileext;
+		}
+		
+		public String getDisplayableType() {
+			return ValMessages.RuleFileExt;
+		}
+		
+		public String getName() {
+			return toString();
+		}
+		
+		public String toString() {
+			if (isCaseSensitive())return NLS.bind(ValMessages.FileExtWithCase, getDisplayableType(), _pattern);
+			return NLS.bind(ValMessages.FileExtWithoutCase, getDisplayableType(), _pattern);
+		}
+
+		public Boolean matchesResource(IResource resource, ContentTypeWrapper contentTypeWrapper) {
+			String ext = resource.getFileExtension();
+			if (isCaseSensitive())return _pattern.equals(ext);
+			return _pattern.equalsIgnoreCase(ext);
+		}
+	}
+	
+	/**
+	 * A rule that is used to filter based on file or folder names.
+	 * @author karasiuk
+	 *
+	 */
+	public static final class File extends FilterRuleCaseSensitive {
+		
+		private final String	_patternAsLowercase;
+		
+		/** One of the FileTypeXX constants. */
+		private final int		_type;
+		
+		public static final int FileTypeFile = 1;
+		public static final int FileTypeFolder = 2;
+		public static final int FileTypeFull = 3;
+		
+		private static File createFile(IConfigurationElement rule){
+			String pattern = rule.getAttribute(ExtensionConstants.RuleAttrib.name);
+			if (pattern == null)throw new IllegalStateException(ValMessages.ErrPatternAttrib);
+			String type = rule.getAttribute(ExtensionConstants.RuleAttrib.fileType);
+			if (type == null)throw new IllegalStateException(ValMessages.ErrTypeReq);
+			
+			int myType = -1;
+			if (ExtensionConstants.FileType.file.equals(type))myType = FileTypeFile;
+			else if (ExtensionConstants.FileType.folder.equals(type)){
+				myType = FileTypeFolder;
+				if (!pattern.endsWith(PortableFileDelim))pattern += PortableFileDelim;
+			}
+			else if (ExtensionConstants.FileType.full.equals(type))myType = FileTypeFull;
+			else {
+				Object[] parms = {type, ExtensionConstants.FileType.file, ExtensionConstants.FileType.folder, 
+					ExtensionConstants.FileType.full};
+				throw new IllegalStateException(NLS.bind(ValMessages.ErrType, parms));
+			}
+			boolean caseSensitive = asBoolean(rule.getAttribute(ExtensionConstants.RuleAttrib.caseSensitive), false);
+			return new File(pattern, caseSensitive, myType);
+		}
+		
+		private  File(String pattern, boolean caseSensitive, int type){			
+			super(pattern, caseSensitive);
+			_type = type;
+			_patternAsLowercase = pattern == null ? null : pattern.toLowerCase();
+		}
+				
+		public String getType() {
+			return ExtensionConstants.Rule.file;
+		}
+		
+		public String getDisplayableType() {
+			if (_type == FileTypeFolder)return ValMessages.RuleFolder;
+			if (_type == FileTypeFull)return ValMessages.RuleFull;
+			return ValMessages.RuleFile;
+		}
+		
+		public void setData(IConfigurationElement rule) {
+		}
+		
+		public String toString() {
+			if (isCaseSensitive())return NLS.bind(ValMessages.FileExtWithCase, getDisplayableType(), _pattern);
+			return NLS.bind(ValMessages.FileExtWithoutCase, getDisplayableType(), _pattern);
+		}
+		
+		public Boolean matchesResource(IResource resource, ContentTypeWrapper contentTypeWrapper) {
+			String name = null;
+			switch (_type){
+			case FileTypeFile:
+				name = resource.getName();
+				break;
+				
+			case FileTypeFolder:
+				name = resource.getProjectRelativePath().removeLastSegments(1).toString() + PortableFileDelim;
+				break;
+				
+			case FileTypeFull:
+				name = resource.getProjectRelativePath().toPortableString();
+				break;
+			}
+			
+			if (name == null)return Boolean.FALSE;
+			if (isCaseSensitive())return name.startsWith(_pattern);
+			return name.toLowerCase().startsWith(_patternAsLowercase);
+		}
+								
+		@Override
+		public void save(Serializer ser) {
+			super.save(ser);
+			ser.put(_type);
+		}
+		
+	}
+	
+	public static final class Facet extends FilterRule {
+		
+		private final String _versionExpression;
+		private String _facetLabel = null;
+		
+		private Facet(IConfigurationElement rule){
+			super(rule.getAttribute(ExtensionConstants.RuleAttrib.id));
+			_versionExpression = rule.getAttribute(ExtensionConstants.RuleAttrib.version);
+			
+		}
+				
+		public Facet(String facetId, String versionExpression) {
+			super(facetId);
+			_versionExpression = versionExpression;
+			
+			try
+			{
+				IProjectFacet facet = ProjectFacetsManager.getProjectFacet(facetId);
+				if(facet != null){
+					_facetLabel = facet.getLabel();
+				}
+			} catch(IllegalArgumentException ex) {
+				//do nothing
+			}
+		}
+
+		public String getType() {
+			return ExtensionConstants.Rule.facet;
+		}
+		
+		public String getDisplayableType() {
+			return ValMessages.RuleFacet;
+		}
+		
+		@Override
+		public Boolean matchesProject(IProject project) {
+			try {
+				if (_versionExpression == null)return FacetedProjectFramework.hasProjectFacet(project, _pattern);
+				return FacetedProjectFramework.hasProjectFacet(project, _pattern, _versionExpression);
+			}
+			catch (CoreException e){
+				if (Tracing.isLogging())ValidationPlugin.getPlugin().handleException(e);
+			}
+			return Boolean.FALSE;
+		}
+		
+		@Override
+		public String toString() {
+			String facetLabel = _facetLabel;
+			StringBuffer b = new StringBuffer(200);
+			b.append(getDisplayableType());
+			b.append(": "); //$NON-NLS-1$
+			
+			//Dispay facet Labels when selecting Settings
+			if(_facetLabel == null){
+				try
+				{
+					IProjectFacet facet = ProjectFacetsManager.getProjectFacet(_pattern);
+					facetLabel = facet.getLabel();		
+				} catch(IllegalArgumentException ex) {
+					//do nothing
+				}				
+			}
+			
+			if(facetLabel != null && facetLabel.length() > 0){
+				b.append(facetLabel);
+				b.append(" - "); //$NON-NLS-1$
+			}
+			
+			b.append(_pattern);
+			
+			if (_versionExpression !=  null){
+				b.append(" ("); //$NON-NLS-1$
+				b.append(_versionExpression);
+				b.append(")"); //$NON-NLS-1$
+			}
+			return b.toString();
+		}
+	}
+	
+	public static final class ContentType extends FilterRule {
+		
+		private final IContentType 	_type;
+		private final boolean		_exactMatch;
+		
+		private ContentType(String pattern, boolean exactMatch){
+			super(pattern);
+			_type = Platform.getContentTypeManager().getContentType(pattern);
+			_exactMatch = exactMatch;
+		}
+		
+		private static ContentType createContentType(IConfigurationElement rule){
+			String pattern = rule.getAttribute(ExtensionConstants.RuleAttrib.id);
+			boolean exactMatch = true;
+			String exact = rule.getAttribute(ExtensionConstants.RuleAttrib.exactMatch);
+			if (ExtensionConstants.False.equals(exact)) exactMatch = false;
+			
+			return new ContentType(pattern, exactMatch);
+		}
+				
+		public String getType() {
+			return ExtensionConstants.Rule.contentType;
+		}
+		
+		@Override
+		public int hashCodeForConfig() {
+			int h =  super.hashCodeForConfig();
+			if (_exactMatch)h += 301;
+			return h;
+		}
+		
+		public String getDisplayableType() {
+			return ValMessages.RuleContentType;
+		}
+								
+		@Override
+		public void save(Serializer ser) {
+			super.save(ser);
+			ser.put(_exactMatch);
+		}
+
+		public void setData(IConfigurationElement rule) {
+		}
+				
+		public Boolean matchesResource(IResource resource, ContentTypeWrapper contentTypeWrapper) {
+			if (_type == null)return Boolean.FALSE;
+			if (resource instanceof IFile) {
+				IFile file = (IFile) resource;
+				IContentType ct = contentTypeWrapper.getContentType(file);
+				if (ct == null)return Boolean.FALSE;
+				boolean match = false;
+				if (_exactMatch)match = ct.getId().equals(_type.getId());
+				else match = ct.isKindOf(_type);
+				
+				if (match && Tracing.isTraceMatches())
+					Tracing.log("FilterRule-01: ", toString() + " has matched " + resource); //$NON-NLS-1$ //$NON-NLS-2$
+				return match;
+			}
+			return Boolean.FALSE;
+		}
+		
+		@Override
+		public String toString() {
+			try {
+				if (_exactMatch)return NLS.bind(ValMessages.ContentTypeExact, getDisplayableType(), _type.getName().concat(" - ").concat(_pattern)); //$NON-NLS-1$
+					return NLS.bind(ValMessages.ContentTypeNotExact, getDisplayableType(), _type.getName().concat(" - ").concat(_pattern)); //$NON-NLS-1$
+			}catch(NullPointerException npe) {
+				if (_exactMatch)return NLS.bind(ValMessages.ContentTypeExact, getDisplayableType(), _pattern);
+					return NLS.bind(ValMessages.ContentTypeNotExact, getDisplayableType(), _pattern);
+			}
+		}
+	}
+	
+	public static final class TargetRuntime extends FilterRule {
+		
+		private String patternLabel = null;
+		
+		private TargetRuntime(IConfigurationElement rule) {
+			super(rule.getAttribute(ExtensionConstants.RuleAttrib.id));
+		}
+	
+		public TargetRuntime(String targetRuntime) {
+			super(targetRuntime);
+			
+			String runtime = ValidatorHelper.getRuntimeName(targetRuntime);
+			
+			if(runtime != null){
+				patternLabel = runtime;
+			}
+		}
+		
+		public String getType() {
+			return ExtensionConstants.Rule.targetRuntime;
+		}
+		
+		public String getDisplayableType() {
+			return ValMessages.RuleTargetRuntime;
+		}
+		
+		@Override
+		public String toString() {
+			if(patternLabel == null){
+				patternLabel = ValidatorHelper.getRuntimeName(_pattern);
+			}
+
+			if(patternLabel != null && patternLabel.length() > 0){
+				return getDisplayableType() + ": " + patternLabel.concat(" - ").concat(_pattern); //$NON-NLS-1$ //$NON-NLS-2$
+			}
+
+			return getDisplayableType() + ": " + _pattern; //$NON-NLS-1$
+		}
+	}
+	
+	public static final class FilePattern extends FilterRuleCaseSensitive {
+		
+		private final Pattern _compiledPattern;
+		
+		private static FilePattern createFilePattern(IConfigurationElement rule){
+			String pattern = rule.getAttribute(ExtensionConstants.RuleAttrib.regex);
+			boolean caseSensitive = asBoolean(rule.getAttribute(ExtensionConstants.RuleAttrib.caseSensitive), false);
+			return new FilePattern(pattern, caseSensitive);
+		}
+		
+		private FilePattern(String pattern, boolean caseSensitive){
+			super(pattern, caseSensitive);
+			int flags = 0;
+			if (caseSensitive)flags = Pattern.CASE_INSENSITIVE;
+			Pattern compiledPattern = Pattern.compile(pattern, flags);				
+			_compiledPattern = compiledPattern;
+		}
+
+		@Override
+		public String getDisplayableType() {
+			return ValMessages.RulePattern;
+		}
+
+		@Override
+		public String getType() {
+			return ExtensionConstants.Rule.pattern;
+		}
+		
+		@Override
+		public Boolean matchesResource(IResource resource, ContentTypeWrapper wrapper) {
+			String name = PortableFileDelim + resource.getProjectRelativePath().toPortableString();
+			return _compiledPattern.matcher(name).matches();
+		}		
+	}
+
+	/**
+	 * Save your settings into the serializer.
+	 * @param ser
+	 */
+	public void save(Serializer ser) {
+		ser.put(getType());
+		ser.put(getPattern());		
+	}
+
+	public int hashCodeForConfig() {
+		int h = getType().hashCode();
+		if (_pattern != null)h += _pattern.hashCode();
+		return h;
+	}
+}
diff --git a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/model/GlobalPreferences.java b/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/model/GlobalPreferences.java
new file mode 100644
index 0000000..2989c2c
--- /dev/null
+++ b/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/model/GlobalPreferences.java
@@ -0,0 +1,133 @@
+/*******************************************************************************
+ * Copyright (c) 2007, 2009 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.wst.validation.internal.model;
+
+/**
+ * This class represents the global Preferences as set on the Validation Preferences page. It doesn't
+ * hold any of the individual validator settings, just the global check boxes. It is an immutable object.
+ */
+public final class GlobalPreferences {
+	
+	/** false - Default setting for the should all the validation be suspended setting. */ 
+	public static final boolean DefaultSuspend = false;
+	
+	/** false - Default setting for the auto save setting. */ 
+	public static final boolean DefaultAutoSave = false;
+	
+	/** false - Default setting for the confirm dialog setting. */ 
+	public static final boolean DefaultConfirm = true;
+	
+	/** false - Default setting for letting projects override the global settings. */
+	public static final boolean DefaultOverride = true;
+	
+	/** 2 - The version of the framework meta data, if an explicit version isn't found. */
+	public static final int DefaultFrameworkVersion = 2;
+	
+	/** Bit masks for what has changed. */
+	public final static int ConfirmDialogMask = 1;
+	public final static int DisableAllValidationMask = 2;
+	public final static int OverrideMask = 4;
+	public final static int SaveAutomaticallyMask = 8;
+	public final static int StateTimeStampMask = 16;
+	public final static int VersionMask = 32;
+	
+	/**
+	 * The changes that could affect what gets validated.
+	 */
+	public final static int BuildChangeMask = DisableAllValidationMask | OverrideMask;
+	
+
+	private final boolean _confirmDialog;
+	private final boolean _disableAllValidation;
+	private final boolean _override;
+	private final boolean _saveAutomatically;
+	
+	/** The plug-in state time stamp. */
+	private final long	_stateTimeStamp;
+	
+	/** The incoming version of the framework. This is used to determine if a migration is needed.*/
+	private final int		_version;
+			
+	/**
+	 * The only valid way to get the global preferences is through the ValManager.
+	 * 
+	 * @see org.eclipse.wst.validation.internal.ValManager#getGlobalPreferences()
+	 */
+	public GlobalPreferences(GlobalPreferencesValues gp) {
+		_confirmDialog = gp.confirmDialog;
+		_disableAllValidation = gp.disableAllValidation;
+		_override = gp.override;
+		_saveAutomatically = gp.saveAutomatically;
+		_stateTimeStamp = gp.stateTimeStamp;
+		_version = gp.version;
+	}
+	
+	/**
+	 * Answer a copy of the values.
+	 * @return
+	 */
+	public GlobalPreferencesValues asValues(){
+		GlobalPreferencesValues gp = new GlobalPreferencesValues();
+		gp.confirmDialog = _confirmDialog;
+		gp.disableAllValidation = _disableAllValidation;
+		gp.override = _override;
+		gp.saveAutomatically = _saveAutomatically;
+		gp.stateTimeStamp = _stateTimeStamp;
+		gp.version = _version;
+		return gp;
+	}
+
+	public boolean getSaveAutomatically() {
+		return _saveAutomatically;
+	}
+
+
+	/**
+	 * Answer if all validation has been disabled.
+	 */
+	public boolean getDisableAllValidation() {
+		return _disableAllValidation;
+	}
+
+	public boolean getConfirmDialog() {
+		return _confirmDialog;
+	}
+
+	public long getStateTimeStamp() {
+		return _stateTimeStamp;
+	}
+
+	/** Answer whether or not projects are allowed to override the global preferences. */
+	public boolean getOverride() {
+		return _override;
+	}
+
+	public int getVersion() {
+		return _version;
+	}
+
+	/**
+	 * Compare yourself to the other global preferences and answer a bitmask with the differences.
+	 * @param gp
+	 * @return bit mask of the changes. See the xxxMask constants for the values of the bits. A zero means that they are the same.
+	 */
+	public int compare(GlobalPreferences gp) {
+		int changes = 0;
+		if (_confirmDialog != gp.getConfirmDialog())changes |= ConfirmDialogMask;
+		if (_disableAllValidation != gp.getDisableAllValidation())changes |= DisableAllValidationMask;
+		if (_override != gp.getOverride())changes |= OverrideMask;
+		if (_saveAutomatically != gp.getSaveAutomatically())changes |= SaveAutomaticallyMask;
+		if (_stateTimeStamp != gp.getStateTimeStamp())changes |= StateTimeStampMask;
+		if (_version != gp.getVersion())changes |= VersionMask;
+		return changes;
+	}
+
+}
diff --git a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/model/GlobalPreferencesValues.java b/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/model/GlobalPreferencesValues.java
new file mode 100644
index 0000000..cdf8345
--- /dev/null
+++ b/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/model/GlobalPreferencesValues.java
@@ -0,0 +1,35 @@
+/*******************************************************************************
+ * Copyright (c) 2009 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.wst.validation.internal.model;
+
+/**
+ * A mutable object that is used to initialize a GlobalPreference.
+ * @author karasiuk
+ *
+ */
+public class GlobalPreferencesValues {
+	public boolean disableAllValidation = GlobalPreferences.DefaultSuspend;
+	public boolean saveAutomatically = GlobalPreferences.DefaultAutoSave;
+	public boolean confirmDialog = GlobalPreferences.DefaultConfirm;
+	public boolean override = GlobalPreferences.DefaultOverride;
+	
+	/** The plug-in state time stamp. */
+	public long	stateTimeStamp;
+	
+	/** The incoming version of the framework. This is used to determine if a migration is needed.*/
+	public int		version;
+	
+	public GlobalPreferencesValues(){
+		
+	}
+
+}
diff --git a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/model/IValidatorVisitor.java b/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/model/IValidatorVisitor.java
new file mode 100644
index 0000000..8c74736
--- /dev/null
+++ b/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/model/IValidatorVisitor.java
@@ -0,0 +1,46 @@
+/*******************************************************************************
+ * Copyright (c) 2007, 2008 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.wst.validation.internal.model;
+
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.wst.validation.Validator;
+import org.eclipse.wst.validation.internal.ValOperation;
+import org.eclipse.wst.validation.internal.ValType;
+
+/**
+ * This interface is implemented by objects that visit enabled validators.
+ * <p> 
+ * Usage:
+ * <pre>
+ * class Visitor implements IValidatorVisitor {
+ *    public void visit(Validator validator, IProgressMonitor monitor) {
+ *       // your code here
+ *    }
+ * }
+ * ValidatorManager vm = ValidatorManager.getDefault();
+ * vm.accept(new Visitor(), ...);
+ * </pre>
+ * </p> 
+ * <p>
+ * Clients may implement this interface.
+ * </p>
+ */
+public interface IValidatorVisitor {
+	
+	/**
+	 * Visits the given validator.
+	 * @param validator
+	 */
+	void visit(Validator validator, IProject project, ValType valType, 
+		ValOperation operation, IProgressMonitor monitor);
+
+}
diff --git a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/model/ProjectPreferences.java b/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/model/ProjectPreferences.java
new file mode 100644
index 0000000..dd26add
--- /dev/null
+++ b/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/model/ProjectPreferences.java
@@ -0,0 +1,71 @@
+/*******************************************************************************
+ * Copyright (c) 2007, 2009 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.wst.validation.internal.model;
+
+import org.eclipse.core.resources.IProject;
+import org.eclipse.wst.validation.Validator;
+
+/**
+ * Validation preferences for a particular project.
+ * @author karasiuk
+ *
+ */
+public final class ProjectPreferences {
+	/*
+	 * Before this object can be considered immutable, the mutable validators need to be addressed.
+	 */
+	/** false - Default setting for the "should all the validation be suspended" setting. */ 
+	public static final boolean DefaultSuspend = false;
+	
+	/** false - Default setting for letting projects override the global settings. */
+	public static final boolean DefaultOverride = false;
+	
+	private final IProject	_project;
+
+	private final boolean 	_override;
+	private final boolean	_suspend;
+	
+	private final Validator[]	_validators;
+	
+	public ProjectPreferences(IProject project){
+		_project = project;
+		_override = DefaultOverride;
+		_suspend  = DefaultSuspend;
+		_validators = new Validator[0];
+	}
+	
+	public ProjectPreferences(IProject project, boolean override, boolean suspend, Validator[] validators){
+		_project = project;
+		_override = override;
+		_suspend = suspend;
+		_validators = validators;
+	}
+	
+	public boolean getOverride() {
+		return _override;
+	}
+	public boolean getSuspend() {
+		return _suspend;
+	}
+	
+	/**
+	 * Answer the validators that have been registered for this project.
+	 * @return an empty array if there are no validators.
+	 */
+	public Validator[] getValidators() {
+		return _validators;
+	}
+	
+	public IProject getProject() {
+		return _project;
+	}
+
+}
diff --git a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/model/ValidatorHelper.java b/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/model/ValidatorHelper.java
new file mode 100644
index 0000000..06f03ad
--- /dev/null
+++ b/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/model/ValidatorHelper.java
@@ -0,0 +1,100 @@
+/*******************************************************************************
+ * Copyright (c) 2005, 2009 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.wst.validation.internal.model;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+import org.eclipse.wst.common.project.facet.core.runtime.IRuntime;
+import org.eclipse.wst.common.project.facet.core.runtime.RuntimeManager;
+import org.eclipse.wst.validation.internal.ValidatorMutable;
+
+/**
+ * Implement some common validator methods, that don't need to be part of the API.
+ * 
+ * @author karasiuk
+ *
+ */
+public final class ValidatorHelper {
+	
+	/**
+	 * Answer true if this validator already has an exclude filter.
+	 */
+	public static boolean hasExcludeGroup(ValidatorMutable v){
+		for (FilterGroup group : v.getGroups())if (group.isExclude())return true;
+		return false;		
+	}
+	
+	/**
+	 * Return all the Runtimes defined in the workspace.
+	 */
+	public static Object[] getRuntimes()
+	{
+		Iterator<IRuntime> runtimes = RuntimeManager.getRuntimes().iterator();
+		List <IRuntime> list = new ArrayList<IRuntime>();
+		
+		while (runtimes.hasNext()) {
+			IRuntime runtime1 = (IRuntime) runtimes.next();
+			String id = runtime1.getProperty("id"); //$NON-NLS-1$
+			
+			if(id != null){
+				list.add(runtime1);
+			}
+		}
+		
+		return list.toArray();
+	}
+	
+	
+	/**
+	 * Return the ID of the given target Runtime.
+	 * @param targetRuntime
+	 * @return
+	 */
+	public static String getRuntimeID(Object targetRuntime)
+	{
+		IRuntime runtime = (IRuntime) targetRuntime;
+		return runtime.getProperty("id"); //$NON-NLS-1$
+	}
+	
+	/**
+	 * Return the target runtime name of the given the ID
+	 * @param id
+	 * @return
+	 */
+	public static String getRuntimeName(String id)
+	{
+		try
+		{
+			IRuntime runtime = RuntimeManager.getRuntime(id);
+			if(runtime != null)
+				return runtime.getLocalizedName();
+			
+		} catch(IllegalArgumentException ex){
+			//do nothing
+		}
+		
+		return null;
+	}
+	
+	/**
+	 * Return the Name of the given target runtime.
+	 * @param targetRuntime
+	 * @return
+	 */
+	public static String getRuntimeName(Object targetRuntime)
+	{
+		IRuntime runtime = (IRuntime) targetRuntime;
+		
+		return runtime.getLocalizedName();
+	}
+}
diff --git a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/package.html b/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/package.html
new file mode 100644
index 0000000..4b88f6b
--- /dev/null
+++ b/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/package.html
@@ -0,0 +1,10 @@
+<html>
+<body>
+<h1>Validation Framework</h1>
+<h3>Build Based Validation</h3>
+The main class for build based validation is the 
+<a href="ValBuilderJob.html">ValBuilderJob</a>. This gets triggered as part of the
+build mechanism. It reacts to resource change events, and from that determines what needs to be 
+validated.
+</body>
+</html>
diff --git a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/package.html b/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/package.html
new file mode 100644
index 0000000..8c3c426
--- /dev/null
+++ b/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/package.html
@@ -0,0 +1,52 @@
+<html>
+<head>
+<title>Validation Framework</title>
+</head>
+<body>
+<p>A framework for calling validators that are build based.</p>
+<p>Also see <a href="doc-files/faq.html">Frequently Asked Questions</a></p>
+<p>
+There are two main types of validation, <b>build based</b> and 
+<b>as you type</b>. This framework supports build based
+validation. If auto build is turned on then the validators are called
+when the user saves their file. If auto build is not turned on then
+the validators are called when the user starts a build.</p>
+<p>This framework was added to WTP in version 3.0.</p>
+<h3>Dependency Support</h3>
+<p>Sometimes resources depend on other resources, to determine whether they are 
+valid or not. An example would be that an XML resource could depend on a DTD. If at some 
+point in the future the DTD changes, then the dependent XML resource should be 
+revalidated to ensure that it still meets the requirements of the changed DTD 
+file. In order to do this efficiently, there needs to be an association between 
+the DTD and all the resources that depend on it.<p>To be as efficient as possible, the validation framework allows 
+this dependency information to be returned as part of a
+<a href="AbstractValidator.html#validate(org.eclipse.core.resources.IResource, int, ValidationState, org.eclipse.core.runtime.IProgressMonitor)">
+validate operation</a>. Since the validator needed to figure this out anyways, 
+why not pass this information back to the framework, so that it can be saved. 
+This saves the cost of having to parse the file at some later point in time 
+(when the file is probably sitting cold on disk). The fewer times that we need 
+to open, read and/or parse the same file, will improve the performance of the 
+product.
+<p>In particular when the validate method returns, a
+<a href="ValidationResult.html">ValidationResult</a> must be returned, inside of 
+this result, all your dependencies need to be specified with the
+<a href="ValidationResult.html#setDependsOn(org.eclipse.core.resources.IResource[])">
+setDependsOn</a> method.<p>In addition to keeping the dependency information 
+up-to-date through the normal course of validation, direct access is also 
+provided to the dependency support through the
+<a href="ValidationFramework.html#getDependencyIndex()">getDependencyIndex</a> 
+method. The <a href="IDependencyIndex.html">IDependencyIndex</a> allows you to 
+directly manipulate the dependency information for a validator.
+<h3>Entry Points into the Validation Framework</h3>
+<p>Here are some of the points where the platform calls into the framework:</p>
+<ul>
+<li><b>Builder</b> - ValidationBuilder</li>
+<li><b>IFacetedProjectListener</b> - ValManager</li>
+<li><b>IJobChangeListener</b> - ValidationOperation, ValidationOperation.ValidationLauncherJob</li>
+<li><b>IProjectChangeListener</b> - ValManager</li>
+<li><b>IPropertyChangeListener</b> - ValidationConfiguration, DisabledResourceManager</li>
+<li><b>IResourceChangeListener</b> - EventManger</li>
+<li><b>IValChangedListener</b> - ValManager, DisabledValidatorManager</li>
+</ul>
+</body>
+</html>
diff --git a/plugins/org.eclipse.wst.validation/xsds/exclude.exsd b/plugins/org.eclipse.wst.validation/xsds/exclude.exsd
new file mode 100644
index 0000000..4637c14
--- /dev/null
+++ b/plugins/org.eclipse.wst.validation/xsds/exclude.exsd
@@ -0,0 +1,303 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!-- Schema file written by PDE -->
+<schema targetNamespace="org.eclipse.wst.validation" xmlns="http://www.w3.org/2001/XMLSchema">
+<annotation>
+      <appInfo>
+         <meta.schema plugin="org.eclipse.wst.validation" id="exclude" name="Validator Exclusion"/>
+      </appInfo>
+      <documentation>
+         A way to add additional exclusion filters to a V2 validator.
+      </documentation>
+   </annotation>
+
+   <element name="extension">
+      <annotation>
+         <appInfo>
+            <meta.element />
+         </appInfo>
+      </annotation>
+      <complexType>
+         <sequence>
+            <element ref="validator" minOccurs="1" maxOccurs="unbounded"/>
+         </sequence>
+         <attribute name="point" type="string" use="required">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+            </annotation>
+         </attribute>
+         <attribute name="id" type="string" use="required">
+            <annotation>
+               <documentation>
+                  A short id that is unique within the plug-in, so that this set of extra exclusion filters can be identified.
+               </documentation>
+            </annotation>
+         </attribute>
+         <attribute name="name" type="string">
+            <annotation>
+               <documentation>
+                  The short user friendly name for the exclusion.
+               </documentation>
+               <appInfo>
+                  <meta.attribute translatable="true"/>
+               </appInfo>
+            </annotation>
+         </attribute>
+      </complexType>
+   </element>
+
+   <element name="validator">
+      <annotation>
+         <documentation>
+            Identifies the validator that is being extended.
+         </documentation>
+      </annotation>
+      <complexType>
+         <sequence>
+            <element ref="exclude"/>
+         </sequence>
+         <attribute name="id" type="string" use="required">
+            <annotation>
+               <documentation>
+                  The fully qualifed validator id that is being extended.
+               </documentation>
+               <appInfo>
+                  <meta.attribute kind="identifier"/>
+               </appInfo>
+            </annotation>
+         </attribute>
+      </complexType>
+   </element>
+
+   <element name="exclude">
+      <annotation>
+         <documentation>
+            This contains a set of exclusion rules, used in filtering which resources get validated. If any of these rules are matched, then the validator is not called on this resource.
+         </documentation>
+      </annotation>
+      <complexType>
+         <sequence>
+            <element ref="rules"/>
+         </sequence>
+      </complexType>
+   </element>
+
+   <element name="fileext">
+      <annotation>
+         <documentation>
+            A file extension, for example html.
+         </documentation>
+      </annotation>
+      <complexType>
+         <attribute name="ext" type="string" use="required">
+            <annotation>
+               <documentation>
+                  The file extension, for example html.
+               </documentation>
+            </annotation>
+         </attribute>
+         <attribute name="caseSensitive" type="boolean">
+            <annotation>
+               <documentation>
+                  If the file extension is case sensitive, then this needs to be set to true.
+               </documentation>
+            </annotation>
+         </attribute>
+      </complexType>
+   </element>
+
+   <element name="projectNature">
+      <annotation>
+         <documentation>
+            Used to filter on project natures.
+         </documentation>
+      </annotation>
+      <complexType>
+         <attribute name="id" type="string" use="required">
+            <annotation>
+               <documentation>
+                  The fully qualified project nature id, for example &quot;org.eclipse.jdt.core.javanature&quot;.
+               </documentation>
+            </annotation>
+         </attribute>
+      </complexType>
+   </element>
+
+   <element name="targetRuntime">
+      <annotation>
+         <documentation>
+            Used to filter on target runtime.
+         </documentation>
+      </annotation>
+      <complexType>
+         <attribute name="id" type="string" use="required">
+            <annotation>
+               <documentation>
+                  The target runtime id, for example &quot;org.eclipse.jst.server.generic.runtime.jboss5&quot;.
+               </documentation>
+            </annotation>
+         </attribute>
+      </complexType>
+   </element>
+
+   <element name="file">
+      <complexType>
+         <attribute name="name" type="string" use="required">
+            <annotation>
+               <documentation>
+                  The file or folder name. The file name can be fully qualified, that is it starts with a leading slash (&quot;/&quot;), or it can be a relative name. Folder names are separated with the forward slash (&quot;/&quot;) character.
+               </documentation>
+            </annotation>
+         </attribute>
+         <attribute name="caseSensitive" type="boolean">
+            <annotation>
+               <documentation>
+                  If the file name is not case senstitive, then this needs to be set to false.
+               </documentation>
+            </annotation>
+         </attribute>
+         <attribute name="type" use="required">
+            <annotation>
+               <documentation>
+                  Type of name, there are three choices. &lt;ul&gt;&lt;li&gt;folder - specifies a project relative folder name.&lt;/li&gt;&lt;li&gt;file - a simple file name (i.e. no path information).&lt;/li&gt;&lt;li&gt;full - a fully qualified (project relative) file name.&lt;/li&gt;&lt;/ul&gt;
+               </documentation>
+            </annotation>
+            <simpleType>
+               <restriction base="string">
+                  <enumeration value="folder">
+                  </enumeration>
+                  <enumeration value="file">
+                  </enumeration>
+                  <enumeration value="full">
+                  </enumeration>
+               </restriction>
+            </simpleType>
+         </attribute>
+      </complexType>
+   </element>
+
+   <element name="rules">
+      <annotation>
+         <documentation>
+            A set of rules for determining if a resource is passed to this validator or not. The rules are OR&apos;ed together.
+         </documentation>
+      </annotation>
+      <complexType>
+         <sequence>
+            <element ref="fileext" minOccurs="0" maxOccurs="unbounded"/>
+            <element ref="file" minOccurs="0" maxOccurs="unbounded"/>
+            <element ref="projectNature" minOccurs="0" maxOccurs="unbounded"/>
+            <element ref="facet" minOccurs="0" maxOccurs="unbounded"/>
+            <element ref="contentType" minOccurs="0" maxOccurs="unbounded"/>
+            <element ref="targetRuntime" minOccurs="0" maxOccurs="unbounded"/>
+            <element ref="pattern" minOccurs="0" maxOccurs="unbounded"/>
+         </sequence>
+      </complexType>
+   </element>
+
+   <element name="facet">
+      <complexType>
+         <attribute name="id" type="string" use="required">
+            <annotation>
+               <documentation>
+                  The facet id.
+               </documentation>
+            </annotation>
+         </attribute>
+      </complexType>
+   </element>
+
+   <element name="contentType">
+      <annotation>
+         <documentation>
+            Used to filter based on content types.
+         </documentation>
+      </annotation>
+      <complexType>
+         <attribute name="id" type="string" use="required">
+            <annotation>
+               <documentation>
+                  The content type id.
+               </documentation>
+            </annotation>
+         </attribute>
+         <attribute name="exactMatch" type="boolean">
+            <annotation>
+               <documentation>
+                  Set to true if the content type needs to match exactly. Set to false if sub types are considered matches as well.
+               </documentation>
+            </annotation>
+         </attribute>
+      </complexType>
+   </element>
+
+   <element name="pattern">
+      <annotation>
+         <documentation>
+            Holds a regualr expression, that matches the resource&apos;s project relative name.
+         </documentation>
+      </annotation>
+      <complexType>
+         <attribute name="regex" type="string" use="required">
+            <annotation>
+               <documentation>
+                  Holds a Java regular expression. See the class java.util.regex.Pattern for more details. This regular expression is matched against a resource&apos;s project relative path, after that path has been converted into a portable path.
+&lt;p&gt;The path will always start with a forward slash (/) so that folder names can be more easily matched.
+               </documentation>
+            </annotation>
+         </attribute>
+         <attribute name="caseSensitive" type="boolean">
+            <annotation>
+               <documentation>
+                  If the file name is not case senstitive, then this needs to be set to false.
+               </documentation>
+            </annotation>
+         </attribute>
+      </complexType>
+   </element>
+
+   <annotation>
+      <appInfo>
+         <meta.section type="since"/>
+      </appInfo>
+      <documentation>
+         WebTools 3.0
+      </documentation>
+   </annotation>
+
+   <annotation>
+      <appInfo>
+         <meta.section type="examples"/>
+      </appInfo>
+      <documentation>
+         &lt;!-- A plug-in is turning off the T1A validator for projects that have the ModuleCoreNature --&gt;
+ &lt;extension
+       id=&quot;exclude1&quot;
+       point=&quot;org.eclipse.wst.validation.exclude&quot;&gt;
+    &lt;validator
+          id=&quot;org.eclipse.wst.common.tests.validation.T1A&quot;&gt;
+       &lt;exclude&gt;
+          &lt;rules&gt;
+             &lt;projectNature
+                   id=&quot;org.eclipse.jst.j2ee.ModuleCoreNature&quot;&gt;
+             &lt;/projectNature&gt;
+          &lt;/rules&gt;
+       &lt;/exclude&gt;
+    &lt;/validator&gt;
+ &lt;/extension&gt;
+      </documentation>
+   </annotation>
+
+   <annotation>
+      <appInfo>
+         <meta.section type="apiInfo"/>
+      </appInfo>
+      <documentation>
+         Provisional API.
+      </documentation>
+   </annotation>
+
+
+
+</schema>
diff --git a/plugins/org.eclipse.wst.common.emf/schema/packageURIMap.exsd b/plugins/org.eclipse.wst.validation/xsds/referencialFileExtSchema.exsd
similarity index 67%
copy from plugins/org.eclipse.wst.common.emf/schema/packageURIMap.exsd
copy to plugins/org.eclipse.wst.validation/xsds/referencialFileExtSchema.exsd
index 4f9d955..fcfe873 100644
--- a/plugins/org.eclipse.wst.common.emf/schema/packageURIMap.exsd
+++ b/plugins/org.eclipse.wst.validation/xsds/referencialFileExtSchema.exsd
@@ -1,60 +1,65 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.wst.common.emf">
+<schema targetNamespace="org.eclipse.wst.validation">
 <annotation>
       <appInfo>
-         <meta.schema plugin="org.eclipse.wst.common.emf" id="packageURIMap" name="%PackageURIMap"/>
+         <meta.schema plugin="org.eclipse.wst.validation" id="referencialFileValidator" name="Referencial File Validator"/>
       </appInfo>
       <documentation>
-         This extension point is used to register package mappings.
+         This extension point is used for referential file validation. This extension point should be extended if you have files that reference other files and would like the validation on referenced files to run when the validation on the referencing file is run. The Post Validator operation that is used by this extension point expects a flat list of files to run validation on referenced files.
       </documentation>
    </annotation>
 
    <element name="extension">
       <complexType>
          <sequence>
-            <element ref="map" minOccurs="1" maxOccurs="unbounded"/>
+            <element ref="referencialFileValidator"/>
          </sequence>
          <attribute name="point" type="string" use="required">
             <annotation>
                <documentation>
-                  
+                  a fully qualified identifier of the target extension point
                </documentation>
             </annotation>
          </attribute>
          <attribute name="id" type="string">
             <annotation>
                <documentation>
-                  
+                  an optional identifier of the extension instance
                </documentation>
             </annotation>
          </attribute>
          <attribute name="name" type="string">
             <annotation>
                <documentation>
-                  
+                  an optional name of the extension instance
                </documentation>
-               <appInfo>
-                  <meta.attribute translatable="true"/>
-               </appInfo>
             </annotation>
          </attribute>
       </complexType>
    </element>
 
-   <element name="map">
+   <element name="referencialFileValidator">
       <complexType>
-         <attribute name="uri" type="string" use="required">
+         <sequence>
+            <element ref="run"/>
+         </sequence>
+         <attribute name="id" type="string" use="required">
             <annotation>
                <documentation>
                   
                </documentation>
             </annotation>
          </attribute>
-         <attribute name="prefix" type="string" use="required">
+      </complexType>
+   </element>
+
+   <element name="run">
+      <complexType>
+         <attribute name="class" type="string" use="required">
             <annotation>
                <documentation>
-                  
+                  This class must implement org.eclipse.wst.validation.internal.operations.ReferencialFileValidator. 
                </documentation>
             </annotation>
          </attribute>
@@ -75,7 +80,7 @@
          <meta.section type="examples"/>
       </appInfo>
       <documentation>
-         [Enter extension point usage example here.]
+         
       </documentation>
    </annotation>
 
@@ -84,7 +89,7 @@
          <meta.section type="apiInfo"/>
       </appInfo>
       <documentation>
-         [Enter API information here.]
+         
       </documentation>
    </annotation>
 
@@ -93,7 +98,7 @@
          <meta.section type="implementation"/>
       </appInfo>
       <documentation>
-         [Enter information about supplied implementation of this extension point.]
+         
       </documentation>
    </annotation>
 
diff --git a/plugins/org.eclipse.wst.common.emf/schema/packageURIMap.exsd b/plugins/org.eclipse.wst.validation/xsds/removeV2Validator.exsd
similarity index 63%
copy from plugins/org.eclipse.wst.common.emf/schema/packageURIMap.exsd
copy to plugins/org.eclipse.wst.validation/xsds/removeV2Validator.exsd
index 4f9d955..271b82e 100644
--- a/plugins/org.eclipse.wst.common.emf/schema/packageURIMap.exsd
+++ b/plugins/org.eclipse.wst.validation/xsds/removeV2Validator.exsd
@@ -1,19 +1,24 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.wst.common.emf">
+<schema targetNamespace="org.eclipse.wst.validation" xmlns="http://www.w3.org/2001/XMLSchema">
 <annotation>
       <appInfo>
-         <meta.schema plugin="org.eclipse.wst.common.emf" id="packageURIMap" name="%PackageURIMap"/>
+         <meta.schema plugin="org.eclipse.wst.validation" id="removeV2Validator" name="Remove V2 Validator"/>
       </appInfo>
       <documentation>
-         This extension point is used to register package mappings.
+         This is used to remove a V2 validator. By specifying the validator ID, the corresponding validator will be removed as if it hasn&apos;t been registered. The removed validator will not be shown in the Preferences page.
       </documentation>
    </annotation>
 
    <element name="extension">
+      <annotation>
+         <appInfo>
+            <meta.element />
+         </appInfo>
+      </annotation>
       <complexType>
          <sequence>
-            <element ref="map" minOccurs="1" maxOccurs="unbounded"/>
+            <element ref="remove" minOccurs="1" maxOccurs="unbounded"/>
          </sequence>
          <attribute name="point" type="string" use="required">
             <annotation>
@@ -42,19 +47,17 @@
       </complexType>
    </element>
 
-   <element name="map">
+   <element name="remove">
+      <annotation>
+         <documentation>
+            Define the validator that will be removed.
+         </documentation>
+      </annotation>
       <complexType>
-         <attribute name="uri" type="string" use="required">
+         <attribute name="validatorId" type="string" use="required">
             <annotation>
                <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="prefix" type="string" use="required">
-            <annotation>
-               <documentation>
-                  
+                  The validator ID that will be removed.
                </documentation>
             </annotation>
          </attribute>
@@ -66,7 +69,7 @@
          <meta.section type="since"/>
       </appInfo>
       <documentation>
-         &lt;b&gt;This extension point is part of an interim API that is still under development and expected to change significantly before reaching stability. It is being made available at this early stage to solicit feedback from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken (repeatedly) as the API evolves.&lt;/b&gt;
+         WebTools 3.2
       </documentation>
    </annotation>
 
@@ -75,16 +78,23 @@
          <meta.section type="examples"/>
       </appInfo>
       <documentation>
-         [Enter extension point usage example here.]
+         An example to remove the XSL validator
+
+&lt;extension
+       point=&quot;org.eclipse.wst.validation.removeV2Validator&quot;&gt;
+    &lt;remove
+          validatorId=&quot;org.eclipse.wst.xml.core.xml&quot;&gt;
+    &lt;/remove&gt;
+ &lt;/extension&gt;
       </documentation>
    </annotation>
 
    <annotation>
       <appInfo>
-         <meta.section type="apiInfo"/>
+         <meta.section type="apiinfo"/>
       </appInfo>
       <documentation>
-         [Enter API information here.]
+         Provisional API.
       </documentation>
    </annotation>
 
@@ -102,7 +112,7 @@
          <meta.section type="copyright"/>
       </appInfo>
       <documentation>
-         Copyright (c) 2005 IBM Corporation and others.&lt;br&gt;
+         Copyright (c) 2010 IBM Corporation and others.&lt;br&gt;
 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 &lt;a
diff --git a/plugins/org.eclipse.wst.common.emf/schema/packageURIMap.exsd b/plugins/org.eclipse.wst.validation/xsds/validationHelper.exsd
similarity index 79%
rename from plugins/org.eclipse.wst.common.emf/schema/packageURIMap.exsd
rename to plugins/org.eclipse.wst.validation/xsds/validationHelper.exsd
index 4f9d955..fd854dc 100644
--- a/plugins/org.eclipse.wst.common.emf/schema/packageURIMap.exsd
+++ b/plugins/org.eclipse.wst.validation/xsds/validationHelper.exsd
@@ -1,38 +1,38 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.wst.common.emf">
+<schema targetNamespace="org.eclipse.wst.validation">
 <annotation>
       <appInfo>
-         <meta.schema plugin="org.eclipse.wst.common.emf" id="packageURIMap" name="%PackageURIMap"/>
+         <meta.schema plugin="org.eclipse.wst.validation" id="validationHelper" name="Validation Helper"/>
       </appInfo>
       <documentation>
-         This extension point is used to register package mappings.
+         
       </documentation>
    </annotation>
 
    <element name="extension">
       <complexType>
          <sequence>
-            <element ref="map" minOccurs="1" maxOccurs="unbounded"/>
+            <element ref="validationHelper"/>
          </sequence>
          <attribute name="point" type="string" use="required">
             <annotation>
                <documentation>
-                  
+                  a fully qualified identifier of the target extension point
                </documentation>
             </annotation>
          </attribute>
          <attribute name="id" type="string">
             <annotation>
                <documentation>
-                  
+                  an optional identifier of the extension instance
                </documentation>
             </annotation>
          </attribute>
          <attribute name="name" type="string">
             <annotation>
                <documentation>
-                  
+                  an optional name of the extension instance
                </documentation>
                <appInfo>
                   <meta.attribute translatable="true"/>
@@ -42,16 +42,16 @@
       </complexType>
    </element>
 
-   <element name="map">
+   <element name="validationHelper">
       <complexType>
-         <attribute name="uri" type="string" use="required">
+         <attribute name="helperClass" type="string" use="required">
             <annotation>
                <documentation>
-                  
+                  The class must implement org.eclipse.wst.validation.internal.IProjectValidationHelper.
                </documentation>
             </annotation>
          </attribute>
-         <attribute name="prefix" type="string" use="required">
+         <attribute name="id" type="string" use="required">
             <annotation>
                <documentation>
                   
@@ -75,7 +75,7 @@
          <meta.section type="examples"/>
       </appInfo>
       <documentation>
-         [Enter extension point usage example here.]
+         
       </documentation>
    </annotation>
 
@@ -84,7 +84,7 @@
          <meta.section type="apiInfo"/>
       </appInfo>
       <documentation>
-         [Enter API information here.]
+         
       </documentation>
    </annotation>
 
@@ -93,7 +93,7 @@
          <meta.section type="implementation"/>
       </appInfo>
       <documentation>
-         [Enter information about supplied implementation of this extension point.]
+         
       </documentation>
    </annotation>
 
diff --git a/plugins/org.eclipse.wst.common.emf/schema/packageURIMap.exsd b/plugins/org.eclipse.wst.validation/xsds/validationSelectionHandler.exsd
similarity index 73%
copy from plugins/org.eclipse.wst.common.emf/schema/packageURIMap.exsd
copy to plugins/org.eclipse.wst.validation/xsds/validationSelectionHandler.exsd
index 4f9d955..acffbfa 100644
--- a/plugins/org.eclipse.wst.common.emf/schema/packageURIMap.exsd
+++ b/plugins/org.eclipse.wst.validation/xsds/validationSelectionHandler.exsd
@@ -1,57 +1,61 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.wst.common.emf">
+<schema targetNamespace="org.eclipse.wst.validation">
 <annotation>
       <appInfo>
-         <meta.schema plugin="org.eclipse.wst.common.emf" id="packageURIMap" name="%PackageURIMap"/>
+         <meta.schema plugin="org.eclipse.wst.validation" id="validationSelectionHandler" name="Validation Selection Handler"/>
       </appInfo>
       <documentation>
-         This extension point is used to register package mappings.
+         
       </documentation>
    </annotation>
 
    <element name="extension">
       <complexType>
          <sequence>
-            <element ref="map" minOccurs="1" maxOccurs="unbounded"/>
+            <element ref="validationSelectionHandler" minOccurs="1" maxOccurs="unbounded"/>
          </sequence>
          <attribute name="point" type="string" use="required">
             <annotation>
                <documentation>
-                  
+                  a fully qualified identifier of the target extension point
                </documentation>
             </annotation>
          </attribute>
          <attribute name="id" type="string">
             <annotation>
                <documentation>
-                  
+                  an optional identifier of the extension instance
                </documentation>
             </annotation>
          </attribute>
          <attribute name="name" type="string">
             <annotation>
                <documentation>
-                  
+                  an optional name of the extension instance
                </documentation>
-               <appInfo>
-                  <meta.attribute translatable="true"/>
-               </appInfo>
             </annotation>
          </attribute>
       </complexType>
    </element>
 
-   <element name="map">
+   <element name="validationSelectionHandler">
       <complexType>
-         <attribute name="uri" type="string" use="required">
+         <attribute name="id" type="string" use="required">
             <annotation>
                <documentation>
                   
                </documentation>
             </annotation>
          </attribute>
-         <attribute name="prefix" type="string" use="required">
+         <attribute name="handlerClass" type="string" use="required">
+            <annotation>
+               <documentation>
+                  The class must implement the IValidationSelectionHandler interface.
+               </documentation>
+            </annotation>
+         </attribute>
+         <attribute name="selectionType" type="string" use="required">
             <annotation>
                <documentation>
                   
@@ -75,7 +79,7 @@
          <meta.section type="examples"/>
       </appInfo>
       <documentation>
-         [Enter extension point usage example here.]
+         
       </documentation>
    </annotation>
 
@@ -84,7 +88,7 @@
          <meta.section type="apiInfo"/>
       </appInfo>
       <documentation>
-         [Enter API information here.]
+         
       </documentation>
    </annotation>
 
@@ -93,7 +97,7 @@
          <meta.section type="implementation"/>
       </appInfo>
       <documentation>
-         [Enter information about supplied implementation of this extension point.]
+         
       </documentation>
    </annotation>
 
diff --git a/plugins/org.eclipse.wst.validation/xsds/validator.exsd b/plugins/org.eclipse.wst.validation/xsds/validator.exsd
new file mode 100644
index 0000000..b03167d
--- /dev/null
+++ b/plugins/org.eclipse.wst.validation/xsds/validator.exsd
@@ -0,0 +1,438 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!-- Schema file written by PDE -->
+<schema targetNamespace="org.eclipse.wst.validation" xmlns="http://www.w3.org/2001/XMLSchema">
+<annotation>
+      <appInfo>
+         <meta.schema plugin="org.eclipse.wst.validation" id="validator-v2" name="Validator V2"/>
+      </appInfo>
+      <documentation>
+         This is used to register a validator to the validation framework (version 2). In addition to specifying the validator to invoke, it registers a set of default filter rules, to control which resources are passsed to the validator.
+      </documentation>
+   </annotation>
+
+   <element name="extension">
+      <annotation>
+         <appInfo>
+            <meta.element />
+         </appInfo>
+      </annotation>
+      <complexType>
+         <sequence>
+            <element ref="validator"/>
+         </sequence>
+         <attribute name="point" type="string" use="required">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+            </annotation>
+         </attribute>
+         <attribute name="id" type="string" use="required">
+            <annotation>
+               <documentation>
+                  A short id that is unique within the plug-in, so that this validator can be identified.
+               </documentation>
+            </annotation>
+         </attribute>
+         <attribute name="name" type="string" use="required">
+            <annotation>
+               <documentation>
+                  The short user friendly name of the validator.
+               </documentation>
+               <appInfo>
+                  <meta.attribute translatable="true"/>
+               </appInfo>
+            </annotation>
+         </attribute>
+      </complexType>
+   </element>
+
+   <element name="validator">
+      <annotation>
+         <documentation>
+            Defines a validator to the validation framework.
+         </documentation>
+      </annotation>
+      <complexType>
+         <sequence>
+            <element ref="include" minOccurs="0" maxOccurs="unbounded"/>
+            <element ref="exclude" minOccurs="0" maxOccurs="1"/>
+            <element ref="messageCategory" minOccurs="0" maxOccurs="unbounded"/>
+            <element ref="group" minOccurs="0" maxOccurs="unbounded"/>
+         </sequence>
+         <attribute name="class" type="string" use="required">
+            <annotation>
+               <documentation>
+                  The class that implements the validator.
+               </documentation>
+               <appInfo>
+                  <meta.attribute kind="java" basedOn="org.eclipse.wst.validation.AbstractValidator"/>
+               </appInfo>
+            </annotation>
+         </attribute>
+         <attribute name="build" type="boolean">
+            <annotation>
+               <documentation>
+                  Is this validator enabled by default for build based validations? The default is true.
+               </documentation>
+            </annotation>
+         </attribute>
+         <attribute name="manual" type="boolean">
+            <annotation>
+               <documentation>
+                  Is this validator enabled by default for manual based validations? The default is true.
+               </documentation>
+            </annotation>
+         </attribute>
+         <attribute name="version" type="string">
+            <annotation>
+               <documentation>
+                  The version of the definition. It is a simple integer. If not specified the version is assumed to be 1.
+               </documentation>
+            </annotation>
+         </attribute>
+         <attribute name="sourceid" type="string">
+            <annotation>
+               <documentation>
+                  If this validator also serves as an as-you-type validator (also know as an ISourceValidator) then it&apos;s source id is specified here, so that the two validators can be associated with one another.
+By source id, we mean the id that is used in the org.eclipse.wst.sse.ui.sourceValidation extension point
+               </documentation>
+            </annotation>
+         </attribute>
+         <attribute name="markerId" type="string">
+            <annotation>
+               <documentation>
+                  If your validator wishes to use it&apos;s own marker, it can do so by supplying that marker id here.
+               </documentation>
+            </annotation>
+         </attribute>
+      </complexType>
+   </element>
+
+   <element name="include">
+      <annotation>
+         <documentation>
+            This contains a set of inclusion rules, which are used in filtering which resources get validated. At least one of these rules must be satisfied in order for the validator to be called on the particular resource. Only &quot;Project Nature&quot; and &quot;Facet&quot; rules are being considered for activating the validator.
+         </documentation>
+      </annotation>
+      <complexType>
+         <sequence>
+            <element ref="rules"/>
+         </sequence>
+      </complexType>
+   </element>
+
+   <element name="exclude">
+      <annotation>
+         <documentation>
+            This contains a set of exclusion rules, used in filtering which resources get validated. If any of these rules are matched, then the validator is not called on this resource.  Only &quot;Project Nature&quot; and &quot;Facet&quot; rules are being considered to prevent activating the validator.
+         </documentation>
+      </annotation>
+      <complexType>
+         <sequence>
+            <element ref="rules"/>
+         </sequence>
+      </complexType>
+   </element>
+
+   <element name="fileext">
+      <annotation>
+         <documentation>
+            A file extension, for example html.
+         </documentation>
+      </annotation>
+      <complexType>
+         <attribute name="ext" type="string" use="required">
+            <annotation>
+               <documentation>
+                  The file extension, for example html.
+               </documentation>
+            </annotation>
+         </attribute>
+         <attribute name="caseSensitive" type="boolean">
+            <annotation>
+               <documentation>
+                  If the file extension is case sensitive, then this needs to be set to true.
+               </documentation>
+            </annotation>
+         </attribute>
+      </complexType>
+   </element>
+
+   <element name="projectNature">
+      <annotation>
+         <documentation>
+            Used to filter on project natures.
+         </documentation>
+      </annotation>
+      <complexType>
+         <attribute name="id" type="string" use="required">
+            <annotation>
+               <documentation>
+                  The fully qualified project nature id, for example &quot;org.eclipse.jdt.core.javanature&quot;.
+               </documentation>
+            </annotation>
+         </attribute>
+      </complexType>
+   </element>
+
+   <element name="file">
+      <complexType>
+         <attribute name="name" type="string" use="required">
+            <annotation>
+               <documentation>
+                  The file or folder name. The file name can be fully qualified, that is it starts with a leading slash (&quot;/&quot;), or it can be a relative name. Folder names are separated with the forward slash (&quot;/&quot;) character.
+               </documentation>
+            </annotation>
+         </attribute>
+         <attribute name="caseSensitive" type="boolean">
+            <annotation>
+               <documentation>
+                  If the file name is not case senstitive, then this needs to be set to false.
+               </documentation>
+            </annotation>
+         </attribute>
+         <attribute name="type" use="required">
+            <annotation>
+               <documentation>
+                  Type of name, there are three choices. &lt;ul&gt;&lt;li&gt;folder - specifies a project relative folder name.&lt;/li&gt;&lt;li&gt;file - a simple file name (i.e. no path information).&lt;/li&gt;&lt;li&gt;full - a fully qualified (project relative) file name.&lt;/li&gt;&lt;/ul&gt;
+               </documentation>
+            </annotation>
+            <simpleType>
+               <restriction base="string">
+                  <enumeration value="folder">
+                  </enumeration>
+                  <enumeration value="file">
+                  </enumeration>
+                  <enumeration value="full">
+                  </enumeration>
+               </restriction>
+            </simpleType>
+         </attribute>
+      </complexType>
+   </element>
+
+   <element name="rules">
+      <annotation>
+         <documentation>
+            A set of rules for determining if a resource is passed to this validator or not. The rules are OR&apos;ed together.
+         </documentation>
+      </annotation>
+      <complexType>
+         <sequence>
+            <element ref="fileext" minOccurs="0" maxOccurs="unbounded"/>
+            <element ref="file" minOccurs="0" maxOccurs="unbounded"/>
+            <element ref="projectNature" minOccurs="0" maxOccurs="unbounded"/>
+            <element ref="facet" minOccurs="0" maxOccurs="unbounded"/>
+            <element ref="contentType" minOccurs="0" maxOccurs="unbounded"/>
+            <element ref="targetRuntime" minOccurs="0" maxOccurs="unbounded"/>
+            <element ref="pattern" minOccurs="0" maxOccurs="unbounded"/>
+         </sequence>
+      </complexType>
+   </element>
+
+   <element name="facet">
+      <complexType>
+         <attribute name="id" type="string" use="required">
+            <annotation>
+               <documentation>
+                  The facet id.
+               </documentation>
+            </annotation>
+         </attribute>
+         <attribute name="version" type="string">
+            <annotation>
+               <documentation>
+                  A version expression that can be used to futher qualify the match. If not specifed, then versions are not used as a criteria for selecting the facet. The syntax of this expression, is the same syntax that is used by the facet framework.
+               </documentation>
+            </annotation>
+         </attribute>
+      </complexType>
+   </element>
+
+   <element name="targetRuntime">
+      <annotation>
+         <documentation>
+            Used to filter on target runtimes.
+         </documentation>
+      </annotation>
+      <complexType>
+         <attribute name="id" type="string" use="required">
+            <annotation>
+               <documentation>
+                  The target runtime id.
+               </documentation>
+            </annotation>
+         </attribute>
+      </complexType>
+   </element>
+
+   <element name="group">
+      <annotation>
+         <documentation>
+            Declares that this validator belongs to this validation group.
+         </documentation>
+      </annotation>
+      <complexType>
+         <attribute name="id" type="string" use="required">
+            <annotation>
+               <documentation>
+                  The fully qualified ID of the validation group to which this validator belongs.
+               </documentation>
+               <appInfo>
+                  <meta.attribute kind="identifier"/>
+               </appInfo>
+            </annotation>
+         </attribute>
+      </complexType>
+   </element>
+
+   <element name="contentType">
+      <annotation>
+         <documentation>
+            Used to filter based on content types.
+         </documentation>
+      </annotation>
+      <complexType>
+         <attribute name="id" type="string" use="required">
+            <annotation>
+               <documentation>
+                  The content type id.
+               </documentation>
+            </annotation>
+         </attribute>
+         <attribute name="exactMatch" type="boolean">
+            <annotation>
+               <documentation>
+                  Set to true if the content type needs to match exactly. Set to false if sub types are considered matches as well.
+               </documentation>
+            </annotation>
+         </attribute>
+      </complexType>
+   </element>
+
+   <element name="messageCategory">
+      <annotation>
+         <documentation>
+            Used to group together a set of messages, where the user can change the message severity of all the messages in the group. This is similar to the support in the JDT, where for example a user can specify whether used methods should be errors, warnings or ignored.
+         </documentation>
+      </annotation>
+      <complexType>
+         <attribute name="id" type="string" use="required">
+            <annotation>
+               <documentation>
+                  A simple id that is unique within the scope of this validator.
+               </documentation>
+            </annotation>
+         </attribute>
+         <attribute name="label" type="string" use="required">
+            <annotation>
+               <documentation>
+                  A short, one line label that is displayed to the end user, that describes the message category.
+               </documentation>
+               <appInfo>
+                  <meta.attribute translatable="true"/>
+               </appInfo>
+            </annotation>
+         </attribute>
+         <attribute name="severity">
+            <annotation>
+               <documentation>
+                  The default severity for this category.
+               </documentation>
+            </annotation>
+            <simpleType>
+               <restriction base="string">
+                  <enumeration value="error">
+                  </enumeration>
+                  <enumeration value="warning">
+                  </enumeration>
+                  <enumeration value="ignore">
+                  </enumeration>
+               </restriction>
+            </simpleType>
+         </attribute>
+      </complexType>
+   </element>
+
+   <element name="pattern">
+      <annotation>
+         <documentation>
+            Holds a regualr expression, that matches the resource&apos;s project relative name.
+         </documentation>
+      </annotation>
+      <complexType>
+         <attribute name="regex" type="string" use="required">
+            <annotation>
+               <documentation>
+                  Holds a Java regular expression. See the class java.util.regex.Pattern for more details. This regular expression is matched against a resource&apos;s project relative path, after that path has been converted into a portable path.
+&lt;p&gt;The path will always start with a forward slash (/) so that folder names can be more easily matched.
+               </documentation>
+            </annotation>
+         </attribute>
+         <attribute name="caseSensitive" type="boolean">
+            <annotation>
+               <documentation>
+                  If the file name is not case senstitive, then this needs to be set to false.
+               </documentation>
+            </annotation>
+         </attribute>
+      </complexType>
+   </element>
+
+   <annotation>
+      <appInfo>
+         <meta.section type="apiInfo"/>
+      </appInfo>
+      <documentation>
+         Provisional API.
+      </documentation>
+   </annotation>
+
+   <annotation>
+      <appInfo>
+         <meta.section type="since"/>
+      </appInfo>
+      <documentation>
+         WebTools 3.0.
+      </documentation>
+   </annotation>
+
+   <annotation>
+      <appInfo>
+         <meta.section type="examples"/>
+      </appInfo>
+      <documentation>
+         An example of a validator that will be called on resources that have html or htm file extensions.
+&lt;pre&gt;
+   &lt;extension
+         point=&quot;org.eclipse.wst.validation.validator&quot;
+         id=&quot;Test&quot; name=&quot;%Validator.Name&quot;&gt;
+      &lt;validator class=&quot;org.eclipse.wst.validation.test.TestValidator&quot;&gt;
+         &lt;include&gt;
+            &lt;rules&gt;
+               &lt;fileext ext=&quot;html&quot;/&gt;
+               &lt;fileext ext=&quot;htm&quot;/&gt;
+            &lt;/rules&gt;
+         &lt;/include&gt;
+      &lt;/validator&gt;
+   &lt;/extension&gt;
+&lt;/pre&gt;
+      </documentation>
+   </annotation>
+
+
+   <annotation>
+      <appInfo>
+         <meta.section type="copyright"/>
+      </appInfo>
+      <documentation>
+         Copyright (c) 2007,2008 IBM Corporation and others.&lt;br&gt;
+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 &lt;a
+href=&quot;http://www.eclipse.org/legal/epl-v10.html&quot;&gt;http://www.eclipse.org/legal/epl-v10.html&lt;/a&gt;
+      </documentation>
+   </annotation>
+
+</schema>
diff --git a/plugins/org.eclipse.wst.validation/xsds/validatorDelegates.exsd b/plugins/org.eclipse.wst.validation/xsds/validatorDelegates.exsd
new file mode 100644
index 0000000..4a5f850
--- /dev/null
+++ b/plugins/org.eclipse.wst.validation/xsds/validatorDelegates.exsd
@@ -0,0 +1,134 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!-- Schema file written by PDE -->
+<schema targetNamespace="org.eclipse.wst.validation">
+<annotation>
+      <appInfo>
+         <meta.schema plugin="org.eclipse.wst.validation" id="validatorDelegates" name="Validator Delegates"/>
+      </appInfo>
+      <documentation>
+         This extension point allows validator providers to contribute alternate implementations for a delegating validator.
+      </documentation>
+   </annotation>
+
+   <element name="extension">
+      <complexType>
+         <sequence>
+            <element ref="delegate"/>
+         </sequence>
+         <attribute name="point" type="string" use="required">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+            </annotation>
+         </attribute>
+         <attribute name="id" type="string">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+            </annotation>
+         </attribute>
+         <attribute name="name" type="string">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+               <appInfo>
+                  <meta.attribute translatable="true"/>
+               </appInfo>
+            </annotation>
+         </attribute>
+      </complexType>
+   </element>
+
+   <element name="delegate">
+      <annotation>
+         <documentation>
+            Defines a validator delegate. Delegating validators can have one or more delegates registered, only one of which can be active (selected) at once.
+         </documentation>
+      </annotation>
+      <complexType>
+         <attribute name="class" type="string" use="required">
+            <annotation>
+               <documentation>
+                  Specifies the class name of the delegate validator. The class must implement IValidatorJob.
+               </documentation>
+               <appInfo>
+                  <meta.attribute kind="java" basedOn="org.eclipse.wst.validation.internal.provisional.core.IValidatorJob"/>
+               </appInfo>
+            </annotation>
+         </attribute>
+         <attribute name="target" type="string" use="required">
+            <annotation>
+               <documentation>
+                  Specifies the id of the validator extension for which this delegate is being registered.
+               </documentation>
+            </annotation>
+         </attribute>
+         <attribute name="name" type="string" use="required">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+            </annotation>
+         </attribute>
+      </complexType>
+   </element>
+
+   <annotation>
+      <appInfo>
+         <meta.section type="since"/>
+      </appInfo>
+      <documentation>
+         &lt;b&gt;This extension point is part of an interim API that is still under development and expected to change significantly before reaching stability. It is being made available at this early stage to solicit feedback from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken (repeatedly) as the API evolves.&lt;/b&gt;
+      </documentation>
+   </annotation>
+
+   <annotation>
+      <appInfo>
+         <meta.section type="examples"/>
+      </appInfo>
+      <documentation>
+         &lt;extension point=&quot;org.eclipse.wst.validation.validatorDelegates&quot;&gt;
+    &lt;delegate
+          class=&quot;com.acme.fast.SuperFastValidator&quot;
+          name=&quot;Super fast validator&quot;
+          target=&quot;org.acme.core.ACMEDelegatingValidator&quot;/&gt;
+ &lt;/extension&gt;
+      </documentation>
+   </annotation>
+
+   <annotation>
+      <appInfo>
+         <meta.section type="apiInfo"/>
+      </appInfo>
+      <documentation>
+         A delegate validator will have to implement the IValidatorJob interface.
+The target validator, the one who will delegate its implementation to a delegate validator will have to extend org.eclipse.wst.validation.delegates.BaseDelegatingValidator.
+      </documentation>
+   </annotation>
+
+   <annotation>
+      <appInfo>
+         <meta.section type="implementation"/>
+      </appInfo>
+      <documentation>
+         
+      </documentation>
+   </annotation>
+
+   <annotation>
+      <appInfo>
+         <meta.section type="copyright"/>
+      </appInfo>
+      <documentation>
+         Copyright (c) 2006 IBM Corporation and others.&lt;br&gt;
+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 &lt;a
+href=&quot;http://www.eclipse.org/legal/epl-v10.html&quot;&gt;http://www.eclipse.org/legal/epl-v10.html&lt;/a&gt;
+      </documentation>
+   </annotation>
+
+</schema>
diff --git a/plugins/org.eclipse.wst.validation/xsds/validatorExtSchema.exsd b/plugins/org.eclipse.wst.validation/xsds/validatorExtSchema.exsd
new file mode 100644
index 0000000..0e9667e
--- /dev/null
+++ b/plugins/org.eclipse.wst.validation/xsds/validatorExtSchema.exsd
@@ -0,0 +1,326 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!-- Schema file written by PDE -->
+<schema targetNamespace="org.eclipse.wst.validation" xmlns="http://www.w3.org/2001/XMLSchema">
+<annotation>
+      <appInfo>
+         <meta.schema plugin="org.eclipse.wst.validation" id="validator" name="Validator"/>
+      </appInfo>
+      <documentation>
+         This extension point give the ability to create a new validator that can validate resources in a Java Project. The validator needs to registered for a given nature of the project for it to run on that project. The user can specifiy file filters to filter out files that need to be validated. The new validator registered by the project nature on the project can be run manually or incrementally if  Auto Build is turned on, during incremental builds the changed delta of files are only validated if those files are part of the validation filters specified.
+      </documentation>
+   </annotation>
+
+   <include schemaLocation="schema://org.eclipse.core.expressions/schema/expressionLanguage.exsd"/>
+
+   <element name="extension">
+      <annotation>
+         <appInfo>
+            <meta.element />
+         </appInfo>
+      </annotation>
+      <complexType>
+         <sequence>
+            <element ref="validator"/>
+         </sequence>
+         <attribute name="point" type="string" use="required">
+            <annotation>
+               <documentation>
+                  A fully qualified identifier of the target extension point
+               </documentation>
+            </annotation>
+         </attribute>
+         <attribute name="id" type="string" use="required">
+            <annotation>
+               <documentation>
+                  An optional identifier of the extension instance
+               </documentation>
+            </annotation>
+         </attribute>
+         <attribute name="name" type="string" use="required">
+            <annotation>
+               <documentation>
+                  An optional name of the extension instance
+               </documentation>
+               <appInfo>
+                  <meta.attribute translatable="true"/>
+               </appInfo>
+            </annotation>
+         </attribute>
+      </complexType>
+   </element>
+
+   <element name="validator">
+      <complexType>
+         <sequence>
+            <element ref="projectNature" minOccurs="0" maxOccurs="unbounded"/>
+            <element ref="filter" minOccurs="0" maxOccurs="unbounded"/>
+            <element ref="enablement" minOccurs="0" maxOccurs="unbounded"/>
+            <element ref="helper"/>
+            <element ref="dependentValidator" minOccurs="0" maxOccurs="1"/>
+            <element ref="run"/>
+            <element ref="markerId" minOccurs="0" maxOccurs="1"/>
+            <element ref="facet" minOccurs="0" maxOccurs="unbounded"/>
+            <element ref="contentTypeBinding" minOccurs="0" maxOccurs="unbounded"/>
+            <element ref="runStrategy"/>
+         </sequence>
+         <attribute name="to" type="string">
+            <annotation>
+               <documentation>
+                  Optional migration tag
+               </documentation>
+            </annotation>
+         </attribute>
+         <attribute name="from" type="string">
+            <annotation>
+               <documentation>
+                  Optional migration tag
+               </documentation>
+            </annotation>
+         </attribute>
+      </complexType>
+   </element>
+
+   <element name="projectNature">
+      <complexType>
+         <sequence>
+         </sequence>
+         <attribute name="id" type="string" use="required">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+            </annotation>
+         </attribute>
+         <attribute name="include" type="boolean">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+            </annotation>
+         </attribute>
+      </complexType>
+   </element>
+
+   <element name="contentTypeBinding">
+      <annotation>
+         <appInfo>
+            <meta.element labelAttribute="contentTypeId"/>
+         </appInfo>
+         <documentation>
+            Associates a particular content type with the current validator, and enables the validator to be run on resources of the specified content type.
+         </documentation>
+      </annotation>
+      <complexType>
+         <attribute name="contentTypeId" type="string" use="required">
+            <annotation>
+               <documentation>
+                  The content type identifier. This is an ID defined by the &apos;org.eclipse.core.runtime.contentTypes&apos; extension point.
+               </documentation>
+            </annotation>
+         </attribute>
+      </complexType>
+   </element>
+
+   <element name="filter">
+      <complexType>
+         <attribute name="objectClass" type="string" use="required">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+            </annotation>
+         </attribute>
+         <attribute name="nameFilter" type="string" use="required">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+            </annotation>
+         </attribute>
+         <attribute name="caseSensitive" type="boolean">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+            </annotation>
+         </attribute>
+         <attribute name="action" type="string">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+            </annotation>
+         </attribute>
+      </complexType>
+   </element>
+
+   <element name="helper">
+      <complexType>
+         <attribute name="class" type="string" use="required">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+            </annotation>
+         </attribute>
+      </complexType>
+   </element>
+
+   <element name="dependentValidator">
+      <complexType>
+         <attribute name="depValValue" type="boolean">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+            </annotation>
+         </attribute>
+      </complexType>
+   </element>
+
+   <element name="run">
+      <complexType>
+         <attribute name="class" type="string" use="required">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+            </annotation>
+         </attribute>
+         <attribute name="incremental" type="boolean">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+            </annotation>
+         </attribute>
+         <attribute name="enabled" type="boolean">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+            </annotation>
+         </attribute>
+         <attribute name="fullBuild" type="boolean">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+            </annotation>
+         </attribute>
+         <attribute name="async" type="boolean">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+            </annotation>
+         </attribute>
+      </complexType>
+   </element>
+
+   <element name="markerId">
+      <annotation>
+         <documentation>
+            The markerId element is is used to get a custom problem marker for the custom validator implemented using this extension point
+
+This markerId element also needs a corresponding problemMarker extension to be defined bythis validator with the same Id as the makerIdValue for the validator to have its own marker type. Here is an example of the a problemMarker extension defined for a markerIdValue &quot;FooMarker&quot;
+
+ &lt;extension
+         id=&quot;FooMarker&quot;
+         name=&quot;%EJB_VALIDATION_PROBLEMMARKER_NAME&quot;
+         point=&quot;org.eclipse.core.resources.markers&quot;&gt;
+      &lt;super
+            type=&quot;org.eclipse.wst.validation.problemmarker&quot;&gt;
+      &lt;/super&gt;
+      &lt;persistent
+            value=&quot;true&quot;&gt;
+      &lt;/persistent&gt;
+      &lt;attribute
+            name=&quot;owner&quot;&gt;
+      &lt;/attribute&gt;
+      &lt;attribute
+            name=&quot;validationSeverity&quot;&gt;
+      &lt;/attribute&gt;
+      &lt;attribute
+            name=&quot;targetObject&quot;&gt;
+      &lt;/attribute&gt;
+      &lt;attribute
+            name=&quot;groupName&quot;&gt;
+      &lt;/attribute&gt;
+      &lt;attribute
+            name=&quot;messageId&quot;&gt;
+      &lt;/attribute&gt;
+   &lt;/extension&gt;
+   
+   Without a problemMarker extension defined, the customer validator will use the base Validation Message problemMarker type.
+         </documentation>
+      </annotation>
+      <complexType>
+         <attribute name="markerIdValue" type="string">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+            </annotation>
+         </attribute>
+      </complexType>
+   </element>
+
+   <element name="facet">
+      <annotation>
+         <appInfo>
+            <meta.element deprecated="true"/>
+         </appInfo>
+         <documentation>
+            This element is deprecated and enablement is the new recommended approach to filter validators based on facets.
+         </documentation>
+      </annotation>
+      <complexType>
+         <attribute name="facetId" type="string">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+            </annotation>
+         </attribute>
+      </complexType>
+   </element>
+
+   <element name="runStrategy">
+      <complexType>
+         <attribute name="project" type="boolean">
+            <annotation>
+               <documentation>
+                  If true then the validator is only called once per project. If false (or missing) then the validator could be called once per resource (based on the other filter rules).
+               </documentation>
+            </annotation>
+         </attribute>
+      </complexType>
+   </element>
+
+
+   <annotation>
+      <appInfo>
+         <meta.section type="since"/>
+      </appInfo>
+      <documentation>
+         &lt;b&gt;This extension point is part of an interim API that is still under development and expected to change significantly before reaching stability. It is being made available at this early stage to solicit feedback from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken (repeatedly) as the API evolves.&lt;/b&gt;
+      </documentation>
+   </annotation>
+
+
+
+   <annotation>
+      <appInfo>
+         <meta.section type="copyright"/>
+      </appInfo>
+      <documentation>
+         Copyright (c) 2005, 2010 IBM Corporation and others.&lt;br&gt;
+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 &lt;a
+href=&quot;http://www.eclipse.org/legal/epl-v10.html&quot;&gt;http://www.eclipse.org/legal/epl-v10.html&lt;/a&gt;
+      </documentation>
+   </annotation>
+
+</schema>
diff --git a/plugins/org.eclipse.wst.validation/xsds/validatorgroup.exsd b/plugins/org.eclipse.wst.validation/xsds/validatorgroup.exsd
new file mode 100644
index 0000000..df05cb1
--- /dev/null
+++ b/plugins/org.eclipse.wst.validation/xsds/validatorgroup.exsd
@@ -0,0 +1,161 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!-- Schema file written by PDE -->
+<schema targetNamespace="org.eclipse.wst.validation" xmlns="http://www.w3.org/2001/XMLSchema">
+<annotation>
+      <appinfo>
+         <meta.schema plugin="org.eclipse.wst.validation" id="validatorGroup" name="Validator Group"/>
+      </appinfo>
+      <documentation>
+         Defines a grouping for validators with listeners notified of group members&apos; activites.  Useful for pre-caching common information used by multiple validators and disposing of that information when they&apos;re all done.
+      </documentation>
+   </annotation>
+
+   <element name="extension">
+      <annotation>
+         <appinfo>
+            <meta.element />
+         </appinfo>
+      </annotation>
+      <complexType>
+         <sequence>
+            <element ref="group" minOccurs="1" maxOccurs="unbounded"/>
+         </sequence>
+         <attribute name="point" type="string" use="required">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+            </annotation>
+         </attribute>
+         <attribute name="id" type="identifier">
+            <annotation>
+               <documentation>
+                  A unique identifier for this extension
+               </documentation>
+            </annotation>
+         </attribute>
+         <attribute name="name" type="string">
+            <annotation>
+               <documentation>
+                  A name for this extension
+               </documentation>
+               <appinfo>
+                  <meta.attribute translatable="true"/>
+               </appinfo>
+            </annotation>
+         </attribute>
+      </complexType>
+   </element>
+
+   <element name="listener">
+      <annotation>
+         <documentation>
+            A listener for activities in this group.
+         </documentation>
+      </annotation>
+      <complexType>
+         <attribute name="class" type="string" use="required">
+            <annotation>
+               <documentation>
+                  The listener&apos;s class.
+               </documentation>
+               <appinfo>
+                  <meta.attribute kind="java" basedOn=":org.eclipse.wst.validation.IValidatorGroupListener"/>
+               </appinfo>
+            </annotation>
+         </attribute>
+      </complexType>
+   </element>
+
+   <element name="group">
+      <annotation>
+         <documentation>
+            Declares a validator group.  A group may have multiple listeners.
+         </documentation>
+      </annotation>
+      <complexType>
+         <choice>
+            <element ref="listener" minOccurs="1" maxOccurs="unbounded"/>
+         </choice>
+         <attribute name="id" type="string" use="required">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+               <appinfo>
+                  <meta.attribute kind="identifier"/>
+               </appinfo>
+            </annotation>
+         </attribute>
+      </complexType>
+   </element>
+
+   <annotation>
+      <appinfo>
+         <meta.section type="since"/>
+      </appinfo>
+      <documentation>
+         WebTools 3.0
+      </documentation>
+   </annotation>
+
+   <annotation>
+      <appinfo>
+         <meta.section type="examples"/>
+      </appinfo>
+      <documentation>
+         Define a listener that simply prints that it has been called.
+&lt;pre&gt;
+&lt;extension point=&quot;org.eclipse.wst.validation.validatorGroup&quot;&gt;
+   &lt;group id=&quot;validatorGroup&quot;&gt;
+     &lt;listener class=&quot;org.eclipse.wst.validation.example.ValidatorGroupListener&quot;/&gt;
+   &lt;/group&gt;
+&lt;/extension&gt;
+
+public class org.eclipse.wst.validation.example.ValidatorGroupListener implements IValidatorGroupListener {
+
+  public ValidatorGroupListener() {
+  }
+
+  public void validationFinishing(IResource resource, IProgressMonitor monitor, ValType valType, ValOperation operation) {
+   System.out.println(&quot;Finishing:&quot; + resource.getFullPath());
+  }
+
+  public void validationStarting(IResource resource, IProgressMonitor monitor, ValType valType, ValOperation operation) {
+   System.out.println(&quot;Starting:&quot; + resource.getFullPath());
+  }
+}
+ 
+&lt;extension id=&quot;id&quot; name=&quot;name&quot; point=&quot;org.eclipse.wst.validation.validatorV2&quot;&gt;
+  &lt;validator class=&quot;org.eclipse.wst.validation.example.Validator&quot;&gt;
+    &lt;group id=&quot;org.eclipse.wst.validation.example.validatorGroup&quot;/&gt;
+  &lt;/validator&gt;
+&lt;/extension&gt;
+&lt;/pre&gt;
+      </documentation>
+   </annotation>
+
+   <annotation>
+      <appinfo>
+         <meta.section type="apiinfo"/>
+      </appinfo>
+      <documentation>
+         Provisional API.
+      </documentation>
+   </annotation>
+
+
+   <annotation>
+      <appinfo>
+         <meta.section type="copyright"/>
+      </appinfo>
+      <documentation>
+         Copyright (c) 2008 IBM Corporation and others.&lt;br&gt;
+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 &lt;a
+href=&quot;http://www.eclipse.org/legal/epl-v10.html&quot;&gt;http://www.eclipse.org/legal/epl-v10.html&lt;/a&gt;
+      </documentation>
+   </annotation>
+
+</schema>